audrius/account-reconcile
1
0
Fork 1
mirror of https://github.com/OCA/account-reconcile.git synced 2025-01-20 12:27:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #531 into 15.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2023-06-03 09:36:24 +00:00
parent d48bdf3898 7313df9b6a
commit 840bb62dd8
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
account_reconciliation_widget/models/reconciliation_widget.py
View File

@@ -1022,11 +1022,14 @@ class AccountReconciliation(models.AbstractModel):
statement_currency = (
st_line.journal_id.currency_id or st_line.journal_id.company_id.currency_id
)
if st_line.amount_currency and st_line.currency_id:
amount = st_line.amount_currency
amount_currency = st_line.amount
st_line_currency = (
st_line.foreign_currency_id or st_line.currency_id or statement_currency
)
if st_line.amount_currency and (st_line_currency != statement_currency):
amount = st_line.amount
amount_currency = st_line.amount_currency
amount_currency_str = formatLang(
self.env, abs(amount_currency), currency_obj=statement_currency
self.env, abs(amount_currency), currency_obj=st_line_currency
)
else:
amount = st_line.amount
@@ -1047,7 +1050,7 @@ class AccountReconciliation(models.AbstractModel):
"date": format_date(self.env, st_line.date),
"amount": amount,
"amount_str": amount_str, # Amount in the statement line currency
"currency_id": st_line.currency_id.id or statement_currency.id,
"currency_id": st_line_currency.id, # Currency according to statement line
"partner_id": st_line.partner_id.id,
"journal_id": st_line.journal_id.id,
"statement_id": st_line.statement_id.id,