mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-21 05:59:18 +00:00
refactor: utm section in sales order
(cherry picked from commit c00bf7df6a)
# Conflicts:
# erpnext/selling/doctype/sales_order/sales_order.json
This commit is contained in:
@@ -161,17 +161,18 @@
|
|||||||
"column_break4",
|
"column_break4",
|
||||||
"select_print_heading",
|
"select_print_heading",
|
||||||
"language",
|
"language",
|
||||||
|
"utm_analytics_section",
|
||||||
|
"utm_source",
|
||||||
|
"utm_medium",
|
||||||
|
"column_break_ijxt",
|
||||||
|
"utm_campaign",
|
||||||
|
"utm_content",
|
||||||
"additional_info_section",
|
"additional_info_section",
|
||||||
"is_internal_customer",
|
"is_internal_customer",
|
||||||
"po_no",
|
"po_no",
|
||||||
"po_date",
|
"po_date",
|
||||||
"represents_company",
|
"represents_company",
|
||||||
"column_break_yvzv",
|
"column_break_yvzv",
|
||||||
"utm_source",
|
|
||||||
"utm_campaign",
|
|
||||||
"utm_medium",
|
|
||||||
"utm_content",
|
|
||||||
"column_break_152",
|
|
||||||
"inter_company_order_reference",
|
"inter_company_order_reference",
|
||||||
"party_account_currency",
|
"party_account_currency",
|
||||||
"connections_tab"
|
"connections_tab"
|
||||||
@@ -1567,10 +1568,6 @@
|
|||||||
"fieldtype": "Section Break",
|
"fieldtype": "Section Break",
|
||||||
"label": "Additional Info"
|
"label": "Additional Info"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"fieldname": "column_break_152",
|
|
||||||
"fieldtype": "Column Break"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"fieldname": "incoterm",
|
"fieldname": "incoterm",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
@@ -1717,6 +1714,16 @@
|
|||||||
"hide_days": 1,
|
"hide_days": 1,
|
||||||
"hide_seconds": 1,
|
"hide_seconds": 1,
|
||||||
"label": "Additional Discount"
|
"label": "Additional Discount"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_ijxt",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"collapsible": 1,
|
||||||
|
"fieldname": "utm_analytics_section",
|
||||||
|
"fieldtype": "Section Break",
|
||||||
|
"label": "UTM Analytics"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"grid_page_length": 50,
|
"grid_page_length": 50,
|
||||||
@@ -1724,7 +1731,11 @@
|
|||||||
"idx": 105,
|
"idx": 105,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2026-02-23 14:25:56.665392",
|
"modified": "2026-02-23 14:25:56.665392",
|
||||||
|
=======
|
||||||
|
"modified": "2026-02-10 11:55:52.796522",
|
||||||
|
>>>>>>> c00bf7df6a (refactor: utm section in sales order)
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Selling",
|
"module": "Selling",
|
||||||
"name": "Sales Order",
|
"name": "Sales Order",
|
||||||
|
|||||||
Reference in New Issue
Block a user