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

fix: distributed discounts on si

Browse Source
This commit is contained in:
David
2024-08-28 10:28:02 +02:00
parent 146ce59b87
commit 0bab6f34c1
20 changed files with 97 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/controllers/accounts_controller.py
View File

@@ -1654,8 +1654,11 @@ class AccountsController(TransactionBase):
and self.get("discount_amount")
and self.get("additional_discount_account")
):
amount = item.amount
base_amount = item.base_amount
amount += item.distributed_discount_amount
base_amount += flt(
item.distributed_discount_amount * self.get("conversion_rate"),
item.precision("distributed_discount_amount"),
)
return amount, base_amount

7
erpnext/controllers/taxes_and_totals.py
View File

@@ -684,6 +684,9 @@ class calculate_taxes_and_totals:
)
item.net_amount = flt(item.net_amount - distributed_amount, item.precision("net_amount"))
item.distributed_discount_amount = flt(
distributed_amount, item.precision("distributed_discount_amount")
)
net_total += item.net_amount
# discount amount rounding loss adjustment if no taxes
@@ -700,6 +703,10 @@ class calculate_taxes_and_totals:
item.net_amount = flt(
item.net_amount + discount_amount_loss, item.precision("net_amount")
)
item.distributed_discount_amount = flt(
distributed_amount + discount_amount_loss,
item.precision("distributed_discount_amount"),
)
item.net_rate = (
flt(item.net_amount / item.qty, item.precision("net_rate")) if item.qty else 0