fix: more fields reordering related to Tab Break

(cherry picked from commit 5389a35)

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json

@@ -170,9 +170,9 @@
   "to_date",
   "printing_settings",
   "letter_head",
-  "select_print_heading",
-  "column_break_112",
   "group_same_items",
+  "column_break_112",
+  "select_print_heading",
   "language",
   "sb_14",
   "on_hold",
@@ -1443,7 +1443,7 @@
   {
    "fieldname": "address_and_contact_tab",
    "fieldtype": "Tab Break",
-   "label": "Address and Contact"
+   "label": "Address & Contact"
   },
   {
    "fieldname": "terms_tab",
@@ -1496,6 +1496,7 @@
    "fieldtype": "Column Break"
   },
   {
+   "collapsible": 1,
    "fieldname": "status_section",
    "fieldtype": "Section Break",
    "label": "Status"

erpnext/accounts/doctype/sales_invoice/sales_invoice.json

@@ -12,14 +12,14 @@
   "customer",
   "customer_name",
   "tax_id",
+  "company",
+  "company_tax_id",
   "column_break1",
   "posting_date",
   "posting_time",
   "set_posting_time",
   "due_date",
   "column_break_14",
-  "company",
-  "company_tax_id",
   "is_pos",
   "pos_profile",
   "is_consolidated",
@@ -87,8 +87,8 @@
   "disable_rounded_total",
   "section_break_49",
   "apply_discount_on",
-  "is_cash_or_non_trade_discount",
   "base_discount_amount",
+  "is_cash_or_non_trade_discount",
   "additional_discount_account",
   "column_break_51",
   "additional_discount_percentage",
@@ -1055,7 +1055,6 @@
   },
   {
    "collapsible": 1,
-   "collapsible_depends_on": "discount_amount",
    "fieldname": "section_break_49",
    "fieldtype": "Section Break",
    "hide_days": 1,
@@ -1111,6 +1110,7 @@
    "fieldtype": "Section Break",
    "hide_days": 1,
    "hide_seconds": 1,
+   "label": "Totals",
    "oldfieldtype": "Section Break",
    "options": "fa fa-money",
    "print_hide": 1
@@ -1292,8 +1292,6 @@
    "print_hide": 1
   },
   {
-   "collapsible": 1,
-   "collapsible_depends_on": "eval:(!doc.is_pos && !doc.is_return)",
    "fieldname": "payment_schedule_section",
    "fieldtype": "Section Break",
    "hide_days": 1,
@@ -1325,7 +1323,7 @@
   {
    "collapsible": 1,
    "collapsible_depends_on": "eval:!doc.is_pos",
-   "depends_on": "eval:doc.is_pos===1||(doc.advances && doc.advances.length>0)",
+   "depends_on": "eval:doc.is_pos===1",
    "fieldname": "payments_section",
    "fieldtype": "Section Break",
    "hide_days": 1,
@@ -1363,6 +1361,7 @@
    "hide_seconds": 1
   },
   {
+   "depends_on": "eval: doc.is_pos || doc.redeem_loyalty_points",
    "fieldname": "base_paid_amount",
    "fieldtype": "Currency",
    "hide_days": 1,
@@ -1498,8 +1497,6 @@
    "print_hide": 1
   },
   {
-   "collapsible": 1,
-   "collapsible_depends_on": "terms",
    "fieldname": "terms_section_break",
    "fieldtype": "Section Break",
    "hide_days": 1,
@@ -2111,7 +2108,7 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
- "modified": "2022-09-27 14:15:35.293825",
+ "modified": "2022-09-28 19:23:38.265409",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",

erpnext/buying/doctype/purchase_order/purchase_order.json

@@ -106,9 +106,11 @@
   "contact_email",
   "company_shipping_address_section",
   "shipping_address",
+  "column_break_99",
   "shipping_address_display",
   "company_billing_address_section",
   "billing_address",
+  "column_break_103",
   "billing_address_display",
   "drop_ship",
   "customer",
@@ -133,10 +135,10 @@
   "per_received",
   "column_break5",
   "letter_head",
-  "select_print_heading",
+  "group_same_items",
   "column_break_86",
+  "select_print_heading",
   "language",
-  "group_same_items",
   "subscription_section",
   "from_date",
   "to_date",
@@ -1218,13 +1220,21 @@
    "fieldtype": "Section Break",
    "label": "Additional Info",
    "oldfieldtype": "Section Break"
+  },
+  {
+   "fieldname": "column_break_99",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_103",
+   "fieldtype": "Column Break"
   }
  ],
  "icon": "fa fa-file-text",
  "idx": 105,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-09-27 17:28:35.652609",
