feat: Tab Break in Sales Order, Delivery Note, Sales Invoice and Purchase Order
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 2da5157..d8b413d 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -12,44 +12,29 @@
"customer",
"customer_name",
"tax_id",
- "pos_profile",
- "is_pos",
- "is_consolidated",
- "is_return",
- "is_debit_note",
- "update_billed_amount_in_sales_order",
"column_break1",
- "company",
- "company_tax_id",
"posting_date",
"posting_time",
"set_posting_time",
"due_date",
+ "column_break_14",
+ "company",
+ "company_tax_id",
+ "is_pos",
+ "pos_profile",
+ "is_consolidated",
+ "is_return",
"return_against",
+ "update_billed_amount_in_sales_order",
+ "is_debit_note",
"amended_from",
"accounting_dimensions_section",
- "project",
- "dimension_col_break",
"cost_center",
- "customer_po_details",
- "po_no",
- "column_break_23",
- "po_date",
- "address_and_contact",
- "customer_address",
- "address_display",
- "contact_person",
- "contact_display",
- "contact_mobile",
- "contact_email",
- "territory",
- "col_break4",
- "shipping_address_name",
- "shipping_address",
- "company_address",
- "company_address_display",
- "dispatch_address_name",
- "dispatch_address",
+ "dimension_col_break",
+ "project",
+ "column_break_27",
+ "campaign",
+ "source",
"currency_and_price_list",
"currency",
"conversion_rate",
@@ -58,60 +43,35 @@
"price_list_currency",
"plc_conversion_rate",
"ignore_pricing_rule",
- "sec_warehouse",
- "set_warehouse",
- "column_break_55",
- "set_target_warehouse",
"items_section",
- "update_stock",
"scan_barcode",
+ "update_stock",
+ "column_break_39",
+ "set_warehouse",
+ "set_target_warehouse",
+ "section_break_42",
"items",
- "pricing_rule_details",
- "pricing_rules",
- "packing_list",
- "packed_items",
- "product_bundle_help",
- "time_sheet_list",
- "timesheets",
- "total_billing_amount",
- "total_billing_hours",
"section_break_30",
"total_qty",
+ "total_net_weight",
+ "column_break_32",
"base_total",
"base_net_total",
- "column_break_32",
- "total_net_weight",
+ "column_break_52",
"total",
"net_total",
"taxes_section",
"taxes_and_charges",
"column_break_38",
"shipping_rule",
+ "column_break_55",
"tax_category",
"section_break_40",
"taxes",
- "sec_tax_breakup",
- "other_charges_calculation",
"section_break_43",
"base_total_taxes_and_charges",
"column_break_47",
"total_taxes_and_charges",
- "loyalty_points_redemption",
- "loyalty_points",
- "loyalty_amount",
- "redeem_loyalty_points",
- "column_break_77",
- "loyalty_program",
- "loyalty_redemption_account",
- "loyalty_redemption_cost_center",
- "section_break_49",
- "apply_discount_on",
- "is_cash_or_non_trade_discount",
- "base_discount_amount",
- "additional_discount_account",
- "column_break_51",
- "additional_discount_percentage",
- "discount_amount",
"totals",
"base_grand_total",
"base_rounding_adjustment",
@@ -125,21 +85,28 @@
"total_advance",
"outstanding_amount",
"disable_rounded_total",
- "column_break4",
- "write_off_amount",
- "base_write_off_amount",
- "write_off_outstanding_amount_automatically",
- "column_break_74",
- "write_off_account",
- "write_off_cost_center",
- "advances_section",
- "allocate_advances_automatically",
- "get_advances",
- "advances",
- "payment_schedule_section",
- "ignore_default_payment_terms_template",
- "payment_terms_template",
- "payment_schedule",
+ "section_break_49",
+ "apply_discount_on",
+ "is_cash_or_non_trade_discount",
+ "base_discount_amount",
+ "additional_discount_account",
+ "column_break_51",
+ "additional_discount_percentage",
+ "discount_amount",
+ "sec_tax_breakup",
+ "other_charges_calculation",
+ "pricing_rule_details",
+ "pricing_rules",
+ "packing_list",
+ "packed_items",
+ "product_bundle_help",
+ "time_sheet_list",
+ "timesheets",
+ "section_break_104",
+ "total_billing_hours",
+ "column_break_106",
+ "total_billing_amount",
+ "payments_tab",
"payments_section",
"cash_bank_account",
"payments",
@@ -152,47 +119,95 @@
"column_break_90",
"change_amount",
"account_for_change_amount",
+ "advances_section",
+ "allocate_advances_automatically",
+ "get_advances",
+ "advances",
+ "write_off_section",
+ "write_off_amount",
+ "base_write_off_amount",
+ "write_off_outstanding_amount_automatically",
+ "column_break_74",
+ "write_off_account",
+ "write_off_cost_center",
+ "loyalty_points_redemption",
+ "redeem_loyalty_points",
+ "loyalty_points",
+ "loyalty_amount",
+ "column_break_77",
+ "loyalty_program",
+ "loyalty_redemption_account",
+ "loyalty_redemption_cost_center",
+ "contact_and_address_tab",
+ "address_and_contact",
+ "customer_address",
+ "address_display",
+ "col_break4",
+ "contact_person",
+ "contact_display",
+ "contact_mobile",
+ "contact_email",
+ "territory",
+ "shipping_address_section",
+ "shipping_address_name",
+ "shipping_address",
+ "shipping_addr_col_break",
+ "dispatch_address_name",
+ "dispatch_address",
+ "company_address_section",
+ "company_address",
+ "company_addr_col_break",
+ "company_address_display",
+ "terms_tab",
+ "payment_schedule_section",
+ "ignore_default_payment_terms_template",
+ "payment_terms_template",
+ "payment_schedule",
"terms_section_break",
"tc_name",
"terms",
- "edit_printing_settings",
- "letter_head",
- "group_same_items",
- "select_print_heading",
- "column_break_84",
- "language",
- "more_information",
- "status",
- "inter_company_invoice_reference",
- "represents_company",
- "customer_group",
- "campaign",
- "col_break23",
- "is_internal_customer",
- "is_discounted",
- "source",
+ "more_info_tab",
+ "customer_po_details",
+ "po_no",
+ "column_break_23",
+ "po_date",
"more_info",
"debit_to",
"party_account_currency",
"is_opening",
"column_break8",
"unrealized_profit_loss_account",
- "remarks",
+ "against_income_account",
"sales_team_section_break",
"sales_partner",
- "column_break10",
"amount_eligible_for_commission",
+ "column_break10",
"commission_rate",
"total_commission",
"section_break2",
"sales_team",
+ "edit_printing_settings",
+ "letter_head",
+ "group_same_items",
+ "column_break_84",
+ "select_print_heading",
+ "language",
"subscription_section",
"from_date",
- "to_date",
- "column_break_140",
"auto_repeat",
+ "column_break_140",
+ "to_date",
"update_auto_repeat_reference",
- "against_income_account"
+ "more_information",
+ "status",
+ "inter_company_invoice_reference",
+ "represents_company",
+ "customer_group",
+ "col_break23",
+ "is_internal_customer",
+ "is_discounted",
+ "remarks",
+ "connections_tab"
],
"fields": [
{
@@ -453,12 +468,11 @@
"label": "Customer's Purchase Order Date"
},
{
- "collapsible": 1,
"fieldname": "address_and_contact",
"fieldtype": "Section Break",
"hide_days": 1,
"hide_seconds": 1,
- "label": "Address and Contact"
+ "label": "Billing Address"
},
{
"fieldname": "customer_address",
@@ -560,7 +574,6 @@
{
"fieldname": "company_address_display",
"fieldtype": "Small Text",
- "hidden": 1,
"hide_days": 1,
"hide_seconds": 1,
"label": "Company Address",
@@ -652,13 +665,6 @@
"print_hide": 1
},
{
- "fieldname": "sec_warehouse",
- "fieldtype": "Section Break",
- "hide_days": 1,
- "hide_seconds": 1,
- "label": "Warehouse"
- },
- {
"depends_on": "update_stock",
"fieldname": "set_warehouse",
"fieldtype": "Link",
@@ -671,6 +677,7 @@
{
"fieldname": "items_section",
"fieldtype": "Section Break",
+ "hide_border": 1,
"hide_days": 1,
"hide_seconds": 1,
"label": "Items",
@@ -702,7 +709,6 @@
"fieldtype": "Table",
"hide_days": 1,
"hide_seconds": 1,
- "label": "Items",
"oldfieldname": "entries",
"oldfieldtype": "Table",
"options": "Sales Invoice Item",
@@ -755,9 +761,10 @@
{
"collapsible": 1,
"collapsible_depends_on": "eval:doc.total_billing_amount > 0",
- "depends_on": "eval: !doc.is_return",
+ "depends_on": "eval:!doc.is_return",
"fieldname": "time_sheet_list",
"fieldtype": "Section Break",
+ "hide_border": 1,
"hide_days": 1,
"hide_seconds": 1,
"label": "Time Sheet List"
@@ -856,8 +863,10 @@
{
"fieldname": "taxes_section",
"fieldtype": "Section Break",
+ "hide_border": 1,
"hide_days": 1,
"hide_seconds": 1,
+ "label": "Taxes and Charges",
"oldfieldtype": "Section Break",
"options": "fa fa-money"
},
@@ -900,6 +909,7 @@
{
"fieldname": "section_break_40",
"fieldtype": "Section Break",
+ "hide_border": 1,
"hide_days": 1,
"hide_seconds": 1
},
@@ -908,7 +918,6 @@
"fieldtype": "Table",
"hide_days": 1,
"hide_seconds": 1,
- "label": "Sales Taxes and Charges",
"oldfieldname": "other_charges",
"oldfieldtype": "Table",
"options": "Sales Taxes and Charges"
@@ -1314,6 +1323,8 @@
"print_hide": 1
},
{
+ "collapsible": 1,
+ "collapsible_depends_on": "eval:!doc.is_pos",
"depends_on": "eval:doc.is_pos===1||(doc.advances && doc.advances.length>0)",
"fieldname": "payments_section",
"fieldtype": "Section Break",
@@ -1383,10 +1394,13 @@
"read_only": 1
},
{
+ "collapsible": 1,
+ "depends_on": "is_pos",
"fieldname": "section_break_88",
"fieldtype": "Section Break",
"hide_days": 1,
- "hide_seconds": 1
+ "hide_seconds": 1,
+ "label": "Changes"
},
{
"depends_on": "is_pos",
@@ -1428,17 +1442,6 @@
"print_hide": 1
},
{
- "collapsible": 1,
- "collapsible_depends_on": "write_off_amount",
- "depends_on": "grand_total",
- "fieldname": "column_break4",
- "fieldtype": "Section Break",
- "hide_days": 1,
- "hide_seconds": 1,
- "label": "Write Off",
- "width": "50%"
- },
- {
"fieldname": "write_off_amount",
"fieldtype": "Currency",
"hide_days": 1,
@@ -1530,7 +1533,7 @@
"fieldtype": "Section Break",
"hide_days": 1,
"hide_seconds": 1,
- "label": "Printing Settings"
+ "label": "Print Settings"
},
{
"allow_on_submit": 1,
@@ -1591,7 +1594,7 @@
"fieldtype": "Section Break",
"hide_days": 1,
"hide_seconds": 1,
- "label": "More Information"
+ "label": "Additional Info"
},
{
"fieldname": "inter_company_invoice_reference",
@@ -1814,7 +1817,7 @@
"fieldtype": "Section Break",
"hide_days": 1,
"hide_seconds": 1,
- "label": "Subscription Section"
+ "label": "Subscription"
},
{
"allow_on_submit": 1,
@@ -1936,10 +1939,6 @@
"read_only": 1
},
{
- "fieldname": "column_break_55",
- "fieldtype": "Column Break"
- },
- {
"depends_on": "eval: doc.is_internal_customer && doc.update_stock",
"fieldname": "set_target_warehouse",
"fieldtype": "Link",
@@ -2009,6 +2008,97 @@
"fieldname": "is_cash_or_non_trade_discount",
"fieldtype": "Check",
"label": "Is Cash or Non Trade Discount"
+ },
+ {
+ "fieldname": "contact_and_address_tab",
+ "fieldtype": "Tab Break",
+ "label": "Contact & Address"
+ },
+ {
+ "fieldname": "payments_tab",
+ "fieldtype": "Tab Break",
+ "label": "Payments"
+ },
+ {
+ "fieldname": "terms_tab",
+ "fieldtype": "Tab Break",
+ "label": "Terms"
+ },
+ {
+ "fieldname": "more_info_tab",
+ "fieldtype": "Tab Break",
+ "label": "More Info"
+ },
+ {
+ "fieldname": "connections_tab",
+ "fieldtype": "Tab Break",
+ "label": "Connections",
+ "show_dashboard": 1
+ },
+ {
+ "fieldname": "column_break_14",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_39",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "section_break_42",
+ "fieldtype": "Section Break",
+ "hide_border": 1,
+ "hide_days": 1,
+ "hide_seconds": 1
+ },
+ {
+ "fieldname": "column_break_55",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "shipping_address_section",
+ "fieldtype": "Section Break",
+ "label": "Shipping Address"
+ },
+ {
+ "fieldname": "company_address_section",
+ "fieldtype": "Section Break",
+ "label": "Company Address"
+ },
+ {
+ "fieldname": "shipping_addr_col_break",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "company_addr_col_break",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_27",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_52",
+ "fieldtype": "Column Break"
+ },
+ {
+ "depends_on": "eval:(!doc.is_return && doc.total_billing_amount > 0)",
+ "fieldname": "section_break_104",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "column_break_106",
+ "fieldtype": "Column Break"
+ },
+ {
+ "collapsible": 1,
+ "collapsible_depends_on": "write_off_amount",
+ "depends_on": "grand_total",
+ "fieldname": "write_off_section",
+ "fieldtype": "Section Break",
+ "hide_days": 1,
+ "hide_seconds": 1,
+ "label": "Write Off",
+ "width": "50%"
}
],
"icon": "fa fa-file-text",
@@ -2021,7 +2111,7 @@
"link_fieldname": "consolidated_invoice"
}
],
- "modified": "2022-09-16 17:44:22.227332",
+ "modified": "2022-09-27 14:15:35.293825",
"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 fb8f25a..7f0fc57 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -12,43 +12,24 @@
"title",
"naming_series",
"supplier",
- "get_items_from_open_material_requests",
"supplier_name",
- "apply_tds",
- "tax_withholding_category",
- "is_subcontracted",
- "supplier_warehouse",
- "column_break1",
- "company",
+ "get_items_from_open_material_requests",
+ "column_break_7",
"transaction_date",
"schedule_date",
"order_confirmation_no",
"order_confirmation_date",
+ "column_break1",
+ "company",
+ "apply_tds",
+ "tax_withholding_category",
+ "is_subcontracted",
+ "supplier_warehouse",
"amended_from",
"accounting_dimensions_section",
"cost_center",
"dimension_col_break",
"project",
- "drop_ship",
- "customer",
- "customer_name",
- "column_break_19",
- "customer_contact_person",
- "customer_contact_display",
- "customer_contact_mobile",
- "customer_contact_email",
- "section_addresses",
- "supplier_address",
- "address_display",
- "contact_person",
- "contact_display",
- "contact_mobile",
- "contact_email",
- "col_break_address",
- "shipping_address",
- "shipping_address_display",
- "billing_address",
- "billing_address_display",
"currency_and_price_list",
"currency",
"conversion_rate",
@@ -57,7 +38,6 @@
"price_list_currency",
"plc_conversion_rate",
"ignore_pricing_rule",
- "section_break_45",
"before_items_section",
"scan_barcode",
"set_from_warehouse",
@@ -67,10 +47,11 @@
"items",
"sb_last_purchase",
"total_qty",
+ "total_net_weight",
+ "column_break_40",
"base_total",
"base_net_total",
"column_break_26",
- "total_net_weight",
"total",
"net_total",
"section_break_48",
@@ -79,14 +60,13 @@
"set_reserve_warehouse",
"supplied_items",
"taxes_section",
+ "taxes_and_charges",
+ "column_break_53",
"tax_category",
"column_break_50",
"shipping_rule",
"section_break_52",
- "taxes_and_charges",
"taxes",
- "sec_tax_breakup",
- "other_charges_calculation",
"totals",
"base_taxes_and_charges_added",
"base_taxes_and_charges_deducted",
@@ -95,12 +75,6 @@
"taxes_and_charges_added",
"taxes_and_charges_deducted",
"total_taxes_and_charges",
- "discount_section",
- "apply_discount_on",
- "base_discount_amount",
- "column_break_45",
- "additional_discount_percentage",
- "discount_amount",
"totals_section",
"base_grand_total",
"base_rounding_adjustment",
@@ -113,17 +87,48 @@
"disable_rounded_total",
"in_words",
"advance_paid",
+ "discount_section",
+ "apply_discount_on",
+ "base_discount_amount",
+ "column_break_45",
+ "additional_discount_percentage",
+ "discount_amount",
+ "sec_tax_breakup",
+ "other_charges_calculation",
+ "contacts_and_addresses_tab",
+ "section_addresses",
+ "supplier_address",
+ "address_display",
+ "contact_person",
+ "contact_display",
+ "contact_mobile",
+ "contact_email",
+ "col_break_address",
+ "shipping_address",
+ "shipping_address_display",
+ "billing_address",
+ "billing_address_display",
+ "terms_tab",
+ "terms_section_break",
+ "tc_name",
+ "terms",
"payment_schedule_section",
"payment_terms_template",
"payment_schedule",
+ "drop_ship",
+ "customer",
+ "customer_name",
+ "column_break_19",
+ "customer_contact_person",
+ "customer_contact_display",
+ "customer_contact_mobile",
+ "customer_contact_email",
+ "more_info_tab",
"tracking_section",
"status",
"column_break_75",
"per_billed",
"per_received",
- "terms_section_break",
- "tc_name",
- "terms",
"column_break5",
"letter_head",
"select_print_heading",
@@ -143,7 +148,8 @@
"is_internal_supplier",
"represents_company",
"inter_company_order_reference",
- "is_old_subcontracting_flow"
+ "is_old_subcontracting_flow",
+ "dashboard"
],
"fields": [
{
@@ -483,7 +489,6 @@
"allow_bulk_edit": 1,
"fieldname": "items",
"fieldtype": "Table",
- "label": "Items",
"oldfieldname": "po_details",
"oldfieldtype": "Table",
"options": "Purchase Order Item",
@@ -579,6 +584,8 @@
{
"fieldname": "taxes_section",
"fieldtype": "Section Break",
+ "hide_border": 1,
+ "label": "Taxes and Charges",
"oldfieldtype": "Section Break",
"options": "fa fa-money"
},
@@ -633,7 +640,6 @@
{
"fieldname": "totals",
"fieldtype": "Section Break",
- "label": "Taxes and Charges",
"oldfieldtype": "Section Break",
"options": "fa fa-money"
},
@@ -1098,7 +1104,9 @@
},
{
"fieldname": "before_items_section",
- "fieldtype": "Section Break"
+ "fieldtype": "Section Break",
+ "hide_border": 1,
+ "label": "Items"
},
{
"fieldname": "items_col_break",
@@ -1134,10 +1142,6 @@
"options": "Tax Withholding Category"
},
{
- "fieldname": "section_break_45",
- "fieldtype": "Section Break"
- },
- {
"collapsible": 1,
"fieldname": "accounting_dimensions_section",
"fieldtype": "Section Break",
@@ -1173,6 +1177,39 @@
"fieldtype": "Link",
"label": "Set From Warehouse",
"options": "Warehouse"
+ },
+ {
+ "fieldname": "contacts_and_addresses_tab",
+ "fieldtype": "Tab Break",
+ "label": "Contacts & Addresses"
+ },
+ {
+ "fieldname": "terms_tab",
+ "fieldtype": "Tab Break",
+ "label": "Terms"
+ },
+ {
+ "fieldname": "more_info_tab",
+ "fieldtype": "Tab Break",
+ "label": "More Info"
+ },
+ {
+ "fieldname": "dashboard",
+ "fieldtype": "Tab Break",
+ "label": "Dashboard",
+ "show_dashboard": 1
+ },
+ {
+ "fieldname": "column_break_7",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_40",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_53",
+ "fieldtype": "Column Break"
}
],
"icon": "fa fa-file-text",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index ff269d0..5013d51 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -15,37 +15,25 @@
"naming_series",
"customer",
"customer_name",
+ "tax_id",
"order_type",
- "skip_delivery_note",
- "column_break1",
- "amended_from",
- "company",
+ "column_break_7",
"transaction_date",
"delivery_date",
+ "column_break1",
"po_no",
"po_date",
- "tax_id",
+ "company",
+ "skip_delivery_note",
+ "amended_from",
"accounting_dimensions_section",
"cost_center",
"dimension_col_break",
"project",
- "contact_info",
- "customer_address",
- "address_display",
- "contact_person",
- "contact_display",
- "contact_phone",
- "contact_mobile",
- "contact_email",
- "company_address",
- "company_address_display",
- "col_break46",
- "shipping_address_name",
- "shipping_address",
- "dispatch_address_name",
- "dispatch_address",
- "customer_group",
- "territory",
+ "column_break_77",
+ "source",
+ "campaign",
+ "custom_dimensions_section",
"currency_and_price_list",
"currency",
"conversion_rate",
@@ -55,46 +43,32 @@
"plc_conversion_rate",
"ignore_pricing_rule",
"sec_warehouse",
+ "scan_barcode",
+ "column_break_28",
"set_warehouse",
"items_section",
- "scan_barcode",
"items",
- "packing_list",
- "packed_items",
- "pricing_rule_details",
- "pricing_rules",
"section_break_31",
- "column_break_33a",
"total_qty",
+ "total_net_weight",
+ "column_break_33",
"base_total",
"base_net_total",
- "column_break_33",
- "total_net_weight",
+ "column_break_33a",
"total",
"net_total",
"taxes_section",
- "tax_category",
+ "taxes_and_charges",
"column_break_38",
+ "tax_category",
+ "column_break_49",
"shipping_rule",
"section_break_40",
- "taxes_and_charges",
"taxes",
- "sec_tax_breakup",
- "other_charges_calculation",
"section_break_43",
"base_total_taxes_and_charges",
"column_break_46",
"total_taxes_and_charges",
- "loyalty_points_redemption",
- "loyalty_points",
- "loyalty_amount",
- "section_break_48",
- "coupon_code",
- "apply_discount_on",
- "base_discount_amount",
- "column_break_50",
- "additional_discount_percentage",
- "discount_amount",
"totals",
"base_grand_total",
"base_rounding_adjustment",
@@ -107,26 +81,49 @@
"in_words",
"advance_paid",
"disable_rounded_total",
+ "section_break_48",
+ "coupon_code",
+ "apply_discount_on",
+ "base_discount_amount",
+ "column_break_50",
+ "additional_discount_percentage",
+ "discount_amount",
+ "sec_tax_breakup",
+ "other_charges_calculation",
+ "packing_list",
+ "packed_items",
+ "pricing_rule_details",
+ "pricing_rules",
+ "contact_info",
+ "billing_address_column",
+ "customer_address",
+ "address_display",
+ "customer_group",
+ "territory",
+ "column_break_84",
+ "contact_person",
+ "contact_display",
+ "contact_phone",
+ "contact_mobile",
+ "contact_email",
+ "shipping_address_column",
+ "shipping_address_name",
+ "shipping_address",
+ "column_break_93",
+ "dispatch_address_name",
+ "dispatch_address",
+ "col_break46",
+ "company_address",
+ "column_break_92",
+ "company_address_display",
"payment_schedule_section",
+ "payment_terms_section",
"payment_terms_template",
"payment_schedule",
"terms_section_break",
"tc_name",
"terms",
"more_info",
- "is_internal_customer",
- "represents_company",
- "inter_company_order_reference",
- "party_account_currency",
- "column_break_77",
- "source",
- "campaign",
- "printing_details",
- "language",
- "letter_head",
- "column_break4",
- "select_print_heading",
- "group_same_items",
"section_break_78",
"status",
"delivery_status",
@@ -143,12 +140,29 @@
"total_commission",
"section_break1",
"sales_team",
+ "loyalty_points_redemption",
+ "loyalty_points",
+ "column_break_116",
+ "loyalty_amount",
"subscription_section",
"from_date",
"to_date",
"column_break_108",
"auto_repeat",
- "update_auto_repeat_reference"
+ "update_auto_repeat_reference",
+ "printing_details",
+ "language",
+ "letter_head",
+ "group_same_items",
+ "column_break4",
+ "select_print_heading",
+ "additional_info_section",
+ "is_internal_customer",
+ "represents_company",
+ "column_break_152",
+ "inter_company_order_reference",
+ "party_account_currency",
+ "connections_tab"
],
"fields": [
{
@@ -334,10 +348,10 @@
"collapsible": 1,
"depends_on": "customer",
"fieldname": "contact_info",
- "fieldtype": "Section Break",
+ "fieldtype": "Tab Break",
"hide_days": 1,
"hide_seconds": 1,
- "label": "Address and Contact",
+ "label": "Address & Contact",
"options": "fa fa-bullhorn"
},
{
@@ -414,9 +428,10 @@
},
{
"fieldname": "col_break46",
- "fieldtype": "Column Break",
+ "fieldtype": "Section Break",
"hide_days": 1,
"hide_seconds": 1,
+ "label": "Company Address",
"width": "50%"
},
{
@@ -550,8 +565,10 @@
{
"fieldname": "sec_warehouse",
"fieldtype": "Section Break",
+ "hide_border": 1,
"hide_days": 1,
- "hide_seconds": 1
+ "hide_seconds": 1,
+ "label": "Items"
},
{
"fieldname": "set_warehouse",
@@ -565,6 +582,7 @@
{
"fieldname": "items_section",
"fieldtype": "Section Break",
+ "hide_border": 1,
"hide_days": 1,
"hide_seconds": 1,
"oldfieldtype": "Section Break",
@@ -688,7 +706,7 @@
"fieldtype": "Section Break",
"hide_days": 1,
"hide_seconds": 1,
- "label": "Taxes and Charges",
+ "label": "Taxes",
"oldfieldtype": "Section Break",
"options": "fa fa-money"
},
@@ -720,6 +738,7 @@
{
"fieldname": "section_break_40",
"fieldtype": "Section Break",
+ "hide_border": 1,
"hide_days": 1,
"hide_seconds": 1
},
@@ -804,7 +823,7 @@
"hidden": 1,
"hide_days": 1,
"hide_seconds": 1,
- "label": "Loyalty Points Redemption",
+ "label": "Loyalty Points",
"print_hide": 1
},
{
@@ -833,7 +852,7 @@
"fieldtype": "Section Break",
"hide_days": 1,
"hide_seconds": 1,
- "label": "Additional Discount and Coupon Code"
+ "label": "Additional Discount"
},
{
"fieldname": "coupon_code",
@@ -891,6 +910,7 @@
"fieldtype": "Section Break",
"hide_days": 1,
"hide_seconds": 1,
+ "label": "Totals",
"oldfieldtype": "Section Break",
"options": "fa fa-money",
"print_hide": 1
@@ -1045,10 +1065,10 @@
},
{
"fieldname": "payment_schedule_section",
- "fieldtype": "Section Break",
+ "fieldtype": "Tab Break",
"hide_days": 1,
"hide_seconds": 1,
- "label": "Payment Terms"
+ "label": "Terms"
},
{
"fieldname": "payment_terms_template",
@@ -1070,13 +1090,12 @@
"print_hide": 1
},
{
- "collapsible": 1,
"collapsible_depends_on": "terms",
"fieldname": "terms_section_break",
"fieldtype": "Section Break",
"hide_days": 1,
"hide_seconds": 1,
- "label": "Terms and Conditions",
+ "label": "Terms & Conditions",
"oldfieldtype": "Section Break",
"options": "fa fa-legal"
},
@@ -1104,10 +1123,10 @@
"collapsible": 1,
"collapsible_depends_on": "project",
"fieldname": "more_info",
- "fieldtype": "Section Break",
+ "fieldtype": "Tab Break",
"hide_days": 1,
"hide_seconds": 1,
- "label": "More Information",
+ "label": "More Info",
"oldfieldtype": "Section Break",
"options": "fa fa-file-text",
"print_hide": 1
@@ -1122,7 +1141,6 @@
"read_only": 1
},
{
- "description": "Track this Sales Order against any Project",
"fieldname": "project",
"fieldtype": "Link",
"hide_days": 1,
@@ -1240,7 +1258,7 @@
"fieldtype": "Section Break",
"hide_days": 1,
"hide_seconds": 1,
- "label": "Billing and Delivery Status",
+ "label": "Status",
"oldfieldtype": "Column Break",
"print_hide": 1,
"width": "50%"
@@ -1410,7 +1428,7 @@
"fieldtype": "Section Break",
"hide_days": 1,
"hide_seconds": 1,
- "label": "Auto Repeat Section",
+ "label": "Auto Repeat",
"no_copy": 1,
"print_hide": 1,
"read_only": 1
@@ -1542,13 +1560,76 @@
{
"fieldname": "dimension_col_break",
"fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_7",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_28",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_49",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "connections_tab",
+ "fieldtype": "Tab Break",
+ "label": "Connections",
+ "show_dashboard": 1
+ },
+ {
+ "fieldname": "payment_terms_section",
+ "fieldtype": "Section Break",
+ "label": "Payment Terms"
+ },
+ {
+ "fieldname": "column_break_116",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "billing_address_column",
+ "fieldtype": "Section Break",
+ "label": "Billing Address"
+ },
+ {
+ "fieldname": "shipping_address_column",
+ "fieldtype": "Section Break",
+ "label": "Shipping Address"
+ },
+ {
+ "fieldname": "column_break_93",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_84",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_92",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "custom_dimensions_section",
+ "fieldtype": "Section Break"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "additional_info_section",
+ "fieldtype": "Section Break",
+ "label": "Additional Info"
+ },
+ {
+ "fieldname": "column_break_152",
+ "fieldtype": "Column Break"
}
],
"icon": "fa fa-file-text",
"idx": 105,
"is_submittable": 1,
"links": [],
- "modified": "2022-09-16 17:43:57.007441",
+ "modified": "2022-09-27 12:38:57.007441",
"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 a8f907e..519301c 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -8,46 +8,29 @@
"document_type": "Document",
"engine": "InnoDB",
"field_order": [
- "delivery_to_section",
- "column_break0",
"title",
"naming_series",
"customer",
+ "tax_id",
"customer_name",
"column_break1",
- "amended_from",
- "company",
"posting_date",
"posting_time",
"set_posting_time",
+ "column_break_10",
+ "company",
+ "amended_from",
"is_return",
"issue_credit_note",
"return_against",
"accounting_dimensions_section",
"cost_center",
- "dimension_col_break",
+ "column_break_18",
"project",
- "customer_po_details",
- "po_no",
- "column_break_17",
- "po_date",
- "section_break_18",
- "pick_list",
- "contact_info",
- "shipping_address_name",
- "shipping_address",
- "dispatch_address_name",
- "dispatch_address",
- "contact_person",
- "contact_display",
- "contact_mobile",
- "contact_email",
- "col_break21",
- "customer_address",
- "tax_id",
- "address_display",
- "company_address",
- "company_address_display",
+ "dimension_col_break",
+ "campaign",
+ "source",
+ "custom_dimensions_section",
"currency_and_price_list",
"currency",
"conversion_rate",
@@ -56,45 +39,36 @@
"price_list_currency",
"plc_conversion_rate",
"ignore_pricing_rule",
- "sec_warehouse",
- "set_warehouse",
- "col_break_warehouse",
- "set_target_warehouse",
"items_section",
"scan_barcode",
+ "column_break_25",
+ "pick_list",
+ "col_break_warehouse",
+ "set_warehouse",
+ "set_target_warehouse",
+ "section_break_30",
"items",
- "pricing_rule_details",
- "pricing_rules",
- "packing_list",
- "packed_items",
- "product_bundle_help",
"section_break_31",
"total_qty",
+ "total_net_weight",
+ "column_break_35",
"base_total",
"base_net_total",
"column_break_33",
- "total_net_weight",
"total",
"net_total",
"taxes_section",
+ "taxes_and_charges",
+ "column_break_43",
"tax_category",
"column_break_39",
"shipping_rule",
"section_break_41",
- "taxes_and_charges",
"taxes",
- "sec_tax_breakup",
- "other_charges_calculation",
"section_break_44",
"base_total_taxes_and_charges",
"column_break_47",
"total_taxes_and_charges",
- "section_break_49",
- "apply_discount_on",
- "base_discount_amount",
- "column_break_51",
- "additional_discount_percentage",
- "discount_amount",
"totals",
"base_grand_total",
"base_rounding_adjustment",
@@ -106,9 +80,50 @@
"rounded_total",
"in_words",
"disable_rounded_total",
- "terms_section_break",
+ "section_break_49",
+ "apply_discount_on",
+ "base_discount_amount",
+ "column_break_51",
+ "additional_discount_percentage",
+ "discount_amount",
+ "sec_tax_breakup",
+ "other_charges_calculation",
+ "packing_list",
+ "packed_items",
+ "product_bundle_help",
+ "pricing_rule_details",
+ "pricing_rules",
+ "address_and_contact_tab",
+ "contact_info",
+ "customer_address",
+ "address_display",
+ "col_break21",
+ "contact_person",
+ "contact_display",
+ "contact_mobile",
+ "contact_email",
+ "shipping_address_section",
+ "shipping_address_name",
+ "shipping_address",
+ "column_break_95",
+ "dispatch_address_name",
+ "dispatch_address",
+ "company_address_section",
+ "company_address",
+ "column_break_101",
+ "company_address_display",
+ "terms_tab",
"tc_name",
"terms",
+ "more_info_tab",
+ "section_break_83",
+ "per_billed",
+ "status",
+ "column_break_112",
+ "per_installed",
+ "installation_status",
+ "column_break_89",
+ "per_returned",
"transporter_info",
"transporter",
"driver",
@@ -118,57 +133,40 @@
"transporter_name",
"driver_name",
"lr_date",
- "more_info",
- "campaign",
- "source",
- "column_break5",
- "is_internal_customer",
- "represents_company",
- "inter_company_reference",
- "per_billed",
- "customer_group",
- "territory",
- "printing_details",
- "letter_head",
- "select_print_heading",
- "language",
- "column_break_88",
- "print_without_amount",
- "group_same_items",
- "section_break_83",
- "status",
- "per_installed",
- "installation_status",
- "column_break_89",
- "per_returned",
- "excise_page",
- "instructions",
- "subscription_section",
- "auto_repeat",
+ "customer_po_details",
+ "po_no",
+ "column_break_17",
+ "po_date",
"sales_team_section_break",
"sales_partner",
- "column_break7",
"amount_eligible_for_commission",
+ "column_break7",
"commission_rate",
"total_commission",
"section_break1",
- "sales_team"
+ "sales_team",
+ "subscription_section",
+ "auto_repeat",
+ "printing_details",
+ "letter_head",
+ "select_print_heading",
+ "column_break_88",
+ "language",
+ "print_without_amount",
+ "group_same_items",
+ "more_info",
+ "is_internal_customer",
+ "represents_company",
+ "inter_company_reference",
+ "customer_group",
+ "territory",
+ "column_break5",
+ "excise_page",
+ "instructions",
+ "connections_tab"
],
"fields": [
{
- "fieldname": "delivery_to_section",
- "fieldtype": "Section Break",
- "label": "Delivery To",
- "options": "fa fa-user"
- },
- {
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "print_width": "50%",
- "width": "50%"
- },
- {
"allow_on_submit": 1,
"default": "{customer_name}",
"fieldname": "title",
@@ -337,11 +335,10 @@
"width": "100px"
},
{
- "collapsible": 1,
"depends_on": "customer",
"fieldname": "contact_info",
"fieldtype": "Section Break",
- "label": "Address and Contact",
+ "label": "Billing Address",
"options": "fa fa-bullhorn"
},
{
@@ -494,10 +491,6 @@
"print_hide": 1
},
{
- "fieldname": "sec_warehouse",
- "fieldtype": "Section Break"
- },
- {
"fieldname": "set_warehouse",
"fieldtype": "Link",
"label": "Set Source Warehouse",
@@ -511,6 +504,8 @@
{
"fieldname": "items_section",
"fieldtype": "Section Break",
+ "hide_border": 1,
+ "label": "Items",
"oldfieldtype": "Section Break",
"options": "fa fa-shopping-cart"
},
@@ -524,7 +519,6 @@
"allow_bulk_edit": 1,
"fieldname": "items",
"fieldtype": "Table",
- "label": "Items",
"oldfieldname": "delivery_note_details",
"oldfieldtype": "Table",
"options": "Delivery Note Item",
@@ -628,6 +622,7 @@
{
"fieldname": "taxes_section",
"fieldtype": "Section Break",
+ "hide_border": 1,
"label": "Taxes and Charges",
"oldfieldtype": "Section Break",
"options": "fa fa-money"
@@ -653,10 +648,10 @@
},
{
"fieldname": "section_break_41",
- "fieldtype": "Section Break"
+ "fieldtype": "Section Break",
+ "hide_border": 1
},
{
- "description": "If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",
"fieldname": "taxes_and_charges",
"fieldtype": "Link",
"label": "Sales Taxes and Charges Template",
@@ -668,7 +663,6 @@
{
"fieldname": "taxes",
"fieldtype": "Table",
- "label": "Sales Taxes and Charges",
"oldfieldname": "other_charges",
"oldfieldtype": "Table",
"options": "Sales Taxes and Charges"
@@ -759,6 +753,7 @@
{
"fieldname": "totals",
"fieldtype": "Section Break",
+ "label": "Totals",
"oldfieldtype": "Section Break",
"options": "fa fa-money"
},
@@ -864,15 +859,6 @@
"width": "150px"
},
{
- "collapsible": 1,
- "collapsible_depends_on": "terms",
- "fieldname": "terms_section_break",
- "fieldtype": "Section Break",
- "label": "Terms and Conditions",
- "oldfieldtype": "Section Break",
- "options": "fa fa-legal"
- },
- {
"fieldname": "tc_name",
"fieldtype": "Link",
"label": "Terms",
@@ -965,13 +951,12 @@
"collapsible": 1,
"fieldname": "more_info",
"fieldtype": "Section Break",
- "label": "More Information",
+ "label": "Additional Info",
"oldfieldtype": "Section Break",
"options": "fa fa-file-text",
"print_hide": 1
},
{
- "description": "Track this Delivery Note against any Project",
"fieldname": "project",
"fieldtype": "Link",
"label": "Project",
@@ -1110,7 +1095,6 @@
},
{
"depends_on": "eval:!doc.__islocal",
- "description": "% of materials delivered against this Delivery Note",
"fieldname": "per_installed",
"fieldtype": "Percent",
"in_list_view": 1,
@@ -1238,10 +1222,6 @@
"read_only": 1
},
{
- "fieldname": "section_break_18",
- "fieldtype": "Section Break"
- },
- {
"default": "0",
"fetch_from": "customer.is_internal_customer",
"fieldname": "is_internal_customer",
@@ -1329,13 +1309,85 @@
{
"fieldname": "dimension_col_break",
"fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "address_and_contact_tab",
+ "fieldtype": "Tab Break",
+ "label": "Address & Contact"
+ },
+ {
+ "fieldname": "terms_tab",
+ "fieldtype": "Tab Break",
+ "label": "Terms"
+ },
+ {
+ "fieldname": "more_info_tab",
+ "fieldtype": "Tab Break",
+ "label": "More Info"
+ },
+ {
+ "fieldname": "connections_tab",
+ "fieldtype": "Tab Break",
+ "label": "Connections",
+ "show_dashboard": 1
+ },
+ {
+ "fieldname": "column_break_10",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_25",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "section_break_30",
+ "fieldtype": "Section Break",
+ "hide_border": 1
+ },
+ {
+ "fieldname": "column_break_35",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_43",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "custom_dimensions_section",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "shipping_address_section",
+ "fieldtype": "Section Break",
+ "label": "Shipping Address"
+ },
+ {
+ "fieldname": "column_break_95",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "company_address_section",
+ "fieldtype": "Section Break",
+ "label": "Company Address"
+ },
+ {
+ "fieldname": "column_break_101",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_112",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_18",
+ "fieldtype": "Column Break"
}
],
"icon": "fa fa-truck",
"idx": 146,
"is_submittable": 1,
"links": [],
- "modified": "2022-09-16 17:46:17.701904",
+ "modified": "2022-09-27 12:49:21.640004",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",