From 373b5702a976100696113242eeb13fab3d667ca0 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 27 Nov 2017 11:27:28 +0530 Subject: [PATCH] [fix] Server test cases (#11727) --- erpnext/controllers/accounts_controller.py | 2 +- erpnext/stock/reorder_item.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index fb97c91f1fa..107f860a5fa 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -908,7 +908,7 @@ def get_payment_term_details(term, posting_date=None, grand_total=None): term_details.payment_term = term.payment_term term_details.description = term.description term_details.invoice_portion = term.invoice_portion - term_details.payment_amount = flt(term.invoice_portion) * flt(grand_total) / 100 + term_details.payment_amount = (term.invoice_portion * grand_total) / 100 if posting_date: term_details.due_date = get_due_date(posting_date, term) return term_details diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py index 99241560355..456b43482ab 100644 --- a/erpnext/stock/reorder_item.py +++ b/erpnext/stock/reorder_item.py @@ -122,8 +122,7 @@ def create_material_request(material_requests): mr.update({ "company": company, "transaction_date": nowdate(), - "material_request_type": "Material Transfer" if request_type=="Transfer" else request_type, - "schedule_date": add_days(nowdate(), cint(items[0].lead_time_days)) + "material_request_type": "Material Transfer" if request_type=="Transfer" else request_type }) for d in items: @@ -152,6 +151,8 @@ def create_material_request(material_requests): "brand": item.brand, }) + schedule_dates = [d.schedule_date for d in mr.items] + mr.schedule_date = max(schedule_dates or [nowdate()]) mr.insert() mr.submit() mr_list.append(mr)