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

fix: discount ledger entry in case of multicurrency invoice (#31047)

Browse Source
This commit is contained in:
mergify[bot]
2022-05-17 12:22:08 +05:30
committed by GitHub
parent 9c21eb5b94
commit c3417e4103
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/controllers/accounts_controller.py
View File

@@ -1126,11 +1126,10 @@ class AccountsController(TransactionBase):
{ {
"account": item.discount_account, "account": item.discount_account,
"against": supplier_or_customer, "against": supplier_or_customer,
dr_or_cr: flt(discount_amount, item.precision("discount_amount")), dr_or_cr: flt(
dr_or_cr
+ "_in_account_currency": flt(
discount_amount * self.get("conversion_rate"), item.precision("discount_amount") discount_amount * self.get("conversion_rate"), item.precision("discount_amount")
), ),
dr_or_cr + "_in_account_currency": flt(discount_amount, item.precision("discount_amount")),
"cost_center": item.cost_center, "cost_center": item.cost_center,
"project": item.project, "project": item.project,
}, },
@@ -1145,11 +1144,11 @@ class AccountsController(TransactionBase):
{ {
"account": income_or_expense_account, "account": income_or_expense_account,
"against": supplier_or_customer, "against": supplier_or_customer,
rev_dr_cr: flt(discount_amount, item.precision("discount_amount")), rev_dr_cr: flt(
rev_dr_cr
+ "_in_account_currency": flt(
discount_amount * self.get("conversion_rate"), item.precision("discount_amount") discount_amount * self.get("conversion_rate"), item.precision("discount_amount")
), ),
rev_dr_cr
+ "_in_account_currency": flt(discount_amount, item.precision("discount_amount")),
"cost_center": item.cost_center, "cost_center": item.cost_center,
"project": item.project or self.project, "project": item.project or self.project,
}, },