Merge pull request #625 from OCA/14.0

Syncing from upstream OCA/account-reconcile (14.0)
brain-tec · Aug 21, 2024 · 9278dd0 · 9278dd0
2 parents b36bc96 + a70efb9
commit 9278dd0
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ addon | version | maintainers | summary
 --- | --- | --- | ---
 [account_bank_statement_reopen_skip_undo_reconciliation](account_bank_statement_reopen_skip_undo_reconciliation/) | 14.0.1.0.0 |  | When reopening a bank statement it will respect the reconciled entries.
 [account_mass_reconcile](account_mass_reconcile/) | 14.0.1.1.2 |  | Account Mass Reconcile
-[account_mass_reconcile_as_job](account_mass_reconcile_as_job/) | 14.0.1.1.1 |  | Account Mass Reconcile as Jobs
+[account_mass_reconcile_as_job](account_mass_reconcile_as_job/) | 14.0.1.1.2 |  | Account Mass Reconcile as Jobs
 [account_mass_reconcile_by_mrp_production](account_mass_reconcile_by_mrp_production/) | 14.0.1.0.0 |  | Allows to reconcile based on the MO line
 [account_mass_reconcile_by_purchase_line](account_mass_reconcile_by_purchase_line/) | 14.0.1.0.0 |  | Allows to reconcile based on the PO line
 [account_mass_reconcile_by_sale_line](account_mass_reconcile_by_sale_line/) | 14.0.1.0.0 |  | Allows to reconcile based on the SO line
@@ -36,7 +36,7 @@ addon | version | maintainers | summary
 [account_reconcile_payment_order](account_reconcile_payment_order/) | 14.0.2.0.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Automatically propose all lines generated from payment orders
 [account_reconcile_reconciliation_date](account_reconcile_reconciliation_date/) | 14.0.1.0.1 |  | Track Reconciliation Date of Payments and Invoices
 [account_reconcile_restrict_partner_mismatch](account_reconcile_restrict_partner_mismatch/) | 14.0.1.0.0 |  | Restrict reconciliation on receivable and payable accounts to the same partner
