From 376da8df0a20971caf1800d5d6bbdeece88af2cd Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Thu, 21 Mar 2024 11:52:10 +0100
Subject: [PATCH] feat(Item Price): validate UOM

(cherry picked from commit 69824eff80eb70b7e3139c6db84eedad84ceb8b4)

# Conflicts:
#	erpnext/stock/doctype/item_price/item_price.py
---
 erpnext/stock/doctype/item_price/item_price.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/erpnext/stock/doctype/item_price/item_price.py b/erpnext/stock/doctype/item_price/item_price.py
index 5445e1b88b0..63cb604a28d 100644
--- a/erpnext/stock/doctype/item_price/item_price.py
+++ b/erpnext/stock/doctype/item_price/item_price.py
@@ -55,6 +55,19 @@ class ItemPrice(Document):
 		if not frappe.db.exists("Item", self.item_code):
 			frappe.throw(_("Item {0} not found.").format(self.item_code))
 
+<<<<<<< HEAD
+=======
+		if self.uom and not frappe.db.exists(
+			"UOM Conversion Detail", {"parenttype": "Item", "parent": self.item_code, "uom": self.uom}
+		):
+			frappe.throw(_("UOM {0} not found in Item {1}").format(self.uom, self.item_code))
+
+	def validate_dates(self):
+		if self.valid_from and self.valid_upto:
+			if getdate(self.valid_from) > getdate(self.valid_upto):
+				frappe.throw(_("Valid From Date must be lesser than Valid Up To Date."))
+
+>>>>>>> 69824eff80 (feat(Item Price): validate UOM)
 	def update_price_list_details(self):
 		if self.price_list:
 			price_list_details = frappe.db.get_value(