Skip to content

Commit

Permalink
[IMP] account_reconcile_oca: FFix multi currency computation
Browse files Browse the repository at this point in the history
  • Loading branch information
@etobella
etobella committed Jun 19, 2024
1 parent 41549a6 commit 084cb4b
Show file tree
Hide file tree
Showing 4 changed files with 179 additions and 108 deletions.
6 changes: 3 additions & 3 deletions account_reconcile_oca/models/account_account_reconcile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,11 @@ def _recompute_data(self, data):
counterparts = data["counterparts"]
amount = 0.0
for line_id in counterparts:
line = self._get_reconcile_line(
lines = self._get_reconcile_line(
self.env["account.move.line"].browse(line_id), "other", True, amount
)
new_data["data"].append(line)
amount += line["amount"]
new_data["data"] += lines
amount += sum(line["amount"] for line in lines)
return new_data

def clean_reconcile(self):
Expand Down
191 changes: 104 additions & 87 deletions account_reconcile_oca/models/account_bank_statement_line.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def _onchange_manual_model_id(self):
self.manual_model_id,
self.reconcile_data_info["reconcile_auxiliary_id"],
),
self.manual_reference
self.manual_reference,
)
else:
# Refreshing data
Expand All @@ -189,26 +189,19 @@ def _onchange_add_account_move_line_id(self):
else:
new_data.append(line)
if is_new_line:
new_data.append(
self._get_reconcile_line(
self.add_account_move_line_id, "other", True, pending_amount
)
reconcile_auxiliary_id, lines = self._get_reconcile_line(
self.add_account_move_line_id, "other", True, pending_amount
)
new_data += lines
self.reconcile_data_info = self._recompute_suspense_line(
new_data,
self.reconcile_data_info["reconcile_auxiliary_id"],
self.manual_reference,
exchange_recompute=True,
)
self.can_reconcile = self.reconcile_data_info.get("can_reconcile", False)
self.add_account_move_line_id = False

def _recompute_suspense_line(
self, data, reconcile_auxiliary_id, manual_reference, exchange_recompute=False
):
reconcile_auxiliary_id = self._compute_exchange_rate(
data, reconcile_auxiliary_id, exchange_recompute=exchange_recompute
)
def _recompute_suspense_line(self, data, reconcile_auxiliary_id, manual_reference):
can_reconcile = True
total_amount = 0
new_data = []
Expand Down Expand Up @@ -450,49 +443,15 @@ def _reconcile_data_by_model(self, data, reconcile_model, reconcile_auxiliary_id
new_data.append(new_line)
return new_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 = (
self.currency_id != self.company_id.currency_id
or self.foreign_currency_id
or any(line["currency_id"] != line["line_currency_id"] for line in data)
)
if not foreign_currency or self.is_reconciled:
return reconcile_auxiliary_id
currency = self.journal_id.currency_id or self.company_id.currency_id
amount = sum(d.get("net_amount", 0) for d in data)
if not currency.is_zero(amount):
account = self.company_id.expense_currency_exchange_account_id
if amount > 0:
account = self.company_id.income_currency_exchange_account_id
data.append(
{
"reference": "reconcile_auxiliary;%s" % reconcile_auxiliary_id,
"id": False,
"account_id": account.name_get()[0],
"partner_id": False,
"date": fields.Date.to_string(self.date),
"name": self.payment_ref or self.name,
"amount": -amount,
"net_amount": -amount,
"credit": amount if amount > 0 else 0.0,
"debit": -amount if amount < 0 else 0.0,
"kind": "other",
"currency_id": self.currency_id.id,
"line_currency_id": self.currency_id.id,
"currency_amount": -amount,
}
)
reconcile_auxiliary_id += 1
return reconcile_auxiliary_id

def _default_reconcile_data(self, from_unreconcile=False):
liquidity_lines, suspense_lines, other_lines = self._seek_for_lines()
data = [self._get_reconcile_line(line, "liquidity") for line in liquidity_lines]
data = []
reconcile_auxiliary_id = 1
for line in liquidity_lines:
reconcile_auxiliary_id, lines = self._get_reconcile_line(
line, "liquidity", reconcile_auxiliary_id=reconcile_auxiliary_id
)
data += lines
if not from_unreconcile:
res = (
self.env["account.reconcile.model"]
Expand All @@ -507,30 +466,31 @@ def _default_reconcile_data(self, from_unreconcile=False):
data, res["model"], reconcile_auxiliary_id
),
self.manual_reference,
exchange_recompute=True
)
elif res and res.get("amls"):
amount = self.amount_total_signed
for line in res.get("amls", []):
line_data = self._get_reconcile_line(
line, "other", is_counterpart=True, max_amount=amount
reconcile_auxiliary_id, line_data = self._get_reconcile_line(
line,
"other",
is_counterpart=True,
max_amount=amount,
reconcile_auxiliary_id=reconcile_auxiliary_id,
)
amount -= line_data.get("amount")
data.append(line_data)
amount -= sum(line.get("amount") for line in line_data)
data += line_data
return self._recompute_suspense_line(
data,
reconcile_auxiliary_id,
self.manual_reference,
exchange_recompute=True,
)
for line in other_lines:
reconcile_auxiliary_id, lines = self._get_reconcile_line(
line, "other", from_unreconcile=from_unreconcile
)
data += lines
return self._recompute_suspense_line(
data
+ [
self._get_reconcile_line(
line, "other", from_unreconcile=from_unreconcile
)
for line in other_lines
],
data,
reconcile_auxiliary_id,
self.manual_reference,
)
Expand Down Expand Up @@ -699,32 +659,32 @@ def create(self, mvals):
if not res:
continue
liquidity_lines, suspense_lines, other_lines = record._seek_for_lines()
data = [
record._get_reconcile_line(line, "liquidity")
for line in liquidity_lines
]
data = []
for line in liquidity_lines:
reconcile_auxiliary_id, lines = record._get_reconcile_line(
line, "liquidity"
)
data += lines
reconcile_auxiliary_id = 1
if res.get("status", "") == "write_off":
data = record._recompute_suspense_line(
*record._reconcile_data_by_model(
data, res["model"], reconcile_auxiliary_id
),
self.manual_reference,
exchange_recompute=True
)
elif res.get("amls"):
amount = self.amount
for line in res.get("amls", []):
line_data = record._get_reconcile_line(
reconcile_auxiliary_id, line_datas = record._get_reconcile_line(
line, "other", is_counterpart=True, max_amount=amount
)
amount -= line_data.get("amount")
data.append(line_data)
amount -= sum(line_data.get("amount") for line_data in line_datas)
data += line_datas
data = record._recompute_suspense_line(
data,
reconcile_auxiliary_id,
self.manual_reference,
exchange_recompute=True,
)
if not data.get("can_reconcile"):
continue
Expand All @@ -745,14 +705,14 @@ def button_manual_reference_full_paid(self):
if line["reference"] == manual_reference and line.get("id"):
total_amount = -line["amount"] + line["original_amount_unsigned"]
original_amount = line["original_amount_unsigned"]
new_data.append(
self._get_reconcile_line(
self.env["account.move.line"].browse(line["id"]),
"other",
is_counterpart=True,
max_amount=original_amount,
)
reconcile_auxiliary_id, lines = self._get_reconcile_line(
self.env["account.move.line"].browse(line["id"]),
"other",
is_counterpart=True,
reconcile_auxiliary_id=reconcile_auxiliary_id,
max_amount=original_amount,
)
new_data += lines
new_data.append(
{
"reference": "reconcile_auxiliary;%s" % reconcile_auxiliary_id,
Expand All @@ -777,7 +737,6 @@ def button_manual_reference_full_paid(self):
new_data,
reconcile_auxiliary_id,
self.manual_reference,
exchange_recompute=True,
)
self.can_reconcile = self.reconcile_data_info.get("can_reconcile", False)

Expand All @@ -792,18 +751,76 @@ def action_checked(self):
self.move_id.to_check = False

def _get_reconcile_line(
self, line, kind, is_counterpart=False, max_amount=False, from_unreconcile=False
self,
line,
kind,
is_counterpart=False,
max_amount=False,
from_unreconcile=False,
reconcile_auxiliary_id=False,
):
vals = super()._get_reconcile_line(
new_vals = super()._get_reconcile_line(
line,
kind,
is_counterpart=is_counterpart,
max_amount=max_amount,
from_unreconcile=from_unreconcile,
)
if vals["partner_id"] is False:
vals["partner_id"] = (False, self.partner_name)
return vals
rates = []
for vals in new_vals:
if vals["partner_id"] is False:
vals["partner_id"] = (False, self.partner_name)
reconcile_auxiliary_id, rate = self._compute_exchange_rate(
vals, line, reconcile_auxiliary_id
)
if rate:
rates.append(rate)
new_vals += rates
return reconcile_auxiliary_id, new_vals

def _compute_exchange_rate(
self,
vals,
line,
reconcile_auxiliary_id,
):
foreign_currency = (
self.currency_id != self.company_id.currency_id
or self.foreign_currency_id
or vals["currency_id"] != vals["line_currency_id"]
)
if not foreign_currency or self.is_reconciled:
return reconcile_auxiliary_id, False
currency = self.env["res.currency"].browse(vals["line_currency_id"])
amount = currency._convert(
vals["currency_amount"],
self.company_id.currency_id,
self.company_id,
self.date,
) - vals.get("amount", 0)
if currency.is_zero(amount):
return reconcile_auxiliary_id, False
account = self.company_id.expense_currency_exchange_account_id
if amount < 0:
account = self.company_id.income_currency_exchange_account_id
data = {
"reference": "reconcile_auxiliary;%s" % reconcile_auxiliary_id,
"id": False,
"account_id": account.name_get()[0],
"partner_id": False,
"date": fields.Date.to_string(self.date),
"name": self.payment_ref or self.name,
"amount": amount,
"net_amount": amount,
"credit": -amount if amount < 0 else 0.0,
"debit": amount if amount > 0 else 0.0,
"kind": "other",
"currency_id": self.currency_id.id,
"line_currency_id": self.currency_id.id,
"currency_amount": amount,
}
reconcile_auxiliary_id += 1
return reconcile_auxiliary_id, data

def add_statement(self):
self.ensure_one()
Expand Down
36 changes: 18 additions & 18 deletions account_reconcile_oca/models/account_reconcile_abstract.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,29 +38,29 @@ def _get_reconcile_line(
):
date = self.date if "date" in self._fields else line.date
original_amount = amount = net_amount = line.debit - line.credit
amount_currency = self.company_id.currency_id
if is_counterpart:
amount = line.amount_residual_currency or line.amount_residual
amount_currency = line.currency_id or self.company_id.currency_id
original_amount = net_amount = line.amount_residual
currency_amount = -line.amount_residual_currency or line.amount_residual
amount = -line.amount_residual
currency = line.currency_id or self.company_id.currency_id
original_amount = net_amount = -line.amount_residual
if max_amount:
currency_max_amount = self.company_id.currency_id._convert(
max_amount, amount_currency, self.company_id, line.date
max_amount, currency, self.company_id, date
)
if amount > currency_max_amount > 0:
if (
-currency_amount > currency_max_amount > 0
or -currency_amount < currency_max_amount < 0
):
amount = currency_max_amount
net_amount = max_amount
if amount < currency_max_amount < 0:
amount = currency_max_amount
net_amount = max_amount
currency_amount = -amount
original_amount = -original_amount
net_amount = -net_amount
amount = amount_currency._convert(
currency_amount, self.company_id.currency_id, self.company_id, date
)
net_amount = -max_amount
currency_amount = -amount
amount = currency._convert(
currency_amount,
self.company_id.currency_id,
self.company_id,
date,
)
else:
amount_currency = line.currency_id
currency_amount = line.amount_currency
vals = {
"reference": "account.move.line;%s" % line.id,
Expand Down Expand Up @@ -96,4 +96,4 @@ def _get_reconcile_line(
vals["original_amount_unsigned"] = original_amount
if is_counterpart:
vals["counterpart_line_ids"] = line.ids
return vals
return [vals]
Loading

0 comments on commit 084cb4b

Please sign in to comment.