fix: minor cleanup
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 69e2f96..e73d602 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -39,13 +39,12 @@
"ignore_pricing_rule",
"sec_warehouse",
"scan_barcode",
+ "col_break_warehouse",
"update_stock",
- "column_break_38",
"set_warehouse",
"set_from_warehouse",
- "col_break_warehouse",
- "rejected_warehouse",
"is_subcontracted",
+ "rejected_warehouse",
"supplier_warehouse",
"items_section",
"items",
@@ -186,7 +185,8 @@
"inter_company_invoice_reference",
"is_old_subcontracting_flow",
"remarks",
- "connections_tab"
+ "connections_tab",
+ "column_break_38"
],
"fields": [
{
@@ -667,6 +667,7 @@
"read_only": 1
},
{
+ "depends_on": "total_net_weight",
"fieldname": "total_net_weight",
"fieldtype": "Float",
"label": "Total Net Weight",
@@ -806,7 +807,6 @@
},
{
"collapsible": 1,
- "collapsible_depends_on": "discount_amount",
"fieldname": "section_break_44",
"fieldtype": "Section Break",
"label": "Additional Discount"
@@ -1340,7 +1340,7 @@
},
{
"depends_on": "eval:doc.is_internal_supplier",
- "description": "Unrealized Profit / Loss account for intra-company transfers",
+ "description": "Unrealized Profit/Loss account for intra-company transfers",
"fieldname": "unrealized_profit_loss_account",
"fieldtype": "Link",
"label": "Unrealized Profit / Loss Account",
@@ -1519,7 +1519,7 @@
"idx": 204,
"is_submittable": 1,
"links": [],
- "modified": "2022-10-07 14:19:14.214157",
+ "modified": "2022-10-11 13:04:44.304389",
"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 4353c6f..97e5f40 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -852,6 +852,7 @@
"read_only": 1
},
{
+ "depends_on": "total_net_weight",
"fieldname": "total_net_weight",
"fieldtype": "Float",
"hide_days": 1,
@@ -2108,7 +2109,7 @@
"link_fieldname": "consolidated_invoice"
}
],
- "modified": "2022-09-28 19:23:38.265409",
+ "modified": "2022-10-11 13:07:36.488095",
"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 a2f9637..2193985 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -454,7 +454,6 @@
"print_hide": 1
},
{
- "description": "Sets 'Warehouse' in each row of the Items table.",
"fieldname": "set_warehouse",
"fieldtype": "Link",
"label": "Set Target Warehouse",
@@ -578,6 +577,7 @@
"read_only": 1
},
{
+ "depends_on": "total_net_weight",
"fieldname": "total_net_weight",
"fieldtype": "Float",
"label": "Total Net Weight",
@@ -707,7 +707,6 @@
"read_only": 1
},
{
- "depends_on": "total_taxes_and_charges",
"fieldname": "total_taxes_and_charges",
"fieldtype": "Currency",
"label": "Total Taxes and Charges",
@@ -781,7 +780,6 @@
"read_only": 1
},
{
- "description": "In Words will be visible once you save the Purchase Order.",
"fieldname": "base_in_words",
"fieldtype": "Data",
"label": "In Words (Company Currency)",
@@ -1234,7 +1232,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
- "modified": "2022-09-28 18:20:49.494279",
+ "modified": "2022-10-11 13:01:41.674352",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order",
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index f858e26..fa64b16 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -301,7 +301,7 @@
"read_only": 1
},
{
- "depends_on": "eval:doc.quotation_to=='Customer' && doc.party_name",
+ "depends_on": "eval:(doc.quotation_to=='Customer' && doc.party_name)",
"fieldname": "col_break98",
"fieldtype": "Column Break",
"width": "50%"
@@ -321,7 +321,7 @@
"read_only": 1
},
{
- "depends_on": "eval:doc.quotation_to=='Customer' && doc.party_name",
+ "depends_on": "eval:(doc.quotation_to=='Customer' && doc.party_name)",
"fieldname": "customer_group",
"fieldtype": "Link",
"hidden": 1,
@@ -490,6 +490,7 @@
"read_only": 1
},
{
+ "depends_on": "total_net_weight",
"fieldname": "total_net_weight",
"fieldtype": "Float",
"label": "Total Net Weight",
@@ -843,7 +844,7 @@
},
{
"allow_on_submit": 1,
- "depends_on": "eval: doc.auto_repeat",
+ "depends_on": "eval:doc.auto_repeat",
"fieldname": "update_auto_repeat_reference",
"fieldtype": "Button",
"label": "Update Auto Repeat Reference"
@@ -868,7 +869,7 @@
},
{
"allow_on_submit": 1,
- "depends_on": "eval:doc.status===\"Lost\"",
+ "depends_on": "eval:doc.status=='Lost'",
"fieldname": "order_lost_reason",
"fieldtype": "Small Text",
"label": "Detailed Reason",
@@ -931,7 +932,6 @@
"read_only": 1
},
{
- "depends_on": "packed_items",
"fieldname": "packed_items",
"fieldtype": "Table",
"label": "Bundle Items",
@@ -1031,7 +1031,7 @@
},
{
"collapsible": 1,
- "depends_on": "eval:(doc.lost_reasons.length>0 || doc.order_lost_reason)",
+ "depends_on": "eval:(doc.lost_reasons || doc.order_lost_reason)",
"fieldname": "lost_reasons_section",
"fieldtype": "Section Break",
"label": "Lost Reasons"
@@ -1058,7 +1058,7 @@
"idx": 82,
"is_submittable": 1,
"links": [],
- "modified": "2022-09-27 15:18:27.693005",
+ "modified": "2022-10-11 13:06:33.479650",
"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 1f3af0c..e6ff39d 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -82,9 +82,9 @@
"advance_paid",
"disable_rounded_total",
"section_break_48",
- "coupon_code",
"apply_discount_on",
"base_discount_amount",
+ "coupon_code",
"column_break_50",
"additional_discount_percentage",
"discount_amount",
@@ -693,6 +693,7 @@
"read_only": 1
},
{
+ "depends_on": "total_net_weight",
"fieldname": "total_net_weight",
"fieldtype": "Float",
"hide_days": 1,
@@ -1628,7 +1629,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
- "modified": "2022-09-28 18:30:34.723896",
+ "modified": "2022-10-11 13:06:10.469796",
"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 541f96b..0ca3e69 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -41,7 +41,6 @@
"ignore_pricing_rule",
"items_section",
"scan_barcode",
- "column_break_25",
"pick_list",
"col_break_warehouse",
"set_warehouse",
@@ -163,7 +162,8 @@
"column_break5",
"excise_page",
"instructions",
- "connections_tab"
+ "connections_tab",
+ "column_break_25"
],
"fields": [
{
@@ -613,6 +613,7 @@
"read_only": 1
},
{
+ "depends_on": "total_net_weight",
"fieldname": "total_net_weight",
"fieldtype": "Float",
"label": "Total Net Weight",
@@ -1386,7 +1387,7 @@
"idx": 146,
"is_submittable": 1,
"links": [],
- "modified": "2022-09-27 14:55:31.964085",
+ "modified": "2022-10-11 13:06:58.655635",
"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 426b509..3141212 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -583,6 +583,7 @@
"read_only": 1
},
{
+ "depends_on": "total_net_weight",
"fieldname": "total_net_weight",
"fieldtype": "Float",
"label": "Total Net Weight",
@@ -920,7 +921,6 @@
"width": "50%"
},
{
- "description": "Track this Purchase Receipt against any Project",
"fieldname": "project",
"fieldtype": "Link",
"label": "Project",
@@ -1224,7 +1224,7 @@
"idx": 261,
"is_submittable": 1,
"links": [],
- "modified": "2022-09-28 13:09:37.482663",
+ "modified": "2022-10-11 13:02:31.776256",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",