schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2017-06-07 12:17:17 +05:30
parent 347a79db5a d428ec1a9e
commit a128b21baa
30 changed files with 711 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/public/js/controllers/taxes_and_totals.js
View File

@@ -609,7 +609,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
this.frm.doc.change_amount = 0.0;
this.frm.doc.base_change_amount = 0.0;
if(this.frm.doc.paid_amount > this.frm.doc.grand_total && !this.frm.doc.is_return) {
var payment_types = $.map(cur_frm.doc.payments, function(d) { return d.type });
var payment_types = $.map(this.frm.doc.payments, function(d) { return d.type });
if (in_list(payment_types, 'Cash')) {
this.frm.doc.change_amount = flt(this.frm.doc.paid_amount - this.frm.doc.grand_total +
this.frm.doc.write_off_amount, precision("change_amount"));