mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-17 17:26:43 +00:00
chore: resolve conflicts
This commit is contained in:
@@ -55,14 +55,6 @@ class ItemPrice(Document):
|
||||
if not frappe.db.exists("Item", 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):
|
||||
if self.price_list:
|
||||
price_list_details = frappe.db.get_value(
|
||||
|
||||
Reference in New Issue
Block a user