diff --git a/account_skip_bank_reconciliation/__manifest__.py b/account_skip_bank_reconciliation/__manifest__.py index 447fb661..d9c2e7db 100644 --- a/account_skip_bank_reconciliation/__manifest__.py +++ b/account_skip_bank_reconciliation/__manifest__.py @@ -4,16 +4,13 @@ { "name": "Account Skip Bank Reconciliation", "summary": "Allows to exclude from bank statement reconciliation " - "all journal items of a reconcilable account", + "all journal items of a reconcilable account", "version": "12.0.1.1.0", "depends": ["account"], "author": "ForgeFlow, Odoo Community Association (OCA)", "website": "http://www.github.com/OCA/account-reconcile", "category": "Finance", - "data": [ - "views/account_view.xml", - "views/account_journal_view.xml", - ], - 'license': 'AGPL-3', - 'installable': True, + "data": ["views/account_view.xml", "views/account_journal_view.xml",], + "license": "AGPL-3", + "installable": True, } diff --git a/account_skip_bank_reconciliation/models/account_account.py b/account_skip_bank_reconciliation/models/account_account.py index b113940c..b61b719d 100644 --- a/account_skip_bank_reconciliation/models/account_account.py +++ b/account_skip_bank_reconciliation/models/account_account.py @@ -8,8 +8,9 @@ class AccountAccount(models.Model): _inherit = "account.account" exclude_bank_reconcile = fields.Boolean( - string='Exclude from Bank Reconciliation', + string="Exclude from Bank Reconciliation", default=False, help="Check this box if the journal items of this account " - "should not appear in the list of journal items to match " - "a statement line.") + "should not appear in the list of journal items to match " + "a statement line.", + ) diff --git a/account_skip_bank_reconciliation/models/account_journal.py b/account_skip_bank_reconciliation/models/account_journal.py index cccaa868..52786bf4 100644 --- a/account_skip_bank_reconciliation/models/account_journal.py +++ b/account_skip_bank_reconciliation/models/account_journal.py @@ -13,5 +13,5 @@ class AccountJournal(models.Model): string="Accounts to consider in reconciliation", domain=[("reconcile", "=", True)], help="If you enter accounts here they will be the only ones" - "to be considered during the reconciliation" + "to be considered during the reconciliation", ) diff --git a/account_skip_bank_reconciliation/models/account_reconcile_model.py b/account_skip_bank_reconciliation/models/account_reconcile_model.py index 76f44d95..1cf9afd8 100644 --- a/account_skip_bank_reconciliation/models/account_reconcile_model.py +++ b/account_skip_bank_reconciliation/models/account_reconcile_model.py @@ -9,7 +9,8 @@ class AccountReconcileModel(models.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(AccountReconcileModel, self)._apply_conditions( + query, params + ) + 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 b553efc1..878a1a6f 100644 --- a/account_skip_bank_reconciliation/models/reconciliation_widget.py +++ b/account_skip_bank_reconciliation/models/reconciliation_widget.py @@ -10,17 +10,23 @@ 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 + ): domain = super()._domain_move_lines_for_reconciliation( - st_line, aml_accounts, partner_id, - excluded_ids=excluded_ids, search_str=search_str) - domain = expression.AND([domain, [ - ("account_id.exclude_bank_reconcile", "!=", True)]]) + st_line, + aml_accounts, + partner_id, + excluded_ids=excluded_ids, + search_str=search_str, + ) + domain = expression.AND( + [domain, [("account_id.exclude_bank_reconcile", "!=", True)]] + ) # Extract from context allowed accounts defined in Journal, if any journal_id = st_line.journal_id account_reconciliation_ids = journal_id.account_reconciliation_ids if account_reconciliation_ids: - domain = expression.AND([domain, [ - ("account_id", "in", account_reconciliation_ids.ids)]]) + domain = expression.AND( + [domain, [("account_id", "in", account_reconciliation_ids.ids)]] + ) return domain diff --git a/account_skip_bank_reconciliation/views/account_journal_view.xml b/account_skip_bank_reconciliation/views/account_journal_view.xml index 6bb62361..453024e5 100644 --- a/account_skip_bank_reconciliation/views/account_journal_view.xml +++ b/account_skip_bank_reconciliation/views/account_journal_view.xml @@ -1,16 +1,18 @@ - + - account.journal - + - - + + - diff --git a/account_skip_bank_reconciliation/views/account_view.xml b/account_skip_bank_reconciliation/views/account_view.xml index c9c47a20..a2e62b7a 100644 --- a/account_skip_bank_reconciliation/views/account_view.xml +++ b/account_skip_bank_reconciliation/views/account_view.xml @@ -1,12 +1,16 @@ - + account.account.form account.account - + - + diff --git a/setup/account_skip_bank_reconciliation/odoo/addons/account_skip_bank_reconciliation b/setup/account_skip_bank_reconciliation/odoo/addons/account_skip_bank_reconciliation new file mode 120000 index 00000000..5c95e6cc --- /dev/null +++ b/setup/account_skip_bank_reconciliation/odoo/addons/account_skip_bank_reconciliation @@ -0,0 +1 @@ +../../../../account_skip_bank_reconciliation \ No newline at end of file diff --git a/setup/account_skip_bank_reconciliation/setup.py b/setup/account_skip_bank_reconciliation/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_skip_bank_reconciliation/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)