nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 18:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-01-07 15:03:55 +05:30
committed by GitHub
parent b561c18502
commit 9b6c2fdfb7
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -746,14 +746,9 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
} }
}, },
<<<<<<< HEAD
set_total_amount_to_default_mop: function() { set_total_amount_to_default_mop: function() {
var grand_total = this.frm.doc.rounded_total || this.frm.doc.grand_total;
=======
set_total_amount_to_default_mop() {
let grand_total = this.frm.doc.rounded_total || this.frm.doc.grand_total; let grand_total = this.frm.doc.rounded_total || this.frm.doc.grand_total;
let base_grand_total = this.frm.doc.base_rounded_total || this.frm.doc.base_grand_total; let base_grand_total = this.frm.doc.base_rounded_total || this.frm.doc.base_grand_total;
>>>>>>> 9d3a5c3184 (fix: Inconsistency in calculating outstanding amount)
if(this.frm.doc.party_account_currency == this.frm.doc.currency) { if(this.frm.doc.party_account_currency == this.frm.doc.currency) {
var total_amount_to_pay = flt((grand_total - this.frm.doc.total_advance var total_amount_to_pay = flt((grand_total - this.frm.doc.total_advance