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

fix: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg 2022-03-27 19:23:53 +05:30 committed by GitHub
parent 485e6b6a09
commit 33fa14b6cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,11 +34,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
frappe.model.set_value(item.doctype, item.name, "rate", item_rate); frappe.model.set_value(item.doctype, item.name, "rate", item_rate);
} }
<<<<<<< HEAD async calculate_taxes_and_totals(update_paid_amount) {
calculate_taxes_and_totals(update_paid_amount) {
=======
calculate_taxes_and_totals: async function(update_paid_amount) {
>>>>>>> a044e92687 (fix: Incorrect default amount to pay for POS invoices)
this.discount_amount_applied = false; this.discount_amount_applied = false;
this._calculate_taxes_and_totals(); this._calculate_taxes_and_totals();
this.calculate_discount_amount(); this.calculate_discount_amount();