+ "modified": "2022-09-28 18:20:49.494279",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Purchase Order",

erpnext/buying/doctype/supplier_quotation/supplier_quotation.json

@@ -89,10 +89,10 @@
   "terms",
   "more_info_tab",
   "printing_settings",
-  "select_print_heading",
+  "letter_head",
   "group_same_items",
   "column_break_85",
-  "letter_head",
+  "select_print_heading",
   "language",
   "subscription_section",
   "auto_repeat",
@@ -830,7 +830,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-09-27 18:13:09.462037",
+ "modified": "2022-09-27 18:20:09.462037",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier Quotation",

erpnext/regional/united_arab_emirates/setup.py

@@ -37,7 +37,7 @@ def make_custom_fields():
 			fieldname="vat_section",
 			label="VAT Details",
 			fieldtype="Section Break",
-			insert_after="group_same_items",
+			insert_after="language",
 			print_hide=1,
 			collapsible=1,
 		),

erpnext/selling/doctype/quotation/quotation.json

@@ -103,15 +103,20 @@
   "tc_name",
   "terms",
   "more_info_tab",
+  "subscription_section",
+  "auto_repeat",
+  "update_auto_repeat_reference",
   "print_settings",
   "letter_head",
   "group_same_items",
   "column_break_73",
   "select_print_heading",
   "language",
-  "subscription_section",
-  "auto_repeat",
-  "update_auto_repeat_reference",
+  "lost_reasons_section",
+  "lost_reasons",
+  "competitors",
+  "column_break_117",
+  "order_lost_reason",
   "additional_info_section",
   "status",
   "customer_group",
@@ -123,11 +128,6 @@
   "opportunity",
   "supplier_quotation",
   "enq_det",
-  "lost_reasons_section",
-  "lost_reasons",
-  "competitors",
-  "column_break_117",
-  "order_lost_reason",
   "connections_tab"
  ],
  "fields": [
@@ -975,7 +975,7 @@
   {
    "fieldname": "address_and_contact_tab",
    "fieldtype": "Tab Break",
-   "label": "Address and Contact"
+   "label": "Address & Contact"
   },
   {
    "fieldname": "terms_tab",
@@ -1058,7 +1058,7 @@
  "idx": 82,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-09-27 15:14:27.693005",
+ "modified": "2022-09-27 15:18:27.693005",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Quotation",

erpnext/selling/doctype/sales_order/sales_order.json

@@ -151,11 +151,11 @@
   "auto_repeat",
   "update_auto_repeat_reference",
   "printing_details",
-  "language",
   "letter_head",
   "group_same_items",
   "column_break4",
   "select_print_heading",
+  "language",
   "additional_info_section",
   "is_internal_customer",
   "represents_company",
@@ -1628,7 +1628,7 @@
  "idx": 105,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-09-27 14:51:09.128426",
+ "modified": "2022-09-28 18:30:34.723896",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order",

erpnext/stock/doctype/delivery_note/delivery_note.json

@@ -149,11 +149,11 @@
   "auto_repeat",
   "printing_details",
   "letter_head",
-  "select_print_heading",
-  "column_break_88",
-  "language",
   "print_without_amount",
   "group_same_items",
+  "column_break_88",
+  "select_print_heading",
+  "language",
   "more_info",
   "is_internal_customer",
   "represents_company",
@@ -1386,7 +1386,7 @@
  "idx": 146,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-09-27 14:51:31.964085",
+ "modified": "2022-09-27 14:55:31.964085",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Delivery Note",

erpnext/stock/doctype/purchase_receipt/purchase_receipt.json

@@ -127,10 +127,10 @@
   "auto_repeat",
   "printing_settings",
   "letter_head",
-  "language",
+  "group_same_items",
   "column_break_97",
   "select_print_heading",
-  "group_same_items",
+  "language",
   "transporter_info",
   "transporter_name",
   "column_break5",
@@ -1224,7 +1224,7 @@
  "idx": 261,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-09-28 13:07:37.482663",
+ "modified": "2022-09-28 13:09:37.482663",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Purchase Receipt",