From cab0e30cebc5c7a2c9f6a264a7bd554d5b89e58f Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 11:17:12 +0530 Subject: [PATCH] feat(Item Price): make UOM mandatory (backport #40588) (#41312) * feat(Item Price): make UOM mandatory (#40588) (cherry picked from commit a61148c464def5b1cc8f60d263e18a745f986bee) # Conflicts: # erpnext/stock/doctype/item_price/item_price.json * chore: `conflicts` --------- Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Co-authored-by: s-aga-r --- erpnext/stock/doctype/item_price/item_price.json | 7 +++++-- erpnext/stock/doctype/item_price/item_price.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erpnext/stock/doctype/item_price/item_price.json b/erpnext/stock/doctype/item_price/item_price.json index b92026dc97b..3daf4dc2bd8 100644 --- a/erpnext/stock/doctype/item_price/item_price.json +++ b/erpnext/stock/doctype/item_price/item_price.json @@ -52,10 +52,13 @@ "search_index": 1 }, { + "fetch_from": "item_code.stock_uom", + "fetch_if_empty": 1, "fieldname": "uom", "fieldtype": "Link", "label": "UOM", - "options": "UOM" + "options": "UOM", + "reqd": 1 }, { "default": "0", @@ -220,7 +223,7 @@ "idx": 1, "index_web_pages_for_search": 1, "links": [], - "modified": "2024-01-30 14:02:19.304854", + "modified": "2024-04-02 22:18:00.450641", "modified_by": "Administrator", "module": "Stock", "name": "Item Price", diff --git a/erpnext/stock/doctype/item_price/item_price.py b/erpnext/stock/doctype/item_price/item_price.py index 34c486b37ac..5445e1b88b0 100644 --- a/erpnext/stock/doctype/item_price/item_price.py +++ b/erpnext/stock/doctype/item_price/item_price.py @@ -38,7 +38,7 @@ class ItemPrice(Document): reference: DF.Data | None selling: DF.Check supplier: DF.Link | None - uom: DF.Link | None + uom: DF.Link valid_from: DF.Date | None valid_upto: DF.Date | None # end: auto-generated types