Merge pull request #642 from OCA/17.0

Syncing from upstream OCA/account-reconcile (17.0)
brain-tec · Sep 21, 2024 · 2aa9344 · 2aa9344
2 parents 51b81a6 + 0a23778
commit 2aa9344
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ 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.4 | [![etobella](https://github.com/etobella.png?size=30px)](https://github.com/etobella) | Reconcile addons for Odoo CE accounting
+[account_reconcile_oca](account_reconcile_oca/) | 17.0.1.2.5 | [![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)

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:fec87faa0dc16f2bc940c74b388d5fa2066077f7160ace0b675230f353212982
+   !! source digest: sha256:92200b09b6310633c2682bfb6982cd9a935abeaac6c3b607cbc8498d38ac8d4f
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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.2.4",
+    "version": "17.0.1.2.5",
     "license": "AGPL-3",
     "author": "CreuBlanca,Dixmit,Odoo Community Association (OCA)",
     "maintainers": ["etobella"],

diff --git a/account_reconcile_oca/models/account_account_reconcile.py b/account_reconcile_oca/models/account_account_reconcile.py
@@ -47,7 +47,11 @@ def _select(self):
             SELECT
                 min(aml.id) as id,
                 MAX({account_name}) as name,
-                aml.partner_id,
+                CASE
+                    WHEN a.account_type in ('asset_receivable', 'liability_payable')
+                        THEN aml.partner_id
+                    ELSE NULL
+                    END as partner_id,
                 a.id as account_id,
                 FALSE as is_reconciled,
                 aml.currency_id as currency_id,
@@ -73,7 +77,14 @@ def _where(self):
     def _groupby(self):
         return """
             GROUP BY
-                a.id, aml.partner_id, aml.currency_id, a.company_id
+                a.id,
+                CASE
+                    WHEN a.account_type in ('asset_receivable', 'liability_payable')
+                        THEN aml.partner_id
+                    ELSE NULL
+                END,
+                aml.currency_id,
+                a.company_id
         """
 
     def _having(self):

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:fec87faa0dc16f2bc940c74b388d5fa2066077f7160ace0b675230f353212982
+!! source digest: sha256:92200b09b6310633c2682bfb6982cd9a935abeaac6c3b607cbc8498d38ac8d4f
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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