Merge PR #410 into 14.0

Signed-off-by grindtildeath
This commit is contained in:
OCA-git-bot
2022-10-12 13:21:10 +00:00
16 changed files with 820 additions and 0 deletions

View File

@@ -0,0 +1,83 @@
================================================
Account Reconciliation Model Strict Match Amount
================================================
.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
:target: https://odoo-community.org/page/development-status
:alt: Beta
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github
:target: https://github.com/OCA/account-reconcile/tree/14.0/account_reconcile_model_strict_match_amount
:alt: OCA/account-reconcile
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/account-reconcile-14-0/account-reconcile-14-0-account_reconcile_model_strict_match_amount
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
:target: https://runbot.odoo-community.org/runbot/98/14.0
:alt: Try me on Runbot
|badge1| |badge2| |badge3| |badge4| |badge5|
This module allows to cancel the bypassing of Amount Matching feature on
Reconciliation models "in case of a statement line communication matching
exactly existing entries", to ensure only statement lines matching the total
amount (or according to its percentage) will be reconciled automatically.
**Table of contents**
.. contents::
:local:
Bug Tracker
===========
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.
If you spotted it first, help us smashing it by providing a detailed and welcomed
`feedback <https://github.com/OCA/account-reconcile/issues/new?body=module:%20account_reconcile_model_strict_match_amount%0Aversion:%2014.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.
Credits
=======
Authors
~~~~~~~
* Camptocamp
Contributors
~~~~~~~~~~~~
* Akim Juillerat <akim.juillerat@camptocamp.com>
* `Trobz <https://trobz.com>`_:
* Nguyen Ho <nguyenhk@trobz.com>
Other credits
~~~~~~~~~~~~~
The migration of this module from 13.0 to 14.0 was financially supported by Camptocamp
Maintainers
~~~~~~~~~~~
This module is maintained by the OCA.
.. image:: https://odoo-community.org/logo.png
:alt: Odoo Community Association
:target: https://odoo-community.org
OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.
This module is part of the `OCA/account-reconcile <https://github.com/OCA/account-reconcile/tree/14.0/account_reconcile_model_strict_match_amount>`_ project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

View File

@@ -0,0 +1 @@
from . import models

View File

@@ -0,0 +1,15 @@
# Copyright 2020 Camptocamp SA
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
{
"name": "Account Reconciliation Model Strict Match Amount",
"summary": "Restrict reconciliation propositions to matching amount parameter",
"version": "14.0.1.0.0",
"category": "Accounting",
"website": "https://github.com/OCA/account-reconcile",
"author": "Camptocamp, Odoo Community Association (OCA)",
"license": "AGPL-3",
"application": False,
"installable": True,
"depends": ["account"],
"data": ["views/account_reconcile_model.xml"],
}

View File

@@ -0,0 +1,32 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account_reconcile_model_strict_match_amount
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 13.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: account_reconcile_model_strict_match_amount
#: model:ir.model.fields,help:account_reconcile_model_strict_match_amount.field_account_reconcile_model__strict_match_total_amount
msgid ""
"Avoid bypassing the Amount Matching parameter in case of a statement line "
"communication matching exactly existing entries."
msgstr ""
#. module: account_reconcile_model_strict_match_amount
#: model:ir.model,name:account_reconcile_model_strict_match_amount.model_account_reconcile_model
msgid ""
"Preset to create journal entries during a invoices and payments matching"
msgstr ""
#. module: account_reconcile_model_strict_match_amount
#: model:ir.model.fields,field_description:account_reconcile_model_strict_match_amount.field_account_reconcile_model__strict_match_total_amount
msgid "Strict Amount Matching"
msgstr ""

View File

@@ -0,0 +1 @@
from . import account_reconcile_model

View File

