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

call calc_adjustment_amount function only if docstatus is zero

Browse Source
This commit is contained in:
Nabin Hait 2013-02-12 18:49:55 +05:30
parent cd50c2513f
commit 4860754407
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js
View File

@ -33,6 +33,7 @@ cur_frm.cscript.refresh = function(doc) {
}
cur_frm.fields_dict.voucher_no.get_query = function(doc) {
// TO-do: check for pos, it should not come
if (!doc.account) msgprint("Please select Account first");
else {
return repl("select gle.voucher_no, gle.posting_date, gle.%(account_type)s \

2
buying/doctype/purchase_common/purchase_common.js
View File

@ -419,7 +419,7 @@ cur_frm.cscript.validate = function(doc, cdt, cdn) {
cur_frm.cscript.calc_amount(doc, 1);
// calculate advances if pv
if(doc.doctype == 'Purchase Invoice') calc_total_advance(doc, cdt, cdn);
if(doc.docstatus == 0 && doc.doctype == 'Purchase Invoice') calc_total_advance(doc, cdt, cdn);
}
// **************** RE-CALCULATE VALUES ***************************

3
selling/doctype/sales_common/sales_common.js
View File

@ -891,7 +891,8 @@ cur_frm.cscript.validate = function(doc, cdt, cdn) {
}
cur_frm.cscript.calculate_charges (doc, cdt, cdn);
if (cur_frm.cscript.calc_adjustment_amount) cur_frm.cscript.calc_adjustment_amount(doc);
if (doc.docstatus == 0 && cur_frm.cscript.calc_adjustment_amount)
cur_frm.cscript.calc_adjustment_amount(doc);
}