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

fix: validate that discount amount cannot exceed total before discount

Browse Source 
(cherry picked from commit f4f79d99e4)

# Conflicts:
#	erpnext/controllers/taxes_and_totals.py
This commit is contained in:
Sagar Vora
2025-10-17 16:12:30 +05:30
committed by Mergify
parent 44539f0944
commit e559fafa83
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/controllers/taxes_and_totals.py
View File

@@ -7,8 +7,12 @@ import json
import frappe import frappe
from frappe import _, scrub from frappe import _, scrub
from frappe.model.document import Document from frappe.model.document import Document
<<<<<<< HEAD
from frappe.utils import cint, flt, round_based_on_smallest_currency_fraction from frappe.utils import cint, flt, round_based_on_smallest_currency_fraction
from frappe.utils.deprecations import deprecated from frappe.utils.deprecations import deprecated
=======
from frappe.utils import cint, flt, fmt_money, round_based_on_smallest_currency_fraction
>>>>>>> f4f79d99e4 (fix: validate that discount amount cannot exceed total before discount)
import erpnext import erpnext
from erpnext.accounts.doctype.journal_entry.journal_entry import get_exchange_rate from erpnext.accounts.doctype.journal_entry.journal_entry import get_exchange_rate
@@ -682,6 +686,22 @@ class calculate_taxes_and_totals:
self.doc.precision("discount_amount"), self.doc.precision("discount_amount"),
) )
discount_amount = self.doc.discount_amount or 0
grand_total = self.doc.grand_total
# validate that discount amount cannot exceed the total before discount
if grand_total * (discount_amount - grand_total) > 0:
frappe.throw(
_(
"Additional Discount Amount ({discount_amount}) cannot exceed "
"the total before such discount ({total_before_discount})"
).format(
discount_amount=self.doc.get_formatted("discount_amount"),
total_before_discount=self.doc.get_formatted("grand_total"),
),
title=_("Invalid Discount Amount"),
)
def apply_discount_amount(self): def apply_discount_amount(self):
if self.doc.discount_amount: if self.doc.discount_amount:
if not self.doc.apply_discount_on: if not self.doc.apply_discount_on: