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

fix: Client side changes for POS Write off amount

Browse Source 
(cherry picked from commit 2e33e748ea248acface128f759d3982635024399)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
This commit is contained in:
Deepesh Garg 2022-03-24 12:56:22 +05:30 committed by mergify-bot
parent f57f4af1d9
commit d04d3038f5
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -690,7 +690,12 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
this.frm.doc.total_advance = flt(total_allocated_amount, precision("total_advance")); this.frm.doc.total_advance = flt(total_allocated_amount, precision("total_advance"));
this.calculate_outstanding_amount(update_paid_amount); this.calculate_outstanding_amount(update_paid_amount);
<<<<<<< HEAD
} }
=======
this.calculate_write_off_amount();
},
>>>>>>> 2e33e748ea (fix: Client side changes for POS Write off amount)
is_internal_invoice() { is_internal_invoice() {
if (['Sales Invoice', 'Purchase Invoice'].includes(this.frm.doc.doctype)) { if (['Sales Invoice', 'Purchase Invoice'].includes(this.frm.doc.doctype)) {
@ -825,26 +830,28 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
var grand_total = this.frm.doc.rounded_total || this.frm.doc.grand_total; var grand_total = this.frm.doc.rounded_total || this.frm.doc.grand_total;
var base_grand_total = this.frm.doc.base_rounded_total || this.frm.doc.base_grand_total; var base_grand_total = this.frm.doc.base_rounded_total || this.frm.doc.base_grand_total;
this.frm.doc.change_amount = flt(this.frm.doc.paid_amount - grand_total + this.frm.doc.change_amount = flt(this.frm.doc.paid_amount - grand_total,
this.frm.doc.write_off_amount, precision("change_amount")); precision("change_amount"));
this.frm.doc.base_change_amount = flt(this.frm.doc.base_paid_amount - this.frm.doc.base_change_amount = flt(this.frm.doc.base_paid_amount -
base_grand_total + this.frm.doc.base_write_off_amount, base_grand_total, precision("base_change_amount"));
precision("base_change_amount"));
} }
} }
} }
<<<<<<< HEAD
calculate_write_off_amount(){ calculate_write_off_amount(){
if(this.frm.doc.paid_amount > this.frm.doc.grand_total){ if(this.frm.doc.paid_amount > this.frm.doc.grand_total){
=======
calculate_write_off_amount: function() {
if (this.frm.doc.write_off_outstanding_amount_automatically) {
>>>>>>> 2e33e748ea (fix: Client side changes for POS Write off amount)
this.frm.doc.write_off_amount = flt(this.frm.doc.grand_total - this.frm.doc.paid_amount this.frm.doc.write_off_amount = flt(this.frm.doc.grand_total - this.frm.doc.paid_amount
+ this.frm.doc.change_amount, precision("write_off_amount")); + this.frm.doc.change_amount, precision("write_off_amount"));
this.frm.doc.base_write_off_amount = flt(this.frm.doc.write_off_amount * this.frm.doc.conversion_rate, this.frm.doc.base_write_off_amount = flt(this.frm.doc.write_off_amount * this.frm.doc.conversion_rate,
precision("base_write_off_amount")); precision("base_write_off_amount"));
}else{
this.frm.doc.paid_amount = 0.0;
} }
this.calculate_outstanding_amount(false); this.calculate_outstanding_amount(false);
} }
}; };