odoo-addon-account-reconcile-oca 16.0.2.4.5__py3-none-any.whl → 16.0.2.4.7__py3-none-any.whl

odoo/addons/account_reconcile_oca/README.rst

@@ -11,7 +11,7 @@ Account Reconcile Oca
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:7f43bb2d4ad1d32679e7ea973dbe721fc6bebc7e94b4b13f34077b3de87fc9fa
+   !! source digest: sha256:13312c9fbbfc16a8a59f7d6184b57e9b3ddc28b0a61fe5ae280f99e5cf8d2940
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -93,6 +93,11 @@ Contributors
 
 * Enric Tobella
 
+Other credits
+~~~~~~~~~~~~~
+
+The system has been improved to handle currency amounts more effectively with the financial support of Sygel Technology.
+
 Maintainers
 ~~~~~~~~~~~
 

odoo/addons/account_reconcile_oca/__manifest__.py

@@ -5,7 +5,7 @@
     "name": "Account Reconcile Oca",
     "summary": """
         Reconcile addons for Odoo CE accounting""",
-    "version": "16.0.2.4.5",
+    "version": "16.0.2.4.7",
     "license": "AGPL-3",
     "author": "CreuBlanca,Dixmit,Odoo Community Association (OCA)",
     "maintainers": ["etobella"],

odoo/addons/account_reconcile_oca/models/account_bank_statement_line.py

@@ -554,7 +554,7 @@ class AccountBankStatementLine(models.Model):
     @api.depends("reconcile_data", "is_reconciled")
     def _compute_reconcile_data_info(self):
         for record in self:
-            if record.reconcile_data:
+            if record.reconcile_data and not record.is_reconciled:
                 record.reconcile_data_info = record.reconcile_data
             else:
                 record.reconcile_data_info = record._default_reconcile_data(
@@ -713,6 +713,7 @@ class AccountBankStatementLine(models.Model):
                                 "other",
                                 from_unreconcile=False,
                                 move=True,
+                                is_reconciled=self.is_reconciled,
                             )
                             data += lines
                         continue
@@ -752,7 +753,10 @@ class AccountBankStatementLine(models.Model):
                     data += lines
             else:
                 reconcile_auxiliary_id, lines = self._get_reconcile_line(
-                    line, "other", from_unreconcile=False
+                    line,
+                    "other",
+                    from_unreconcile=False,
+                    is_reconciled=self.is_reconciled,
                 )
                 data += lines
 
@@ -1162,6 +1166,7 @@ class AccountBankStatementLine(models.Model):
         from_unreconcile=False,
         reconcile_auxiliary_id=False,
         move=False,
+        is_reconciled=False,
     ):
         new_vals = super()._get_reconcile_line(
             line,
@@ -1170,6 +1175,7 @@ class AccountBankStatementLine(models.Model):
             max_amount=max_amount,
             from_unreconcile=from_unreconcile,
             move=move,
+            is_reconciled=is_reconciled,
         )
         rates = []
         for vals in new_vals:

odoo/addons/account_reconcile_oca/models/account_reconcile_abstract.py

@@ -44,6 +44,7 @@ class AccountReconcileAbstract(models.AbstractModel):
         max_amount=False,
         from_unreconcile=False,
         move=False,
+        is_reconciled=False,
     ):
         date = self.date if "date" in self._fields else line.date
         original_amount = amount = net_amount = line.debit - line.credit
@@ -82,6 +83,8 @@ class AccountReconcileAbstract(models.AbstractModel):
                         self.company_id,
                         date,
                     )
+        elif is_reconciled:
+            currency_amount = line.amount_currency
         else:
             currency_amount = self.amount_currency or self.amount
             line_currency = self._get_reconcile_currency()

odoo/addons/account_reconcile_oca/readme/CREDITS.rst

@@ -0,0 +1 @@
+The system has been improved to handle currency amounts more effectively with the financial support of Sygel Technology.

odoo/addons/account_reconcile_oca/static/description/index.html

