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

[MIG] account_reconcile_model_oca: Migration to 18.0

pull/738/head
Duy (Đỗ Anh) 2024-11-05 18:03:13 +07:00
parent 3cc2fe2765
commit 7d3576c02e
9 changed files with 113 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
account_reconcile_model_oca/README.rst
View File

@ -17,13 +17,13 @@ Account Reconcile Model Oca
:target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
:alt: License: LGPL-3 :alt: License: LGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github
:target: https://github.com/OCA/account-reconcile/tree/17.0/account_reconcile_model_oca :target: https://github.com/OCA/account-reconcile/tree/18.0/account_reconcile_model_oca
:alt: OCA/account-reconcile :alt: OCA/account-reconcile
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/account-reconcile-17-0/account-reconcile-17-0-account_reconcile_model_oca :target: https://translation.odoo-community.org/projects/account-reconcile-18-0/account-reconcile-18-0-account_reconcile_model_oca
:alt: Translate me on Weblate :alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/builds?repo=OCA/account-reconcile&target_branch=17.0 :target: https://runboat.odoo-community.org/builds?repo=OCA/account-reconcile&target_branch=18.0
:alt: Try me on Runboat :alt: Try me on Runboat
|badge1| |badge2| |badge3| |badge4| |badge5| |badge1| |badge2| |badge3| |badge4| |badge5|
@ -42,7 +42,7 @@ Bug Tracker
Bugs are tracked on `GitHub Issues <https://github.com/OCA/account-reconcile/issues>`_. Bugs are tracked on `GitHub Issues <https://github.com/OCA/account-reconcile/issues>`_.
In case of trouble, please check there if your issue has already been reported. In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed If you spotted it first, help us to smash it by providing a detailed and welcomed
`feedback <https://github.com/OCA/account-reconcile/issues/new?body=module:%20account_reconcile_model_oca%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_. `feedback <https://github.com/OCA/account-reconcile/issues/new?body=module:%20account_reconcile_model_oca%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
Do not contact contributors directly about support or help with technical issues. Do not contact contributors directly about support or help with technical issues.
@ -62,6 +62,16 @@ Contributors
- Enric Tobella - Enric Tobella
- Trobz <https://www.trobz.com/>
- Do Anh Duy <duyda@trobz.com>
Other credits
-------------
The migration of this module from 17.0 to 18.0 was financially supported
by Camptocamp.
Maintainers Maintainers
----------- -----------
@ -75,6 +85,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and mission is to support the collaborative development of Odoo features and
promote its widespread use. promote its widespread use.
This module is part of the `OCA/account-reconcile <https://github.com/OCA/account-reconcile/tree/17.0/account_reconcile_model_oca>`_ project on GitHub. This module is part of the `OCA/account-reconcile <https://github.com/OCA/account-reconcile/tree/18.0/account_reconcile_model_oca>`_ project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

2
account_reconcile_model_oca/__manifest__.py
View File

@ -5,7 +5,7 @@
"name": "Account Reconcile Model Oca", "name": "Account Reconcile Model Oca",
"summary": """ "summary": """
This includes the logic moved from Odoo Community to Odoo Enterprise""", This includes the logic moved from Odoo Community to Odoo Enterprise""",
"version": "17.0.1.0.1", "version": "18.0.1.0.0",
"license": "LGPL-3", "license": "LGPL-3",
"author": "Dixmit,Odoo,Odoo Community Association (OCA)", "author": "Dixmit,Odoo,Odoo Community Association (OCA)",
"website": "https://github.com/OCA/account-reconcile", "website": "https://github.com/OCA/account-reconcile",

59
account_reconcile_model_oca/models/account_bank_statement_line.py
View File

