From 6fb207d831330213f34c837b35423d2c33fc09a3 Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Wed, 16 Sep 2020 13:33:10 +0200 Subject: [PATCH] [13.0][MIG] account_skip_bank_reconciliation --- account_skip_bank_reconciliation/README.rst | 11 ++++++----- account_skip_bank_reconciliation/__init__.py | 0 account_skip_bank_reconciliation/__manifest__.py | 6 +++--- account_skip_bank_reconciliation/models/__init__.py | 0 .../models/account_reconcile_model.py | 10 ++++------ .../models/reconciliation_widget.py | 9 ++++++++- .../readme/CONTRIBUTORS.rst | 1 + .../static/description/index.html | 9 +++++---- 8 files changed, 27 insertions(+), 19 deletions(-) mode change 100755 => 100644 account_skip_bank_reconciliation/__init__.py mode change 100755 => 100644 account_skip_bank_reconciliation/models/__init__.py diff --git a/account_skip_bank_reconciliation/README.rst b/account_skip_bank_reconciliation/README.rst index 4293f2e3..ca16ae8a 100644 --- a/account_skip_bank_reconciliation/README.rst +++ b/account_skip_bank_reconciliation/README.rst @@ -14,13 +14,13 @@ Account Skip Bank Reconciliation :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github - :target: https://github.com/OCA/account-reconcile/tree/12.0/account_skip_bank_reconciliation + :target: https://github.com/OCA/account-reconcile/tree/13.0/account_skip_bank_reconciliation :alt: OCA/account-reconcile .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/account-reconcile-12-0/account-reconcile-12-0-account_skip_bank_reconciliation + :target: https://translation.odoo-community.org/projects/account-reconcile-13-0/account-reconcile-13-0-account_skip_bank_reconciliation :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/98/12.0 + :target: https://runbot.odoo-community.org/runbot/98/13.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -65,7 +65,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -82,6 +82,7 @@ Contributors * Miquel Raïch * Adrià Gil Sorribes +* Lois Rilo Maintainers ~~~~~~~~~~~ @@ -96,6 +97,6 @@ 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. -This module is part of the `OCA/account-reconcile `_ project on GitHub. +This module is part of the `OCA/account-reconcile `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_skip_bank_reconciliation/__init__.py b/account_skip_bank_reconciliation/__init__.py old mode 100755 new mode 100644 diff --git a/account_skip_bank_reconciliation/__manifest__.py b/account_skip_bank_reconciliation/__manifest__.py index d9c2e7db..2680f258 100644 --- a/account_skip_bank_reconciliation/__manifest__.py +++ b/account_skip_bank_reconciliation/__manifest__.py @@ -5,12 +5,12 @@ "name": "Account Skip Bank Reconciliation", "summary": "Allows to exclude from bank statement reconciliation " "all journal items of a reconcilable account", - "version": "12.0.1.1.0", + "version": "13.0.1.0.0", "depends": ["account"], "author": "ForgeFlow, Odoo Community Association (OCA)", - "website": "http://www.github.com/OCA/account-reconcile", + "website": "https://www.github.com/OCA/account-reconcile", "category": "Finance", - "data": ["views/account_view.xml", "views/account_journal_view.xml",], + "data": ["views/account_view.xml", "views/account_journal_view.xml"], "license": "AGPL-3", "installable": True, } diff --git a/account_skip_bank_reconciliation/models/__init__.py b/account_skip_bank_reconciliation/models/__init__.py old mode 100755 new mode 100644 diff --git a/account_skip_bank_reconciliation/models/account_reconcile_model.py b/account_skip_bank_reconciliation/models/account_reconcile_model.py index 1cf9afd8..ea61c9b3 100644 --- a/account_skip_bank_reconciliation/models/account_reconcile_model.py +++ b/account_skip_bank_reconciliation/models/account_reconcile_model.py @@ -1,16 +1,14 @@ # Copyright 2020 ForgeFlow S.L. # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from odoo import api, models +from odoo import models class AccountReconcileModel(models.Model): _inherit = "account.reconcile.model" - @api.multi def _apply_conditions(self, query, params): - query, params = super(AccountReconcileModel, self)._apply_conditions( - query, params - ) - query += " AND account.exclude_bank_reconcile IS NOT TRUE" + query, params = super()._apply_conditions(query, params) + if self.rule_type == "invoice_matching": + query += " AND account.exclude_bank_reconcile IS NOT TRUE" return query, params diff --git a/account_skip_bank_reconciliation/models/reconciliation_widget.py b/account_skip_bank_reconciliation/models/reconciliation_widget.py index 878a1a6f..38cdb5ce 100644 --- a/account_skip_bank_reconciliation/models/reconciliation_widget.py +++ b/account_skip_bank_reconciliation/models/reconciliation_widget.py @@ -10,7 +10,13 @@ class AccountReconciliation(models.AbstractModel): @api.model def _domain_move_lines_for_reconciliation( - self, st_line, aml_accounts, partner_id, excluded_ids=None, search_str=False + self, + st_line, + aml_accounts, + partner_id, + excluded_ids=None, + search_str=False, + mode="rp", ): domain = super()._domain_move_lines_for_reconciliation( st_line, @@ -18,6 +24,7 @@ class AccountReconciliation(models.AbstractModel): partner_id, excluded_ids=excluded_ids, search_str=search_str, + mode=mode, ) domain = expression.AND( [domain, [("account_id.exclude_bank_reconcile", "!=", True)]] diff --git a/account_skip_bank_reconciliation/readme/CONTRIBUTORS.rst b/account_skip_bank_reconciliation/readme/CONTRIBUTORS.rst index fba5ce30..7326223e 100644 --- a/account_skip_bank_reconciliation/readme/CONTRIBUTORS.rst +++ b/account_skip_bank_reconciliation/readme/CONTRIBUTORS.rst @@ -1,2 +1,3 @@ * Miquel Raïch * Adrià Gil Sorribes +* Lois Rilo diff --git a/account_skip_bank_reconciliation/static/description/index.html b/account_skip_bank_reconciliation/static/description/index.html index e0a34be4..01adae60 100644 --- a/account_skip_bank_reconciliation/static/description/index.html +++ b/account_skip_bank_reconciliation/static/description/index.html @@ -3,7 +3,7 @@ - + Account Skip Bank Reconciliation