Techsystech
/
account-reconcile
mirror of https://github.com/OCA/account-reconcile.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[FIX] account_reconcile_oca: Fix foreign currency

pull/636/head
Enric Tobella 2024-03-07 19:33:44 +01:00
parent a7ee6de1e6
commit 50a8b92a87
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
account_reconcile_oca/models/account_bank_statement_line.py
View File

@ -144,13 +144,16 @@ class AccountBankStatementLine(models.Model):
new_data, new_data,
self.reconcile_data_info["reconcile_auxiliary_id"], self.reconcile_data_info["reconcile_auxiliary_id"],
self.manual_reference, self.manual_reference,
exchange_recompute=True,
) )
self.can_reconcile = self.reconcile_data_info.get("can_reconcile", False) self.can_reconcile = self.reconcile_data_info.get("can_reconcile", False)
self.add_account_move_line_id = False self.add_account_move_line_id = False
def _recompute_suspense_line(self, data, reconcile_auxiliary_id, manual_reference): def _recompute_suspense_line(
self, data, reconcile_auxiliary_id, manual_reference, exchange_recompute=False
):
reconcile_auxiliary_id = self._compute_exchange_rate( reconcile_auxiliary_id = self._compute_exchange_rate(
data, reconcile_auxiliary_id data, reconcile_auxiliary_id, exchange_recompute=exchange_recompute
) )
can_reconcile = True can_reconcile = True
total_amount = 0 total_amount = 0
@ -393,7 +396,11 @@ class AccountBankStatementLine(models.Model):
new_data.append(new_line) new_data.append(new_line)
return new_data, reconcile_auxiliary_id return new_data, reconcile_auxiliary_id
def _compute_exchange_rate(self, data, reconcile_auxiliary_id): def _compute_exchange_rate(
self, data, reconcile_auxiliary_id, exchange_recompute=False
):
if not exchange_recompute:
return reconcile_auxiliary_id
foreign_currency = ( foreign_currency = (
self.currency_id != self.company_id.currency_id self.currency_id != self.company_id.currency_id
or self.foreign_currency_id or self.foreign_currency_id
@ -416,6 +423,7 @@ class AccountBankStatementLine(models.Model):
"date": fields.Date.to_string(self.date), "date": fields.Date.to_string(self.date),
"name": self.payment_ref or self.name, "name": self.payment_ref or self.name,
"amount": -amount, "amount": -amount,
"net_amount": -amount,
"credit": amount if amount > 0 else 0.0, "credit": amount if amount > 0 else 0.0,
"debit": -amount if amount < 0 else 0.0, "debit": -amount if amount < 0 else 0.0,
"kind": "other", "kind": "other",
@ -444,7 +452,8 @@ class AccountBankStatementLine(models.Model):
*self._reconcile_data_by_model( *self._reconcile_data_by_model(
data, res["model"], reconcile_auxiliary_id data, res["model"], reconcile_auxiliary_id
), ),
self.manual_reference self.manual_reference,
exchange_recompute=True
) )
elif res and res.get("amls"): elif res and res.get("amls"):
amount = self.amount_total_signed amount = self.amount_total_signed
@ -455,7 +464,10 @@ class AccountBankStatementLine(models.Model):
amount -= line_data.get("amount") amount -= line_data.get("amount")
data.append(line_data) data.append(line_data)
return self._recompute_suspense_line( return self._recompute_suspense_line(
data, reconcile_auxiliary_id, self.manual_reference data,
reconcile_auxiliary_id,
self.manual_reference,
exchange_recompute=True,
) )
return self._recompute_suspense_line( return self._recompute_suspense_line(
data data
@ -643,7 +655,8 @@ class AccountBankStatementLine(models.Model):
*record._reconcile_data_by_model( *record._reconcile_data_by_model(
data, res["model"], reconcile_auxiliary_id data, res["model"], reconcile_auxiliary_id
), ),
self.manual_reference self.manual_reference,
exchange_recompute=True
) )
elif res.get("amls"): elif res.get("amls"):
amount = self.amount amount = self.amount
@ -654,7 +667,10 @@ class AccountBankStatementLine(models.Model):
amount -= line_data.get("amount") amount -= line_data.get("amount")
data.append(line_data) data.append(line_data)
data = record._recompute_suspense_line( data = record._recompute_suspense_line(
data, reconcile_auxiliary_id, self.manual_reference data,
reconcile_auxiliary_id,
self.manual_reference,
exchange_recompute=True,
) )
if not data.get("can_reconcile"): if not data.get("can_reconcile"):
continue continue
@ -704,7 +720,10 @@ class AccountBankStatementLine(models.Model):
else: else:
new_data.append(line) new_data.append(line)
self.reconcile_data_info = self._recompute_suspense_line( self.reconcile_data_info = self._recompute_suspense_line(
new_data, reconcile_auxiliary_id, self.manual_reference new_data,
reconcile_auxiliary_id,
self.manual_reference,
exchange_recompute=True,
) )
self.can_reconcile = self.reconcile_data_info.get("can_reconcile", False) self.can_reconcile = self.reconcile_data_info.get("can_reconcile", False)