fix: merge conflicts

This commit is contained in:
nishkagosalia
2026-05-28 15:35:10 +05:30
parent 20592fc25d
commit b74e365421
10 changed files with 0 additions and 144 deletions

View File

@@ -26,11 +26,6 @@
"due_date", "due_date",
"amended_from", "amended_from",
"return_against", "return_against",
<<<<<<< HEAD
"section_break_abck",
"title",
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"accounting_dimensions_section", "accounting_dimensions_section",
"project", "project",
"dimension_col_break", "dimension_col_break",
@@ -1630,13 +1625,6 @@
"label": "Auto Repeat" "label": "Auto Repeat"
}, },
{ {
<<<<<<< HEAD
"fieldname": "section_break_abck",
"fieldtype": "Section Break"
},
{
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"allow_on_submit": 1, "allow_on_submit": 1,
"fieldname": "title", "fieldname": "title",
"fieldtype": "Data", "fieldtype": "Data",

View File

@@ -27,11 +27,6 @@
"update_billed_amount_in_purchase_receipt", "update_billed_amount_in_purchase_receipt",
"apply_tds", "apply_tds",
"amended_from", "amended_from",
<<<<<<< HEAD
"section_break_hzux",
"title",
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"supplier_invoice_details", "supplier_invoice_details",
"bill_no", "bill_no",
"column_break_15", "column_break_15",
@@ -1688,11 +1683,6 @@
"fieldname": "automation_section", "fieldname": "automation_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Automation" "label": "Automation"
<<<<<<< HEAD
},
{
"fieldname": "section_break_hzux",
"fieldtype": "Section Break"
}, },
{ {
"allow_on_submit": 1, "allow_on_submit": 1,
@@ -1701,8 +1691,6 @@
"label": "Title", "label": "Title",
"no_copy": 1, "no_copy": 1,
"print_hide": 1 "print_hide": 1
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,
@@ -1710,11 +1698,7 @@
"idx": 204, "idx": 204,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-04-28 07:15:31.062404",
=======
"modified": "2026-05-28 12:36:55.215363", "modified": "2026-05-28 12:36:55.215363",
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",

View File

@@ -33,11 +33,6 @@
"is_created_using_pos", "is_created_using_pos",
"pos_closing_entry", "pos_closing_entry",
"has_subcontracted", "has_subcontracted",
<<<<<<< HEAD
"section_break_qllv",
"title",
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"accounting_dimensions_section", "accounting_dimensions_section",
"cost_center", "cost_center",
"dimension_col_break", "dimension_col_break",
@@ -2332,7 +2327,6 @@
"label": "Automation" "label": "Automation"
}, },
{ {
<<<<<<< HEAD
"fieldname": "section_break_pxwz", "fieldname": "section_break_pxwz",
"fieldtype": "Section Break" "fieldtype": "Section Break"
}, },
@@ -2349,12 +2343,6 @@
"fieldtype": "Column Break" "fieldtype": "Column Break"
}, },
{ {
"fieldname": "section_break_qllv",
"fieldtype": "Section Break"
},
{
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"allow_on_submit": 1, "allow_on_submit": 1,
"fieldname": "title", "fieldname": "title",
"fieldtype": "Data", "fieldtype": "Data",

View File

@@ -23,11 +23,6 @@
"is_subcontracted", "is_subcontracted",
"has_unit_price_items", "has_unit_price_items",
"supplier_warehouse", "supplier_warehouse",
<<<<<<< HEAD
"section_break_ahub",
"title",
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"accounting_dimensions_section", "accounting_dimensions_section",
"cost_center", "cost_center",
"dimension_col_break", "dimension_col_break",
@@ -1313,11 +1308,6 @@
"fieldname": "auto_repeat_section", "fieldname": "auto_repeat_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Auto Repeat" "label": "Auto Repeat"
<<<<<<< HEAD
},
{
"fieldname": "section_break_ahub",
"fieldtype": "Section Break"
}, },
{ {
"allow_on_submit": 1, "allow_on_submit": 1,
@@ -1326,8 +1316,6 @@
"label": "Title", "label": "Title",
"no_copy": 1, "no_copy": 1,
"print_hide": 1 "print_hide": 1
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,
@@ -1335,11 +1323,7 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-04-28 06:11:46.904768",
=======
"modified": "2026-05-28 12:34:19.659621", "modified": "2026-05-28 12:34:19.659621",
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "name": "Purchase Order",

View File

@@ -16,11 +16,6 @@
"status", "status",
"has_unit_price_items", "has_unit_price_items",
"amended_from", "amended_from",
<<<<<<< HEAD
"section_break_mhyw",
"title",
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"suppliers_section", "suppliers_section",
"suppliers", "suppliers",
"items_section", "items_section",
@@ -379,13 +374,6 @@
"read_only": 1 "read_only": 1
}, },
{ {
<<<<<<< HEAD
"fieldname": "section_break_mhyw",
"fieldtype": "Section Break"
},
{
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"allow_on_submit": 1, "allow_on_submit": 1,
"fieldname": "title", "fieldname": "title",
"fieldtype": "Data", "fieldtype": "Data",
@@ -399,11 +387,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-04-28 06:18:05.661710",
=======
"modified": "2026-05-28 12:28:46.606963", "modified": "2026-05-28 12:28:46.606963",
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Request for Quotation", "name": "Request for Quotation",

View File

@@ -20,11 +20,6 @@
"quotation_number", "quotation_number",
"has_unit_price_items", "has_unit_price_items",
"amended_from", "amended_from",
<<<<<<< HEAD
"section_break_kumc",
"title",
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"accounting_dimensions_section", "accounting_dimensions_section",
"cost_center", "cost_center",
"dimension_col_break", "dimension_col_break",
@@ -944,13 +939,6 @@
"fieldname": "auto_repeat_section", "fieldname": "auto_repeat_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Auto Repeat" "label": "Auto Repeat"
<<<<<<< HEAD
},
{
"fieldname": "section_break_kumc",
"fieldtype": "Section Break"
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,
@@ -959,11 +947,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-04-28 06:23:52.813948",
=======
"modified": "2026-05-28 12:29:37.509487", "modified": "2026-05-28 12:29:37.509487",
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier Quotation", "name": "Supplier Quotation",

View File

@@ -22,11 +22,6 @@
"company", "company",
"has_unit_price_items", "has_unit_price_items",
"amended_from", "amended_from",
<<<<<<< HEAD
"section_break_jdzz",
"title",
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"currency_and_price_list", "currency_and_price_list",
"currency", "currency",
"conversion_rate", "conversion_rate",
@@ -1130,13 +1125,6 @@
"label": "Auto Repeat" "label": "Auto Repeat"
}, },
{ {
<<<<<<< HEAD
"fieldname": "section_break_jdzz",
"fieldtype": "Section Break"
},
{
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"allow_on_submit": 1, "allow_on_submit": 1,
"fieldname": "title", "fieldname": "title",
"fieldtype": "Data", "fieldtype": "Data",
@@ -1149,11 +1137,7 @@
"idx": 82, "idx": 82,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-04-28 06:28:13.103302",
=======
"modified": "2026-05-28 11:38:05.090149", "modified": "2026-05-28 11:38:05.090149",
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Quotation", "name": "Quotation",

View File

@@ -26,11 +26,6 @@
"has_unit_price_items", "has_unit_price_items",
"is_subcontracted", "is_subcontracted",
"amended_from", "amended_from",
<<<<<<< HEAD
"section_break_zstt",
"title",
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"accounting_dimensions_section", "accounting_dimensions_section",
"cost_center", "cost_center",
"dimension_col_break", "dimension_col_break",
@@ -1752,13 +1747,6 @@
"read_only": 1 "read_only": 1
}, },
{ {
<<<<<<< HEAD
"fieldname": "section_break_zstt",
"fieldtype": "Section Break"
},
{
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"allow_on_submit": 1, "allow_on_submit": 1,
"fieldname": "title", "fieldname": "title",
"fieldtype": "Data", "fieldtype": "Data",

View File

@@ -22,11 +22,6 @@
"is_return", "is_return",
"issue_credit_note", "issue_credit_note",
"return_against", "return_against",
<<<<<<< HEAD
"section_break_zxcd",
"title",
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"accounting_dimensions_section", "accounting_dimensions_section",
"cost_center", "cost_center",
"column_break_18", "column_break_18",
@@ -1454,13 +1449,6 @@
"label": "Auto Repeat" "label": "Auto Repeat"
}, },
{ {
<<<<<<< HEAD
"fieldname": "section_break_zxcd",
"fieldtype": "Section Break"
},
{
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"allow_on_submit": 1, "allow_on_submit": 1,
"fieldname": "title", "fieldname": "title",
"fieldtype": "Data", "fieldtype": "Data",

View File

@@ -25,11 +25,6 @@
"apply_putaway_rule", "apply_putaway_rule",
"is_return", "is_return",
"return_against", "return_against",
<<<<<<< HEAD
"section_break_yxar",
"title",
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"accounting_dimensions_section", "accounting_dimensions_section",
"cost_center", "cost_center",
"dimension_col_break", "dimension_col_break",
@@ -1291,11 +1286,6 @@
{ {
"fieldname": "column_break_ugyv", "fieldname": "column_break_ugyv",
"fieldtype": "Column Break" "fieldtype": "Column Break"
<<<<<<< HEAD
},
{
"fieldname": "section_break_yxar",
"fieldtype": "Section Break"
}, },
{ {
"allow_on_submit": 1, "allow_on_submit": 1,
@@ -1304,8 +1294,6 @@
"label": "Title", "label": "Title",
"no_copy": 1, "no_copy": 1,
"print_hide": 1 "print_hide": 1
=======
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,
@@ -1313,11 +1301,7 @@
"idx": 261, "idx": 261,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-04-28 06:47:12.170270",
=======
"modified": "2026-05-28 12:38:05.907578", "modified": "2026-05-28 12:38:05.907578",
>>>>>>> 34c24b86fa (fix(UX): Move title field to More Info)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt", "name": "Purchase Receipt",