From 9a4ddaee71c1314a7fb996070e7d2d03b137baab Mon Sep 17 00:00:00 2001 From: Antoine Date: Fri, 20 Oct 2023 14:58:42 +0200 Subject: [PATCH 1/7] Added UOM to quotation item with adjusted column width --- .../selling/doctype/quotation_item/quotation_item.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json index c052e5c98a..41bc9bffef 100644 --- a/erpnext/selling/doctype/quotation_item/quotation_item.json +++ b/erpnext/selling/doctype/quotation_item/quotation_item.json @@ -158,7 +158,7 @@ }, { "bold": 1, - "columns": 2, + "columns": 1, "fieldname": "qty", "fieldtype": "Float", "in_list_view": 1, @@ -186,8 +186,10 @@ "fieldtype": "Column Break" }, { + "columns": 1, "fieldname": "uom", "fieldtype": "Link", + "in_list_view": 1, "label": "UOM", "options": "UOM", "reqd": 1 @@ -689,7 +691,7 @@ "idx": 1, "istable": 1, "links": [], - "modified": "2023-09-26 13:42:11.410294", + "modified": "2023-10-20 14:58:12.264378", "modified_by": "Administrator", "module": "Selling", "name": "Quotation Item", @@ -699,4 +701,4 @@ "sort_order": "DESC", "states": [], "track_changes": 1 -} +} \ No newline at end of file -- GitLab From a912635fc0635ebb72d6978ea815b4131bf785e1 Mon Sep 17 00:00:00 2001 From: Antoine Date: Fri, 20 Oct 2023 15:00:27 +0200 Subject: [PATCH 2/7] Added UOM to sales invoice item with adjusted column width --- .../doctype/sales_invoice_item/sales_invoice_item.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json index 47dd52c0d0..7f43402a3d 100644 --- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json +++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json @@ -182,7 +182,7 @@ }, { "bold": 1, - "columns": 2, + "columns": 1, "fieldname": "qty", "fieldtype": "Float", "in_list_view": 1, @@ -203,8 +203,10 @@ "fieldtype": "Column Break" }, { + "columns": 1, "fieldname": "uom", "fieldtype": "Link", + "in_list_view": 1, "label": "UOM", "options": "UOM", "reqd": 1 @@ -742,8 +744,8 @@ { "fieldname": "event_registration", "fieldtype": "Link", - "options": "Event Registration", "label": "Event Registration", + "options": "Event Registration", "read_only": 1 }, { @@ -924,7 +926,7 @@ "idx": 1, "istable": 1, "links": [], - "modified": "2023-07-26 12:53:22.404057", + "modified": "2023-10-20 14:59:59.595610", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice Item", @@ -934,4 +936,4 @@ "sort_field": "modified", "sort_order": "DESC", "states": [] -} +} \ No newline at end of file -- GitLab From 3cd7bb74c493e48b75ce1aec389aadf83f01a4e1 Mon Sep 17 00:00:00 2001 From: Antoine Date: Fri, 20 Oct 2023 15:01:01 +0200 Subject: [PATCH 3/7] Added UOM to Supplier quotation item with adjusted column width --- .../supplier_quotation_item.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json index 8d491fbc84..85cf2d89f3 100644 --- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json +++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json @@ -75,7 +75,7 @@ "fields": [ { "bold": 1, - "columns": 2, + "columns": 4, "fieldname": "item_code", "fieldtype": "Link", "in_list_view": 1, @@ -152,6 +152,7 @@ }, { "bold": 1, + "columns": 1, "fieldname": "qty", "fieldtype": "Float", "in_list_view": 1, @@ -196,6 +197,7 @@ "fieldtype": "Column Break" }, { + "columns": 1, "fieldname": "uom", "fieldtype": "Link", "in_list_view": 1, @@ -559,13 +561,15 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2020-10-19 12:36:26.913211", + "modified": "2023-10-20 15:00:40.656528", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Quotation Item", + "naming_rule": "Random", "owner": "Administrator", "permissions": [], "sort_field": "modified", "sort_order": "DESC", + "states": [], "track_changes": 1 -} +} \ No newline at end of file -- GitLab From 52893c0688c119f75d4d9934153f2fd7dc68e12e Mon Sep 17 00:00:00 2001 From: Antoine Date: Fri, 20 Oct 2023 15:02:23 +0200 Subject: [PATCH 4/7] Added UOM to purchase order item with adjusted column width --- .../doctype/purchase_order_item/purchase_order_item.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json index 18ebc2de1c..b52a74418c 100644 --- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json +++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json @@ -902,7 +902,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2023-09-13 16:22:40.825092", + "modified": "2023-10-20 15:01:20.889026", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order Item", @@ -915,4 +915,4 @@ "sort_order": "DESC", "states": [], "track_changes": 1 -} +} \ No newline at end of file -- GitLab From 6fd60b34b3c063bd861a0e45b451bb0fa11167b5 Mon Sep 17 00:00:00 2001 From: Antoine Date: Fri, 20 Oct 2023 15:03:11 +0200 Subject: [PATCH 5/7] Updated columns widths of delivery note for consistency --- .../doctype/delivery_note_item/delivery_note_item.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json index 42ebabd1bb..3028f239d3 100644 --- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json +++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -115,6 +115,7 @@ "print_hide": 1 }, { + "columns": 4, "fieldname": "item_code", "fieldtype": "Link", "in_global_search": 1, @@ -186,6 +187,7 @@ "label": "Quantity and Rate" }, { + "columns": 1, "fieldname": "qty", "fieldtype": "Float", "in_list_view": 1, @@ -215,6 +217,7 @@ "fieldtype": "Column Break" }, { + "columns": 1, "fieldname": "uom", "fieldtype": "Link", "in_list_view": 1, @@ -335,6 +338,7 @@ "fieldtype": "Section Break" }, { + "columns": 2, "fieldname": "rate", "fieldtype": "Currency", "in_list_view": 1, @@ -346,6 +350,7 @@ "width": "150px" }, { + "columns": 2, "fieldname": "amount", "fieldtype": "Currency", "in_list_view": 1, @@ -892,7 +897,7 @@ "idx": 1, "istable": 1, "links": [], - "modified": "2023-10-16 16:18:18.013379", + "modified": "2023-10-20 15:02:51.777051", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note Item", @@ -902,4 +907,4 @@ "sort_field": "modified", "sort_order": "DESC", "states": [] -} +} \ No newline at end of file -- GitLab From bcc51137371ce9efea67bc52a486d36a8194515b Mon Sep 17 00:00:00 2001 From: Antoine Date: Fri, 20 Oct 2023 15:05:55 +0200 Subject: [PATCH 6/7] Added UOM to purchase invoice item with adjusted column width --- .../purchase_invoice_item.json | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json index a25dd71a69..206b497ed0 100644 --- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json @@ -110,12 +110,13 @@ "dimension_col_break", "cost_center", "section_break_82", - "page_break" + "page_break", + "rejected_qty" ], "fields": [ { "bold": 1, - "columns": 3, + "columns": 4, "fieldname": "item_code", "fieldtype": "Link", "in_list_view": 1, @@ -184,7 +185,7 @@ }, { "bold": 1, - "columns": 2, + "columns": 1, "fieldname": "qty", "fieldtype": "Float", "in_list_view": 1, @@ -212,8 +213,10 @@ "fieldtype": "Column Break" }, { + "columns": 1, "fieldname": "uom", "fieldtype": "Link", + "in_list_view": 1, "label": "UOM", "options": "UOM", "print_hide": 1, @@ -280,7 +283,7 @@ }, { "bold": 1, - "columns": 3, + "columns": 2, "fieldname": "rate", "fieldtype": "Currency", "in_list_view": 1, @@ -589,9 +592,9 @@ "fieldname": "item_group", "fieldtype": "Link", "label": "Item Group", + "options": "Item Group", "print_hide": 1, - "read_only": 1, - "options": "Item Group" + "read_only": 1 }, { "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", @@ -916,7 +919,7 @@ "idx": 1, "istable": 1, "links": [], - "modified": "2023-10-04 21:01:01.824892", + "modified": "2023-10-20 15:05:17.101869", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice Item", @@ -926,4 +929,4 @@ "sort_field": "modified", "sort_order": "DESC", "states": [] -} +} \ No newline at end of file -- GitLab From d37680eade15153da19854b8a296c12ec7c4360c Mon Sep 17 00:00:00 2001 From: Antoine Date: Fri, 20 Oct 2023 15:15:27 +0200 Subject: [PATCH 7/7] Added UOM to sales order item with adjusted column width --- .../doctype/sales_order_item/sales_order_item.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json index e99b6c8366..555ed6675b 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -111,7 +111,7 @@ "fields": [ { "bold": 1, - "columns": 3, + "columns": 4, "fieldname": "item_code", "fieldtype": "Link", "in_global_search": 1, @@ -227,8 +227,10 @@ "fieldtype": "Column Break" }, { + "columns": 1, "fieldname": "uom", "fieldtype": "Link", + "in_list_view": 1, "label": "UOM", "options": "UOM", "reqd": 1 @@ -347,7 +349,7 @@ "precision": "2" }, { - "columns": 2, + "columns": 1, "depends_on": "eval: doc.type != \"\"", "fieldname": "rate", "fieldtype": "Currency", @@ -360,7 +362,7 @@ "width": "100px" }, { - "columns": 2, + "columns": 1, "fieldname": "amount", "fieldtype": "Currency", "in_list_view": 1, @@ -923,7 +925,7 @@ "idx": 1, "istable": 1, "links": [], - "modified": "2023-10-17 18:18:26.475259", + "modified": "2023-10-20 15:12:34.878015", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order Item", -- GitLab