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

fix: Set paid amount automatically only if return entry validated and has negative grand total (#49829)

Browse Source
This commit is contained in:
Nabin Hait
2025-10-06 11:27:55 +05:30
committed by GitHub
parent c0c2e2367c
commit dcbcc596f2
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/controllers/accounts_controller.py
View File

@@ -228,6 +228,11 @@ class AccountsController(TransactionBase):
self.validate_date_with_fiscal_year() self.validate_date_with_fiscal_year()
self.validate_party_accounts() self.validate_party_accounts()
if self.doctype in ["Sales Invoice", "Purchase Invoice"]:
if self.is_return:
self.validate_qty()
else:
self.validate_deferred_start_and_end_date()
self.validate_inter_company_reference() self.validate_inter_company_reference()
# validate inter company transaction rate # validate inter company transaction rate
@@ -279,11 +284,6 @@ class AccountsController(TransactionBase):
self.set_advance_gain_or_loss() self.set_advance_gain_or_loss()
if self.is_return:
self.validate_qty()
else:
self.validate_deferred_start_and_end_date()
self.validate_deferred_income_expense_account() self.validate_deferred_income_expense_account()
self.set_inter_company_account() self.set_inter_company_account()

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

@@ -78,6 +78,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
if ( if (
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 > this.frm.doc.paid_amount this.frm.doc.grand_total > this.frm.doc.paid_amount
) { ) {
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"));