From 6c4cddccf6c9bec81c533aaf72865998e42de72d Mon Sep 17 00:00:00 2001 From: Saqib Date: Fri, 6 Mar 2020 11:06:41 +0530 Subject: [PATCH] fix: show uom in print formats instead of stock uom (#20844) Co-authored-by: Saqib Ansari --- .../purchase_invoice_item/purchase_invoice_item.json | 3 +-- .../selling/doctype/quotation_item/quotation_item.json | 8 ++++++-- .../doctype/sales_order_item/sales_order_item.json | 4 ++-- .../doctype/delivery_note_item/delivery_note_item.json | 6 ++++-- .../purchase_receipt_item/purchase_receipt_item.json | 4 ++-- 5 files changed, 15 insertions(+), 10 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 acb0398b5c0..36bb2be3dc5 100644 --- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json @@ -198,7 +198,6 @@ "fieldtype": "Link", "label": "UOM", "options": "UOM", - "print_hide": 1, "reqd": 1 }, { @@ -771,7 +770,7 @@ "idx": 1, "istable": 1, "links": [], - "modified": "2019-12-04 12:23:17.046413", + "modified": "2020-03-05 14:20:17.297284", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice Item", diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json index a299b8809ab..3ff5555e827 100644 --- a/erpnext/selling/doctype/quotation_item/quotation_item.json +++ b/erpnext/selling/doctype/quotation_item/quotation_item.json @@ -1,4 +1,5 @@ { + "actions": [], "creation": "2013-03-07 11:42:57", "doctype": "DocType", "document_type": "Document", @@ -163,6 +164,7 @@ "oldfieldname": "stock_uom", "oldfieldtype": "Data", "options": "UOM", + "print_hide": 1, "print_width": "100px", "read_only": 1, "width": "100px" @@ -176,7 +178,6 @@ "fieldtype": "Link", "label": "UOM", "options": "UOM", - "print_hide": 1, "reqd": 1 }, { @@ -382,6 +383,7 @@ "read_only": 1 }, { + "default": "0", "fieldname": "is_free_item", "fieldtype": "Check", "label": "Is Free Item", @@ -517,6 +519,7 @@ }, { "allow_on_submit": 1, + "default": "0", "fieldname": "page_break", "fieldtype": "Check", "label": "Page Break", @@ -574,7 +577,8 @@ ], "idx": 1, "istable": 1, - "modified": "2019-05-01 17:39:14.228141", + "links": [], + "modified": "2020-03-05 14:18:58.783751", "modified_by": "Administrator", "module": "Selling", "name": "Quotation Item", 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 317f284eff3..c95f236ebba 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -209,7 +209,6 @@ "fieldtype": "Link", "label": "UOM", "options": "UOM", - "print_hide": 1, "reqd": 1 }, { @@ -758,7 +757,8 @@ ], "idx": 1, "istable": 1, - "modified": "2019-12-11 18:06:26.238169", + "links": [], + "modified": "2020-03-05 14:20:28.085117", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order Item", 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 af06daeabd3..782ac84e57d 100644 --- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json +++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -1,4 +1,5 @@ { + "actions": [], "autoname": "hash", "creation": "2013-04-22 13:15:44", "doctype": "DocType", @@ -180,6 +181,7 @@ "oldfieldname": "stock_uom", "oldfieldtype": "Data", "options": "UOM", + "print_hide": 1, "print_width": "50px", "read_only": 1, "reqd": 1, @@ -195,7 +197,6 @@ "in_list_view": 1, "label": "UOM", "options": "UOM", - "print_hide": 1, "reqd": 1 }, { @@ -702,7 +703,8 @@ ], "idx": 1, "istable": 1, - "modified": "2019-05-25 22:08:27.452734", + "links": [], + "modified": "2020-03-05 14:18:33.131672", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note Item", diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json index 16ec8db335c..d5cf4cadb14 100644 --- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json +++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json @@ -222,7 +222,6 @@ "oldfieldname": "uom", "oldfieldtype": "Link", "options": "UOM", - "print_hide": 1, "print_width": "100px", "reqd": 1, "width": "100px" @@ -823,7 +822,8 @@ ], "idx": 1, "istable": 1, - "modified": "2019-10-14 16:03:25.499557", + "links": [], + "modified": "2020-03-05 14:19:48.799370", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt Item",