nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-30 18:34:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
barredterra
2024-03-21 14:16:27 +01:00
parent 357a1c9752
commit df6226f07f
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/stock/doctype/item_price/item_price.py
View File

@@ -55,14 +55,6 @@ class ItemPrice(Document):
if not frappe.db.exists("Item", self.item_code): if not frappe.db.exists("Item", self.item_code):
frappe.throw(_("Item {0} not found.").format(self.item_code)) frappe.throw(_("Item {0} not found.").format(self.item_code))
<<<<<<< HEAD
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 Upto Date."))
=======
>>>>>>> cbcc47b5c4 (refactor(Item Price): validate dates)
def update_price_list_details(self): def update_price_list_details(self):
if self.price_list: if self.price_list:
price_list_details = frappe.db.get_value( price_list_details = frappe.db.get_value(