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

fix: Ignore for Purchase Invoices

Browse Source 
(cherry picked from commit ed38679d222e12709396fbb8dacbe9e25ea38ed7)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
This commit is contained in:
Deepesh Garg 2022-03-24 13:09:55 +05:30 committed by mergify-bot
parent d04d3038f5
commit 8cfa3a9ece
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -819,7 +819,11 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
this.frm.set_value('base_paid_amount', flt(base_paid_amount, precision("base_paid_amount")));
}
<<<<<<< HEAD
calculate_change_amount(){
=======
calculate_change_amount: function() {
>>>>>>> ed38679d22 (fix: Ignore for Purchase Invoices)
this.frm.doc.change_amount = 0.0;
this.frm.doc.base_change_amount = 0.0;
if(in_list(["Sales Invoice", "POS Invoice"], this.frm.doc.doctype)