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

[minor] currency trigger should not be called in refresh

Browse Source
This commit is contained in:
Nabin Hait 2013-07-29 19:00:53 +05:30
parent 19d945a4e7
commit 1f996c3121
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/accounts_controller.py
View File

@ -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)),

2
public/js/transaction.js
View File

@ -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() {