@ -2,14 +2,13 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from odoo import models from odoo import models
from odoo.osv.expression import get_unaccent_wrapper from odoo.tools import SQL, html2plaintext
from odoo.tools import html2plaintext
from odoo.addons.base.models.res_bank import sanitize_account_number from odoo.addons.base.models.res_bank import sanitize_account_number
class AccountBankStatementLine(models.Model): class AccountBankStatementLine(models.Model):
_inherit = ("account.bank.statement.line",) _inherit = "account.bank.statement.line"
def _retrieve_partner(self): def _retrieve_partner(self):
self.ensure_one() self.ensure_one()
@ -55,7 +54,7 @@ class AccountBankStatementLine(models.Model):
# Retrieve the partner from statement line text values. # Retrieve the partner from statement line text values.
st_line_text_values = self._get_st_line_strings_for_matching() st_line_text_values = self._get_st_line_strings_for_matching()
unaccent = get_unaccent_wrapper(self._cr) unaccent = self.env.registry.unaccent
sub_queries = [] sub_queries = []
params = [] params = []
for text_value in st_line_text_values: for text_value in st_line_text_values:
@ -66,35 +65,45 @@ class AccountBankStatementLine(models.Model):
# Take care a partner could contain some special characters in its name that # Take care a partner could contain some special characters in its name that
# needs to be escaped. # needs to be escaped.
sub_queries.append( sub_queries.append(
rf""" SQL(
{unaccent("%s")} ~* ('^' || ( rf"""
SELECT STRING_AGG(CONCAT('(?=.*\m', chunk[1], '\M)'), '') {unaccent("%s")} ~* ('^' || (
FROM regexp_matches({unaccent('partner.name')}, '\w{{3,}}', 'g') SELECT STRING_AGG(CONCAT('(?=.*\m', chunk[1], '\M)'), '')
AS chunk FROM regexp_matches({unaccent('partner.name')}, '\w{{3,}}', 'g')
)) AS chunk
""" ))
""",
text_value,
)
) )
params.append(text_value) params.append(text_value)
if sub_queries: if sub_queries:
self.env["res.partner"].flush_model(["company_id", "name"]) self.env["res.partner"].flush_model(["company_id", "name"])
self.env["account.move.line"].flush_model(["partner_id", "company_id"]) self.env["account.move.line"].flush_model(["partner_id", "company_id"])
self._cr.execute( query = SQL("""
SELECT aml.partner_id
FROM account_move_line aml
JOIN res_partner partner ON
aml.partner_id = partner.id
AND partner.name IS NOT NULL
AND partner.active
AND (
""")
query_parts = SQL(") OR (").join(sub_queries)
final_query = SQL(
""" """
SELECT aml.partner_id %s
FROM account_move_line aml %s
JOIN res_partner partner ON )
aml.partner_id = partner.id WHERE aml.company_id = %s
AND partner.name IS NOT NULL LIMIT 1
AND partner.active """,
AND ((""" query,
+ ") OR (".join(sub_queries) query_parts,
+ """)) self.company_id.id,
WHERE aml.company_id = %s
LIMIT 1
""",
params + [self.company_id.id],
) )
self._cr.execute(final_query)
row = self._cr.fetchone() row = self._cr.fetchone()
if row: if row:
return self.env["res.partner"].browse(row[0]) return self.env["res.partner"].browse(row[0])

17
account_reconcile_model_oca/models/account_reconcile_model.py
View File

