From b51e55b2c475659c4b87777ec9a5bff2fc3f57d6 Mon Sep 17 00:00:00 2001 From: Afshan Date: Thu, 16 Jul 2020 13:14:08 +0530 Subject: [PATCH 1/2] style: moved parent warehouse to top section also added a section break for better look --- erpnext/stock/doctype/warehouse/warehouse.json | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json index 5d534af15769..3a04bf261fd0 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.json +++ b/erpnext/stock/doctype/warehouse/warehouse.json @@ -10,12 +10,14 @@ "field_order": [ "warehouse_detail", "warehouse_name", + "column_break_3", + "warehouse_type", + "parent_warehouse", "is_group", - "company", - "disabled", "column_break_4", "account", - "warehouse_type", + "company", + "disabled", "address_and_contact", "address_html", "column_break_10", @@ -31,7 +33,6 @@ "state", "pin", "tree_details", - "parent_warehouse", "lft", "rgt", "old_parent" @@ -224,13 +225,17 @@ "fieldtype": "Link", "label": "Warehouse Type", "options": "Warehouse Type" + }, + { + "fieldname": "column_break_3", + "fieldtype": "Section Break" } ], "icon": "fa fa-building", "idx": 1, "is_tree": 1, "links": [], - "modified": "2020-03-18 18:11:53.282358", + "modified": "2020-07-16 13:09:34.144030", "modified_by": "Administrator", "module": "Stock", "name": "Warehouse", From 88750a176e91b87dd41c4ebc2ad5371a86093481 Mon Sep 17 00:00:00 2001 From: Afshan Date: Thu, 16 Jul 2020 15:44:42 +0530 Subject: [PATCH 2/2] style: changes display depends on for HTML field --- erpnext/stock/doctype/warehouse/warehouse.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json index 3a04bf261fd0..3b49c4ca523e 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.json +++ b/erpnext/stock/doctype/warehouse/warehouse.json @@ -92,6 +92,7 @@ "options": "Account" }, { + "depends_on": "eval:!doc.__islocal", "fieldname": "address_and_contact", "fieldtype": "Section Break", "label": "Address and Contact" @@ -235,7 +236,7 @@ "idx": 1, "is_tree": 1, "links": [], - "modified": "2020-07-16 13:09:34.144030", + "modified": "2020-07-16 15:43:50.653256", "modified_by": "Administrator", "module": "Stock", "name": "Warehouse",