CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-17 09:17:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-11-20 12:51:29 +05:30
parent b6524946bc
commit 80f0d5b5ec
1 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
erpnext/selling/doctype/quotation/quotation.json
View File

@@ -1070,57 +1070,19 @@
"fieldname": "named_place",
"fieldtype": "Data",
"label": "Named Place"
<<<<<<< HEAD
=======
},
{
"fieldname": "utm_campaign",
"fieldtype": "Link",
"label": "Campaign",
"oldfieldname": "campaign",
"oldfieldtype": "Link",
"options": "UTM Campaign",
"print_hide": 1
},
{
"fieldname": "utm_source",
"fieldtype": "Link",
"label": "Source",
"oldfieldname": "source",
"oldfieldtype": "Select",
"options": "UTM Source",
"print_hide": 1
},
{
"fieldname": "utm_medium",
"fieldtype": "Link",
"label": "Medium",
"options": "UTM Medium",
"print_hide": 1
},
{
"fieldname": "utm_content",
"fieldtype": "Data",
"label": "Content",
"print_hide": 1
},
{
"default": "0",
"fieldname": "disable_rounded_total",
"fieldtype": "Check",
"label": "Disable Rounded Total"
>>>>>>> f8524d526b (fix: added disable_rounded_total field)
}
],
"icon": "fa fa-shopping-cart",
"idx": 82,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2024-03-20 16:04:21.567847",
=======
"modified": "2024-11-07 18:37:11.715189",
>>>>>>> f8524d526b (fix: added disable_rounded_total field)
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",