@ -362,16 +362,21 @@ class AccountReconcileModel(models.Model):
aml_domain = self._get_invoice_matching_amls_domain(st_line, partner) aml_domain = self._get_invoice_matching_amls_domain(st_line, partner)
query = self.env["account.move.line"]._where_calc(aml_domain) query = self.env["account.move.line"]._where_calc(aml_domain)
tables, where_clause, where_params = query.get_sql() from_string, from_params = query.from_clause
where_string, where_params = query.where_clause
from_clause = from_string
where_clause = where_string
query_params = from_params + where_params
tokens = self._get_invoice_matching_st_line_tokens(st_line) tokens = self._get_invoice_matching_st_line_tokens(st_line)
if tokens: if tokens:
sub_queries = [] search_fields = [
for table_alias, field in (
("account_move_line", "name"), ("account_move_line", "name"),
("account_move_line__move_id", "name"), ("account_move_line__move_id", "name"),
("account_move_line__move_id", "ref"), ("account_move_line__move_id", "ref"),
): ]
sub_queries = []
for table_alias, field in search_fields:
sub_queries.append( sub_queries.append(
rf""" rf"""
SELECT SELECT
@ -389,7 +394,7 @@ class AccountReconcileModel(models.Model):
'\s+' '\s+'
) )
) AS token ) AS token
FROM {tables} FROM {from_clause}
JOIN account_move account_move_line__move_id JOIN account_move account_move_line__move_id
ON account_move_line__move_id.id = account_move_line.move_id ON account_move_line__move_id.id = account_move_line.move_id
WHERE {where_clause} AND {table_alias}.{field} IS NOT NULL WHERE {where_clause} AND {table_alias}.{field} IS NOT NULL
@ -411,7 +416,7 @@ class AccountReconcileModel(models.Model):
+ order_by + order_by
+ """ + """
""", """,
(where_params * 3) + [tuple(tokens)], (query_params * 3) + [tuple(tokens)],
) )
candidate_ids = [r[0] for r in self._cr.fetchall()] candidate_ids = [r[0] for r in self._cr.fetchall()]
if candidate_ids: if candidate_ids:

3
account_reconcile_model_oca/readme/CONTRIBUTORS.md
View File

@ -1,3 +1,6 @@
- Dixmit - Dixmit
- Enric Tobella - Enric Tobella
- Trobz \<<https://www.trobz.com/>\>
- Do Anh Duy \<<duyda@trobz.com>\>

1
account_reconcile_model_oca/readme/CREDITS.md 100644
View File

@ -0,0 +1 @@
The migration of this module from 17.0 to 18.0 was financially supported by Camptocamp.

31
account_reconcile_model_oca/static/description/index.html
View File