-[account_reconciliation_widget](account_reconciliation_widget/) | 14.0.2.0.7 |  | Account reconciliation widget
+[account_reconciliation_widget](account_reconciliation_widget/) | 14.0.2.0.8 |  | Account reconciliation widget
 [account_reconciliation_widget_limit_aml](account_reconciliation_widget_limit_aml/) | 14.0.1.0.0 |  | Filter all account move lines in reconciliation view
 [bank_statement_check_number](bank_statement_check_number/) | 14.0.1.0.0 | [![ps-tubtim](https://github.com/ps-tubtim.png?size=30px)](https://github.com/ps-tubtim) | Add the check number in the bank statements
 

diff --git a/account_mass_reconcile_as_job/README.rst b/account_mass_reconcile_as_job/README.rst
@@ -7,7 +7,7 @@ Account Mass Reconcile as Jobs
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:d5f7f21092a4f50b6356af995ff62e226c4b943c5f770dafda6a6aecd6e9be55
+   !! source digest: sha256:f8ee55a2588d224d9287add31dd0709aeb78ec6c8a452118c250c93f29cde055
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/account_mass_reconcile_as_job/__manifest__.py b/account_mass_reconcile_as_job/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
 {
     "name": "Account Mass Reconcile as Jobs",
-    "version": "14.0.1.1.1",
+    "version": "14.0.1.1.2",
     "category": "Accounting",
     "depends": [
         "queue_job",

diff --git a/account_mass_reconcile_as_job/static/description/index.html b/account_mass_reconcile_as_job/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>
@@ -9,10 +8,11 @@
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -275,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -367,7 +367,7 @@ <h1 class="title">Account Mass Reconcile as Jobs</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:d5f7f21092a4f50b6356af995ff62e226c4b943c5f770dafda6a6aecd6e9be55
+!! source digest: sha256:f8ee55a2588d224d9287add31dd0709aeb78ec6c8a452118c250c93f29cde055
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/14.0/account_mass_reconcile_as_job"><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-14-0/account-reconcile-14-0-account_mass_reconcile_as_job"><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=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Modify the mass reconcile to do only the search (create the groups to
@@ -429,7 +429,9 @@ <h2><a class="toc-backref" href="#toc-entry-6">Other credits</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>

diff --git a/account_mass_reconcile_as_job/tests/test_scenario_reconcile_as_job.py b/account_mass_reconcile_as_job/tests/test_scenario_reconcile_as_job.py
@@ -52,7 +52,8 @@ def test_scenario_reconcile_as_job(self):
             trap.perform_enqueued_jobs()
             self.assertEqual("paid", invoice.payment_state)
 
-    def test_scenario_reconcile_lines_as_job(self):
+    def _test_scenario_reconcile_lines_as_job(self):
+        # TODO: Repair this test (giving error in `trap.assert_jobs_count(2)`)
         self.env["ir.config_parameter"].sudo().set_param(
             "account.mass.reconcile.as.job", True
         )

diff --git a/account_reconciliation_widget/README.rst b/account_reconciliation_widget/README.rst
@@ -7,7 +7,7 @@ account_reconciliation_widget
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:0d52517eebbb28021256df2b908243ec57e21ff06fc619cd39ff1785a6552e12
+   !! source digest: sha256:219f08a1b6a8326ee063c0572605434cc36332b0b504c74fef0b9f5c13784bbd
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/account_reconciliation_widget/__manifest__.py b/account_reconciliation_widget/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "account_reconciliation_widget",
-    "version": "14.0.2.0.7",
+    "version": "14.0.2.0.8",
     "category": "Accounting",
     "license": "AGPL-3",
     "summary": "Account reconciliation widget",

diff --git a/account_reconciliation_widget/models/reconciliation_widget.py b/account_reconciliation_widget/models/reconciliation_widget.py
@@ -308,12 +308,6 @@ def get_bank_statement_data(self, bank_statement_line_ids, srch_domain=None):
         """
         if not bank_statement_line_ids:
             return {}
-        bank_statements = (
-            self.env["account.bank.statement.line"]
-            .browse(bank_statement_line_ids)
-            .mapped("statement_id")
-        )
-
         query = """
              SELECT line.id
              FROM account_bank_statement_line line
@@ -340,18 +334,17 @@ def get_bank_statement_data(self, bank_statement_line_ids, srch_domain=None):
             [line["st_line"]["id"] for line in results["lines"]]
         )
         bank_statements_left = bank_statement_lines_left.mapped("statement_id")
-
+        data = bank_statements_left.read(["name", "journal_id"])
+        data = data and data[0] or {}
         results.update(
             {
                 "statement_id": len(bank_statements_left) == 1
-                and bank_statements_left.id
+                and bank_statements_left[0].id
                 or False,
                 "statement_name": len(bank_statements_left) == 1
-                and bank_statements_left.name
-                or False,
-                "journal_id": bank_statements
-                and bank_statements[0].journal_id.id
+                and data.get("name")
                 or False,
+                "journal_id": data and data.get("journal_id", [False])[0] or False,
                 "notifications": [],
             }
         )

diff --git a/account_reconciliation_widget/static/description/index.html b/account_reconciliation_widget/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>
@@ -9,10 +8,11 @@
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -275,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -367,7 +367,7 @@ <h1 class="title">account_reconciliation_widget</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:0d52517eebbb28021256df2b908243ec57e21ff06fc619cd39ff1785a6552e12
+!! source digest: sha256:219f08a1b6a8326ee063c0572605434cc36332b0b504c74fef0b9f5c13784bbd
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/14.0/account_reconciliation_widget"><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-14-0/account-reconcile-14-0-account_reconciliation_widget"><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=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module restores account reconciliation widget moved from Odoo community to enterpise in V. 14.0
@@ -419,7 +419,9 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>