Merge branch '17.0' into 17.0-mig-account_in_payment

README.md

@@ -23,8 +23,8 @@ addon | version | maintainers | summary
 --- | --- | --- | ---
 [account_mass_reconcile](account_mass_reconcile/) | 17.0.1.0.1 |  | Account Mass Reconcile
 [account_reconcile_model_oca](account_reconcile_model_oca/) | 17.0.1.0.1 |  | This includes the logic moved from Odoo Community to Odoo Enterprise
-[account_reconcile_oca](account_reconcile_oca/) | 17.0.1.2.3 | [![etobella](https://github.com/etobella.png?size=30px)](https://github.com/etobella) | Reconcile addons for Odoo CE accounting
-[account_statement_base](account_statement_base/) | 17.0.1.0.0 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Base module for Bank Statements
+[account_reconcile_oca](account_reconcile_oca/) | 17.0.1.2.4 | [![etobella](https://github.com/etobella.png?size=30px)](https://github.com/etobella) | Reconcile addons for Odoo CE accounting
+[account_statement_base](account_statement_base/) | 17.0.1.0.1 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Base module for Bank Statements
 
 [//]: # (end addons)
 

account_reconcile_oca/README.rst

@@ -7,7 +7,7 @@ Account Reconcile Oca
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:03f1bec0fb4d71509ddd5f9fe13713c9f65957e744454883322244ae09e52425
+   !! source digest: sha256:fec87faa0dc16f2bc940c74b388d5fa2066077f7160ace0b675230f353212982
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

account_reconcile_oca/__manifest__.py

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

account_reconcile_oca/models/account_bank_statement_line.py

@@ -412,8 +412,9 @@ def _reconcile_data_by_model(self, data, reconcile_model, reconcile_auxiliary_id
                 continue
             new_data.append(line_data)
             liquidity_amount += line_data["amount"]
+
         for line in reconcile_model._get_write_off_move_lines_dict(
-            -liquidity_amount, self._retrieve_partner()
+            -liquidity_amount, self._retrieve_partner().id
         ):
             new_line = line.copy()
             amount = line.get("balance")

account_reconcile_oca/static/description/index.html

@@ -367,7 +367,7 @@ <h1 class="title">Account Reconcile Oca</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:03f1bec0fb4d71509ddd5f9fe13713c9f65957e744454883322244ae09e52425
+!! source digest: sha256:fec87faa0dc16f2bc940c74b388d5fa2066077f7160ace0b675230f353212982
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/licence-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

account_reconcile_oca/static/src/js/reconcile/reconcile_controller.esm.js

@@ -33,7 +33,7 @@ export class ReconcileController extends KanbanController {
         });
     }
     get journalId() {
-        if (this.props.resModel === "account.bank.statement.line") {
+        if (this.props.context.active_model === "account.journal") {
             return this.props.context.active_id;
         }
         return false;
@@ -69,6 +69,7 @@ export class ReconcileController extends KanbanController {
         this.action.doAction(action, {
             onClose: async () => {
                 await this.model.root.load();
+                await this.updateJournalInfo();
                 this.render(true);
             },
         });

account_reconcile_oca/static/src/js/reconcile_form/reconcile_form_controller.esm.js

@@ -23,10 +23,12 @@ export class ReconcileFormController extends FormController {
     async reloadFormController() {
         var is_reconciled = this.model.root.data.is_reconciled;
         await this.model.root.load();
-        if (!is_reconciled && this.model.root.data.is_reconciled) {
-            // This only happens when we press the reconcile button
-            if (this.env.parentController) {
-                // Showing rainbow man
+        if (this.env.parentController) {
+            // We will update the parent controller every time we reload the form.
+            await this.env.parentController.model.root.load();
+            await this.env.parentController.render(true);
+            if (!is_reconciled && this.model.root.data.is_reconciled) {
+                // This only happens when we press the reconcile button for showing rainbow man
                 const message = await this.orm.call(
                     "account.journal",
                     "get_rainbowman_message",
@@ -36,8 +38,6 @@ export class ReconcileFormController extends FormController {
                     this.env.parentController.setRainbowMan(message);
                 }
                 // Refreshing
-                await this.env.parentController.model.root.load();
-                await this.env.parentController.render(true);
                 this.env.parentController.selectRecord();
             }
         }

account_reconcile_oca/views/account_move.xml

@@ -13,6 +13,7 @@
                     type="action"
                     name="%(account_reconcile_oca.action_bank_statement_line_move_view_reconcile)s"
                     string="Bank reconcile"
+                    context="{'search_default_move_id': id}"
                     class="btn btn-primary"
                     icon="fa-list"
                     invisible="statement_line_id == False"

account_reconcile_oca/views/account_move_line.xml

@@ -45,7 +45,7 @@
                     <field
                     name="name"
                     string="Journal Item"
-                    filter_domain="[                         '|', '|', '|',                         ('name', 'ilike', self), ('ref', 'ilike', self), ('account_id', 'ilike', self), ('partner_id', 'ilike', self)]"
+                    filter_domain="['|','|','|','|','|',('name', 'ilike', self), ('ref', 'ilike', self), ('account_id', 'ilike', self), ('partner_id', 'ilike', self),('amount_residual', 'ilike', self),('amount_residual_currency', 'ilike', self)]"
                 />
                     <field name="name" />
                     <field name="ref" />

account_statement_base/README.rst

@@ -7,7 +7,7 @@ Bank Statement Base
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:ebb315e960fae495344d0aa2729ae20054f785e44d1eb1e75adfbcce350e911e
+   !! source digest: sha256:fda7731d828a881d3d3f7d31cc319a4653655b80fda1bece80ea21b3a1e89add
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png
@@ -58,7 +58,14 @@ Authors
 Contributors
 ------------
 
--  Alexis de Lattre <[email protected]>
+-  `Akretion <https://www.akretion.com>`__:
+
+   -  Alexis de Lattre <[email protected]>
+
+-  `Tecnativa <https://www.tecnativa.com>`__:
+
+   -  Carlos Dauden
+   -  Sergio Teruel
 
 Maintainers
 -----------

account_statement_base/__init__.py

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

account_statement_base/__manifest__.py

@@ -4,7 +4,7 @@
 
 {
     "name": "Bank Statement Base",
-    "version": "17.0.1.0.0",
+    "version": "17.0.1.0.1",
     "category": "Accounting",
     "license": "LGPL-3",
     "summary": "Base module for Bank Statements",
@@ -14,8 +14,8 @@
     "website": "https://github.com/OCA/account-reconcile",
     "depends": ["account"],
     "data": [
-        "views/account_bank_statement.xml",
         "views/account_bank_statement_line.xml",
+        "views/account_bank_statement.xml",  # Keep order
     ],
     "installable": True,
 }

account_statement_base/i18n/account_statement_base.pot

@@ -13,6 +13,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: account_statement_base
+#: model_terms:ir.ui.view,arch_db:account_statement_base.view_bank_statement_form
+msgid "Bank Statement"
+msgstr ""
+
 #. module: account_statement_base
 #: model:ir.actions.act_window,name:account_statement_base.account_bank_statement_line_action
 msgid "Bank Statement Lines"
@@ -24,6 +29,7 @@ msgid "Date"
 msgstr ""
 
 #. module: account_statement_base
+#: model:ir.model,name:account_statement_base.model_account_journal
 #: model_terms:ir.ui.view,arch_db:account_statement_base.account_bank_statement_line_search
 msgid "Journal"
 msgstr ""
@@ -73,3 +79,13 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:account_statement_base.account_bank_statement_line_search
 msgid "Transaction Type"
 msgstr ""
+
+#. module: account_statement_base
+#: model_terms:ir.ui.view,arch_db:account_statement_base.view_bank_statement_form
+msgid "Transactions"
+msgstr ""
+
+#. module: account_statement_base
+#: model_terms:ir.ui.view,arch_db:account_statement_base.view_bank_statement_form
+msgid "e.g. BNK/2021/0001"
+msgstr ""

account_statement_base/i18n/es.po

@@ -16,6 +16,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.17\n"
 
+#. module: account_statement_base
+#: model_terms:ir.ui.view,arch_db:account_statement_base.view_bank_statement_form
+msgid "Bank Statement"
+msgstr ""
+
 #. module: account_statement_base
 #: model:ir.actions.act_window,name:account_statement_base.account_bank_statement_line_action
 msgid "Bank Statement Lines"
@@ -27,6 +32,7 @@ msgid "Date"
 msgstr "Fecha"
 
 #. module: account_statement_base
+#: model:ir.model,name:account_statement_base.model_account_journal
 #: model_terms:ir.ui.view,arch_db:account_statement_base.account_bank_statement_line_search
 msgid "Journal"
 msgstr "Dario"
@@ -76,3 +82,13 @@ msgstr "Para revisar"
 #: model_terms:ir.ui.view,arch_db:account_statement_base.account_bank_statement_line_search
 msgid "Transaction Type"
 msgstr "Tipo de transacción"
+
+#. module: account_statement_base
+#: model_terms:ir.ui.view,arch_db:account_statement_base.view_bank_statement_form
+msgid "Transactions"
+msgstr ""
+
+#. module: account_statement_base
+#: model_terms:ir.ui.view,arch_db:account_statement_base.view_bank_statement_form
+msgid "e.g. BNK/2021/0001"
+msgstr ""

account_statement_base/i18n/fr.po

@@ -16,6 +16,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.17\n"
 
+#. module: account_statement_base
+#: model_terms:ir.ui.view,arch_db:account_statement_base.view_bank_statement_form
+msgid "Bank Statement"
+msgstr ""
+
 #. module: account_statement_base
 #: model:ir.actions.act_window,name:account_statement_base.account_bank_statement_line_action
 msgid "Bank Statement Lines"
@@ -27,6 +32,7 @@ msgid "Date"
 msgstr "Date"
 
 #. module: account_statement_base
+#: model:ir.model,name:account_statement_base.model_account_journal
 #: model_terms:ir.ui.view,arch_db:account_statement_base.account_bank_statement_line_search
 msgid "Journal"
 msgstr "Journal"
@@ -76,3 +82,13 @@ msgstr "À vérifier"
 #: model_terms:ir.ui.view,arch_db:account_statement_base.account_bank_statement_line_search
 msgid "Transaction Type"
 msgstr "Type de transaction"
+
+#. module: account_statement_base
+#: model_terms:ir.ui.view,arch_db:account_statement_base.view_bank_statement_form
+msgid "Transactions"
+msgstr ""
+
+#. module: account_statement_base
+#: model_terms:ir.ui.view,arch_db:account_statement_base.view_bank_statement_form
+msgid "e.g. BNK/2021/0001"
+msgstr ""

account_statement_base/i18n/it.po

@@ -6,15 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 17.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2024-02-06 09:35+0000\n"
+"PO-Revision-Date: 2024-09-09 09:06+0000\n"
 "Last-Translator: mymage <[email protected]>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.17\n"
+"X-Generator: Weblate 5.6.2\n"
+
+#. module: account_statement_base
+#: model_terms:ir.ui.view,arch_db:account_statement_base.view_bank_statement_form
+msgid "Bank Statement"
+msgstr "Estratto conto bancario"
 
 #. module: account_statement_base
 #: model:ir.actions.act_window,name:account_statement_base.account_bank_statement_line_action
@@ -27,6 +32,7 @@ msgid "Date"
 msgstr "Data"
 
 #. module: account_statement_base
+#: model:ir.model,name:account_statement_base.model_account_journal
 #: model_terms:ir.ui.view,arch_db:account_statement_base.account_bank_statement_line_search
 msgid "Journal"
 msgstr "Registro"
@@ -76,3 +82,13 @@ msgstr "Da controllare"
 #: model_terms:ir.ui.view,arch_db:account_statement_base.account_bank_statement_line_search
 msgid "Transaction Type"
 msgstr "Tipo transazione"
+
+#. module: account_statement_base
+#: model_terms:ir.ui.view,arch_db:account_statement_base.view_bank_statement_form
+msgid "Transactions"
+msgstr "Transazioni"
+
+#. module: account_statement_base
+#: model_terms:ir.ui.view,arch_db:account_statement_base.view_bank_statement_form
+msgid "e.g. BNK/2021/0001"
+msgstr "es. BNK/2021/0001"

account_statement_base/i18n/pt_BR.po

@@ -16,6 +16,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.17\n"
 
+#. module: account_statement_base
+#: model_terms:ir.ui.view,arch_db:account_statement_base.view_bank_statement_form
+msgid "Bank Statement"
+msgstr ""
+
 #. module: account_statement_base
 #: model:ir.actions.act_window,name:account_statement_base.account_bank_statement_line_action
 msgid "Bank Statement Lines"
@@ -27,6 +32,7 @@ msgid "Date"
 msgstr "Data"
 
 #. module: account_statement_base
+#: model:ir.model,name:account_statement_base.model_account_journal
 #: model_terms:ir.ui.view,arch_db:account_statement_base.account_bank_statement_line_search
 msgid "Journal"
 msgstr "Diário"
@@ -76,3 +82,13 @@ msgstr "Para Verificar"
 #: model_terms:ir.ui.view,arch_db:account_statement_base.account_bank_statement_line_search
 msgid "Transaction Type"
 msgstr "Tipo de Transação"
+
+#. module: account_statement_base
+#: model_terms:ir.ui.view,arch_db:account_statement_base.view_bank_statement_form
+msgid "Transactions"
+msgstr ""
+
+#. module: account_statement_base
+#: model_terms:ir.ui.view,arch_db:account_statement_base.view_bank_statement_form
+msgid "e.g. BNK/2021/0001"
+msgstr ""

account_statement_base/i18n/zh.po

@@ -14,6 +14,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. module: account_statement_base
+#: model_terms:ir.ui.view,arch_db:account_statement_base.view_bank_statement_form
+msgid "Bank Statement"
+msgstr ""
+
 #. module: account_statement_base
 #: model:ir.actions.act_window,name:account_statement_base.account_bank_statement_line_action
 msgid "Bank Statement Lines"
@@ -25,6 +30,7 @@ msgid "Date"
 msgstr ""
 
 #. module: account_statement_base
+#: model:ir.model,name:account_statement_base.model_account_journal
 #: model_terms:ir.ui.view,arch_db:account_statement_base.account_bank_statement_line_search
 msgid "Journal"
 msgstr ""
@@ -74,3 +80,13 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:account_statement_base.account_bank_statement_line_search
 msgid "Transaction Type"
 msgstr ""
+
+#. module: account_statement_base
+#: model_terms:ir.ui.view,arch_db:account_statement_base.view_bank_statement_form
+msgid "Transactions"
+msgstr ""
+
+#. module: account_statement_base
+#: model_terms:ir.ui.view,arch_db:account_statement_base.view_bank_statement_form
+msgid "e.g. BNK/2021/0001"
+msgstr ""