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

[fix] Server test cases (#11727)

Browse Source
This commit is contained in:
rohitwaghchaure 2017-11-27 11:27:28 +05:30 committed by Nabin Hait
parent 15f8fe0179
commit 373b5702a9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/accounts_controller.py
View File

@ -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.payment_term = term.payment_term
term_details.description = term.description term_details.description = term.description
term_details.invoice_portion = term.invoice_portion 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: if posting_date:
term_details.due_date = get_due_date(posting_date, term) term_details.due_date = get_due_date(posting_date, term)
return term_details return term_details

5
erpnext/stock/reorder_item.py
View File

@ -122,8 +122,7 @@ def create_material_request(material_requests):
mr.update({ mr.update({
"company": company, "company": company,
"transaction_date": nowdate(), "transaction_date": nowdate(),
"material_request_type": "Material Transfer" if request_type=="Transfer" else request_type, "material_request_type": "Material Transfer" if request_type=="Transfer" else request_type
"schedule_date": add_days(nowdate(), cint(items[0].lead_time_days))
}) })
for d in items: for d in items:
@ -152,6 +151,8 @@ def create_material_request(material_requests):
"brand": item.brand, "brand": item.brand,
}) })
schedule_dates = [d.schedule_date for d in mr.items]
mr.schedule_date = max(schedule_dates or [nowdate()])
mr.insert() mr.insert()
mr.submit() mr.submit()
mr_list.append(mr) mr_list.append(mr)