Merge pull request #559 from OCA/16.0

Syncing from upstream OCA/account-reconcile (16.0)
brain-tec · Mar 17, 2024 · c958782 · c958782
2 parents 9808e78 + 7ad0b37
commit c958782
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -25,8 +25,8 @@ addon | version | maintainers | summary
 [account_move_base_import](account_move_base_import/) | 16.0.1.0.1 |  | Journal Entry base import
 [account_move_line_reconcile_manual](account_move_line_reconcile_manual/) | 16.0.2.0.0 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Manually reconcile Journal Items
 [account_move_reconcile_forbid_cancel](account_move_reconcile_forbid_cancel/) | 16.0.1.0.1 |  | Account Move Reconcile Forbid Cancel
-[account_reconcile_oca](account_reconcile_oca/) | 16.0.1.2.9 | [![etobella](https://github.com/etobella.png?size=30px)](https://github.com/etobella) | Reconcile addons for Odoo CE accounting
-[account_statement_base](account_statement_base/) | 16.0.1.3.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/) | 16.0.1.2.10 | [![etobella](https://github.com/etobella.png?size=30px)](https://github.com/etobella) | Reconcile addons for Odoo CE accounting
+[account_statement_base](account_statement_base/) | 16.0.1.3.1 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Base module for Bank Statements
 [base_transaction_id](base_transaction_id/) | 16.0.1.0.0 |  | Base transaction ID for financial institutes
 
 [//]: # (end addons)

diff --git a/account_reconcile_oca/README.rst b/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:41bfe5e8981ad915aa3914a1e1f8f870c70c82e2805bcc259bd27a75e90c4119
+   !! source digest: sha256:d9953a0cdfb581fb43423f15451cf6022c99a95ed64b3b8458a497166ebaa6d3
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/account_reconcile_oca/__manifest__.py b/account_reconcile_oca/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Account Reconcile Oca",
     "summary": """
         Reconcile addons for Odoo CE accounting""",
-    "version": "16.0.1.2.9",
+    "version": "16.0.1.2.10",
     "license": "AGPL-3",
     "author": "CreuBlanca,Dixmit,Odoo Community Association (OCA)",
     "maintainers": ["etobella"],

diff --git a/account_reconcile_oca/migrations/16.0.1.2.0/pre-migration.py b/account_reconcile_oca/migrations/16.0.1.2.0/pre-migration.py
@@ -3,6 +3,10 @@
 
 @openupgrade.migrate()
 def migrate(env, version):
+    if not openupgrade.column_exists(
+        env.cr, "account_bank_statement_line", "reconcile_data"
+    ):
+        return  # coming directly from v15, so reconcile_data doesn't exist
     # Due to the big change we did, we need to loose how data is stored
     openupgrade.logged_query(
         env.cr,

diff --git a/account_reconcile_oca/static/description/index.html b/account_reconcile_oca/static/description/index.html
@@ -366,7 +366,7 @@ <h1 class="title">Account Reconcile Oca</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:41bfe5e8981ad915aa3914a1e1f8f870c70c82e2805bcc259bd27a75e90c4119
+!! source digest: sha256:d9953a0cdfb581fb43423f15451cf6022c99a95ed64b3b8458a497166ebaa6d3
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/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>

diff --git a/account_reconcile_oca/views/account_bank_statement_line.xml b/account_reconcile_oca/views/account_bank_statement_line.xml
@@ -306,11 +306,12 @@
         <field
             name="context"
         >{'default_journal_id': active_id, 'search_default_not_reconciled': True, 'view_ref': 'account_reconcile_oca.bank_statement_line_form_reconcile_view'}</field>
-        <field name="view_mode">tree</field>
+        <field name="view_mode">kanban,tree</field>
         <field
             name="view_ids"
             eval="[(5, 0, 0),
-            (0, 0, {'view_mode': 'tree', 'view_id': ref('bank_statement_line_reconcile_view')})]"
+            (0, 0, {'view_mode': 'kanban', 'view_id': ref('bank_statement_line_reconcile_view')}),
+            (0, 0, {'view_mode': 'tree', 'view_id': ref('account_statement_base.account_bank_statement_line_tree')})]"
         />
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
@@ -325,11 +326,12 @@
         <field
             name="context"
         >{'default_journal_id': active_id, 'view_ref': 'account_reconcile_oca.bank_statement_line_form_reconcile_view'}</field>
-        <field name="view_mode">tree</field>
+        <field name="view_mode">tree,kanban</field>
         <field
             name="view_ids"
             eval="[(5, 0, 0),
-            (0, 0, {'view_mode': 'tree', 'view_id': ref('bank_statement_line_reconcile_view')})]"
+            (0, 0, {'view_mode': 'tree', 'view_id': ref('account_statement_base.account_bank_statement_line_tree')}),
+            (0, 0, {'view_mode': 'kanban', 'view_id': ref('bank_statement_line_reconcile_view')})]"
         />
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">

diff --git a/account_statement_base/README.rst b/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:9d56896373955a98283ed39c9c119716851406b4960187cfcd0fe9433aedbb81
+   !! source digest: sha256:9a858f447676a3776013f766b07795f4826c669e6834584e8d2a2e031a552d34
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png

diff --git a/account_statement_base/__manifest__.py b/account_statement_base/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     "name": "Bank Statement Base",
-    "version": "16.0.1.3.0",
+    "version": "16.0.1.3.1",
     "category": "Accounting",
     "license": "LGPL-3",
     "summary": "Base module for Bank Statements",

diff --git a/account_statement_base/static/description/index.html b/account_statement_base/static/description/index.html
@@ -1,4 +1,3 @@
-<?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>
@@ -367,7 +366,7 @@ <h1 class="title">Bank Statement Base</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:9d56896373955a98283ed39c9c119716851406b4960187cfcd0fe9433aedbb81
+!! source digest: sha256:9a858f447676a3776013f766b07795f4826c669e6834584e8d2a2e031a552d34
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Mature" src="https://img.shields.io/badge/maturity-Mature-brightgreen.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-reconcile/tree/16.0/account_statement_base"><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_statement_base"><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 is a technical module that adds the views of the <strong>Bank Statement Lines</strong> (since Odoo 16.0, these views are not part of the <em>account</em> module any more).</p>

diff --git a/account_statement_base/views/account_bank_statement_line.xml b/account_statement_base/views/account_bank_statement_line.xml
@@ -60,21 +60,51 @@
 <record id="account_bank_statement_line_tree" model="ir.ui.view">
     <field name="model">account.bank.statement.line</field>
     <field name="arch" type="xml">
-        <tree decoration-muted="is_reconciled">
+        <tree editable="top" multi_edit="1" decoration-muted="is_reconciled">
             <field name="sequence" widget="handle" />
-            <field name="date" />
-            <field name="payment_ref" />
-            <field name="ref" optional="hide" />
-            <field name="partner_id" />
-            <field name="amount" />
+            <field name="date" attrs="{'readonly': [('is_reconciled', '=', True)]}" />
+            <field
+                    name="payment_ref"
+                    attrs="{'readonly': [('is_reconciled', '=', True)]}"
+                />
+            <field
+                    name="ref"
+                    optional="hide"
+                    attrs="{'readonly': [('is_reconciled', '=', True)]}"
+                />
+            <field
+                    name="partner_id"
+                    attrs="{'readonly': [('is_reconciled', '=', True)]}"
+                />
+            <field name="amount" attrs="{'readonly': [('is_reconciled', '=', True)]}" />
+            <field
+                    name="foreign_currency_id"
+                    optional="hidden"
+                    groups="base.group_multi_currency"
+                    attrs="{'readonly': [('is_reconciled', '=', True)]}"
+                />
             <field
                     name="amount_currency"
                     optional="hide"
                     groups="base.group_multi_currency"
+                    attrs="{'readonly': [('is_reconciled', '=', True)]}"
+                />
+            <field
+                    name="narration"
+                    optional="hide"
+                    string="Notes"
+                    attrs="{'readonly': [('is_reconciled', '=', True)]}"
+                />
+            <field
+                    name="journal_id"
+                    optional="hide"
+                    attrs="{'readonly': [('is_reconciled', '=', True)]}"
+                />
+            <field
+                    name="partner_bank_id"
+                    optional="hide"
+                    attrs="{'readonly': [('is_reconciled', '=', True)]}"
                 />
-            <field name="narration" optional="hide" string="Notes" />
-            <field name="journal_id" optional="hide" />
-            <field name="partner_bank_id" optional="hide" />
             <button
                     name="action_undo_reconciliation"
                     type="object"
@@ -85,9 +115,9 @@
             <field name="company_id" invisible="1" />
             <field name="is_reconciled" invisible="1" />
             <field name="currency_id" invisible="1" />
-            <field name="foreign_currency_id" invisible="1" />
             <field name="country_code" invisible="1" />
             <field name="state" invisible="1" />
+            <field name="suitable_journal_ids" invisible="1" />
         </tree>
     </field>
 </record>