@@ -0,0 +1,63 @@
# Copyright 2020 Camptocamp SA
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
from odoo import fields, models
class AccountReconcileModel(models.Model):
_inherit = "account.reconcile.model"
strict_match_total_amount = fields.Boolean(
string="Strict Amount Matching",
help="Avoid bypassing the Amount Matching parameter in case of a "
"statement line communication matching exactly existing entries.",
)
# flake8: noqa
def _get_select_communication_flag(self):
comm_flag = super()._get_select_communication_flag()
if not self.match_total_amount or not self.strict_match_total_amount:
return comm_flag
# comm_flag.replace is for 13.0
comm_flag = (
r"""
COALESCE(
"""
+ comm_flag.replace("AS communication_flag", "")
+ r"""
, FALSE)
AND
CASE
WHEN abs(st_line.amount) < abs(aml.balance) THEN abs(st_line.amount) / abs(aml.balance) * 100
WHEN abs(st_line.amount) > abs(aml.balance) THEN abs(aml.balance) / abs(st_line.amount) * 100
ELSE 100
END >= {match_total_amount_param}
""".format(
match_total_amount_param=self.match_total_amount_param
)
)
return comm_flag
def _get_select_payment_reference_flag(self):
ref_flag = super()._get_select_payment_reference_flag()
if not self.match_total_amount or not self.strict_match_total_amount:
return ref_flag
# ref_flag.replace is for 13.0
ref_flag = (
r"""
COALESCE(
"""
+ ref_flag.replace("AS reference_flag", "")
+ r"""
, FALSE)
AND
CASE
WHEN abs(st_line.amount) < abs(aml.balance) THEN abs(st_line.amount) / abs(aml.balance) * 100
WHEN abs(st_line.amount) > abs(aml.balance) THEN abs(aml.balance) / abs(st_line.amount) * 100
ELSE 100
END >= {match_total_amount_param}
""".format(
match_total_amount_param=self.match_total_amount_param
)
)
return ref_flag

View File

@@ -0,0 +1,3 @@
* Akim Juillerat <akim.juillerat@camptocamp.com>
* `Trobz <https://trobz.com>`_:
* Nguyen Ho <nguyenhk@trobz.com>

View File

@@ -0,0 +1 @@
The migration of this module from 13.0 to 14.0 was financially supported by Camptocamp

View File

@@ -0,0 +1,4 @@
This module allows to cancel the bypassing of Amount Matching feature on
Reconciliation models "in case of a statement line communication matching
exactly existing entries", to ensure only statement lines matching the total
amount (or according to its percentage) will be reconciled automatically.

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

View File

