Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Saqib Ansari 2022-05-17 11:22:01 +05:30 committed by GitHub
parent 3714e36b44
commit f915a9cef7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/controllers/accounts_controller.py
View File

@ -1130,11 +1130,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,
}, },
@ -1149,11 +1148,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,
}, },