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

Merge pull request #48535 from ljain112/fix-dda

Browse Source 
fix: handle cases where distributed discount amount is not set
This commit is contained in:
ruthra kumar
2025-07-15 15:07:06 +05:30
committed by GitHub
parent 0fb6b4eaf6 816b84be02
commit e725780c6d
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/controllers/accounts_controller.py
View File

@@ -1947,6 +1947,15 @@ class AccountsController(TransactionBase):
and self.get("discount_amount")
and self.get("additional_discount_account")
):
# cases where distributed_discount_amount is not patched
if not hasattr(self, "__has_distributed_discount_set"):
self.__has_distributed_discount_set = any(
i.distributed_discount_amount for i in self.get("items")
)
if not self.__has_distributed_discount_set:
return item.amount, item.base_amount
amount += item.distributed_discount_amount
base_amount += flt(
item.distributed_discount_amount * self.get("conversion_rate"),