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

conflicts resolved

Browse Source
This commit is contained in:
saurabh 2016-02-23 02:26:37 +05:30
commit fb71f32ebf
4 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
erpnext/buying/doctype/supplier/supplier.json
View File

@ -307,18 +307,31 @@
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
<<<<<<< HEAD
"fieldname": "credit_days_based_on", "fieldname": "credit_days_based_on",
"fieldtype": "Select", "fieldtype": "Select",
=======
"depends_on": "eval:doc.credit_days_based_on == 'Fixed Days'",
"fieldname": "credit_days",
"fieldtype": "Int",
>>>>>>> ff321763cf11f306460db22789e31756121dbe67
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
<<<<<<< HEAD
"label": "Credit Days Based On", "label": "Credit Days Based On",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "\nFixed Days\nLast Day of the Next Month", "options": "\nFixed Days\nLast Day of the Next Month",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
=======
"label": "Credit Days",
"length": 0,
"no_copy": 0,
"permlevel": 0,
>>>>>>> ff321763cf11f306460db22789e31756121dbe67
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
@ -332,16 +345,30 @@
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
<<<<<<< HEAD
"depends_on": "eval:doc.credit_days_based_on == 'Fixed Days'", "depends_on": "eval:doc.credit_days_based_on == 'Fixed Days'",
"fieldname": "credit_days", "fieldname": "credit_days",
"fieldtype": "Int", "fieldtype": "Int",
=======
"depends_on": "eval:!doc.__islocal",
"fieldname": "address_contacts",
"fieldtype": "Section Break",
>>>>>>> ff321763cf11f306460db22789e31756121dbe67
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
<<<<<<< HEAD
"label": "Credit Days", "label": "Credit Days",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
=======
"label": "Address and Contacts",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
"options": "icon-map-marker",
>>>>>>> ff321763cf11f306460db22789e31756121dbe67
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
@ -356,6 +383,7 @@
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
<<<<<<< HEAD
"depends_on": "eval:!doc.__islocal", "depends_on": "eval:!doc.__islocal",
"fieldname": "address_contacts", "fieldname": "address_contacts",
"fieldtype": "Section Break", "fieldtype": "Section Break",
@ -382,6 +410,8 @@
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
=======
>>>>>>> ff321763cf11f306460db22789e31756121dbe67
"fieldname": "address_html", "fieldname": "address_html",
"fieldtype": "HTML", "fieldtype": "HTML",
"hidden": 0, "hidden": 0,
@ -608,7 +638,11 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
<<<<<<< HEAD
"modified": "2016-02-22 16:50:55.710869", "modified": "2016-02-22 16:50:55.710869",
=======
"modified": "2016-02-17 12:28:05.386806",
>>>>>>> ff321763cf11f306460db22789e31756121dbe67
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier", "name": "Supplier",
@ -760,4 +794,4 @@
"search_fields": "supplier_name, supplier_type", "search_fields": "supplier_name, supplier_type",
"sort_order": "ASC", "sort_order": "ASC",
"title_field": "supplier_name" "title_field": "supplier_name"
} }

2
erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
View File

@ -1892,4 +1892,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"timeline_field": "supplier", "timeline_field": "supplier",
"title_field": "title" "title_field": "title"
} }

2
erpnext/selling/doctype/customer/customer.json
View File

@ -1059,4 +1059,4 @@
"search_fields": "customer_name,customer_group,territory", "search_fields": "customer_name,customer_group,territory",
"sort_order": "ASC", "sort_order": "ASC",
"title_field": "customer_name" "title_field": "customer_name"
} }

2
erpnext/setup/doctype/translation/translation.json
View File

@ -172,4 +172,4 @@
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"title_field": "source_name" "title_field": "source_name"
} }