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

Merge pull request #19306 from nabinhait/required_date_fix

Browse Source 
fix: Always set required date based on min date on item table
This commit is contained in:
Deepesh Garg 2019-10-21 15:25:23 +05:30 committed by GitHub
commit fbae893f07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/buying/doctype/purchase_order/test_purchase_order.py
View File

@ -589,6 +589,23 @@ class TestPurchaseOrder(unittest.TestCase):
frappe.db.set_value("Accounts Settings", "Accounts Settings", frappe.db.set_value("Accounts Settings", "Accounts Settings",
"unlink_advance_payment_on_cancelation_of_order", 0) "unlink_advance_payment_on_cancelation_of_order", 0)
def test_schedule_date(self):
po = create_purchase_order(do_not_submit=True)
po.schedule_date = None
po.append("items", {
"item_code": "_Test Item",
"qty": 1,
"rate": 100,
"schedule_date": add_days(nowdate(), 5)
})
po.save()
self.assertEqual(po.schedule_date, add_days(nowdate(), 1))
po.items[0].schedule_date = add_days(nowdate(), 2)
po.save()
self.assertEqual(po.schedule_date, add_days(nowdate(), 2))
def make_pr_against_po(po, received_qty=0): def make_pr_against_po(po, received_qty=0):
pr = make_purchase_receipt(po) pr = make_purchase_receipt(po)
pr.get("items")[0].qty = received_qty or 5 pr.get("items")[0].qty = received_qty or 5

6
erpnext/controllers/buying_controller.py
View File

@ -695,8 +695,10 @@ class BuyingController(StockController):
def validate_schedule_date(self): def validate_schedule_date(self):
if not self.get("items"): if not self.get("items"):
return return
if not self.schedule_date:
self.schedule_date = min([d.schedule_date for d in self.get("items")]) earliest_schedule_date = min([d.schedule_date for d in self.get("items")])
if earliest_schedule_date:
self.schedule_date = earliest_schedule_date
if self.schedule_date: if self.schedule_date:
for d in self.get('items'): for d in self.get('items'):