Merge branch 'master' into edge

This commit is contained in:
Rushabh Mehta
2013-02-12 19:23:48 +05:30
10 changed files with 16 additions and 20 deletions

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);
}