Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] Sales Invoice json conflict (#11779)

Browse Source
This commit is contained in:
Vishal Dhayagude 2017-11-29 16:25:24 +05:30 committed by Nabin Hait
parent d42242df22
commit 855e390265
1 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@ -271,41 +271,23 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
<<<<<<< fc60f9655fe871ba666a8f6fc860c47c5f4c397e
"depends_on": "is_pos",
"fieldname": "pos_profile",
"fieldtype": "Link",
"hidden": 0,
=======
"fieldname": "offline_pos_name", "fieldname": "offline_pos_name",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 1, "hidden": 1,
>>>>>>> [fix] Print hide added
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_global_search": 0, "in_global_search": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
<<<<<<< fc60f9655fe871ba666a8f6fc860c47c5f4c397e
"label": "POS Profile",
"length": 0,
"no_copy": 1,
"options": "POS Profile",
=======
"label": "Offline POS Name", "label": "Offline POS Name",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
>>>>>>> [fix] Print hide added
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 1, "print_hide": 1,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
<<<<<<< fc60f9655fe871ba666a8f6fc860c47c5f4c397e
"read_only": 0,
=======
"read_only": 1, "read_only": 1,
>>>>>>> [fix] Print hide added
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
@ -319,13 +301,8 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
<<<<<<< fc60f9655fe871ba666a8f6fc860c47c5f4c397e
"fieldname": "offline_pos_name",
"fieldtype": "Data",
=======
"fieldname": "pos_profile", "fieldname": "pos_profile",
"fieldtype": "Link", "fieldtype": "Link",
>>>>>>> [fix] Print hide added
"hidden": 1, "hidden": 1,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
@ -333,25 +310,15 @@
"in_global_search": 0, "in_global_search": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
<<<<<<< fc60f9655fe871ba666a8f6fc860c47c5f4c397e
"label": "Offline POS Name",
"length": 0,
"no_copy": 0,
=======
"label": "POS Profile", "label": "POS Profile",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "POS Profile", "options": "POS Profile",
>>>>>>> [fix] Print hide added
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 1, "print_hide": 1,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
<<<<<<< fc60f9655fe871ba666a8f6fc860c47c5f4c397e
"read_only": 1,
=======
"read_only": 0, "read_only": 0,
>>>>>>> [fix] Print hide added
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
@ -1771,8 +1738,6 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
<<<<<<< fc60f9655fe871ba666a8f6fc860c47c5f4c397e
=======
"fieldname": "total_net_weight", "fieldname": "total_net_weight",
"fieldtype": "Float", "fieldtype": "Float",
"hidden": 0, "hidden": 0,
@ -1803,7 +1768,6 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
>>>>>>> [fix] Print hide added
"fieldname": "taxes_section", "fieldname": "taxes_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"hidden": 0, "hidden": 0,