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

fix: include return invoice discount in discount validation

Browse Source
This commit is contained in:
ravibharathi656
2025-12-05 15:40:34 +05:30
parent 17ff48ab92
commit fab1ef5d76
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/controllers/taxes_and_totals.py
View File

@@ -7,6 +7,7 @@ import json
import frappe import frappe
from frappe import _, scrub from frappe import _, scrub
from frappe.model.document import Document, bulk_insert from frappe.model.document import Document, bulk_insert
from frappe.query_builder import functions
from frappe.utils import cint, flt, round_based_on_smallest_currency_fraction from frappe.utils import cint, flt, round_based_on_smallest_currency_fraction
import erpnext import erpnext
@@ -776,6 +777,22 @@ class calculate_taxes_and_totals:
discount_amount = self.doc.discount_amount or 0 discount_amount = self.doc.discount_amount or 0
grand_total = self.doc.grand_total grand_total = self.doc.grand_total
if self.doc.get("is_return") and self.doc.get("return_against"):
doctype = frappe.qb.DocType(self.doc.doctype)
result = (
frappe.qb.from_(doctype)
.select(functions.Sum(doctype.discount_amount).as_("total_return_discount"))
.where(
(doctype.return_against == self.doc.return_against)
& (doctype.is_return == 1)
& (doctype.docstatus == 1)
)
).run(as_dict=True)
total_return_discount = abs(result[0].get("total_return_discount") or 0)
discount_amount += total_return_discount
# validate that discount amount cannot exceed the total before discount # validate that discount amount cannot exceed the total before discount
if ( if (
(grand_total >= 0 and discount_amount > grand_total) (grand_total >= 0 and discount_amount > grand_total)