mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-18 12:39:18 +00:00
Merge pull request #40591 from frappe/mergify/bp/version-15-hotfix/pr-40587
refactor(Item Price): validate dates (#40587)
This commit is contained in:
@@ -7,7 +7,6 @@ from frappe import _, bold
|
|||||||
from frappe.model.document import Document
|
from frappe.model.document import Document
|
||||||
from frappe.query_builder import Criterion
|
from frappe.query_builder import Criterion
|
||||||
from frappe.query_builder.functions import Cast_
|
from frappe.query_builder.functions import Cast_
|
||||||
from frappe.utils import getdate
|
|
||||||
|
|
||||||
|
|
||||||
class ItemPriceDuplicateItem(frappe.ValidationError):
|
class ItemPriceDuplicateItem(frappe.ValidationError):
|
||||||
@@ -46,7 +45,7 @@ class ItemPrice(Document):
|
|||||||
|
|
||||||
def validate(self):
|
def validate(self):
|
||||||
self.validate_item()
|
self.validate_item()
|
||||||
self.validate_dates()
|
self.validate_from_to_dates("valid_from", "valid_upto")
|
||||||
self.update_price_list_details()
|
self.update_price_list_details()
|
||||||
self.update_item_details()
|
self.update_item_details()
|
||||||
self.check_duplicates()
|
self.check_duplicates()
|
||||||
@@ -56,11 +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))
|
||||||
|
|
||||||
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."))
|
|
||||||
|
|
||||||
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(
|
||||||
|
|||||||
Reference in New Issue
Block a user