Merge pull request #213 from OCA/17.0

Syncing from upstream OCA/account-reconcile (17.0)
brain-tec · Oct 7, 2024 · 3aa942a · 3aa942a
2 parents 35804fb + e0dcf23
commit 3aa942a
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 10 deletions.
diff --git a/README.md b/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.3.0 | [![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.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/) | 17.0.1.3.1 | [![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.3.1 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Base module for Bank Statements
 
 [//]: # (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:88b6b066ad75c60faa27b6558ead2c5bf920b1e5f1baf6e5b1414a4361cd5d63
+   !! source digest: sha256:ced9f9f34e2e93a89da3b24795e651216f00dfd02b395e3f876cee5ddf39dd78
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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": "17.0.1.3.0",
+    "version": "17.0.1.3.1",
     "license": "AGPL-3",
     "author": "CreuBlanca,Dixmit,Odoo Community Association (OCA)",
     "maintainers": ["etobella"],

diff --git a/account_reconcile_oca/static/description/index.html b/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:88b6b066ad75c60faa27b6558ead2c5bf920b1e5f1baf6e5b1414a4361cd5d63
+!! source digest: sha256:ced9f9f34e2e93a89da3b24795e651216f00dfd02b395e3f876cee5ddf39dd78
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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

diff --git a/account_reconcile_oca/static/src/scss/reconcile.scss b/account_reconcile_oca/static/src/scss/reconcile.scss
@@ -16,9 +16,9 @@
         width: 100%;
         .o_reconcile_create_statement {
             position: absolute;
-            height: 4px;
+            height: 0px;
             margin: 0;
-            padding: 2px 0 0 0;
+            padding: 0 0 0 0;
             border: 0;
             top: -14px;
             opacity: 0;

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:a6db86062f116142106b9ac1a1fd98c3f66c7bbb4d98a35bcff5c002288792a6
+   !! source digest: sha256:baed690e1bab1fc9aea5f5fbb74b80f3a00ed79c64bd911ce8b59571b8b27ad4
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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": "17.0.1.3.0",
+    "version": "17.0.1.3.1",
     "category": "Accounting",
     "license": "LGPL-3",
     "summary": "Base module for Bank Statements",

diff --git a/account_statement_base/models/account_bank_statement.py b/account_statement_base/models/account_bank_statement.py
@@ -4,6 +4,25 @@
 class AccountBankStatement(models.Model):
     _inherit = "account.bank.statement"
 
+    # TODO: Delete if merged https://github.com/odoo/odoo/pull/182497
+    def _compute_date_index(self):
+        """The super() method does not take into account lines that do not have
+        internal_index set yet, and causes sorted() to fail, we need to re-define
+        the method in these cases to avoid the error.
+        """
+        _self = self
+        for stmt in self:
+            if any(not line.internal_index for line in stmt.line_ids):
+                _self -= stmt
+                sorted_lines = stmt.line_ids.filtered("internal_index").sorted(
+                    "internal_index"
+                )
+                stmt.first_line_index = sorted_lines[:1].internal_index
+                stmt.date = sorted_lines.filtered(lambda line: line.state == "posted")[
+                    -1:
+                ].date
+        return super(AccountBankStatement, _self)._compute_date_index()
+
     def action_open_statement_lines(self):
         self.ensure_one()
         if not self:

diff --git a/account_statement_base/models/account_bank_statement_line.py b/account_statement_base/models/account_bank_statement_line.py
@@ -7,6 +7,13 @@
 class AccountBankStatementLine(models.Model):
     _inherit = "account.bank.statement.line"
 
+    # TODO: Delete if merged https://github.com/odoo/odoo/pull/182497
+    def _compute_running_balance(self):
+        # We need to set value to all records because super() does not do it using sql.
+        for item in self:
+            item.running_balance = item.running_balance
+        return super()._compute_running_balance()
+
     def action_open_journal_entry(self):
         self.ensure_one()
         if not self:

diff --git a/account_statement_base/static/description/index.html b/account_statement_base/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Bank Statement Base</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:a6db86062f116142106b9ac1a1fd98c3f66c7bbb4d98a35bcff5c002288792a6
+!! source digest: sha256:baed690e1bab1fc9aea5f5fbb74b80f3a00ed79c64bd911ce8b59571b8b27ad4
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/17.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-17-0/account-reconcile-17-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=17.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