@@ -372,7 +372,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:7f43bb2d4ad1d32679e7ea973dbe721fc6bebc7e94b4b13f34077b3de87fc9fa
+!! source digest: sha256:13312c9fbbfc16a8a59f7d6184b57e9b3ddc28b0a61fe5ae280f99e5cf8d2940
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-reconcile/tree/16.0/account_reconcile_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-16-0/account-reconcile-16-0-account_reconcile_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=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This addon allows to reconcile bank statements and account marked as <cite>reconcile</cite>.</p>
@@ -389,7 +389,8 @@ ul.auto-toc {
 <li><a class="reference internal" href="#credits" id="toc-entry-6">Credits</a><ul>
 <li><a class="reference internal" href="#authors" id="toc-entry-7">Authors</a></li>
 <li><a class="reference internal" href="#contributors" id="toc-entry-8">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="toc-entry-9">Maintainers</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-9">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-10">Maintainers</a></li>
 </ul>
 </li>
 </ul>
@@ -441,8 +442,12 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <li>Enric Tobella</li>
 </ul>
 </div>
+<div class="section" id="other-credits">
+<h3><a class="toc-backref" href="#toc-entry-9">Other credits</a></h3>
+<p>The system has been improved to handle currency amounts more effectively with the financial support of Sygel Technology.</p>
+</div>
 <div class="section" id="maintainers">
-<h3><a class="toc-backref" href="#toc-entry-9">Maintainers</a></h3>
+<h3><a class="toc-backref" href="#toc-entry-10">Maintainers</a></h3>
 <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" />

odoo/addons/account_reconcile_oca/tests/test_bank_account_reconcile.py

@@ -147,6 +147,66 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         self.assertEqual(receivable_line.amount_currency, -100)
         self.assertEqual(receivable_line.balance, -50)
 
+    def test_two_manual_lines_with_currency(self):
+        """We want to test the reconcile widget for bank statements
+        on manual lines with foreign currency.
+        We enforce the currency rate to be sure that the amounts are correct
+        """
+        self.env["res.currency.rate"].create(
+            {
+                "currency_id": self.env.ref("base.USD").id,
+                "name": time.strftime("%Y-07-15"),
+                "rate": 2,
+            }
+        )
+        bank_stmt = self.acc_bank_stmt_model.create(
+            {
+                "journal_id": self.bank_journal_euro.id,
+                "date": time.strftime("%Y-07-15"),
+                "name": "test",
+            }
+        )
+        bank_stmt_line = self.acc_bank_stmt_line_model.create(
+            {
+                "name": "testLine",
+                "journal_id": self.bank_journal_euro.id,
+                "statement_id": bank_stmt.id,
+                "amount": 50,
+                "amount_currency": 100,
+                "foreign_currency_id": self.currency_usd_id,
+                "date": time.strftime("%Y-07-15"),
+            }
+        )
+        receivable_acc = self.company_data["default_account_receivable"]
+        expense_acc = self.company_data["default_account_expense"]
+        with Form(
+            bank_stmt_line,
+            view="account_reconcile_oca.bank_statement_line_form_reconcile_view",
+        ) as f:
+            self.assertFalse(f.can_reconcile)
+            f.manual_reference = "reconcile_auxiliary;1"
+            f.manual_account_id = receivable_acc
+            f.manual_amount_in_currency = -40
+            self.assertFalse(f.can_reconcile)
+            f.manual_reference = "reconcile_auxiliary;2"
+            f.manual_account_id = expense_acc
+            self.assertTrue(f.can_reconcile)
+        bank_stmt_line.reconcile_bank_line()
+        receivable_line = bank_stmt_line.line_ids.filtered(
+            lambda line: line.account_id == receivable_acc
+        )
+        self.assertEqual(receivable_line.currency_id.id, self.currency_usd_id)
+        self.assertEqual(receivable_line.amount_currency, -40)
+        self.assertEqual(receivable_line.balance, -20)
+        matched_line = False
+        for line in bank_stmt_line.reconcile_data_info["data"]:
+            if line["id"] == receivable_line.id:
+                matched_line = True
+                self.assertEqual(line["currency_amount"], -40)
+                self.assertEqual(line["amount"], -20)
+                break
+        self.assertEqual(matched_line, True)
+
     def test_reconcile_invoice_reconcile_full(self):
         """
         We want to test the reconcile widget for bank statements on invoices.
@@ -1192,8 +1252,12 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         self.assertEqual(len(bank_stmt_line.reconcile_data_info["data"]), 3)
         exchange_line = bank_stmt_line.reconcile_data_info["data"][-1]
         self.assertEqual(exchange_line["amount"], 61.42)
+        self.assertEqual(exchange_line["currency_amount"], 0)
         bank_stmt_line.reconcile_bank_line()
         self.assertEqual(inv1.payment_state, "paid")
+        exchange_line = bank_stmt_line.reconcile_data_info["data"][-1]
+        self.assertEqual(exchange_line["amount"], 61.42)
+        self.assertEqual(exchange_line["currency_amount"], 0)
 
     def test_invoice_foreign_currency_change(self):
         self.env["res.currency.rate"].create(

{odoo_addon_account_reconcile_oca-16.0.2.4.5.dist-info → odoo_addon_account_reconcile_oca-16.0.2.4.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-account_reconcile_oca
-Version: 16.0.2.4.5
+Version: 16.0.2.4.7
 Summary: Reconcile addons for Odoo CE accounting
 Home-page: https://github.com/OCA/account-reconcile
 Author: CreuBlanca,Dixmit,Odoo Community Association (OCA)
@@ -27,7 +27,7 @@ Account Reconcile Oca
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:7f43bb2d4ad1d32679e7ea973dbe721fc6bebc7e94b4b13f34077b3de87fc9fa
+   !! source digest: sha256:13312c9fbbfc16a8a59f7d6184b57e9b3ddc28b0a61fe5ae280f99e5cf8d2940
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -109,6 +109,11 @@ Contributors
 
 * Enric Tobella
 
+Other credits
+~~~~~~~~~~~~~
+
+The system has been improved to handle currency amounts more effectively with the financial support of Sygel Technology.
+
 Maintainers
 ~~~~~~~~~~~
 

{odoo_addon_account_reconcile_oca-16.0.2.4.5.dist-info → odoo_addon_account_reconcile_oca-16.0.2.4.7.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/account_reconcile_oca/README.rst,sha256=8fv79qeEtqi5BQ4nEsWsspF3M8Z23YB1J5q0EWZz4V8,4210
+odoo/addons/account_reconcile_oca/README.rst,sha256=c5z5T3vxVp5BIP_6ly4OXSptFtDuK-GbyXghXSq81ww,4361
 odoo/addons/account_reconcile_oca/__init__.py,sha256=vqRYeBgCVZMpZhYvILSxVsNLC9V7zDnvxMnKU8RQP94,55
-odoo/addons/account_reconcile_oca/__manifest__.py,sha256=C_oY41PGvqRc6sTqD0-CMzoKT1hQlqTjQJMIazAarfY,1859
+odoo/addons/account_reconcile_oca/__manifest__.py,sha256=85zXrn8R3543yDPojW7qPlLnLaPbbAcnt50-ZS_aHX4,1859
 odoo/addons/account_reconcile_oca/hooks.py,sha256=l2-vYiPh-Wu_4Hi3GvfoUmc527S-Jozb07-DbP6LzDA,187
 odoo/addons/account_reconcile_oca/demo/demo.xml,sha256=6k0uK-H1aBiyogVNhQMQfFGL5zUfUGV2M-sSV6LHeUs,204
 odoo/addons/account_reconcile_oca/i18n/account_reconcile_oca.pot,sha256=U3FnhiYPGvtS34Pj9ukKklmAgC5ie3Ywb0br8u6FN9k,27287
@@ -19,20 +19,21 @@ odoo/addons/account_reconcile_oca/migrations/16.0.1.2.0/pre-migration.py,sha256=
 odoo/addons/account_reconcile_oca/models/__init__.py,sha256=28wbZjUZa30uHQY10BMJtKQ_BqJgwLQMQvB9uv0H_fY,282
 odoo/addons/account_reconcile_oca/models/account_account_reconcile.py,sha256=kO8O0cfsxwXc--MbaJ12sc9QhOIVMVrl5rYpmnrVO-0,7523
 odoo/addons/account_reconcile_oca/models/account_bank_statement.py,sha256=CFqlLLtmTqmt5yH3v_pkUfkZezSb1nEhBTu2J5gCjxM,1034
-odoo/addons/account_reconcile_oca/models/account_bank_statement_line.py,sha256=DqD1MtRMWgHHweOQqePcdJOAJv3yuODI9ybHyBAiOQo,52954
+odoo/addons/account_reconcile_oca/models/account_bank_statement_line.py,sha256=rI4Un-UQzT7tEmSmNj5gX17EfK_ijRZeEd1pnyHXQrY,53214
 odoo/addons/account_reconcile_oca/models/account_journal.py,sha256=_nEkPbyL_osFfl-cCXJieLCWv60aPR1QjIc_7kpKaeM,1462
 odoo/addons/account_reconcile_oca/models/account_move_line.py,sha256=yLNHitduzhS5ShrWWw31S5zirIadFsG8ga1gtXehRTc,1213
-odoo/addons/account_reconcile_oca/models/account_reconcile_abstract.py,sha256=ByjBoDd9EECUZNfFGZ1d57QZjnYS8OkKrULNW6zkyg4,5034
+odoo/addons/account_reconcile_oca/models/account_reconcile_abstract.py,sha256=OOzCKZgs_wMHJm1pvzgO5p3paemlLC4Dt4tYtUfClNA,5142
 odoo/addons/account_reconcile_oca/models/res_company.py,sha256=IlB-zFZnnaNFzeFFQn70qDUCcNXSHvVVlJ7PUneOcjc,1391
 odoo/addons/account_reconcile_oca/models/res_config_settings.py,sha256=AuenxX0UfqYWWP-QvtB0irSf_JuWVh4a9QylPfl-Lxc,325
 odoo/addons/account_reconcile_oca/readme/CONTRIBUTORS.rst,sha256=GAYxzAZEN5wTBewMNx4PD2y_QoI-dzpokacQ9NnaEso,16
+odoo/addons/account_reconcile_oca/readme/CREDITS.rst,sha256=zJiSNYKRLokLvhGSsm8yNj5yg74DREisdz1ovGnY_mI,121
 odoo/addons/account_reconcile_oca/readme/DESCRIPTION.rst,sha256=nc8nUT3VmwXIXvJXpq_hj2MeJzNnpsByDS4G3elJsrU,82
 odoo/addons/account_reconcile_oca/readme/ROADMAP.rst,sha256=MlQ8cFQmu5MzBoFW2WP_WGKVTLQK-9RCMgCjGT-TAJU,104
 odoo/addons/account_reconcile_oca/readme/USAGE.rst,sha256=Vr2Odh3VlB7F-pWq5CqnP5kihsCPVWnEhd7EtQfISfg,732
 odoo/addons/account_reconcile_oca/security/ir.model.access.csv,sha256=XfN2EKOoChlEDonVd5DtodVAQyRbShiJ8nrXx6EwNmM,339
 odoo/addons/account_reconcile_oca/security/security.xml,sha256=i978n9S9IyLCKqJRvw4gBy8mQBf2-QTPyVu8cRyDuVc,385
 odoo/addons/account_reconcile_oca/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
-odoo/addons/account_reconcile_oca/static/description/index.html,sha256=H-g_z9C8sfjUGd8C9gtBQgD2Te71H-MShICkRLGhV7g,14397
+odoo/addons/account_reconcile_oca/static/description/index.html,sha256=Ni-iiLi4XjL1BXvIqJAT55M8lp8CgxcxzIRpaWe-pnk,14741
 odoo/addons/account_reconcile_oca/static/description/reconcile-model-full.png,sha256=gzF5JHp5XjYi7VWFIknCzEIYDlfUKkeeH0nCFR2KLNU,135838
 odoo/addons/account_reconcile_oca/static/description/reconcile-model-partial.png,sha256=YXlvsPVtDcHZvwv5yZfHGeyMvmxngzGsQWPicrLpFds,137158
 odoo/addons/account_reconcile_oca/static/src/js/reconcile/reconcile_controller.esm.js,sha256=4bw-Dc1pmVx6sv-fBzyPfBj-rZrqFUVZ8C19n9Pfpi0,4880
@@ -56,7 +57,7 @@ odoo/addons/account_reconcile_oca/static/src/scss/reconcile.scss,sha256=cQoernco
 odoo/addons/account_reconcile_oca/static/src/xml/reconcile.xml,sha256=aBm6PxYfEciRO8tmtoj955h8pDzKFjFN_0MXWbaAZSY,9671
 odoo/addons/account_reconcile_oca/tests/__init__.py,sha256=8JhP4auByShS8Z_Ik5dShMuWdh1kBlYP_DLI4Ku8XWA,79
 odoo/addons/account_reconcile_oca/tests/test_account_reconcile.py,sha256=opQs4FgChPdphc25Jzs07TuYxoVGBCj6IAPueMLNkH0,10576
-odoo/addons/account_reconcile_oca/tests/test_bank_account_reconcile.py,sha256=36vQlGdKlDTV6anNu3VA5HWTzqSiAUf7gQHdgx1AD3c,51426
+odoo/addons/account_reconcile_oca/tests/test_bank_account_reconcile.py,sha256=0fkG-qHgWosiERv6sz6mz4Z0qYg4JUzTBiEBGF6dxkI,54219
 odoo/addons/account_reconcile_oca/views/account_account.xml,sha256=Z6S9dDF2CnaSl8CYw69dxJiuVznJZzZX2BrhaDeMP3c,916
 odoo/addons/account_reconcile_oca/views/account_account_reconcile.xml,sha256=yGOV7nOj5dVwp09ItOIfvNiBQrO_FpAC36gcnjI98JE,7066
 odoo/addons/account_reconcile_oca/views/account_bank_statement.xml,sha256=e8ojLqYeZaMdTj-F0QdmFST4ICAlaKV66SJPkHXCdEU,2473
@@ -65,7 +66,7 @@ odoo/addons/account_reconcile_oca/views/account_journal.xml,sha256=WQGxMPgl4Um-I
 odoo/addons/account_reconcile_oca/views/account_move.xml,sha256=qMXpycJJfaztyToulMmLY1NF2UDL2lcZM-m1tTiAoRY,995
 odoo/addons/account_reconcile_oca/views/account_move_line.xml,sha256=BfObEwM6vXHMtxOFMOGDdCPOWO4ybz3w1_fm4_ufqM0,5274
 odoo/addons/account_reconcile_oca/views/res_config_settings.xml,sha256=hL06Z_0Eg96LU6ta7VHRaheUDehJ6tVexBjU6X52Vng,1412
-odoo_addon_account_reconcile_oca-16.0.2.4.5.dist-info/METADATA,sha256=Gd1leycvlUj-5ng9y3c7BXgNYT4sGPU4s4QCDBoNlvg,4823
-odoo_addon_account_reconcile_oca-16.0.2.4.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-odoo_addon_account_reconcile_oca-16.0.2.4.5.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_account_reconcile_oca-16.0.2.4.5.dist-info/RECORD,,
+odoo_addon_account_reconcile_oca-16.0.2.4.7.dist-info/METADATA,sha256=YlL6ZF3Y0itCjb4rCum4H0rJdzboW3QqyEq82t3YEis,4974
+odoo_addon_account_reconcile_oca-16.0.2.4.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+odoo_addon_account_reconcile_oca-16.0.2.4.7.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_account_reconcile_oca-16.0.2.4.7.dist-info/RECORD,,