From 20592fc25d351996a39c93363ba358f06376753d Mon Sep 17 00:00:00 2001 From: nishkagosalia Date: Thu, 28 May 2026 12:47:15 +0530 Subject: [PATCH 1/2] fix(UX): Move title field to More Info (cherry picked from commit 34c24b86fa6235b2094e86cadf9fe07bfb503b5c) # Conflicts: # erpnext/accounts/doctype/pos_invoice/pos_invoice.json # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json # erpnext/accounts/doctype/sales_invoice/sales_invoice.json # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/buying/doctype/request_for_quotation/request_for_quotation.json # erpnext/buying/doctype/supplier_quotation/supplier_quotation.json # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/sales_order/sales_order.json # erpnext/stock/doctype/delivery_note/delivery_note.json # erpnext/stock/doctype/purchase_receipt/purchase_receipt.json --- .../accounts/doctype/pos_invoice/pos_invoice.json | 9 ++++++++- .../doctype/purchase_invoice/purchase_invoice.json | 11 +++++++++++ .../doctype/sales_invoice/sales_invoice.json | 9 ++++++++- .../doctype/purchase_order/purchase_order.json | 13 +++++++++++-- .../request_for_quotation.json | 11 +++++++++++ .../supplier_quotation/supplier_quotation.json | 11 +++++++++++ erpnext/selling/doctype/quotation/quotation.json | 11 +++++++++++ .../selling/doctype/sales_order/sales_order.json | 9 ++++++++- .../stock/doctype/delivery_note/delivery_note.json | 9 ++++++++- .../doctype/purchase_receipt/purchase_receipt.json | 11 +++++++++++ 10 files changed, 98 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json index bf8713de63f..ef15d5dbeee 100644 --- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json +++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json @@ -26,8 +26,11 @@ "due_date", "amended_from", "return_against", +<<<<<<< HEAD "section_break_abck", "title", +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "accounting_dimensions_section", "project", "dimension_col_break", @@ -172,6 +175,7 @@ "is_discounted", "col_break23", "status", + "title", "more_info", "debit_to", "party_account_currency", @@ -1626,10 +1630,13 @@ "label": "Auto Repeat" }, { +<<<<<<< HEAD "fieldname": "section_break_abck", "fieldtype": "Section Break" }, { +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "allow_on_submit": 1, "fieldname": "title", "fieldtype": "Data", @@ -1641,7 +1648,7 @@ "icon": "fa fa-file-text", "is_submittable": 1, "links": [], - "modified": "2026-05-01 02:37:30.580568", + "modified": "2026-05-28 12:22:50.253090", "modified_by": "Administrator", "module": "Accounts", "name": "POS Invoice", diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index 4f8fe3a79ca..d061647b97d 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -27,8 +27,11 @@ "update_billed_amount_in_purchase_receipt", "apply_tds", "amended_from", +<<<<<<< HEAD "section_break_hzux", "title", +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "supplier_invoice_details", "bill_no", "column_break_15", @@ -201,6 +204,7 @@ "hold_comment", "additional_info_section", "is_internal_supplier", + "title", "represents_company", "supplier_group", "sender", @@ -1684,6 +1688,7 @@ "fieldname": "automation_section", "fieldtype": "Section Break", "label": "Automation" +<<<<<<< HEAD }, { "fieldname": "section_break_hzux", @@ -1696,6 +1701,8 @@ "label": "Title", "no_copy": 1, "print_hide": 1 +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) } ], "grid_page_length": 50, @@ -1703,7 +1710,11 @@ "idx": 204, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2026-04-28 07:15:31.062404", +======= + "modified": "2026-05-28 12:36:55.215363", +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 7a9c1c379c9..8072faab5ad 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -33,8 +33,11 @@ "is_created_using_pos", "pos_closing_entry", "has_subcontracted", +<<<<<<< HEAD "section_break_qllv", "title", +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "accounting_dimensions_section", "cost_center", "dimension_col_break", @@ -234,6 +237,7 @@ "status", "remarks", "customer_group", + "title", "column_break_imbx", "is_internal_customer", "represents_company", @@ -2328,6 +2332,7 @@ "label": "Automation" }, { +<<<<<<< HEAD "fieldname": "section_break_pxwz", "fieldtype": "Section Break" }, @@ -2348,6 +2353,8 @@ "fieldtype": "Section Break" }, { +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "allow_on_submit": 1, "fieldname": "title", "fieldtype": "Data", @@ -2367,7 +2374,7 @@ "link_fieldname": "consolidated_invoice" } ], - "modified": "2026-05-21 17:31:11.190958", + "modified": "2026-05-28 12:15:12.486443", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index ee1f13e4b3f..ac6fd8b9a3d 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -23,8 +23,11 @@ "is_subcontracted", "has_unit_price_items", "supplier_warehouse", +<<<<<<< HEAD "section_break_ahub", "title", +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "accounting_dimensions_section", "cost_center", "dimension_col_break", @@ -56,9 +59,7 @@ "net_total", "section_break_48", "pricing_rules", - "raw_material_details", "set_reserve_warehouse", - "supplied_items", "taxes_section", "tax_category", "taxes_and_charges", @@ -156,6 +157,7 @@ "auto_repeat", "update_auto_repeat_reference", "additional_info_section", + "title", "party_account_currency", "represents_company", "ref_sq", @@ -1311,6 +1313,7 @@ "fieldname": "auto_repeat_section", "fieldtype": "Section Break", "label": "Auto Repeat" +<<<<<<< HEAD }, { "fieldname": "section_break_ahub", @@ -1323,6 +1326,8 @@ "label": "Title", "no_copy": 1, "print_hide": 1 +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) } ], "grid_page_length": 50, @@ -1330,7 +1335,11 @@ "idx": 105, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2026-04-28 06:11:46.904768", +======= + "modified": "2026-05-28 12:34:19.659621", +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json index 988ffcb9eb3..3a1b4576a4b 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -16,8 +16,11 @@ "status", "has_unit_price_items", "amended_from", +<<<<<<< HEAD "section_break_mhyw", "title", +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "suppliers_section", "suppliers", "items_section", @@ -44,6 +47,7 @@ "letter_head", "more_info", "opportunity", + "title", "address_and_contact_tab", "billing_address", "billing_address_display", @@ -375,10 +379,13 @@ "read_only": 1 }, { +<<<<<<< HEAD "fieldname": "section_break_mhyw", "fieldtype": "Section Break" }, { +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "allow_on_submit": 1, "fieldname": "title", "fieldtype": "Data", @@ -392,7 +399,11 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2026-04-28 06:18:05.661710", +======= + "modified": "2026-05-28 12:28:46.606963", +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "modified_by": "Administrator", "module": "Buying", "name": "Request for Quotation", diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json index ec0b33611b3..67337ceacd1 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json @@ -20,8 +20,11 @@ "quotation_number", "has_unit_price_items", "amended_from", +<<<<<<< HEAD "section_break_kumc", "title", +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "accounting_dimensions_section", "cost_center", "dimension_col_break", @@ -118,6 +121,7 @@ "more_info", "is_subcontracted", "column_break_57", + "title", "opportunity", "connections_tab" ], @@ -940,10 +944,13 @@ "fieldname": "auto_repeat_section", "fieldtype": "Section Break", "label": "Auto Repeat" +<<<<<<< HEAD }, { "fieldname": "section_break_kumc", "fieldtype": "Section Break" +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) } ], "grid_page_length": 50, @@ -952,7 +959,11 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2026-04-28 06:23:52.813948", +======= + "modified": "2026-05-28 12:29:37.509487", +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "modified_by": "Administrator", "module": "Buying", "name": "Supplier Quotation", diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index c22bd3b3e68..5f00a8b184b 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -22,8 +22,11 @@ "company", "has_unit_price_items", "amended_from", +<<<<<<< HEAD "section_break_jdzz", "title", +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "currency_and_price_list", "currency", "conversion_rate", @@ -135,6 +138,7 @@ "status", "customer_group", "territory", + "title", "column_break_108", "opportunity", "enq_det", @@ -1126,10 +1130,13 @@ "label": "Auto Repeat" }, { +<<<<<<< HEAD "fieldname": "section_break_jdzz", "fieldtype": "Section Break" }, { +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "allow_on_submit": 1, "fieldname": "title", "fieldtype": "Data", @@ -1142,7 +1149,11 @@ "idx": 82, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2026-04-28 06:28:13.103302", +======= + "modified": "2026-05-28 11:38:05.090149", +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "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 60ae95172cd..1df667a6c4a 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -26,8 +26,11 @@ "has_unit_price_items", "is_subcontracted", "amended_from", +<<<<<<< HEAD "section_break_zstt", "title", +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "accounting_dimensions_section", "cost_center", "dimension_col_break", @@ -176,6 +179,7 @@ "po_no", "po_date", "represents_company", + "title", "column_break_yvzv", "inter_company_order_reference", "party_account_currency", @@ -1748,10 +1752,13 @@ "read_only": 1 }, { +<<<<<<< HEAD "fieldname": "section_break_zstt", "fieldtype": "Section Break" }, { +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "allow_on_submit": 1, "fieldname": "title", "fieldtype": "Data", @@ -1765,7 +1772,7 @@ "idx": 105, "is_submittable": 1, "links": [], - "modified": "2026-05-01 02:37:30.937916", + "modified": "2026-05-28 11:41:11.823034", "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 e11853ff6fa..3179f83d389 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -22,8 +22,11 @@ "is_return", "issue_credit_note", "return_against", +<<<<<<< HEAD "section_break_zxcd", "title", +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "accounting_dimensions_section", "cost_center", "column_break_18", @@ -169,6 +172,7 @@ "inter_company_reference", "customer_group", "territory", + "title", "column_break5", "excise_page", "instructions", @@ -1450,10 +1454,13 @@ "label": "Auto Repeat" }, { +<<<<<<< HEAD "fieldname": "section_break_zxcd", "fieldtype": "Section Break" }, { +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "allow_on_submit": 1, "fieldname": "title", "fieldtype": "Data", @@ -1466,7 +1473,7 @@ "idx": 146, "is_submittable": 1, "links": [], - "modified": "2026-05-01 02:37:31.430649", + "modified": "2026-05-28 11:44:37.286743", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note", diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index 5238eca245a..ae83a79d427 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -25,8 +25,11 @@ "apply_putaway_rule", "is_return", "return_against", +<<<<<<< HEAD "section_break_yxar", "title", +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "accounting_dimensions_section", "cost_center", "dimension_col_break", @@ -150,6 +153,7 @@ "instructions", "is_internal_supplier", "represents_company", + "title", "inter_company_reference", "column_break_131", "remarks", @@ -1287,6 +1291,7 @@ { "fieldname": "column_break_ugyv", "fieldtype": "Column Break" +<<<<<<< HEAD }, { "fieldname": "section_break_yxar", @@ -1299,6 +1304,8 @@ "label": "Title", "no_copy": 1, "print_hide": 1 +======= +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) } ], "grid_page_length": 50, @@ -1306,7 +1313,11 @@ "idx": 261, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2026-04-28 06:47:12.170270", +======= + "modified": "2026-05-28 12:38:05.907578", +>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt", From b74e3654218fca646c73f31063aa4d1efebfdf1f Mon Sep 17 00:00:00 2001 From: nishkagosalia Date: Thu, 28 May 2026 15:35:10 +0530 Subject: [PATCH 2/2] fix: merge conflicts --- .../doctype/pos_invoice/pos_invoice.json | 12 ------------ .../purchase_invoice/purchase_invoice.json | 16 ---------------- .../doctype/sales_invoice/sales_invoice.json | 12 ------------ .../doctype/purchase_order/purchase_order.json | 16 ---------------- .../request_for_quotation.json | 16 ---------------- .../supplier_quotation/supplier_quotation.json | 16 ---------------- erpnext/selling/doctype/quotation/quotation.json | 16 ---------------- .../selling/doctype/sales_order/sales_order.json | 12 ------------ .../doctype/delivery_note/delivery_note.json | 12 ------------ .../purchase_receipt/purchase_receipt.json | 16 ---------------- 10 files changed, 144 deletions(-) diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json index ef15d5dbeee..14c5153f0b9 100644 --- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json +++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json @@ -26,11 +26,6 @@ "due_date", "amended_from", "return_against", -<<<<<<< HEAD - "section_break_abck", - "title", -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "accounting_dimensions_section", "project", "dimension_col_break", @@ -1630,13 +1625,6 @@ "label": "Auto Repeat" }, { -<<<<<<< HEAD - "fieldname": "section_break_abck", - "fieldtype": "Section Break" - }, - { -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "allow_on_submit": 1, "fieldname": "title", "fieldtype": "Data", diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index d061647b97d..557c2940ef5 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -27,11 +27,6 @@ "update_billed_amount_in_purchase_receipt", "apply_tds", "amended_from", -<<<<<<< HEAD - "section_break_hzux", - "title", -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "supplier_invoice_details", "bill_no", "column_break_15", @@ -1688,11 +1683,6 @@ "fieldname": "automation_section", "fieldtype": "Section Break", "label": "Automation" -<<<<<<< HEAD - }, - { - "fieldname": "section_break_hzux", - "fieldtype": "Section Break" }, { "allow_on_submit": 1, @@ -1701,8 +1691,6 @@ "label": "Title", "no_copy": 1, "print_hide": 1 -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) } ], "grid_page_length": 50, @@ -1710,11 +1698,7 @@ "idx": 204, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2026-04-28 07:15:31.062404", -======= "modified": "2026-05-28 12:36:55.215363", ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 8072faab5ad..5c9289d3b51 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -33,11 +33,6 @@ "is_created_using_pos", "pos_closing_entry", "has_subcontracted", -<<<<<<< HEAD - "section_break_qllv", - "title", -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "accounting_dimensions_section", "cost_center", "dimension_col_break", @@ -2332,7 +2327,6 @@ "label": "Automation" }, { -<<<<<<< HEAD "fieldname": "section_break_pxwz", "fieldtype": "Section Break" }, @@ -2349,12 +2343,6 @@ "fieldtype": "Column Break" }, { - "fieldname": "section_break_qllv", - "fieldtype": "Section Break" - }, - { -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "allow_on_submit": 1, "fieldname": "title", "fieldtype": "Data", diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index ac6fd8b9a3d..47f355dff84 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -23,11 +23,6 @@ "is_subcontracted", "has_unit_price_items", "supplier_warehouse", -<<<<<<< HEAD - "section_break_ahub", - "title", -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "accounting_dimensions_section", "cost_center", "dimension_col_break", @@ -1313,11 +1308,6 @@ "fieldname": "auto_repeat_section", "fieldtype": "Section Break", "label": "Auto Repeat" -<<<<<<< HEAD - }, - { - "fieldname": "section_break_ahub", - "fieldtype": "Section Break" }, { "allow_on_submit": 1, @@ -1326,8 +1316,6 @@ "label": "Title", "no_copy": 1, "print_hide": 1 -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) } ], "grid_page_length": 50, @@ -1335,11 +1323,7 @@ "idx": 105, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2026-04-28 06:11:46.904768", -======= "modified": "2026-05-28 12:34:19.659621", ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json index 3a1b4576a4b..890e2824dc8 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -16,11 +16,6 @@ "status", "has_unit_price_items", "amended_from", -<<<<<<< HEAD - "section_break_mhyw", - "title", -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "suppliers_section", "suppliers", "items_section", @@ -379,13 +374,6 @@ "read_only": 1 }, { -<<<<<<< HEAD - "fieldname": "section_break_mhyw", - "fieldtype": "Section Break" - }, - { -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "allow_on_submit": 1, "fieldname": "title", "fieldtype": "Data", @@ -399,11 +387,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2026-04-28 06:18:05.661710", -======= "modified": "2026-05-28 12:28:46.606963", ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "modified_by": "Administrator", "module": "Buying", "name": "Request for Quotation", diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json index 67337ceacd1..a5619bd5f0b 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json @@ -20,11 +20,6 @@ "quotation_number", "has_unit_price_items", "amended_from", -<<<<<<< HEAD - "section_break_kumc", - "title", -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "accounting_dimensions_section", "cost_center", "dimension_col_break", @@ -944,13 +939,6 @@ "fieldname": "auto_repeat_section", "fieldtype": "Section Break", "label": "Auto Repeat" -<<<<<<< HEAD - }, - { - "fieldname": "section_break_kumc", - "fieldtype": "Section Break" -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) } ], "grid_page_length": 50, @@ -959,11 +947,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2026-04-28 06:23:52.813948", -======= "modified": "2026-05-28 12:29:37.509487", ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "modified_by": "Administrator", "module": "Buying", "name": "Supplier Quotation", diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index 5f00a8b184b..914273af088 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -22,11 +22,6 @@ "company", "has_unit_price_items", "amended_from", -<<<<<<< HEAD - "section_break_jdzz", - "title", -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "currency_and_price_list", "currency", "conversion_rate", @@ -1130,13 +1125,6 @@ "label": "Auto Repeat" }, { -<<<<<<< HEAD - "fieldname": "section_break_jdzz", - "fieldtype": "Section Break" - }, - { -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "allow_on_submit": 1, "fieldname": "title", "fieldtype": "Data", @@ -1149,11 +1137,7 @@ "idx": 82, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2026-04-28 06:28:13.103302", -======= "modified": "2026-05-28 11:38:05.090149", ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "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 1df667a6c4a..739b91f18b1 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -26,11 +26,6 @@ "has_unit_price_items", "is_subcontracted", "amended_from", -<<<<<<< HEAD - "section_break_zstt", - "title", -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "accounting_dimensions_section", "cost_center", "dimension_col_break", @@ -1752,13 +1747,6 @@ "read_only": 1 }, { -<<<<<<< HEAD - "fieldname": "section_break_zstt", - "fieldtype": "Section Break" - }, - { -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "allow_on_submit": 1, "fieldname": "title", "fieldtype": "Data", diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json index 3179f83d389..5d156970ec4 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -22,11 +22,6 @@ "is_return", "issue_credit_note", "return_against", -<<<<<<< HEAD - "section_break_zxcd", - "title", -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "accounting_dimensions_section", "cost_center", "column_break_18", @@ -1454,13 +1449,6 @@ "label": "Auto Repeat" }, { -<<<<<<< HEAD - "fieldname": "section_break_zxcd", - "fieldtype": "Section Break" - }, - { -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "allow_on_submit": 1, "fieldname": "title", "fieldtype": "Data", diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index ae83a79d427..fa71e305e4b 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -25,11 +25,6 @@ "apply_putaway_rule", "is_return", "return_against", -<<<<<<< HEAD - "section_break_yxar", - "title", -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "accounting_dimensions_section", "cost_center", "dimension_col_break", @@ -1291,11 +1286,6 @@ { "fieldname": "column_break_ugyv", "fieldtype": "Column Break" -<<<<<<< HEAD - }, - { - "fieldname": "section_break_yxar", - "fieldtype": "Section Break" }, { "allow_on_submit": 1, @@ -1304,8 +1294,6 @@ "label": "Title", "no_copy": 1, "print_hide": 1 -======= ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) } ], "grid_page_length": 50, @@ -1313,11 +1301,7 @@ "idx": 261, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2026-04-28 06:47:12.170270", -======= "modified": "2026-05-28 12:38:05.907578", ->>>>>>> 34c24b86fa (fix(UX): Move title field to More Info) "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt",