odoo-addon-account-reconcile-oca 17.0.1.5.16__py3-none-any.whl → 17.0.1.5.18__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:31f91db271f8646a719ad4e114a597364eb5e5746ad43e7c866e4df326982710
+   !! source digest: sha256:f5ea6e3a47d5601899213ca2b0c16edce1690f0c20d71db238c0ea7a9f696623
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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.16",
+    "version": "17.0.1.5.18",
     "license": "AGPL-3",
     "author": "CreuBlanca,Dixmit,Odoo Community Association (OCA)",
     "maintainers": ["etobella"],

odoo/addons/account_reconcile_oca/i18n/account_reconcile_oca.pot

@@ -493,6 +493,11 @@ msgstr ""
 msgid "Payable"
 msgstr ""
 
+#. module: account_reconcile_oca
+#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__previous_manual_amount_in_currency
+msgid "Previous Manual Amount In Currency"
+msgstr ""
+
 #. module: account_reconcile_oca
 #: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_move_line_search_reconcile_view
 msgid "Purchases"

odoo/addons/account_reconcile_oca/models/account_bank_statement_line.py

@@ -77,6 +77,12 @@ class AccountBankStatementLine(models.Model):
         prefetch=False,
         currency_field="manual_in_currency_id",
     )
+    previous_manual_amount_in_currency = fields.Monetary(
+        store=False,
+        default=False,
+        prefetch=False,
+        currency_field="manual_in_currency_id",
+    )
     manual_exchange_counterpart = fields.Boolean(
         store=False,
     )
@@ -86,7 +92,11 @@ class AccountBankStatementLine(models.Model):
         store=False,
         default=False,
         prefetch=False,
-        domain=[("rule_type", "=", "writeoff_button")],
+        domain="""
+        [('rule_type', '=', 'writeoff_button'),
+        '|',
+        ('match_journal_ids', '=', False), ('match_journal_ids', '=', journal_id)]
+        """,
     )
     manual_name = fields.Char(store=False, default=False, prefetch=False)
     manual_amount = fields.Monetary(
@@ -384,6 +394,7 @@ class AccountBankStatementLine(models.Model):
             "currency_id"
         ] != line.get("line_currency_id")
         self.manual_amount_in_currency = line.get("currency_amount")
+        self.previous_manual_amount_in_currency = line.get("currency_amount")
         self.manual_name = line["name"]
         self.manual_exchange_counterpart = line.get("is_exchange_counterpart", False)
         self.manual_partner_id = line.get("partner_id") and line["partner_id"][0]
@@ -402,10 +413,6 @@ class AccountBankStatementLine(models.Model):
         data = self.reconcile_data_info.get("data", [])
         new_data = []
         related_move_line_id = False
-        for line in data:
-            if line.get("reference") == self.manual_reference:
-                related_move_line_id = line.get("id")
-                break
         for line in data:
             if (
                 self.manual_delete
@@ -429,21 +436,6 @@ class AccountBankStatementLine(models.Model):
         )
         self.can_reconcile = self.reconcile_data_info.get("can_reconcile", False)
 
-    @api.onchange("manual_amount_in_currency")
-    def _onchange_manual_amount_in_currency(self):
-        if (
-            self.manual_line_id.exists()
-            and self.manual_line_id
-            and self.manual_kind != "liquidity"
-        ):
-            self.manual_amount = self.manual_in_currency_id._convert(
-                self.manual_amount_in_currency,
-                self.company_id.currency_id,
-                self.company_id,
-                self.manual_line_id.date,
-            )
-        self._onchange_manual_reconcile_vals()
-
     def _get_manual_reconcile_vals(self):
         vals = {
             "name": self.manual_name,
@@ -462,6 +454,7 @@ class AccountBankStatementLine(models.Model):
             "credit": -self.manual_amount if self.manual_amount < 0 else 0.0,
             "debit": self.manual_amount if self.manual_amount > 0 else 0.0,
             "analytic_distribution": self.analytic_distribution,
+            "currency_amount": self.manual_amount_in_currency,
         }
         liquidity_lines, _suspense_lines, _other_lines = self._seek_for_lines()
         if self.manual_line_id and self.manual_line_id.id not in liquidity_lines.ids:
