From 6539e443a5eb5301826295723d64705f43a480ee Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 6 Feb 2026 16:18:58 +0530 Subject: [PATCH 01/10] refactor: hide UTM parameters (cherry picked from commit aaf5f923b0daff972c2a9c7a17cf894e257b1cba) # Conflicts: # erpnext/selling/doctype/quotation/quotation.json --- .../selling/doctype/quotation/quotation.json | 64 +++++++++++++++---- .../selling_settings/selling_settings.json | 17 ++++- .../selling_settings/selling_settings.py | 26 ++++++++ 3 files changed, 93 insertions(+), 14 deletions(-) diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index 78cf42ae753..be82453e419 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -123,19 +123,20 @@ "competitors", "column_break_117", "order_lost_reason", + "utm_analytics_section", + "utm_source", + "utm_medium", + "column_break_fozg", + "utm_campaign", + "utm_content", "additional_info_section", "status", "customer_group", "territory", "column_break_108", - "utm_source", - "utm_campaign", - "utm_medium", - "utm_content", - "column_break4", "opportunity", - "supplier_quotation", "enq_det", + "supplier_quotation", "connections_tab" ], "fields": [ @@ -862,13 +863,6 @@ "oldfieldtype": "Small Text", "print_hide": 1 }, - { - "fieldname": "column_break4", - "fieldtype": "Column Break", - "oldfieldtype": "Column Break", - "print_hide": 1, - "width": "50%" - }, { "default": "Draft", "fieldname": "status", @@ -1117,13 +1111,57 @@ "no_copy": 1, "options": "Item Wise Tax Detail", "print_hide": 1 +<<<<<<< HEAD +======= + }, + { + "collapsible": 1, + "fieldname": "additional_discount_section", + "fieldtype": "Section Break", + "label": "Additional Discount" + }, + { + "fieldname": "totals_section", + "fieldtype": "Section Break", + "label": "Totals", + "oldfieldtype": "Section Break", + "options": "fa fa-money", + "print_hide": 1 + }, + { + "fieldname": "base_totals_section", + "fieldtype": "Section Break", + "label": "Totals (Company Currency)" + }, + { + "fieldname": "column_break_vyhp", + "fieldtype": "Column Break" + }, + { + "fieldname": "column_break_bffp", + "fieldtype": "Column Break" + }, + { + "fieldname": "column_break_fozg", + "fieldtype": "Column Break" + }, + { + "collapsible": 1, + "fieldname": "utm_analytics_section", + "fieldtype": "Section Break", + "label": "UTM Analytics" +>>>>>>> aaf5f923b0 (refactor: hide UTM parameters) } ], "icon": "fa fa-shopping-cart", "idx": 82, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2026-01-29 21:18:48.836168", +======= + "modified": "2026-02-06 17:34:22.170032", +>>>>>>> aaf5f923b0 (refactor: hide UTM parameters) "modified_by": "Administrator", "module": "Selling", "name": "Quotation", diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json index 9fe14ae2a98..b7e4fce817d 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.json +++ b/erpnext/selling/doctype/selling_settings/selling_settings.json @@ -41,6 +41,8 @@ "allow_zero_qty_in_quotation", "allow_zero_qty_in_sales_order", "set_zero_rate_for_expired_batch", + "section_break_avhb", + "enable_utm", "experimental_section", "use_legacy_js_reactivity", "subcontracting_inward_tab", @@ -305,6 +307,19 @@ "fieldname": "enable_tracking_sales_commissions", "fieldtype": "Check", "label": "Enable tracking sales commissions" + }, + { + "fieldname": "section_break_avhb", + "fieldtype": "Section Break", + "label": "Analytics" + }, + { + "default": "0", + "description": "Enable UTM parameters", + "documentation_url": "https://en.wikipedia.org/wiki/UTM_parameters", + "fieldname": "enable_utm", + "fieldtype": "Check", + "label": "Enable UTM" } ], "grid_page_length": 50, @@ -314,7 +329,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2026-02-04 16:16:57.618127", + "modified": "2026-02-06 16:11:13.538490", "modified_by": "Administrator", "module": "Selling", "name": "Selling Settings", diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.py b/erpnext/selling/doctype/selling_settings/selling_settings.py index 775b5844c3e..8621f5f066d 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.py +++ b/erpnext/selling/doctype/selling_settings/selling_settings.py @@ -10,6 +10,17 @@ from frappe.custom.doctype.property_setter.property_setter import make_property_ from frappe.model.document import Document from frappe.utils import cint +UTM_DOCTYPES = [ + "Lead", + "Quotation", + "POS Invoice", + "POS Profile", + "Opportunity", + "Sales Order", + "Sales Invoice", + "Delivery Note", +] + class SellingSettings(Document): # begin: auto-generated types @@ -38,6 +49,7 @@ class SellingSettings(Document): enable_cutoff_date_on_bulk_delivery_note_creation: DF.Check enable_discount_accounting: DF.Check enable_tracking_sales_commissions: DF.Check + enable_utm: DF.Check fallback_to_default_price_list: DF.Check hide_tax_id: DF.Check maintain_same_rate_action: DF.Literal["Stop", "Warn"] @@ -84,6 +96,9 @@ class SellingSettings(Document): if old_doc.enable_tracking_sales_commissions != self.enable_tracking_sales_commissions: toggle_tracking_sales_commissions_section(not self.enable_tracking_sales_commissions) + if old_doc.enable_utm != self.enable_utm: + toggle_utm_analytics_section(not self.enable_utm) + def validate_fallback_to_default_price_list(self): if ( self.fallback_to_default_price_list @@ -195,3 +210,14 @@ def toggle_tracking_sales_commissions_section(hide): create_property_setter_for_hiding_field(doctype, "commission_section", hide) if meta.has_field("sales_team_section"): create_property_setter_for_hiding_field(doctype, "sales_team_section", hide) + + +def toggle_utm_analytics_section(hide): + from erpnext.accounts.doctype.accounts_settings.accounts_settings import ( + create_property_setter_for_hiding_field, + ) + + for doctype in UTM_DOCTYPES: + meta = frappe.get_meta(doctype) + if meta.has_field("utm_analytics_section"): + create_property_setter_for_hiding_field(doctype, "utm_analytics_section", hide) From 774aa2b78ffb110cf445e681b995688f0ffbe225 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 10 Feb 2026 11:56:32 +0530 Subject: [PATCH 02/10] refactor: utm section in sales order (cherry picked from commit c00bf7df6af08303aadd300045fee443efc59a97) # Conflicts: # erpnext/selling/doctype/sales_order/sales_order.json --- .../doctype/sales_order/sales_order.json | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 4238e3438a3..33c0572183f 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -161,17 +161,18 @@ "column_break4", "select_print_heading", "language", + "utm_analytics_section", + "utm_source", + "utm_medium", + "column_break_ijxt", + "utm_campaign", + "utm_content", "additional_info_section", "is_internal_customer", "po_no", "po_date", "represents_company", "column_break_yvzv", - "utm_source", - "utm_campaign", - "utm_medium", - "utm_content", - "column_break_152", "inter_company_order_reference", "party_account_currency", "connections_tab" @@ -1567,10 +1568,6 @@ "fieldtype": "Section Break", "label": "Additional Info" }, - { - "fieldname": "column_break_152", - "fieldtype": "Column Break" - }, { "fieldname": "incoterm", "fieldtype": "Link", @@ -1717,6 +1714,16 @@ "hide_days": 1, "hide_seconds": 1, "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, @@ -1724,7 +1731,11 @@ "idx": 105, "is_submittable": 1, "links": [], +<<<<<<< HEAD "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", "module": "Selling", "name": "Sales Order", From 964d75bd3ee768407776774f7c0efa4512cb1326 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 10 Feb 2026 11:59:17 +0530 Subject: [PATCH 03/10] refactor: utm section in sales invoice (cherry picked from commit 678d261f4008610bf5faa5a0c2b7484f058c643f) # Conflicts: # erpnext/accounts/doctype/sales_invoice/sales_invoice.json --- .../doctype/sales_invoice/sales_invoice.json | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index bfe52e8c7b1..0ec05b072aa 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -219,16 +219,17 @@ "column_break_140", "to_date", "update_auto_repeat_reference", + "utm_analytics_section", + "utm_source", + "utm_medium", + "column_break_ixxw", + "utm_campaign", + "utm_content", "more_information", "status", "remarks", "customer_group", "column_break_imbx", - "utm_source", - "utm_campaign", - "utm_medium", - "utm_content", - "col_break23", "is_internal_customer", "represents_company", "inter_company_invoice_reference", @@ -1632,13 +1633,6 @@ "no_copy": 1, "read_only": 1 }, - { - "fieldname": "col_break23", - "fieldtype": "Column Break", - "hide_days": 1, - "hide_seconds": 1, - "width": "50%" - }, { "default": "Draft", "fieldname": "status", @@ -2307,12 +2301,23 @@ "print_hide": 1 }, { +<<<<<<< HEAD "fieldname": "section_break_vacb", "fieldtype": "Section Break" }, { "fieldname": "column_break_rdks", "fieldtype": "Column Break" +======= + "fieldname": "column_break_ixxw", + "fieldtype": "Column Break" + }, + { + "collapsible": 1, + "fieldname": "utm_analytics_section", + "fieldtype": "Section Break", + "label": "UTM Analytics" +>>>>>>> 678d261f40 (refactor: utm section in sales invoice) } ], "grid_page_length": 50, @@ -2326,7 +2331,11 @@ "link_fieldname": "consolidated_invoice" } ], +<<<<<<< HEAD "modified": "2026-02-23 14:29:00.301842", +======= + "modified": "2026-02-10 11:59:07.819903", +>>>>>>> 678d261f40 (refactor: utm section in sales invoice) "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", From 08df2a755e78ee009ef5c7f748a422b3a6763107 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 10 Feb 2026 14:23:28 +0530 Subject: [PATCH 04/10] refactor: utm section pos invoice (cherry picked from commit 0bafa347a5ecf9e02ccf97265b0345be07b33803) --- .../doctype/pos_invoice/pos_invoice.json | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json index 406e3fa7537..ff57c811c58 100644 --- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json +++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json @@ -159,15 +159,16 @@ "language", "column_break_84", "select_print_heading", + "utm_analytics_section", + "utm_source", + "utm_medium", + "column_break_bhao", + "utm_campaign", "more_information", "inter_company_invoice_reference", "customer_group", "is_discounted", "col_break23", - "utm_source", - "utm_campaign", - "utm_medium", - "column_break_gpiw", "status", "more_info", "debit_to", @@ -1541,10 +1542,6 @@ "fieldtype": "Check", "label": "Update Billed Amount in Delivery Note" }, - { - "fieldname": "column_break_gpiw", - "fieldtype": "Column Break" - }, { "fieldname": "utm_medium", "fieldtype": "Link", @@ -1612,12 +1609,22 @@ "no_copy": 1, "options": "Item Wise Tax Detail", "print_hide": 1 + }, + { + "collapsible": 1, + "fieldname": "utm_analytics_section", + "fieldtype": "Section Break", + "label": "UTM Analytics" + }, + { + "fieldname": "column_break_bhao", + "fieldtype": "Column Break" } ], "icon": "fa fa-file-text", "is_submittable": 1, "links": [], - "modified": "2026-01-29 21:20:51.376875", + "modified": "2026-02-10 14:23:07.181782", "modified_by": "Administrator", "module": "Accounts", "name": "POS Invoice", From fc0a07b3b1eb49bdb92a784a348cad0939e6574a Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 10 Feb 2026 14:24:59 +0530 Subject: [PATCH 05/10] refactor: utm analytics section in pos profile (cherry picked from commit 7de0ca164dc85347d3efdf2cd8904de50bc39fc5) # Conflicts: # erpnext/accounts/doctype/pos_profile/pos_profile.json --- .../doctype/pos_profile/pos_profile.json | 117 ++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json index c0e5c895403..b7e0cc1bb55 100644 --- a/erpnext/accounts/doctype/pos_profile/pos_profile.json +++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json @@ -44,6 +44,7 @@ "column_break0", "tc_name", "select_print_heading", +<<<<<<< HEAD "section_break_19", "selling_price_list", "currency", @@ -62,6 +63,14 @@ "cost_center", "dimension_col_break", "project" +======= + "utm_analytics_section", + "utm_source", + "column_break_tvls", + "utm_campaign", + "column_break_xygw", + "utm_medium" +>>>>>>> 7de0ca164d (refactor: utm analytics section in pos profile) ], "fields": [ { @@ -430,6 +439,110 @@ "fieldname": "allow_partial_payment", "fieldtype": "Check", "label": "Allow Partial Payment" +<<<<<<< HEAD +======= + }, + { + "fieldname": "column_break_tvls", + "fieldtype": "Column Break" + }, + { + "fieldname": "column_break_xygw", + "fieldtype": "Column Break" + }, + { + "fieldname": "accounting_tab", + "fieldtype": "Tab Break", + "label": "Accounting" + }, + { + "fieldname": "more_info_tab", + "fieldtype": "Tab Break", + "label": "More Info" + }, + { + "fieldname": "pos_configurations_tab", + "fieldtype": "Tab Break", + "label": "POS Configurations" + }, + { + "fieldname": "price_list_and_currency_section", + "fieldtype": "Section Break", + "label": "Price List & Currency" + }, + { + "fieldname": "column_break_bptt", + "fieldtype": "Column Break" + }, + { + "fieldname": "write_off_section", + "fieldtype": "Section Break", + "label": "Write Off" + }, + { + "fieldname": "column_break_ukpz", + "fieldtype": "Column Break" + }, + { + "fieldname": "column_break_pkca", + "fieldtype": "Column Break" + }, + { + "fieldname": "income_and_expense_account", + "fieldtype": "Section Break", + "label": "Income and Expense" + }, + { + "fieldname": "column_break_byzk", + "fieldtype": "Column Break" + }, + { + "fieldname": "taxes_section", + "fieldtype": "Section Break", + "label": "Taxes" + }, + { + "fieldname": "column_break_cjpp", + "fieldtype": "Column Break" + }, + { + "fieldname": "pos_item_selector_section", + "fieldtype": "Section Break", + "label": "POS Item Selector" + }, + { + "fieldname": "column_break_rpny", + "fieldtype": "Column Break" + }, + { + "fieldname": "column_break_stcl", + "fieldtype": "Column Break" + }, + { + "fieldname": "pos_item_details_section", + "fieldtype": "Section Break", + "label": "POS Item Details" + }, + { + "fieldname": "column_break_hwfg", + "fieldtype": "Column Break" + }, + { + "fieldname": "column_break_egpi", + "fieldtype": "Column Break" + }, + { + "default": "0", + "fieldname": "allow_warehouse_change", + "fieldtype": "Check", + "label": "Allow User to Edit Warehouse" + }, + { + "collapsible": 1, + "fieldname": "utm_analytics_section", + "fieldtype": "Section Break", + "label": "Campaign" +>>>>>>> 7de0ca164d (refactor: utm analytics section in pos profile) } ], "grid_page_length": 50, @@ -458,7 +571,11 @@ "link_fieldname": "pos_profile" } ], +<<<<<<< HEAD "modified": "2025-06-24 11:19:19.834905", +======= + "modified": "2026-02-10 14:24:48.597412", +>>>>>>> 7de0ca164d (refactor: utm analytics section in pos profile) "modified_by": "Administrator", "module": "Accounts", "name": "POS Profile", From 3a8967b2a7d7141bae4b1d9dca1ded0c45b64e09 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 10 Feb 2026 14:28:26 +0530 Subject: [PATCH 06/10] refactor: utm analytics section in lead (cherry picked from commit 71e8941285a6e084c3cf171ad726367dff7c7c41) --- erpnext/crm/doctype/lead/lead.json | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json index c4b0133e96e..925a60913f6 100644 --- a/erpnext/crm/doctype/lead/lead.json +++ b/erpnext/crm/doctype/lead/lead.json @@ -52,13 +52,12 @@ "country", "column_break2", "contact_html", - "section_break_analytics", + "utm_analytics_section", "utm_source", - "utm_content", + "utm_medium", "column_break_gkxo", "utm_campaign", - "column_break_gqka", - "utm_medium", + "utm_content", "qualification_tab", "qualification_status", "column_break_64", @@ -504,10 +503,6 @@ "fieldname": "column_break_gkxo", "fieldtype": "Column Break" }, - { - "fieldname": "column_break_gqka", - "fieldtype": "Column Break" - }, { "fieldname": "utm_content", "fieldtype": "Data", @@ -537,7 +532,8 @@ "options": "UTM Campaign" }, { - "fieldname": "section_break_analytics", + "collapsible": 1, + "fieldname": "utm_analytics_section", "fieldtype": "Section Break", "label": "Analytics" } @@ -547,7 +543,7 @@ "idx": 5, "image_field": "image", "links": [], - "modified": "2025-06-26 11:02:01.158901", + "modified": "2026-02-10 14:36:37.157961", "modified_by": "Administrator", "module": "CRM", "name": "Lead", From 2bb8c7c74ee992698e08389527298e793cf77f6c Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 10 Feb 2026 14:30:29 +0530 Subject: [PATCH 07/10] refactor: utm section in opportunity (cherry picked from commit 223d560b32f474e59633769de346253c1ee7cff4) --- .../crm/doctype/opportunity/opportunity.json | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json index cf8f36e04c7..50f8eb9aabf 100644 --- a/erpnext/crm/doctype/opportunity/opportunity.json +++ b/erpnext/crm/doctype/opportunity/opportunity.json @@ -44,13 +44,12 @@ "column_break_17", "opportunity_amount", "base_opportunity_amount", - "section_break_analytics", + "utm_analytics_section", "utm_source", - "utm_content", + "utm_medium", "column_break_emai", "utm_campaign", - "column_break_whcu", - "utm_medium", + "utm_content", "more_info", "company", "transaction_date", @@ -629,15 +628,6 @@ "options": "UTM Campaign", "print_hide": 1 }, - { - "fieldname": "section_break_analytics", - "fieldtype": "Section Break", - "label": "Analytics" - }, - { - "fieldname": "column_break_whcu", - "fieldtype": "Column Break" - }, { "fieldname": "utm_medium", "fieldtype": "Link", @@ -650,13 +640,19 @@ "fieldtype": "Data", "label": "Content", "print_hide": 1 + }, + { + "collapsible": 1, + "fieldname": "utm_analytics_section", + "fieldtype": "Section Break", + "label": "Analytics" } ], "grid_page_length": 50, "icon": "fa fa-info-sign", "idx": 195, "links": [], - "modified": "2025-08-11 13:35:39.476016", + "modified": "2026-02-10 14:36:01.387984", "modified_by": "Administrator", "module": "CRM", "name": "Opportunity", From 0433f73b03a4691cb1accd1235044fae04f8b9e3 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 10 Feb 2026 14:33:01 +0530 Subject: [PATCH 08/10] 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", From 4acf404ae5f201c1b0c486042ea3740cde5ac078 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Thu, 12 Feb 2026 10:38:50 +0530 Subject: [PATCH 09/10] refactor: better description on toggle (cherry picked from commit 20af546b26b18658f035e1199869b9122498536a) --- .../selling/doctype/selling_settings/selling_settings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json index b7e4fce817d..53e9d42a7ab 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.json +++ b/erpnext/selling/doctype/selling_settings/selling_settings.json @@ -315,7 +315,7 @@ }, { "default": "0", - "description": "Enable UTM parameters", + "description": "Enable Urchin Tracking Module parameters in Quotation, Sales Order, Sales Invoice, POS Invoice, Lead, and Delivery Note.", "documentation_url": "https://en.wikipedia.org/wiki/UTM_parameters", "fieldname": "enable_utm", "fieldtype": "Check", @@ -329,7 +329,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2026-02-06 16:11:13.538490", + "modified": "2026-02-12 10:38:34.605126", "modified_by": "Administrator", "module": "Selling", "name": "Selling Settings", From 270b09f936f244ce72e325886c9d709592e7330b Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 25 Feb 2026 13:46:50 +0530 Subject: [PATCH 10/10] chore: resolve conflicts --- .../doctype/pos_profile/pos_profile.json | 102 +----------------- .../doctype/sales_invoice/sales_invoice.json | 9 +- .../selling/doctype/quotation/quotation.json | 34 ------ .../doctype/sales_order/sales_order.json | 4 - .../doctype/delivery_note/delivery_note.json | 8 -- 5 files changed, 3 insertions(+), 154 deletions(-) diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json index b7e0cc1bb55..78d568b60b1 100644 --- a/erpnext/accounts/doctype/pos_profile/pos_profile.json +++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json @@ -12,9 +12,6 @@ "disabled", "column_break_9", "warehouse", - "utm_source", - "utm_campaign", - "utm_medium", "company_address", "section_break_15", "applicable_for_users", @@ -44,7 +41,6 @@ "column_break0", "tc_name", "select_print_heading", -<<<<<<< HEAD "section_break_19", "selling_price_list", "currency", @@ -62,15 +58,13 @@ "accounting_dimensions_section", "cost_center", "dimension_col_break", - "project" -======= + "project", "utm_analytics_section", "utm_source", "column_break_tvls", "utm_campaign", "column_break_xygw", "utm_medium" ->>>>>>> 7de0ca164d (refactor: utm analytics section in pos profile) ], "fields": [ { @@ -439,8 +433,6 @@ "fieldname": "allow_partial_payment", "fieldtype": "Check", "label": "Allow Partial Payment" -<<<<<<< HEAD -======= }, { "fieldname": "column_break_tvls", @@ -450,99 +442,11 @@ "fieldname": "column_break_xygw", "fieldtype": "Column Break" }, - { - "fieldname": "accounting_tab", - "fieldtype": "Tab Break", - "label": "Accounting" - }, - { - "fieldname": "more_info_tab", - "fieldtype": "Tab Break", - "label": "More Info" - }, - { - "fieldname": "pos_configurations_tab", - "fieldtype": "Tab Break", - "label": "POS Configurations" - }, - { - "fieldname": "price_list_and_currency_section", - "fieldtype": "Section Break", - "label": "Price List & Currency" - }, - { - "fieldname": "column_break_bptt", - "fieldtype": "Column Break" - }, - { - "fieldname": "write_off_section", - "fieldtype": "Section Break", - "label": "Write Off" - }, - { - "fieldname": "column_break_ukpz", - "fieldtype": "Column Break" - }, - { - "fieldname": "column_break_pkca", - "fieldtype": "Column Break" - }, - { - "fieldname": "income_and_expense_account", - "fieldtype": "Section Break", - "label": "Income and Expense" - }, - { - "fieldname": "column_break_byzk", - "fieldtype": "Column Break" - }, - { - "fieldname": "taxes_section", - "fieldtype": "Section Break", - "label": "Taxes" - }, - { - "fieldname": "column_break_cjpp", - "fieldtype": "Column Break" - }, - { - "fieldname": "pos_item_selector_section", - "fieldtype": "Section Break", - "label": "POS Item Selector" - }, - { - "fieldname": "column_break_rpny", - "fieldtype": "Column Break" - }, - { - "fieldname": "column_break_stcl", - "fieldtype": "Column Break" - }, - { - "fieldname": "pos_item_details_section", - "fieldtype": "Section Break", - "label": "POS Item Details" - }, - { - "fieldname": "column_break_hwfg", - "fieldtype": "Column Break" - }, - { - "fieldname": "column_break_egpi", - "fieldtype": "Column Break" - }, - { - "default": "0", - "fieldname": "allow_warehouse_change", - "fieldtype": "Check", - "label": "Allow User to Edit Warehouse" - }, { "collapsible": 1, "fieldname": "utm_analytics_section", "fieldtype": "Section Break", "label": "Campaign" ->>>>>>> 7de0ca164d (refactor: utm analytics section in pos profile) } ], "grid_page_length": 50, @@ -571,11 +475,7 @@ "link_fieldname": "pos_profile" } ], -<<<<<<< HEAD - "modified": "2025-06-24 11:19:19.834905", -======= "modified": "2026-02-10 14:24:48.597412", ->>>>>>> 7de0ca164d (refactor: utm analytics section in pos profile) "modified_by": "Administrator", "module": "Accounts", "name": "POS Profile", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 0ec05b072aa..9cfbd4f0053 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -2301,14 +2301,14 @@ "print_hide": 1 }, { -<<<<<<< HEAD "fieldname": "section_break_vacb", "fieldtype": "Section Break" }, { "fieldname": "column_break_rdks", "fieldtype": "Column Break" -======= + }, + { "fieldname": "column_break_ixxw", "fieldtype": "Column Break" }, @@ -2317,7 +2317,6 @@ "fieldname": "utm_analytics_section", "fieldtype": "Section Break", "label": "UTM Analytics" ->>>>>>> 678d261f40 (refactor: utm section in sales invoice) } ], "grid_page_length": 50, @@ -2331,11 +2330,7 @@ "link_fieldname": "consolidated_invoice" } ], -<<<<<<< HEAD - "modified": "2026-02-23 14:29:00.301842", -======= "modified": "2026-02-10 11:59:07.819903", ->>>>>>> 678d261f40 (refactor: utm section in sales invoice) "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index be82453e419..f4bad5d519b 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -1111,35 +1111,6 @@ "no_copy": 1, "options": "Item Wise Tax Detail", "print_hide": 1 -<<<<<<< HEAD -======= - }, - { - "collapsible": 1, - "fieldname": "additional_discount_section", - "fieldtype": "Section Break", - "label": "Additional Discount" - }, - { - "fieldname": "totals_section", - "fieldtype": "Section Break", - "label": "Totals", - "oldfieldtype": "Section Break", - "options": "fa fa-money", - "print_hide": 1 - }, - { - "fieldname": "base_totals_section", - "fieldtype": "Section Break", - "label": "Totals (Company Currency)" - }, - { - "fieldname": "column_break_vyhp", - "fieldtype": "Column Break" - }, - { - "fieldname": "column_break_bffp", - "fieldtype": "Column Break" }, { "fieldname": "column_break_fozg", @@ -1150,18 +1121,13 @@ "fieldname": "utm_analytics_section", "fieldtype": "Section Break", "label": "UTM Analytics" ->>>>>>> aaf5f923b0 (refactor: hide UTM parameters) } ], "icon": "fa fa-shopping-cart", "idx": 82, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2026-01-29 21:18:48.836168", -======= "modified": "2026-02-06 17:34:22.170032", ->>>>>>> aaf5f923b0 (refactor: hide UTM parameters) "modified_by": "Administrator", "module": "Selling", "name": "Quotation", diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 33c0572183f..00a8f8d3b12 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -1731,11 +1731,7 @@ "idx": 105, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "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", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json index 1f818cfcddd..08a8de10163 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -1422,7 +1422,6 @@ "print_hide": 1 }, { -<<<<<<< HEAD "fieldname": "totals_section", "fieldtype": "Section Break", "label": "Totals", @@ -1436,8 +1435,6 @@ "options": "Company:company:default_currency" }, { - "fieldname": "column_break_ydwe", -======= "collapsible": 1, "fieldname": "utm_analytics_section", "fieldtype": "Section Break", @@ -1445,7 +1442,6 @@ }, { "fieldname": "column_break_neoj", ->>>>>>> 578783af8e (refactor: utm analytics section delivery note) "fieldtype": "Column Break" } ], @@ -1453,11 +1449,7 @@ "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",