chore: resolve conflicts

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",

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",

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",

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",

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",