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 #603 into 14.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2023-11-06 19:12:17 +00:00
parent 39c10796d8 ba9809fa9b
commit 2c946e8c73
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
account_reconciliation_widget/models/account_bank_statement.py
View File

@@ -1,5 +1,6 @@
from odoo import _, fields, models from odoo import _, fields, models
from odoo.exceptions import UserError from odoo.exceptions import UserError
from odoo.tools import float_is_zero
class AccountBankStatement(models.Model): class AccountBankStatement(models.Model):
@@ -195,7 +196,26 @@ class AccountBankStatementLine(models.Model):
aml_dict["partner_id"] = self.partner_id.id aml_dict["partner_id"] = self.partner_id.id
aml_dict["statement_line_id"] = self.id aml_dict["statement_line_id"] = self.id
self._prepare_move_line_for_currency(aml_dict, date) self._prepare_move_line_for_currency(aml_dict, date)
# Adjust latest counterpart move debit/credit if currency amount is balanced
# but company amount is not
if self.currency_id != self.company_currency_id:
all_amls = to_create + [liquidity_aml_dict]
balance_currency = sum([x["amount_currency"] for x in all_amls])
balance = sum([x["debit"] - x["credit"] for x in all_amls])
if float_is_zero(
balance_currency, precision_rounding=self.currency_id.rounding
) and not float_is_zero(
balance, precision_rounding=self.company_currency_id.rounding
):
aml_dict = to_create[-1]
if aml_dict["debit"]:
aml_dict["debit"] = self.company_currency_id.round(
aml_dict["debit"] - balance
)
else:
aml_dict["credit"] = self.company_currency_id.round(
aml_dict["credit"] + balance
)
# Create write-offs # Create write-offs
wo_aml = self.env["account.move.line"] wo_aml = self.env["account.move.line"]
for aml_dict in new_aml_dicts: for aml_dict in new_aml_dicts:

5
account_reconciliation_widget/models/reconciliation_widget.py
View File

@@ -332,7 +332,10 @@ class AccountReconciliation(models.AbstractModel):
domain += srch_domain domain += srch_domain
bank_statement_lines = self.env["account.bank.statement.line"].search(domain) bank_statement_lines = self.env["account.bank.statement.line"].search(domain)
results = self.get_bank_statement_line_data(bank_statement_lines.ids) results = self.get_bank_statement_line_data(
bank_statement_lines.ids,
excluded_ids=bank_statement_lines.move_id.line_ids.ids,
)
bank_statement_lines_left = self.env["account.bank.statement.line"].browse( bank_statement_lines_left = self.env["account.bank.statement.line"].browse(
[line["st_line"]["id"] for line in results["lines"]] [line["st_line"]["id"] for line in results["lines"]]
) )