From 1f996c31217682c3cbf2d38ce79b5ed5749c1cdb Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 29 Jul 2013 19:00:53 +0530 Subject: [PATCH] [minor] currency trigger should not be called in refresh --- controllers/accounts_controller.py | 2 +- public/js/transaction.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/accounts_controller.py b/controllers/accounts_controller.py index 8e531fbda85..725fdb32797 100644 --- a/controllers/accounts_controller.py +++ b/controllers/accounts_controller.py @@ -396,7 +396,7 @@ class AccountsController(TransactionBase): self.precision(based_on, item)) webnotes.errprint([max_allowed_amt, total_billed_amt]) - if max_allowed_amt and total_billed_amt > max_allowed_amt: + if max_allowed_amt and total_billed_amt - max_allowed_amt > 0.02: webnotes.msgprint(_("Row ")+ cstr(item.idx) + ": " + cstr(item.item_code) + _(" will be over-billed against mentioned ") + cstr(ref_dt) + _(". Max allowed " + cstr(based_on) + ": " + cstr(max_allowed_amt)), diff --git a/public/js/transaction.js b/public/js/transaction.js index 8770ba958a1..7077e02e76f 100644 --- a/public/js/transaction.js +++ b/public/js/transaction.js @@ -49,7 +49,7 @@ erpnext.TransactionController = wn.ui.form.Controller.extend({ erpnext.hide_naming_series(); erpnext.hide_company(); this.show_item_wise_taxes(); - this.frm.fields_dict.currency ? this.currency() : this.set_dynamic_labels(); + this.set_dynamic_labels(); }, onload_post_render: function() {