@ -8,10 +8,11 @@
/* /*
:Author: David Goodger (goodger@python.org) :Author: David Goodger (goodger@python.org)
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ :Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain. :Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils. Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet. customize this style sheet.
@ -274,7 +275,7 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code {
margin-left: 2em ; margin-left: 2em ;
margin-right: 2em } margin-right: 2em }
pre.code .ln { color: grey; } /* line numbers */ pre.code .ln { color: gray; } /* line numbers */
pre.code, code { background-color: #eeeeee } pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 } pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@ -300,7 +301,7 @@ span.option {
span.pre { span.pre {
white-space: pre } white-space: pre }
span.problematic { span.problematic, pre.problematic {
color: red } color: red }
span.section-subtitle { span.section-subtitle {
@ -368,7 +369,7 @@ ul.auto-toc {
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:cead010f67ccc5d4b9700540c9d8d0b4fb20d497a38d36cea80cf6f78563a756 !! source digest: sha256:cead010f67ccc5d4b9700540c9d8d0b4fb20d497a38d36cea80cf6f78563a756
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-reconcile/tree/17.0/account_reconcile_model_oca"><img alt="OCA/account-reconcile" src="https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-reconcile-17-0/account-reconcile-17-0-account_reconcile_model_oca"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/account-reconcile&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p> <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-reconcile/tree/18.0/account_reconcile_model_oca"><img alt="OCA/account-reconcile" src="https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-reconcile-18-0/account-reconcile-18-0-account_reconcile_model_oca"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/account-reconcile&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module restores account reconciliation models functions moved from <p>This module restores account reconciliation models functions moved from
Odoo community to enterpise in V. 17.0</p> Odoo community to enterpise in V. 17.0</p>
<p><strong>Table of contents</strong></p> <p><strong>Table of contents</strong></p>
@ -378,7 +379,8 @@ Odoo community to enterpise in V. 17.0</p>
<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul> <li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li> <li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li> <li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li> <li><a class="reference internal" href="#other-credits" id="toc-entry-5">Other credits</a></li>
<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
@ -388,7 +390,7 @@ Odoo community to enterpise in V. 17.0</p>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/account-reconcile/issues">GitHub Issues</a>. <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/account-reconcile/issues">GitHub Issues</a>.
In case of trouble, please check there if your issue has already been reported. In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed If you spotted it first, help us to smash it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/account-reconcile/issues/new?body=module:%20account_reconcile_model_oca%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p> <a class="reference external" href="https://github.com/OCA/account-reconcile/issues/new?body=module:%20account_reconcile_model_oca%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p> <p>Do not contact contributors directly about support or help with technical issues.</p>
</div> </div>
<div class="section" id="credits"> <div class="section" id="credits">
@ -407,16 +409,27 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
<li>Enric Tobella</li> <li>Enric Tobella</li>
</ul> </ul>
</li> </li>
<li>Trobz &lt;<a class="reference external" href="https://www.trobz.com/">https://www.trobz.com/</a>&gt;<ul>
<li>Do Anh Duy &lt;<a class="reference external" href="mailto:duyda&#64;trobz.com">duyda&#64;trobz.com</a>&gt;</li>
</ul>
</li>
</ul> </ul>
</div> </div>
<div class="section" id="other-credits">
<h2><a class="toc-backref" href="#toc-entry-5">Other credits</a></h2>
<p>The migration of this module from 17.0 to 18.0 was financially supported
by Camptocamp.</p>
</div>
<div class="section" id="maintainers"> <div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2> <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p> <p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a> <a class="reference external image-reference" href="https://odoo-community.org">
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
</a>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and mission is to support the collaborative development of Odoo features and
promote its widespread use.</p> promote its widespread use.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-reconcile/tree/17.0/account_reconcile_model_oca">OCA/account-reconcile</a> project on GitHub.</p> <p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-reconcile/tree/18.0/account_reconcile_model_oca">OCA/account-reconcile</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p> <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div> </div>
</div> </div>

12
account_reconcile_model_oca/tests/common.py
View File

@ -13,8 +13,8 @@ class TestAccountReconciliationCommon(AccountTestInvoicingCommon):
""" """
@classmethod @classmethod
def setUpClass(cls, chart_template_ref=None): def setUpClass(cls):
super().setUpClass(chart_template_ref=chart_template_ref) super().setUpClass()
cls.company = cls.company_data["company"] cls.company = cls.company_data["company"]
cls.company.currency_id = cls.env.ref("base.EUR") cls.company.currency_id = cls.env.ref("base.EUR")
@ -69,7 +69,7 @@ class TestAccountReconciliationCommon(AccountTestInvoicingCommon):
"code": "TWAIT", "code": "TWAIT",
"account_type": "liability_current", "account_type": "liability_current",
"reconcile": True, "reconcile": True,
"company_id": cls.company.id, "company_ids": cls.company.ids,
} }
) )
# cash basis final account # cash basis final account
@ -78,7 +78,7 @@ class TestAccountReconciliationCommon(AccountTestInvoicingCommon):
"name": "TAX_TO_DEDUCT", "name": "TAX_TO_DEDUCT",
"code": "TDEDUCT", "code": "TDEDUCT",
"account_type": "asset_current", "account_type": "asset_current",
"company_id": cls.company.id, "company_ids": cls.company.ids,
} }
) )
cls.tax_base_amount_account = cls.env["account.account"].create( cls.tax_base_amount_account = cls.env["account.account"].create(
@ -86,7 +86,7 @@ class TestAccountReconciliationCommon(AccountTestInvoicingCommon):
"name": "TAX_BASE", "name": "TAX_BASE",
"code": "TBASE", "code": "TBASE",
"account_type": "asset_current", "account_type": "asset_current",
"company_id": cls.company.id, "company_ids": cls.company.ids,
} }
) )
cls.company.account_cash_basis_base_account_id = cls.tax_base_amount_account.id cls.company.account_cash_basis_base_account_id = cls.tax_base_amount_account.id
@ -190,7 +190,7 @@ class TestAccountReconciliationCommon(AccountTestInvoicingCommon):
0, 0,
0, 0,
{ {
"name": "product that cost %s" % invoice_amount, "name": f"product that cost {invoice_amount}",
"quantity": 1, "quantity": 1,
"price_unit": invoice_amount, "price_unit": invoice_amount,
"tax_ids": [Command.set([])], "tax_ids": [Command.set([])],

46
account_reconcile_model_oca/tests/test_reconciliation_match.py
View File

@ -1,8 +1,7 @@
from freezegun import freeze_time from freezegun import freeze_time
from odoo import Command from odoo import Command
from odoo.tests import tagged from odoo.tests import Form, tagged
from odoo.tests.common import Form
from odoo.addons.account.tests.common import AccountTestInvoicingCommon from odoo.addons.account.tests.common import AccountTestInvoicingCommon
@ -10,21 +9,14 @@ from odoo.addons.account.tests.common import AccountTestInvoicingCommon
@tagged("post_install", "-at_install") @tagged("post_install", "-at_install")
class TestReconciliationMatchingRules(AccountTestInvoicingCommon): class TestReconciliationMatchingRules(AccountTestInvoicingCommon):
@classmethod @classmethod
def setUpClass(cls, chart_template_ref=None): def setUpClass(cls):
super().setUpClass(chart_template_ref=chart_template_ref) super().setUpClass()
################# #################
# Company setup # # Company setup #
################# #################
cls.currency_data_2 = cls.setup_multi_currency_data( cls.other_currency = cls.setup_other_currency(
{ "EUR", rates=[("2016-01-01", 10.0), ("2017-01-01", 20.0)]
"name": "Dark Chocolate Coin",
"symbol": "🍫",
"currency_unit_label": "Dark Choco",
"currency_subunit_label": "Dark Cacao Powder",
},
rate2016=10.0,
rate2017=20.0,
) )
cls.company = cls.company_data["company"] cls.company = cls.company_data["company"]
@ -33,7 +25,7 @@ class TestReconciliationMatchingRules(AccountTestInvoicingCommon):
cls.current_assets_account = cls.env["account.account"].search( cls.current_assets_account = cls.env["account.account"].search(
[ [
("account_type", "=", "asset_current"), ("account_type", "=", "asset_current"),
("company_id", "=", cls.company.id), ("company_ids", "in", cls.company.id),
], ],
limit=1, limit=1,
) )
@ -188,6 +180,9 @@ class TestReconciliationMatchingRules(AccountTestInvoicingCommon):
}, },
] ]
) )
cls.payment_credit_account_id = (
cls.outbound_payment_method_line.payment_account_id
)
@classmethod @classmethod
def _create_invoice_line( def _create_invoice_line(
@ -212,8 +207,6 @@ class TestReconciliationMatchingRules(AccountTestInvoicingCommon):
invoice_form.partner_id = partner invoice_form.partner_id = partner
if currency: if currency:
invoice_form.currency_id = currency invoice_form.currency_id = currency
if pay_reference:
invoice_form.payment_reference = pay_reference
if ref: if ref:
invoice_form.ref = ref invoice_form.ref = ref
if name: if name:
@ -224,6 +217,8 @@ class TestReconciliationMatchingRules(AccountTestInvoicingCommon):
invoice_line_form.price_unit = amount invoice_line_form.price_unit = amount
invoice_line_form.tax_ids.clear() invoice_line_form.tax_ids.clear()
invoice = invoice_form.save() invoice = invoice_form.save()
if pay_reference:
invoice.payment_reference = pay_reference
invoice.action_post() invoice.action_post()
lines = invoice.line_ids lines = invoice.line_ids
return lines.filtered( return lines.filtered(
@ -1031,7 +1026,7 @@ class TestReconciliationMatchingRules(AccountTestInvoicingCommon):
def test_reverted_move_matching(self): def test_reverted_move_matching(self):
partner = self.partner_1 partner = self.partner_1
AccountMove = self.env["account.move"] AccountMove = self.env["account.move"]
account = self.bank_journal.company_id.account_journal_payment_credit_account_id account = self.payment_credit_account_id
move = AccountMove.create( move = AccountMove.create(
{ {
"journal_id": self.bank_journal.id, "journal_id": self.bank_journal.id,
@ -1061,8 +1056,7 @@ class TestReconciliationMatchingRules(AccountTestInvoicingCommon):
) )
payment_bnk_line = move.line_ids.filtered( payment_bnk_line = move.line_ids.filtered(
lambda line: line.account_id lambda line: line.account_id == self.payment_credit_account_id
== self.bank_journal.company_id.account_journal_payment_credit_account_id
) )
move.action_post() move.action_post()
@ -1262,7 +1256,7 @@ class TestReconciliationMatchingRules(AccountTestInvoicingCommon):
"name": "test_match_multi_currencies", "name": "test_match_multi_currencies",
"code": "xxxx", "code": "xxxx",
"type": "bank", "type": "bank",
"currency_id": self.currency_data["currency"].id, "currency_id": self.company_data["currency"].id,
} }
) )
@ -1287,7 +1281,7 @@ class TestReconciliationMatchingRules(AccountTestInvoicingCommon):
"date": "2016-01-01", "date": "2016-01-01",
"payment_ref": "line", "payment_ref": "line",
"partner_id": partner.id, "partner_id": partner.id,
"foreign_currency_id": self.currency_data_2["currency"].id, "foreign_currency_id": self.other_currency.id,
"amount": 300.0, # Rate is 3 GOL = 1 USD in 2016. "amount": 300.0, # Rate is 3 GOL = 1 USD in 2016.
# Rate is 10 DAR = 1 USD in 2016 but the rate used by the bank is 9:1. # Rate is 10 DAR = 1 USD in 2016 but the rate used by the bank is 9:1.
"amount_currency": 900.0, "amount_currency": 900.0,
@ -1310,7 +1304,7 @@ class TestReconciliationMatchingRules(AccountTestInvoicingCommon):
"default_account_receivable" "default_account_receivable"
].id, ].id,
"partner_id": partner.id, "partner_id": partner.id,
"currency_id": self.currency_data["currency"].id, "currency_id": self.other_currency.id,
"debit": 100.0, "debit": 100.0,
"credit": 0.0, "credit": 0.0,
"amount_currency": 200.0, "amount_currency": 200.0,
@ -1325,7 +1319,7 @@ class TestReconciliationMatchingRules(AccountTestInvoicingCommon):
"default_account_receivable" "default_account_receivable"
].id, ].id,
"partner_id": partner.id, "partner_id": partner.id,
"currency_id": self.currency_data_2["currency"].id, "currency_id": self.other_currency.id,
"debit": 14.0, "debit": 14.0,
"credit": 0.0, "credit": 0.0,
"amount_currency": 280.0, "amount_currency": 280.0,
@ -1364,7 +1358,7 @@ class TestReconciliationMatchingRules(AccountTestInvoicingCommon):
@freeze_time("2020-01-01") @freeze_time("2020-01-01")
def test_matching_with_write_off_foreign_currency(self): def test_matching_with_write_off_foreign_currency(self):
journal_foreign_curr = self.company_data["default_journal_bank"].copy() journal_foreign_curr = self.company_data["default_journal_bank"].copy()
journal_foreign_curr.currency_id = self.currency_data["currency"] journal_foreign_curr.currency_id = self.company_data["currency"]
reco_model = self._create_reconcile_model( reco_model = self._create_reconcile_model(
auto_reconcile=True, auto_reconcile=True,
@ -1400,7 +1394,7 @@ class TestReconciliationMatchingRules(AccountTestInvoicingCommon):
"payment_type": "inbound", "payment_type": "inbound",
"partner_type": "customer", "partner_type": "customer",
"partner_id": partner.id, "partner_id": partner.id,
"ref": memo, "memo": memo,
"destination_account_id": self.company_data[ "destination_account_id": self.company_data[
"default_account_receivable" "default_account_receivable"
].id, ].id,
@ -1408,7 +1402,7 @@ class TestReconciliationMatchingRules(AccountTestInvoicingCommon):
) )
payment.action_post() payment.action_post()
return payment.line_ids.filtered( return payment.move_id.line_ids.filtered(
lambda x: x.account_id.account_type lambda x: x.account_id.account_type
not in {"asset_receivable", "liability_payable"} not in {"asset_receivable", "liability_payable"}
) )