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