From 2e31945d478922985df9b9c838a7f32824a70683 Mon Sep 17 00:00:00 2001 From: oihane Date: Mon, 28 Sep 2015 11:25:55 +0200 Subject: [PATCH] [IMP] Fixed reported problems * Warning raised when template name does not contain '.' * Template name was not same as template ID * Dependecies added to __openerp__.py file --- base_report_auto_create_qweb/__openerp__.py | 7 ++++++- .../models/report_xml.py | 14 ++++++++++---- .../tests/test_base_report_auto_create_qweb.py | 16 +++++++++++++--- .../views/report_xml_view.xml | 1 - 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/base_report_auto_create_qweb/__openerp__.py b/base_report_auto_create_qweb/__openerp__.py index 92f73e2ae..0e19e549a 100644 --- a/base_report_auto_create_qweb/__openerp__.py +++ b/base_report_auto_create_qweb/__openerp__.py @@ -22,12 +22,17 @@ "depends": [ "report", ], + "external_dependencies": { + "python": [ + "unidecode", + ], + }, "author": "OdooMRP team, " "AvanzOSC, " "Serv. Tecnol. Avanzados - Pedro M. Baeza, " "Odoo Community Association (OCA), ", "website": "http://www.odoomrp.com", - 'license': 'AGPL-3', + "license": "AGPL-3", "contributors": [ "Oihane Crucelaegui ", "Pedro M. Baeza ", diff --git a/base_report_auto_create_qweb/models/report_xml.py b/base_report_auto_create_qweb/models/report_xml.py index 768be451f..7ef02178a 100644 --- a/base_report_auto_create_qweb/models/report_xml.py +++ b/base_report_auto_create_qweb/models/report_xml.py @@ -4,13 +4,19 @@ ############################################################################## from openerp import models, api, exceptions, _ +import logging + +_logger = logging.getLogger(__name__) class IrActionsReport(models.Model): _inherit = 'ir.actions.report.xml' def _format_template_name(self, text): - from unidecode import unidecode + try: + from unidecode import unidecode + except ImportError: + _logger.debug('Can not `import unidecode`.') text = unidecode(unicode(text)) text.lower() return text.encode('iso-8859-1') @@ -53,13 +59,13 @@ class IrActionsReport(models.Model): def create(self, values): values['report_name'] = self._format_template_name( values.get('report_name', '')) - if not self.env.context.get('enable_duplication', False): - return super(IrActionsReport, self).create(values) if (values.get('report_type') in ['qweb-pdf', 'qweb-html'] and values.get('report_name') and values['report_name'].find('.') == -1): raise exceptions.Warning( _("Template Name must contain at least a dot in it's name")) + if not self.env.context.get('enable_duplication', False): + return super(IrActionsReport, self).create(values) report_xml = super(IrActionsReport, self).create(values) if values.get('report_type') in ['qweb-pdf', 'qweb-html']: report_view_ids = self.env.context.get('report_views', False) @@ -112,6 +118,6 @@ class IrActionsReport(models.Model): module = self.report_name.split('.')[0] report_name = self.report_name.split('.')[1] arch = ('\n' - '\n' % report_name) + '\n' % self.report_name) self._create_qweb(self.name, report_name, module, self.model, arch) self.associated_view() diff --git a/base_report_auto_create_qweb/tests/test_base_report_auto_create_qweb.py b/base_report_auto_create_qweb/tests/test_base_report_auto_create_qweb.py index 176131870..84e247f7f 100644 --- a/base_report_auto_create_qweb/tests/test_base_report_auto_create_qweb.py +++ b/base_report_auto_create_qweb/tests/test_base_report_auto_create_qweb.py @@ -3,6 +3,7 @@ # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html import openerp.tests.common as common +from openerp import exceptions class TestBaseReportAutoQwebCreate(common.TransactionCase): @@ -24,8 +25,8 @@ class TestBaseReportAutoQwebCreate(common.TransactionCase): view_num = self.view_model.search_count( [('name', 'ilike', report_html.report_name.split('.')[1]), ('type', '=', 'qweb')]) - self.assertEqual(view_num, 1, 'Only one view must be created.') self.assertNotEqual(view_num, 0, 'There are not related views') + self.assertEqual(view_num, 1, 'Only one view must be created.') def test_creation_duplicate_pdf(self): report_pdf = self.report_model.create({ @@ -38,8 +39,8 @@ class TestBaseReportAutoQwebCreate(common.TransactionCase): view_num = self.view_model.search_count( [('name', 'ilike', report_pdf.report_name.split('.')[1]), ('type', '=', 'qweb')]) - self.assertEqual(view_num, 1, 'One view must be created.') self.assertNotEqual(view_num, 0, 'There are not related views.') + self.assertEqual(view_num, 1, 'One view must be created.') wizard = self.duplicate_model.with_context( active_id=report_pdf.id, model=report_pdf.model).create({ 'suffix': 'copytest', @@ -51,6 +52,15 @@ class TestBaseReportAutoQwebCreate(common.TransactionCase): view_num2 = self.view_model.search_count( [('name', 'ilike', report_pdf_copy.report_name.split('.')[1]), ('type', '=', 'qweb')]) + self.assertNotEqual(view_num2, 0, 'There are not related views.') self.assertEqual(view_num2, view_num, 'Same view numbers must have been created.') - self.assertNotEqual(view_num, 0, 'There are not related views.') + + def test_wrong_template_name(self): + with self.assertRaises(exceptions.Warning): + self.report_model.create({ + 'name': 'Test', + 'model': 'res.partner', + 'report_type': 'qweb-pdf', + 'report_name': 'report_test', + }) diff --git a/base_report_auto_create_qweb/views/report_xml_view.xml b/base_report_auto_create_qweb/views/report_xml_view.xml index bfccb5b9d..70ed53585 100644 --- a/base_report_auto_create_qweb/views/report_xml_view.xml +++ b/base_report_auto_create_qweb/views/report_xml_view.xml @@ -20,6 +20,5 @@ -