commit 855e39026578cb983469d999de55abb4f26fab8f
author Vishal Dhayagude <vishdha@users.noreply.github.com> Wed Nov 29 16:25:24 2017 +0530
committer Nabin Hait <nabinhait@gmail.com> Wed Nov 29 16:25:24 2017 +0530
tree 41307975f104bbcf594f48febf2fd64f11a4edb9
parent d42242df220893dae6f3b97e838a56b054b4f610

[fix] Sales Invoice json conflict (#11779)

erpnext/accounts/doctype/sales_invoice/sales_invoice.json

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