From 52bf56d4150db34828276ffe053c7e3779db5e20 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 27 Nov 2017 11:43:52 +0530 Subject: [PATCH] [fix] payment terms test case --- erpnext/controllers/accounts_controller.py | 2 +- erpnext/selling/doctype/quotation/test_quotation.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 107f860a5fa..fb97c91f1fa 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 = (term.invoice_portion * grand_total) / 100 + term_details.payment_amount = flt(term.invoice_portion) * flt(grand_total) / 100 if posting_date: term_details.due_date = get_due_date(posting_date, term) return term_details diff --git a/erpnext/selling/doctype/quotation/test_quotation.py b/erpnext/selling/doctype/quotation/test_quotation.py index c6a488e3cc2..e79d46ae3fd 100644 --- a/erpnext/selling/doctype/quotation/test_quotation.py +++ b/erpnext/selling/doctype/quotation/test_quotation.py @@ -70,9 +70,9 @@ class TestQuotation(unittest.TestCase): quotation.save() quotation.submit() - self.assertEqual(quotation.payment_schedule[0].payment_amount, 8906.25) + self.assertEqual(quotation.payment_schedule[0].payment_amount, 8906.00) self.assertEqual(quotation.payment_schedule[0].due_date, quotation.transaction_date) - self.assertEqual(quotation.payment_schedule[1].payment_amount, 8906.25) + self.assertEqual(quotation.payment_schedule[1].payment_amount, 8906.00) self.assertEqual(quotation.payment_schedule[1].due_date, add_days(quotation.transaction_date, 30)) sales_order = make_sales_order(quotation.name) @@ -88,9 +88,9 @@ class TestQuotation(unittest.TestCase): sales_order.transaction_date = nowdate() sales_order.insert() - self.assertEqual(sales_order.payment_schedule[0].payment_amount, 8906.25) + self.assertEqual(sales_order.payment_schedule[0].payment_amount, 8906.00) self.assertEqual(sales_order.payment_schedule[0].due_date, quotation.transaction_date) - self.assertEqual(sales_order.payment_schedule[1].payment_amount, 8906.25) + self.assertEqual(sales_order.payment_schedule[1].payment_amount, 8906.00) self.assertEqual( sales_order.payment_schedule[1].due_date, add_days(quotation.transaction_date, 30) )