@@ -0,0 +1,435 @@
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
<title>Account Reconciliation Model Strict Match Amount</title>
<style type="text/css">
/*
:Author: David Goodger (goodger@python.org)
:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
customize this style sheet.
*/
/* used to remove borders from tables and images */
.borderless, table.borderless td, table.borderless th {
border: 0 }
table.borderless td, table.borderless th {
/* Override padding for "table.docutils td" with "! important".
The right padding separates the table cells. */
padding: 0 0.5em 0 0 ! important }
.first {
/* Override more specific margin styles with "! important". */
margin-top: 0 ! important }
.last, .with-subtitle {
margin-bottom: 0 ! important }
.hidden {
display: none }
.subscript {
vertical-align: sub;
font-size: smaller }
.superscript {
vertical-align: super;
font-size: smaller }
a.toc-backref {
text-decoration: none ;
color: black }
blockquote.epigraph {
margin: 2em 5em ; }
dl.docutils dd {
margin-bottom: 0.5em }
object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
overflow: hidden;
}
/* Uncomment (and remove this text!) to get bold-faced definition list terms
dl.docutils dt {
font-weight: bold }
*/
div.abstract {
margin: 2em 5em }
div.abstract p.topic-title {
font-weight: bold ;
text-align: center }
div.admonition, div.attention, div.caution, div.danger, div.error,
div.hint, div.important, div.note, div.tip, div.warning {
margin: 2em ;
border: medium outset ;
padding: 1em }
div.admonition p.admonition-title, div.hint p.admonition-title,
div.important p.admonition-title, div.note p.admonition-title,
div.tip p.admonition-title {
font-weight: bold ;
font-family: sans-serif }
div.attention p.admonition-title, div.caution p.admonition-title,
div.danger p.admonition-title, div.error p.admonition-title,
div.warning p.admonition-title, .code .error {
color: red ;
font-weight: bold ;
font-family: sans-serif }
/* Uncomment (and remove this text!) to get reduced vertical space in
compound paragraphs.
div.compound .compound-first, div.compound .compound-middle {
margin-bottom: 0.5em }
div.compound .compound-last, div.compound .compound-middle {
margin-top: 0.5em }
*/
div.dedication {
margin: 2em 5em ;
text-align: center ;
font-style: italic }
div.dedication p.topic-title {
font-weight: bold ;
font-style: normal }
div.figure {
margin-left: 2em ;
margin-right: 2em }
div.footer, div.header {
clear: both;
font-size: smaller }
div.line-block {
display: block ;
margin-top: 1em ;
margin-bottom: 1em }
div.line-block div.line-block {
margin-top: 0 ;
margin-bottom: 0 ;
margin-left: 1.5em }
div.sidebar {
margin: 0 0 0.5em 1em ;
border: medium outset ;
padding: 1em ;
background-color: #ffffee ;
width: 40% ;
float: right ;
clear: right }
div.sidebar p.rubric {
font-family: sans-serif ;
font-size: medium }
div.system-messages {
margin: 5em }
div.system-messages h1 {
color: red }
div.system-message {
border: medium outset ;
padding: 1em }
div.system-message p.system-message-title {
color: red ;
font-weight: bold }
div.topic {
margin: 2em }
h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
margin-top: 0.4em }
h1.title {
text-align: center }
h2.subtitle {
text-align: center }
hr.docutils {
width: 75% }
img.align-left, .figure.align-left, object.align-left, table.align-left {
clear: left ;
float: left ;
margin-right: 1em }
img.align-right, .figure.align-right, object.align-right, table.align-right {
clear: right ;
float: right ;
margin-left: 1em }
img.align-center, .figure.align-center, object.align-center {
display: block;
margin-left: auto;
margin-right: auto;
}
table.align-center {
margin-left: auto;
margin-right: auto;
}
.align-left {
text-align: left }
.align-center {
clear: both ;
text-align: center }
.align-right {
text-align: right }
/* reset inner alignment in figures */
div.align-right {
text-align: inherit }
/* div.align-center * { */
/* text-align: left } */
.align-top {
vertical-align: top }
.align-middle {
vertical-align: middle }
.align-bottom {
vertical-align: bottom }
ol.simple, ul.simple {
margin-bottom: 1em }
ol.arabic {
list-style: decimal }
ol.loweralpha {
list-style: lower-alpha }
ol.upperalpha {
list-style: upper-alpha }
ol.lowerroman {
list-style: lower-roman }
ol.upperroman {
list-style: upper-roman }
p.attribution {
text-align: right ;
margin-left: 50% }
p.caption {
font-style: italic }
p.credits {
font-style: italic ;
font-size: smaller }
p.label {
white-space: nowrap }
p.rubric {
font-weight: bold ;
font-size: larger ;
color: maroon ;
text-align: center }
p.sidebar-title {
font-family: sans-serif ;
font-weight: bold ;
font-size: larger }
p.sidebar-subtitle {
font-family: sans-serif ;
font-weight: bold }
p.topic-title {
font-weight: bold }
pre.address {
margin-bottom: 0 ;
margin-top: 0 ;
font: inherit }
pre.literal-block, pre.doctest-block, pre.math, pre.code {
margin-left: 2em ;
margin-right: 2em }
pre.code .ln { color: grey; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
pre.code .literal.string, code .literal.string { color: #0C5404 }
pre.code .name.builtin, code .name.builtin { color: #352B84 }
pre.code .deleted, code .deleted { background-color: #DEB0A1}
pre.code .inserted, code .inserted { background-color: #A3D289}
span.classifier {
font-family: sans-serif ;
font-style: oblique }
span.classifier-delimiter {
font-family: sans-serif ;
font-weight: bold }
span.interpreted {
font-family: sans-serif }
span.option {
white-space: nowrap }
span.pre {
white-space: pre }
span.problematic {
color: red }
span.section-subtitle {
/* font-size relative to parent (h1..h6 element) */
font-size: 80% }
table.citation {
border-left: solid 1px gray;
margin-left: 1px }
table.docinfo {
margin: 2em 4em }
table.docutils {
margin-top: 0.5em ;
margin-bottom: 0.5em }
table.footnote {
border-left: solid 1px black;
margin-left: 1px }
table.docutils td, table.docutils th,
table.docinfo td, table.docinfo th {
padding-left: 0.5em ;
padding-right: 0.5em ;
vertical-align: top }
table.docutils th.field-name, table.docinfo th.docinfo-name {
font-weight: bold ;
text-align: left ;
white-space: nowrap ;
padding-left: 0 }
/* "booktabs" style (no vertical lines) */
table.docutils.booktabs {
border: 0px;
border-top: 2px solid;
border-bottom: 2px solid;
border-collapse: collapse;
}
table.docutils.booktabs * {
border: 0px;
}
table.docutils.booktabs th {
border-bottom: thin solid;
text-align: left;
}
h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
font-size: 100% }
ul.auto-toc {
list-style-type: none }
</style>
</head>
<body>
<div class="document" id="account-reconciliation-model-strict-match-amount">
<h1 class="title">Account Reconciliation Model Strict Match Amount</h1>
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" 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" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/account-reconcile/tree/14.0/account_reconcile_model_strict_match_amount"><img alt="OCA/account-reconcile" src="https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/account-reconcile-14-0/account-reconcile-14-0-account_reconcile_model_strict_match_amount"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/98/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p>This module allows to cancel the bypassing of Amount Matching feature on
Reconciliation models “in case of a statement line communication matching
exactly existing entries”, to ensure only statement lines matching the total
amount (or according to its percentage) will be reconciled automatically.</p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
<li><a class="reference internal" href="#bug-tracker" id="id1">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="id4">Contributors</a></li>
<li><a class="reference internal" href="#other-credits" id="id5">Other credits</a></li>
<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
</ul>
</li>
</ul>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
<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.
If you spotted it first, help us smashing 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_strict_match_amount%0Aversion:%2014.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>
</div>
<div class="section" id="credits">
<h1><a class="toc-backref" href="#id2">Credits</a></h1>
<div class="section" id="authors">
<h2><a class="toc-backref" href="#id3">Authors</a></h2>
<ul class="simple">
<li>Camptocamp</li>
</ul>
</div>
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#id4">Contributors</a></h2>
<ul class="simple">
<li>Akim Juillerat &lt;<a class="reference external" href="mailto:akim.juillerat&#64;camptocamp.com">akim.juillerat&#64;camptocamp.com</a>&gt;</li>
<li><dl class="first docutils">
<dt><a class="reference external" href="https://trobz.com">Trobz</a>:</dt>
<dd><ul class="first last">
<li>Nguyen Ho &lt;<a class="reference external" href="mailto:nguyenhk&#64;trobz.com">nguyenhk&#64;trobz.com</a>&gt;</li>
</ul>
</dd>
</dl>
</li>
</ul>
</div>
<div class="section" id="other-credits">
<h2><a class="toc-backref" href="#id5">Other credits</a></h2>
<p>The migration of this module from 13.0 to 14.0 was financially supported by Camptocamp</p>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
<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>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-reconcile/tree/14.0/account_reconcile_model_strict_match_amount">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>
</div>
</div>
</div>
</body>
</html>

View File

@@ -0,0 +1 @@
from . import test_account_reconcile_model_strict_match_amount

View File

@@ -0,0 +1,150 @@
# Copyright 2020 Camptocamp SA
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
from odoo.tests import tagged
from odoo.addons.account.tests.test_reconciliation_matching_rules import (
TestReconciliationMatchingRules,
)
@tagged("post_install", "-at_install")
class TestAccountReconcileModelStrictMatchAmount(TestReconciliationMatchingRules):
@classmethod
def setUpClass(cls):
super().setUpClass()
cls.partner_s_3 = cls.env["res.partner"].create({"name": "partner_s_3"})
cls.partner_s_4 = cls.env["res.partner"].create({"name": "partner_s_4"})
cls.partner_s_5 = cls.env["res.partner"].create({"name": "partner_s_5"})
cls.partner_s_6 = cls.env["res.partner"].create({"name": "partner_s_6"})
cls.invoice_line_s_5 = cls._create_invoice_line(
150, cls.partner_s_3, "out_invoice"
)
# Explicitly set the ref on the account.move after field on the line
# was defined as readonly and value is not written anymore
# cf https://github.com/odoo/odoo/commit/38c13bbef39e3e82a77cfd4a316be94280e3cee5 # noqa
cls.invoice_line_s_5.move_id.ref = "ABC001XYZ"
cls.invoice_line_s_6 = cls._create_invoice_line(
300, cls.partner_s_4, "out_invoice"
)
cls.invoice_line_s_6.name = "ABC002XYZ"
cls.invoice_line_s_7 = cls._create_invoice_line(
450, cls.partner_s_5, "out_invoice"
)
cls.invoice_line_s_7.move_id.ref = "ABC003XYZ"
cls.invoice_line_s_8 = cls._create_invoice_line(
600, cls.partner_s_6, "out_invoice"
)
cls.invoice_line_s_8.move_id.payment_reference = "ABC004XYZ"
cls.bank_st_s = cls.env["account.bank.statement"].create(
{
"name": "test bank journal 2",
"journal_id": cls.company_data["default_journal_bank"].id,
}
)
cls.bank_line_s_3 = cls.env["account.bank.statement.line"].create(
{
"statement_id": cls.bank_st_s.id,
"payment_ref": "ABC001XYZ",
"partner_id": cls.partner_s_3.id,
"amount": 135,
"sequence": 1,
}
)
cls.bank_line_s_4 = cls.env["account.bank.statement.line"].create(
{
"statement_id": cls.bank_st_s.id,
"payment_ref": "ABC002XYZ",
"partner_id": cls.partner_s_4.id,
"amount": 270,
"sequence": 2,
}
)
cls.bank_line_s_5 = cls.env["account.bank.statement.line"].create(
{
"statement_id": cls.bank_st_s.id,
"payment_ref": "ABC003XYZ",
"partner_id": cls.partner_s_5.id,
"amount": 405,
"sequence": 3,
}
)
cls.bank_line_s_6 = cls.env["account.bank.statement.line"].create(
{
"statement_id": cls.bank_st_s.id,
"payment_ref": "ABC004XYZ",
"partner_id": cls.partner_s_6.id,
"amount": 540,
"sequence": 4,
}
)
cls.bank_st_s.balance_end_real = cls.bank_st_s.balance_end
cls.bank_st_s.button_post()
def test_auto_reconcile_strict_match_100(self):
my_rule = self.env["account.reconcile.model"].create(
{
"name": "Strict Invoice matching amount 100%",
"rule_type": "invoice_matching",
"auto_reconcile": True,
"match_nature": "both",
"match_same_currency": True,
"match_total_amount": True,
"match_total_amount_param": 100.0,
"strict_match_total_amount": True,
}
)
self._check_statement_matching(
my_rule,
{
self.bank_line_s_3.id: {"aml_ids": []},
self.bank_line_s_4.id: {"aml_ids": []},
self.bank_line_s_5.id: {"aml_ids": []},
self.bank_line_s_6.id: {"aml_ids": []},
},
statements=self.bank_st_s,
)
def test_auto_reconcile_strict_match_90(self):
my_rule = self.env["account.reconcile.model"].create(
{
"name": "Strict Invoice matching amount 90%",
"rule_type": "invoice_matching",
"auto_reconcile": True,
"match_nature": "both",
"match_same_currency": True,
"match_total_amount": True,
"match_total_amount_param": 90.0,
"strict_match_total_amount": True,
}
)
self._check_statement_matching(
my_rule,
{
self.bank_line_s_3.id: {
"aml_ids": [self.invoice_line_s_5.id],
"model": my_rule,
"status": "reconciled",
"partner": self.partner_s_3,
},
self.bank_line_s_4.id: {
"aml_ids": [self.invoice_line_s_6.id],
"model": my_rule,
"status": "reconciled",
"partner": self.partner_s_4,
},
self.bank_line_s_5.id: {
"aml_ids": [self.invoice_line_s_7.id],
"model": my_rule,
"status": "reconciled",
"partner": self.partner_s_5,
},
self.bank_line_s_6.id: {
"aml_ids": [self.invoice_line_s_8.id],
"model": my_rule,
"status": "reconciled",
"partner": self.partner_s_6,
},
},
statements=self.bank_st_s,
)

View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="view_account_reconcile_model_form" model="ir.ui.view">
<field name="name">account.reconcile.model.form</field>
<field name="model">account.reconcile.model</field>
<field name="inherit_id" ref="account.view_account_reconcile_model_form" />
<field name="arch" type="xml">
<xpath expr="//div[field[@name='match_total_amount']]" position="after">
<field
name="strict_match_total_amount"
attrs="{'invisible': ['|', ('rule_type', '!=', 'invoice_matching'), ('match_total_amount', '=', False)]}"
/>
</xpath>
<xpath
expr="//div[field[@name='match_total_amount']]/div[hasclass('text-muted')]"
position="attributes"
>
<attribute
name="attrs"
>{'invisible': ['|', '|', ('rule_type', '!=', 'invoice_matching'), ('match_total_amount', '=', False), ('strict_match_total_amount', '=', True)]}</attribute>
</xpath>
</field>
</record>
</odoo>

View File

@@ -0,0 +1 @@
../../../../account_reconcile_model_strict_match_amount

View File

@@ -0,0 +1,6 @@
import setuptools
setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)