mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-31 10:49:09 +00:00
refactor: utm section in sales invoice
(cherry picked from commit 678d261f40)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/sales_invoice.json
This commit is contained in:
@@ -219,16 +219,17 @@
|
|||||||
"column_break_140",
|
"column_break_140",
|
||||||
"to_date",
|
"to_date",
|
||||||
"update_auto_repeat_reference",
|
"update_auto_repeat_reference",
|
||||||
|
"utm_analytics_section",
|
||||||
|
"utm_source",
|
||||||
|
"utm_medium",
|
||||||
|
"column_break_ixxw",
|
||||||
|
"utm_campaign",
|
||||||
|
"utm_content",
|
||||||
"more_information",
|
"more_information",
|
||||||
"status",
|
"status",
|
||||||
"remarks",
|
"remarks",
|
||||||
"customer_group",
|
"customer_group",
|
||||||
"column_break_imbx",
|
"column_break_imbx",
|
||||||
"utm_source",
|
|
||||||
"utm_campaign",
|
|
||||||
"utm_medium",
|
|
||||||
"utm_content",
|
|
||||||
"col_break23",
|
|
||||||
"is_internal_customer",
|
"is_internal_customer",
|
||||||
"represents_company",
|
"represents_company",
|
||||||
"inter_company_invoice_reference",
|
"inter_company_invoice_reference",
|
||||||
@@ -1632,13 +1633,6 @@
|
|||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"fieldname": "col_break23",
|
|
||||||
"fieldtype": "Column Break",
|
|
||||||
"hide_days": 1,
|
|
||||||
"hide_seconds": 1,
|
|
||||||
"width": "50%"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"default": "Draft",
|
"default": "Draft",
|
||||||
"fieldname": "status",
|
"fieldname": "status",
|
||||||
@@ -2307,12 +2301,23 @@
|
|||||||
"print_hide": 1
|
"print_hide": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
<<<<<<< HEAD
|
||||||
"fieldname": "section_break_vacb",
|
"fieldname": "section_break_vacb",
|
||||||
"fieldtype": "Section Break"
|
"fieldtype": "Section Break"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "column_break_rdks",
|
"fieldname": "column_break_rdks",
|
||||||
"fieldtype": "Column Break"
|
"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,
|
"grid_page_length": 50,
|
||||||
@@ -2326,7 +2331,11 @@
|
|||||||
"link_fieldname": "consolidated_invoice"
|
"link_fieldname": "consolidated_invoice"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2026-02-23 14:29:00.301842",
|
"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",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Sales Invoice",
|
"name": "Sales Invoice",
|
||||||
|
|||||||
Reference in New Issue
Block a user