odoo-addon-account-reconcile-oca 17.0.1.5.18.2__py3-none-any.whl → 17.0.1.5.19__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:f5ea6e3a47d5601899213ca2b0c16edce1690f0c20d71db238c0ea7a9f696623
+   !! source digest: sha256:80cddeea5a6e673aeb7d21ef2276036c0a8d4846320b9194345e1fe3d790bc90
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

odoo/addons/account_reconcile_oca/__manifest__.py

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

odoo/addons/account_reconcile_oca/models/account_bank_statement_line.py

@@ -757,7 +757,7 @@ 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=True
                 )
                 data += lines
 
@@ -1171,6 +1171,7 @@ class AccountBankStatementLine(models.Model):
         from_unreconcile=False,
         reconcile_auxiliary_id=False,
         move=False,
+        is_reconciled=False,
     ):
         new_vals = super()._get_reconcile_line(
             line,
@@ -1179,6 +1180,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_residual_currency or -line.amount_residual
         else:
             currency_amount = self.amount_currency or self.amount
             line_currency = self._get_reconcile_currency()

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:f5ea6e3a47d5601899213ca2b0c16edce1690f0c20d71db238c0ea7a9f696623
+!! source digest: sha256:80cddeea5a6e673aeb7d21ef2276036c0a8d4846320b9194345e1fe3d790bc90
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/17.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-17-0/account-reconcile-17-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=17.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

odoo/addons/account_reconcile_oca/tests/test_bank_account_reconcile.py

@@ -154,6 +154,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.

{odoo_addon_account_reconcile_oca-17.0.1.5.18.2.dist-info → odoo_addon_account_reconcile_oca-17.0.1.5.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-account_reconcile_oca
-Version: 17.0.1.5.18.2
+Version: 17.0.1.5.19
 Requires-Python: >=3.10
 Requires-Dist: odoo-addon-account_reconcile_model_oca>=17.0dev,<17.1dev
 Requires-Dist: odoo-addon-account_statement_base>=17.0dev,<17.1dev
@@ -29,7 +29,7 @@ Account Reconcile Oca
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:f5ea6e3a47d5601899213ca2b0c16edce1690f0c20d71db238c0ea7a9f696623
+   !! source digest: sha256:80cddeea5a6e673aeb7d21ef2276036c0a8d4846320b9194345e1fe3d790bc90
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

{odoo_addon_account_reconcile_oca-17.0.1.5.18.2.dist-info → odoo_addon_account_reconcile_oca-17.0.1.5.19.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/account_reconcile_oca/README.rst,sha256=PYcm19MAMLljoLQFq6ChLxEXffABSyZy-2uL3UUf4q4,3868
+odoo/addons/account_reconcile_oca/README.rst,sha256=sX0Szoauz5MZBXherIOvBN67SanWiTzewVnBM92Ya70,3868
 odoo/addons/account_reconcile_oca/__init__.py,sha256=vqRYeBgCVZMpZhYvILSxVsNLC9V7zDnvxMnKU8RQP94,55
-odoo/addons/account_reconcile_oca/__manifest__.py,sha256=r5SwsEstn-XV6uY4cXZaYz3ndUzp94nM9B0NXCbqwhg,1899
+odoo/addons/account_reconcile_oca/__manifest__.py,sha256=7ndpoEe6DIMm4WzWTQkA3Nu6dziNOL4eakBOZuCeHbs,1899
 odoo/addons/account_reconcile_oca/hooks.py,sha256=SfJ-GlIGYL1kf8xhQs5qDqwNnE8S9Gs-5dP3vOD-IMM,182
 odoo/addons/account_reconcile_oca/demo/demo.xml,sha256=6k0uK-H1aBiyogVNhQMQfFGL5zUfUGV2M-sSV6LHeUs,204
 odoo/addons/account_reconcile_oca/i18n/account_reconcile_oca.pot,sha256=Sl3e7QgJomoJKdDI85cSMg09BHgxK3IwHHE4E_1MfAs,26250
@@ -19,10 +19,10 @@ odoo/addons/account_reconcile_oca/i18n/zh_CN.po,sha256=Jc9D7xl_9byNX26cd9ClIGDd6
 odoo/addons/account_reconcile_oca/models/__init__.py,sha256=28wbZjUZa30uHQY10BMJtKQ_BqJgwLQMQvB9uv0H_fY,282
 odoo/addons/account_reconcile_oca/models/account_account_reconcile.py,sha256=XXLkq9g4_6x6vZQIAr3i7r-_OJ8vwvC1dTanvL5eWGg,7452
 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=YJMSkGvYGF0K0GJlbxXc7cA0ZO0sWUTHwWXpN8aehvI,53687
+odoo/addons/account_reconcile_oca/models/account_bank_statement_line.py,sha256=lNRQ9zPuJv1xo5DQkrQuzgagYiIef2rvVePJDLThYrg,53777
 odoo/addons/account_reconcile_oca/models/account_journal.py,sha256=PXXoGnByO7ve9_G09tnn95HKJoLvXM1pDxHDdd7bpU4,1359
 odoo/addons/account_reconcile_oca/models/account_move_line.py,sha256=PfdU6cfrKjKMqL_qGqNdyPUWg-frGQ6nR5uCoYtW38M,1212
-odoo/addons/account_reconcile_oca/models/account_reconcile_abstract.py,sha256=XJb9P7PWb7EzWnABzUzjODA4ybK1-91mMhbuM1IRz7o,5101
+odoo/addons/account_reconcile_oca/models/account_reconcile_abstract.py,sha256=6NyQPSx9O0DFR24K9Zh_W5yww4udc9ICHimtlQ1L7Pk,5243
 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.md,sha256=subC7gWq_kRC_nJfLRfrI_IXlNoGgWaq9Es5qXuMa1w,16
@@ -32,7 +32,7 @@ odoo/addons/account_reconcile_oca/readme/USAGE.md,sha256=yNLGo35X7TW2TLyJqHU-gdQ
 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=mH5oRuYGA2CG8gzWHcJzNl3uJck45kUGbBElsQwK3hc,14006
+odoo/addons/account_reconcile_oca/static/description/index.html,sha256=zecT0mcBcZv3SQIb_r03nJ_Ql5wkdmFWNeX8TRrFR0o,14006
 odoo/addons/account_reconcile_oca/static/src/js/reconcile/reconcile_controller.esm.js,sha256=k85Scd4skR5y56TvFVEqB_uf7vCD9Y7RpInETuNBAc8,4891
 odoo/addons/account_reconcile_oca/static/src/js/reconcile/reconcile_kanban_record.esm.js,sha256=ewNK1VQgFZWccTiyJMKYkOG6KtbHHVnI2pdNy9kjkig,467
 odoo/addons/account_reconcile_oca/static/src/js/reconcile/reconcile_renderer.esm.js,sha256=9NSr3iZ7H_QGTpixW5D4WEJuD_u4KRpdYwRmKqcML_k,2117
@@ -54,7 +54,7 @@ odoo/addons/account_reconcile_oca/static/src/scss/reconcile.scss,sha256=b6clO2yW
 odoo/addons/account_reconcile_oca/static/src/xml/reconcile.xml,sha256=oTMZ-vgK_9-7uISjRTrfQeEjo95NbCCSN18uRYFHFkc,9411
 odoo/addons/account_reconcile_oca/tests/__init__.py,sha256=8JhP4auByShS8Z_Ik5dShMuWdh1kBlYP_DLI4Ku8XWA,79
 odoo/addons/account_reconcile_oca/tests/test_account_reconcile.py,sha256=MP5M-NsVhMoYiU675hr1nsvZRRK-4e5KUYMCCKTUHB8,10807
-odoo/addons/account_reconcile_oca/tests/test_bank_account_reconcile.py,sha256=5Thync7EUKOaSykQf8nYJN2C_LPi_l8ElFCKjJxWE20,53515
+odoo/addons/account_reconcile_oca/tests/test_bank_account_reconcile.py,sha256=w5t6xfiS9jwHGS_wC-fyWGCoiVpcFsOIEUs8pn9Bzng,56056
 odoo/addons/account_reconcile_oca/views/account_account.xml,sha256=0RiPmzfRUj54oMYKWM7mLnZL-5IhI5W8fiRruHL0SYc,866
 odoo/addons/account_reconcile_oca/views/account_account_reconcile.xml,sha256=2FKosNTl4hVC_yVq8uRzZvMMrXyEttK_YTsdnV8o0NI,7016
 odoo/addons/account_reconcile_oca/views/account_bank_statement.xml,sha256=QrjQZ3OTsnbopdLnnsFaZ0f7ncLkOUbtVj9osXdxw5k,2436
@@ -63,7 +63,7 @@ odoo/addons/account_reconcile_oca/views/account_journal.xml,sha256=T5tZ5Ev0psYp7
 odoo/addons/account_reconcile_oca/views/account_move.xml,sha256=BnvchVpOJ31M-kCoe6AHDxHMfrEEgJTPPysxguX3xgE,975
 odoo/addons/account_reconcile_oca/views/account_move_line.xml,sha256=Kr_ET1IAat3B8UoW6VPQO3q88JLVdE5-5jpb13ioCbY,5405
 odoo/addons/account_reconcile_oca/views/res_config_settings.xml,sha256=PxIqWILg_L_ahR-SDlDWEqWDJKNumPRifFAGF0BG57E,807
-odoo_addon_account_reconcile_oca-17.0.1.5.18.2.dist-info/METADATA,sha256=X_seInPZTSMaPI3fRD4nkDOqnni5ovVSLvvvHcONttQ,4593
-odoo_addon_account_reconcile_oca-17.0.1.5.18.2.dist-info/WHEEL,sha256=9fEMia4zL7ZuZbnCOrcYogUhmn4XFIVaJ8G4YGI31xc,81
-odoo_addon_account_reconcile_oca-17.0.1.5.18.2.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_account_reconcile_oca-17.0.1.5.18.2.dist-info/RECORD,,
+odoo_addon_account_reconcile_oca-17.0.1.5.19.dist-info/METADATA,sha256=DBnQLyqUp1eXxPPX591WU1O1APmPpxpaLPPnld_22ko,4591
+odoo_addon_account_reconcile_oca-17.0.1.5.19.dist-info/WHEEL,sha256=9fEMia4zL7ZuZbnCOrcYogUhmn4XFIVaJ8G4YGI31xc,81
+odoo_addon_account_reconcile_oca-17.0.1.5.19.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
+odoo_addon_account_reconcile_oca-17.0.1.5.19.dist-info/RECORD,,