CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-31 19:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolved conflict

Browse Source
This commit is contained in:
Nabin Hait
2025-10-06 12:17:57 +05:30
committed by GitHub
parent bd3503a3d8
commit a39bc626c7
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,16 +76,10 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
// Update paid amount on return/debit note creation // Update paid amount on return/debit note creation
if ( if (
<<<<<<< HEAD
this.frm.doc.doctype === "Purchase Invoice"
&& this.frm.doc.is_return
&& (this.frm.doc.grand_total > this.frm.doc.paid_amount)
=======
this.frm.doc.doctype === "Purchase Invoice" && this.frm.doc.doctype === "Purchase Invoice" &&
this.frm.doc.is_return && this.frm.doc.is_return &&
this.frm.doc.grand_total < 0 && this.frm.doc.grand_total < 0 &&
this.frm.doc.grand_total > this.frm.doc.paid_amount this.frm.doc.grand_total > this.frm.doc.paid_amount
>>>>>>> dcbcc596f2 (fix: Set paid amount automatically only if return entry validated and has negative grand total (#49829))
) { ) {
this.frm.doc.paid_amount = flt(this.frm.doc.grand_total, precision("grand_total")); this.frm.doc.paid_amount = flt(this.frm.doc.grand_total, precision("grand_total"));
} }