nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2023-11-18 20:10:28 +05:30
parent 51e33e1556
commit da27c0fb2d
1 changed files with 0 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -841,57 +841,6 @@
"fieldname": "named_place",
"fieldtype": "Data",
"label": "Named Place"
<<<<<<< HEAD
=======
},
{
"fieldname": "shipping_address",
"fieldtype": "Link",
"label": "Shipping Address",
"options": "Address",
"print_hide": 1
},
{
"fieldname": "column_break_zjaq",
"fieldtype": "Column Break"
},
{
"fieldname": "shipping_address_display",
"fieldtype": "Small Text",
"label": "Shipping Address Details",
"print_hide": 1,
"read_only": 1
},
{
"fieldname": "shipping_address_section",
"fieldtype": "Section Break",
"label": "Shipping Address"
},
{
"fieldname": "supplier_address_section",
"fieldtype": "Section Break",
"label": "Supplier Address"
},
{
"fieldname": "company_billing_address_section",
"fieldtype": "Section Break",
"label": "Company Billing Address"
},
{
"fieldname": "billing_address",
"fieldtype": "Link",
"label": "Company Billing Address",
"options": "Address"
},
{
"fieldname": "column_break_gcth",
"fieldtype": "Column Break"
},
{
"fieldname": "billing_address_display",
"fieldtype": "Small Text",
"label": "Billing Address Details",
"read_only": 1
},
{
"fieldname": "cost_center",
@@ -913,7 +862,6 @@
"fieldname": "accounting_dimensions_section",
"fieldtype": "Section Break",
"label": "Accounting Dimensions"
>>>>>>> 089da459f7 (feat: Add accounting dimensions to Supplier Quotation)
}
],
"icon": "fa fa-shopping-cart",
@@ -921,11 +869,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-04-14 16:43:41.714832",
=======
"modified": "2023-11-17 12:34:30.083077",
>>>>>>> 089da459f7 (feat: Add accounting dimensions to Supplier Quotation)
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier Quotation",