From 3959aeb8486297108978beb56215177cf1fc093f Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 23 Jan 2018 15:40:29 +0530 Subject: [PATCH] [fix] parse value before setting it to dissable_rounded_total on Purchase Invoice --- erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js | 2 +- erpnext/public/js/controllers/transaction.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js index 2fbf014289e..de0b6f5add0 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -18,7 +18,7 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({ this.frm.set_df_property("credit_to", "print_hide", 0); } } else { - this.frm.set_value("disable_rounded_total", frappe.sys_defaults.disable_rounded_total); + this.frm.set_value("disable_rounded_total", cint(frappe.sys_defaults.disable_rounded_total)); } // formatter for material request item diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index d290c92eafa..d06a76a5178 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -539,7 +539,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ // due_date is to be changed, payment terms template and/or payment schedule must // be removed as due_date is automatically changed based on payment terms if (this.frm.doc.due_date) { - if (this.frm.doc.payment_terms_template || this.frm.doc.payment_schedule.length) { + if (this.frm.doc.payment_terms_template || + (this.frm.doc.payment_schedule && this.frm.doc.payment_schedule.length)) { var message1 = ""; var message2 = ""; var final_message = "Please clear the ";