Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Delivery Date Change based on Delivery Date change in child table (#15068)

Browse Source
This commit is contained in:
KanchanChauhan 2018-08-01 18:11:58 +05:30 committed by Nabin Hait
parent 041a5c2d3b
commit e1f0be6da5
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/selling/doctype/sales_order/sales_order.json
View File

@ -388,7 +388,7 @@
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"allow_on_submit": 1,
"bold": 0,
"collapsible": 0,
"columns": 0,
@ -3917,7 +3917,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2018-07-30 08:36:11.652659",
"modified": "2018-08-01 08:36:11.652659",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",

11
erpnext/selling/doctype/sales_order/sales_order.py
View File

@ -106,17 +106,19 @@ class SalesOrder(SellingController):
def validate_delivery_date(self):
if self.order_type == 'Sales':
delivery_date_list = [d.delivery_date for d in self.get("items") if d.delivery_date]
max_delivery_date = max(delivery_date_list) if delivery_date_list else None
if not self.delivery_date:
delivery_date_list = [d.delivery_date for d in self.get("items") if d.delivery_date]
self.delivery_date = max(delivery_date_list) if delivery_date_list else None
self.delivery_date = max_delivery_date
if self.delivery_date:
for d in self.get("items"):
if not d.delivery_date:
d.delivery_date = self.delivery_date
if getdate(self.transaction_date) > getdate(d.delivery_date):
frappe.msgprint(_("Expected Delivery Date should be after Sales Order Date"),
indicator='orange', title=_('Warning'))
indicator='orange', title=_('Warning'))
if getdate(self.delivery_date) != getdate(max_delivery_date):
self.delivery_date = max_delivery_date
else:
frappe.throw(_("Please enter Delivery Date"))
@ -303,6 +305,7 @@ class SalesOrder(SellingController):
self.validate_po()
self.validate_drop_ship()
self.validate_supplier_after_submit()
self.validate_delivery_date()
def validate_supplier_after_submit(self):
"""Check that supplier is the same after submit if PO is already made"""