@@ -483,11 +476,35 @@ class AccountBankStatementLine(models.Model):
         "manual_name",
         "manual_amount",
         "analytic_distribution",
+        "manual_amount_in_currency",
     )
     def _onchange_manual_reconcile_vals(self):
         self.ensure_one()
         data = self.reconcile_data_info.get("data", [])
         new_data = []
+        if (
+            self.manual_in_currency_id
+            and float_compare(
+                self.manual_amount_in_currency,
+                self.previous_manual_amount_in_currency,
+                precision_rounding=self.manual_in_currency_id.rounding,
+            )
+            != 0
+        ):
+            in_currency_date = self.date
+            if (
+                self.manual_line_id.exists()
+                and self.manual_line_id
+                and self.manual_kind != "liquidity"
+            ):
+                in_currency_date = self.manual_line_id.date
+            self.manual_amount = self.manual_in_currency_id._convert(
+                self.manual_amount_in_currency,
+                self.manual_currency_id,
+                self.company_id,
+                in_currency_date,
+            )
+        self.previous_manual_amount_in_currency = self.manual_amount_in_currency
         for line in data:
             if line["reference"] == self.manual_reference:
                 if self._check_line_changed(line):
@@ -510,6 +527,7 @@ class AccountBankStatementLine(models.Model):
                 )
                 line.update(
                     {
+                        "currency_amount": self.manual_amount_in_currency,
                         "amount": amount,
                         "credit": -amount if amount < 0 else 0.0,
                         "debit": amount if amount > 0 else 0.0,

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:31f91db271f8646a719ad4e114a597364eb5e5746ad43e7c866e4df326982710
+!! source digest: sha256:f5ea6e3a47d5601899213ca2b0c16edce1690f0c20d71db238c0ea7a9f696623
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/views/account_bank_statement_line.xml

@@ -226,6 +226,7 @@
                 <field name="is_reconciled" invisible="1" />
                 <field name="foreign_currency_id" invisible="1" />
                 <field name="company_currency_id" invisible="1" />
+                <field name="previous_manual_amount_in_currency" invisible="1" />
                 <field name="currency_id" invisible="1" />
                 <field
                     name="reconcile_data_info"

{odoo_addon_account_reconcile_oca-17.0.1.5.16.dist-info → odoo_addon_account_reconcile_oca-17.0.1.5.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-account_reconcile_oca
-Version: 17.0.1.5.16
+Version: 17.0.1.5.18
 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
@@ -14,6 +14,7 @@ Classifier: Programming Language :: Python
 Classifier: Framework :: Odoo
 Classifier: Framework :: Odoo :: 17.0
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3
+Description-Content-Type: text/x-rst
 
 .. image:: https://odoo-community.org/readme-banner-image
    :target: https://odoo-community.org/get-involved?utm_source=readme
@@ -28,7 +29,7 @@ Account Reconcile Oca
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:31f91db271f8646a719ad4e114a597364eb5e5746ad43e7c866e4df326982710
+   !! source digest: sha256:f5ea6e3a47d5601899213ca2b0c16edce1690f0c20d71db238c0ea7a9f696623
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

{odoo_addon_account_reconcile_oca-17.0.1.5.16.dist-info → odoo_addon_account_reconcile_oca-17.0.1.5.18.dist-info}/RECORD

@@ -1,9 +1,9 @@
-odoo/addons/account_reconcile_oca/README.rst,sha256=I858WiTfw2KJ1y_gvScIsAHZbyp59-01RDr_3Lwu7kE,3868
+odoo/addons/account_reconcile_oca/README.rst,sha256=PYcm19MAMLljoLQFq6ChLxEXffABSyZy-2uL3UUf4q4,3868
 odoo/addons/account_reconcile_oca/__init__.py,sha256=vqRYeBgCVZMpZhYvILSxVsNLC9V7zDnvxMnKU8RQP94,55
-odoo/addons/account_reconcile_oca/__manifest__.py,sha256=xcAvk0SFrBlmenGFsrz-PSB3FMgrXwM6-oonPHldork,1899
+odoo/addons/account_reconcile_oca/__manifest__.py,sha256=r5SwsEstn-XV6uY4cXZaYz3ndUzp94nM9B0NXCbqwhg,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=BcfAQyKghg_o7ALjpCAMiPLW-CShv_JKszBr_tkMdJc,26028
+odoo/addons/account_reconcile_oca/i18n/account_reconcile_oca.pot,sha256=Sl3e7QgJomoJKdDI85cSMg09BHgxK3IwHHE4E_1MfAs,26250
 odoo/addons/account_reconcile_oca/i18n/ca.po,sha256=RoTNlADuJhgQ_ElabXWViCQJ2Z1CK-EHT3jH53mnZGM,28078
 odoo/addons/account_reconcile_oca/i18n/es.po,sha256=7URuRFpoH8vxfbrZiPawHn8fY7JShVIff3y1Lj7KhtI,28949
 odoo/addons/account_reconcile_oca/i18n/fr.po,sha256=RBaZBVI69TSIKAH1cP6V3oBEqFxuP3cu868Tw1yACpM,28341
@@ -19,7 +19,7 @@ odoo/addons/account_reconcile_oca/i18n/zh_CN.po,sha256=ILUDUbsuaR12dfjEEYGXlMa-V
 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=Y3dBhqz2Mbdu6XM5PE4A6BWoh9-vN-pfOK3dmQSC4a4,52953
+odoo/addons/account_reconcile_oca/models/account_bank_statement_line.py,sha256=YJMSkGvYGF0K0GJlbxXc7cA0ZO0sWUTHwWXpN8aehvI,53687
 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
@@ -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=X3q7QWYMdTqIiHkk6U4UzkKaHh5wZ_31JQrvP4UHR1s,14006
+odoo/addons/account_reconcile_oca/static/description/index.html,sha256=mH5oRuYGA2CG8gzWHcJzNl3uJck45kUGbBElsQwK3hc,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
@@ -58,12 +58,12 @@ odoo/addons/account_reconcile_oca/tests/test_bank_account_reconcile.py,sha256=5T
 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
-odoo/addons/account_reconcile_oca/views/account_bank_statement_line.xml,sha256=CKERtA3HeYQa9BRMxFdxzpXnOweb1x7qwWD2uQJ8q20,22010
+odoo/addons/account_reconcile_oca/views/account_bank_statement_line.xml,sha256=osgKE8XUUJPANCazrjgAm4WfoyKqV2gY6ayh5ifNLnc,22092
 odoo/addons/account_reconcile_oca/views/account_journal.xml,sha256=T5tZ5Ev0psYp78f3NkNVJjWMUOssYJ7WzLpsMKyOvI4,3378
 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.16.dist-info/METADATA,sha256=2gUtit9_fibujq33gS_NFEONo1c2gT4BTLo-I5nZrs8,4554
-odoo_addon_account_reconcile_oca-17.0.1.5.16.dist-info/WHEEL,sha256=9fEMia4zL7ZuZbnCOrcYogUhmn4XFIVaJ8G4YGI31xc,81
-odoo_addon_account_reconcile_oca-17.0.1.5.16.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_account_reconcile_oca-17.0.1.5.16.dist-info/RECORD,,
+odoo_addon_account_reconcile_oca-17.0.1.5.18.dist-info/METADATA,sha256=8k3xlaspUdbXxYAax-nTCC96Wco2U0pKrS0Oha4t7pA,4591
+odoo_addon_account_reconcile_oca-17.0.1.5.18.dist-info/WHEEL,sha256=9fEMia4zL7ZuZbnCOrcYogUhmn4XFIVaJ8G4YGI31xc,81
+odoo_addon_account_reconcile_oca-17.0.1.5.18.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
+odoo_addon_account_reconcile_oca-17.0.1.5.18.dist-info/RECORD,,