schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix: calculate discount percentage if discount amount is specified" (#47927)

Browse Source
This commit is contained in:
Sagar Vora
2025-06-06 06:06:20 +00:00
committed by GitHub
parent c9413e0cbb 27dc0f5b70
commit abad8050a3
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/controllers/taxes_and_totals.py
View File

@@ -12,7 +12,6 @@ from frappe.utils import cint, flt, round_based_on_smallest_currency_fraction
import erpnext
from erpnext.accounts.doctype.journal_entry.journal_entry import get_exchange_rate
from erpnext.accounts.doctype.pricing_rule.utils import get_applied_pricing_rules
from erpnext.accounts.utils import get_currency_precision
from erpnext.controllers.accounts_controller import (
validate_conversion_rate,
validate_inclusive_tax,
@@ -708,16 +707,7 @@ class calculate_taxes_and_totals:
tax.item_wise_tax_detail = json.dumps(tax.item_wise_tax_detail)
def set_discount_amount(self):
if self.doc.discount_amount:
self.doc.additional_discount_percentage = flt(
flt(
self.doc.discount_amount / flt(self.doc.get(scrub(self.doc.apply_discount_on))),
get_currency_precision(),
)
* 100,
self.doc.precision("additional_discount_percentage"),
)
elif self.doc.additional_discount_percentage:
if self.doc.additional_discount_percentage:
self.doc.discount_amount = flt(
flt(self.doc.get(scrub(self.doc.apply_discount_on)))
* self.doc.additional_discount_percentage