From 0433f73b03a4691cb1accd1235044fae04f8b9e3 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 10 Feb 2026 14:33:01 +0530 Subject: [PATCH] refactor: utm analytics section delivery note (cherry picked from commit 578783af8e4e731fc0a3ee9a68f44b22a6d58d1f) # Conflicts: # erpnext/stock/doctype/delivery_note/delivery_note.json --- .../doctype/delivery_note/delivery_note.json | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json index 3b2215fdae7..1f818cfcddd 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -156,17 +156,18 @@ "column_break_88", "select_print_heading", "language", + "utm_analytics_section", + "utm_source", + "utm_medium", + "column_break_neoj", + "utm_campaign", + "utm_content", "more_info", "is_internal_customer", "represents_company", "inter_company_reference", "customer_group", "territory", - "column_break_pxls", - "utm_source", - "utm_campaign", - "utm_medium", - "utm_content", "column_break5", "excise_page", "instructions", @@ -1366,10 +1367,6 @@ "options": "Delivery Trip", "print_hide": 1 }, - { - "fieldname": "column_break_pxls", - "fieldtype": "Column Break" - }, { "fieldname": "utm_medium", "fieldtype": "Link", @@ -1425,6 +1422,7 @@ "print_hide": 1 }, { +<<<<<<< HEAD "fieldname": "totals_section", "fieldtype": "Section Break", "label": "Totals", @@ -1439,6 +1437,15 @@ }, { "fieldname": "column_break_ydwe", +======= + "collapsible": 1, + "fieldname": "utm_analytics_section", + "fieldtype": "Section Break", + "label": "UTM Analytics" + }, + { + "fieldname": "column_break_neoj", +>>>>>>> 578783af8e (refactor: utm analytics section delivery note) "fieldtype": "Column Break" } ], @@ -1446,7 +1453,11 @@ "idx": 146, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2026-02-23 23:05:39.097097", +======= + "modified": "2026-02-10 14:35:08.523130", +>>>>>>> 578783af8e (refactor: utm analytics section delivery note) "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note",