diff --git a/account_statement_import_file_reconciliation_widget/README.rst b/account_statement_import_file_reconcile_oca/README.rst similarity index 100% rename from account_statement_import_file_reconciliation_widget/README.rst rename to account_statement_import_file_reconcile_oca/README.rst diff --git a/account_statement_import_file_reconciliation_widget/__init__.py b/account_statement_import_file_reconcile_oca/__init__.py similarity index 100% rename from account_statement_import_file_reconciliation_widget/__init__.py rename to account_statement_import_file_reconcile_oca/__init__.py diff --git a/account_statement_import_file_reconciliation_widget/__manifest__.py b/account_statement_import_file_reconcile_oca/__manifest__.py similarity index 84% rename from account_statement_import_file_reconciliation_widget/__manifest__.py rename to account_statement_import_file_reconcile_oca/__manifest__.py index e236c0cf..76794b0b 100644 --- a/account_statement_import_file_reconciliation_widget/__manifest__.py +++ b/account_statement_import_file_reconcile_oca/__manifest__.py @@ -5,9 +5,9 @@ { "name": "Import Statement Files and Go Direct to Reconciliation", "category": "Accounting", - "version": "14.0.1.0.0", + "version": "16.0.1.0.0", "license": "AGPL-3", - "depends": ["account_statement_import", "account_reconciliation_widget"], + "depends": ["account_statement_import_file", "account_reconcile_oca"], "author": "Akretion, Odoo Community Association (OCA)", "maintainers": ["alexis-via"], "website": "https://github.com/OCA/bank-statement-import", diff --git a/account_statement_import_file_reconciliation_widget/i18n/account_statement_import_file_reconciliation_widget.pot b/account_statement_import_file_reconcile_oca/i18n/account_statement_import_file_reconciliation_widget.pot similarity index 100% rename from account_statement_import_file_reconciliation_widget/i18n/account_statement_import_file_reconciliation_widget.pot rename to account_statement_import_file_reconcile_oca/i18n/account_statement_import_file_reconciliation_widget.pot diff --git a/account_statement_import_file_reconciliation_widget/i18n/fr.po b/account_statement_import_file_reconcile_oca/i18n/fr.po similarity index 100% rename from account_statement_import_file_reconciliation_widget/i18n/fr.po rename to account_statement_import_file_reconcile_oca/i18n/fr.po diff --git a/account_statement_import_file_reconciliation_widget/readme/CONTRIBUTORS.rst b/account_statement_import_file_reconcile_oca/readme/CONTRIBUTORS.rst similarity index 100% rename from account_statement_import_file_reconciliation_widget/readme/CONTRIBUTORS.rst rename to account_statement_import_file_reconcile_oca/readme/CONTRIBUTORS.rst diff --git a/account_statement_import_file_reconciliation_widget/readme/DESCRIPTION.rst b/account_statement_import_file_reconcile_oca/readme/DESCRIPTION.rst similarity index 59% rename from account_statement_import_file_reconciliation_widget/readme/DESCRIPTION.rst rename to account_statement_import_file_reconcile_oca/readme/DESCRIPTION.rst index 89c445c9..8ec9c83a 100644 --- a/account_statement_import_file_reconciliation_widget/readme/DESCRIPTION.rst +++ b/account_statement_import_file_reconcile_oca/readme/DESCRIPTION.rst @@ -1,9 +1,9 @@ This module is a glue module between 2 modules: -* **account_statement_import** from the Github project *OCA/bank-statement-import* -* **account_reconciliation_widget** from the Github project `OCA/account-reconcile `_ +* **account_statement_import_file** from the Github project *OCA/bank-statement-import* +* **account_reconcile_oca** from the Github project `OCA/account-reconcile `_ -This module adds a button **Import and Start to Reconcile** on the bank statement file import wizard. When you click on this button, Odoo will import the bank statement file and jump directly to the special reconciliation interface. +This module adds a button **Import and Start to Reconcile** on the bank statement file import wizard. When you click on this button, Odoo will import the bank statement file and jump directly to the reconciliation interface. .. figure:: ../static/description/bank_statement_import_start_reconcile.png :alt: Bank statement import wizard screenshot diff --git a/account_statement_import_file_reconcile_oca/readme/INSTALL.rst b/account_statement_import_file_reconcile_oca/readme/INSTALL.rst new file mode 100644 index 00000000..e65c8730 --- /dev/null +++ b/account_statement_import_file_reconcile_oca/readme/INSTALL.rst @@ -0,0 +1 @@ +This module will be installed automatically by Odoo if the modules **account_statement_import_file** and **account_reconcile_oca** are installed. diff --git a/account_statement_import_file_reconcile_oca/static/description/bank_statement_import_start_reconcile.png b/account_statement_import_file_reconcile_oca/static/description/bank_statement_import_start_reconcile.png new file mode 100644 index 00000000..1f8ea2cd Binary files /dev/null and b/account_statement_import_file_reconcile_oca/static/description/bank_statement_import_start_reconcile.png differ diff --git a/account_statement_import_file_reconciliation_widget/static/description/icon.png b/account_statement_import_file_reconcile_oca/static/description/icon.png similarity index 100% rename from account_statement_import_file_reconciliation_widget/static/description/icon.png rename to account_statement_import_file_reconcile_oca/static/description/icon.png diff --git a/account_statement_import_file_reconciliation_widget/static/description/index.html b/account_statement_import_file_reconcile_oca/static/description/index.html similarity index 100% rename from account_statement_import_file_reconciliation_widget/static/description/index.html rename to account_statement_import_file_reconcile_oca/static/description/index.html diff --git a/account_statement_import_file_reconciliation_widget/wizards/__init__.py b/account_statement_import_file_reconcile_oca/wizards/__init__.py similarity index 100% rename from account_statement_import_file_reconciliation_widget/wizards/__init__.py rename to account_statement_import_file_reconcile_oca/wizards/__init__.py diff --git a/account_statement_import_file_reconcile_oca/wizards/account_statement_import.py b/account_statement_import_file_reconcile_oca/wizards/account_statement_import.py new file mode 100644 index 00000000..8a91d71e --- /dev/null +++ b/account_statement_import_file_reconcile_oca/wizards/account_statement_import.py @@ -0,0 +1,37 @@ +# Copyright 2022 Akretion France (http://www.akretion.com/) +# @author: Alexis de Lattre +# Licence AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0). + +from odoo import models + + +class AccountStatementImport(models.TransientModel): + _inherit = "account.statement.import" + + def import_file_and_reconcile_button(self): + """Process the file chosen in the wizard, create bank statement(s) + and jump directly to the reconciliation widget""" + result = self._import_file() + self.env["account.bank.statement"].browse(result["statement_ids"]) + action = self.env["ir.actions.actions"]._for_xml_id( + "account_reconcile_oca.action_bank_statement_line_reconcile" + ) + action["context"] = { + "default_journal_id": self._context.get("journal_id"), + "active_id": self._context.get("journal_id"), + "search_default_not_reconciled": True, + "view_ref": "account_reconcile_oca.bank_statement_line_form_reconcile_view", + } + if result["notifications"]: + action_with_notif = { + "type": "ir.actions.client", + "tag": "display_notification", + "params": { + "type": "warning", + "sticky": True, + "message": "\n\n".join(result["notifications"]), + "next": action, + }, + } + return action_with_notif + return action diff --git a/account_statement_import_file_reconciliation_widget/wizards/account_statement_import_view.xml b/account_statement_import_file_reconcile_oca/wizards/account_statement_import_view.xml similarity index 91% rename from account_statement_import_file_reconciliation_widget/wizards/account_statement_import_view.xml rename to account_statement_import_file_reconcile_oca/wizards/account_statement_import_view.xml index 477cdb71..8d5d15af 100644 --- a/account_statement_import_file_reconciliation_widget/wizards/account_statement_import_view.xml +++ b/account_statement_import_file_reconcile_oca/wizards/account_statement_import_view.xml @@ -10,7 +10,7 @@ account.statement.import