diff --git a/excel_import_export/__manifest__.py b/excel_import_export/__manifest__.py index fee958bc5..e82589091 100644 --- a/excel_import_export/__manifest__.py +++ b/excel_import_export/__manifest__.py @@ -4,7 +4,7 @@ { 'name': 'Excel Import/Export', 'summary': 'Base module for easy way to develop Excel import/export', - 'version': '12.0.1.0.0', + 'version': '12.0.1.0.1', 'author': 'Ecosoft,Odoo Community Association (OCA)', 'license': 'AGPL-3', 'website': 'https://github.com/OCA/server-tools/', diff --git a/excel_import_export/readme/HISTORY.rst b/excel_import_export/readme/HISTORY.rst index b8d1b41b6..bdec0bb7d 100644 --- a/excel_import_export/readme/HISTORY.rst +++ b/excel_import_export/readme/HISTORY.rst @@ -2,3 +2,8 @@ ~~~~~~~~~~~~~~~~~~~~~~~ * Start of the history + +12.0.1.0.2 (2019-06-24) +~~~~~~~~~~~~~~~~~~~~~~~ + +* Fix wizard on v12 can't download sample template file - https://github.com/OCA/server-tools/issues/1574 diff --git a/excel_import_export/readme/INSTALL.rst b/excel_import_export/readme/INSTALL.rst index f35fa5a09..f64a90e5b 100644 --- a/excel_import_export/readme/INSTALL.rst +++ b/excel_import_export/readme/INSTALL.rst @@ -2,4 +2,4 @@ To install this module, you need to install following python library, **xlrd, xl Then, simply install **excel_import_export**. -For samples, install **excel_import_export_sample**. +For demo, install **excel_import_export_demo**. diff --git a/excel_import_export/readme/USAGE.rst b/excel_import_export/readme/USAGE.rst index 372fda63b..297f93e3c 100644 --- a/excel_import_export/readme/USAGE.rst +++ b/excel_import_export/readme/USAGE.rst @@ -11,11 +11,11 @@ For reporting, also call `export_xlsx(...)` but through following method After install this module, go to Settings > Excel Import/Export > XLSX Templates, this is where the key component located. -As this module provide tools, it is best to explain as use cases. For example use cases, please install **excel_import_export_sample** +As this module provide tools, it is best to explain as use cases. For example use cases, please install **excel_import_export_demo** **Use Case 1:** Export/Import Excel on existing document -This add export/import action menus in existing document (example - excel_import_export_sample/import_export_sale_order) +This add export/import action menus in existing document (example - excel_import_export_demo/import_export_sale_order) 1. Create export action menu on document, with res_model="export.xlsx.wizard" and src_model="", and context['template_domain'] to locate the right template -- actions.xml 2. Create import action menu on document, with res_model="import.xlsx.wizard" and src_model="", and context['template_domain'] to locate the right template -- action.xml @@ -24,7 +24,7 @@ This add export/import action menus in existing document (example - excel_import **Use Case 2:** Import Excel Files -With menu wizard to create new documents (example - excel_import_export_sample/import_sale_orders) +With menu wizard to create new documents (example - excel_import_export_demo/import_sale_orders) 1. Create report menu with search wizard, res_model="import.xlsx.wizard" and context['template_domain'] to locate the right template -- menu_action.xml 2. Create Excel Template File (.xlsx), in the template, name the underlining tab used for import -- .xlsx @@ -32,7 +32,7 @@ With menu wizard to create new documents (example - excel_import_export_sample/i **Use Case 3:** Create Excel Report -This create report menu with criteria wizard. (example - excel_import_export_sample/report_sale_order) +This create report menu with criteria wizard. (example - excel_import_export_demo/report_sale_order) 1. Create report's menu, action, and add context['template_domain'] to locate the right template for this report -- .xml 2. Create report's wizard for search criteria. The view inherits ``excel_import_export.xlsx_report_view`` and mode="primary". In this view, you only need to add criteria fields, the rest will reuse from interited view -- diff --git a/excel_import_export/wizard/import_xlsx_wizard.py b/excel_import_export/wizard/import_xlsx_wizard.py index 49be5c07a..d3835551e 100644 --- a/excel_import_export/wizard/import_xlsx_wizard.py +++ b/excel_import_export/wizard/import_xlsx_wizard.py @@ -114,6 +114,21 @@ class ImportXLSXWizard(models.TransientModel): defaults['res_model'] = res_model return defaults + @api.multi + def get_import_sample(self): + self.ensure_one() + return { + 'name': _('Import Excel'), + 'type': 'ir.actions.act_window', + 'res_model': 'import.xlsx.wizard', + 'view_mode': 'form', + 'view_type': 'form', + 'res_id': self.id, + 'views': [(False, 'form')], + 'target': 'new', + 'context': self._context.copy() + } + @api.multi def action_import(self): self.ensure_one() diff --git a/excel_import_export/wizard/import_xlsx_wizard.xml b/excel_import_export/wizard/import_xlsx_wizard.xml index b1abc2144..0e91e789d 100644 --- a/excel_import_export/wizard/import_xlsx_wizard.xml +++ b/excel_import_export/wizard/import_xlsx_wizard.xml @@ -9,7 +9,11 @@ import.xlsx.wizard
+ + + + @@ -18,10 +22,11 @@ - - - - +
+
+ diff --git a/excel_import_export_demo/tests/test_xlsx_import_export.py b/excel_import_export_demo/tests/test_xlsx_import_export.py index d121c5799..8a6aa158a 100644 --- a/excel_import_export_demo/tests/test_xlsx_import_export.py +++ b/excel_import_export_demo/tests/test_xlsx_import_export.py @@ -41,6 +41,9 @@ class TestXLSXImportExport(TestExcelImportExport): with Form(self.env['import.xlsx.wizard'].with_context(ctx)) as f: f.import_file = self.export_file import_wizard = f.save() + # Test sample template + import_wizard.get_import_sample() + self.assertTrue(import_wizard.datas) # Test whether it loads correct template self.assertEqual(import_wizard.template_id, self.env.ref('excel_import_export_demo.'