[IMP] <base_report_auto_create_qweb> Fixed reported problems
* Warning raised when template name does not contain '.' * Template name was not same as template ID * Dependecies added to __openerp__.py filepull/260/head
parent
6d834572a1
commit
2e31945d47
|
@ -22,12 +22,17 @@
|
||||||
"depends": [
|
"depends": [
|
||||||
"report",
|
"report",
|
||||||
],
|
],
|
||||||
|
"external_dependencies": {
|
||||||
|
"python": [
|
||||||
|
"unidecode",
|
||||||
|
],
|
||||||
|
},
|
||||||
"author": "OdooMRP team, "
|
"author": "OdooMRP team, "
|
||||||
"AvanzOSC, "
|
"AvanzOSC, "
|
||||||
"Serv. Tecnol. Avanzados - Pedro M. Baeza, "
|
"Serv. Tecnol. Avanzados - Pedro M. Baeza, "
|
||||||
"Odoo Community Association (OCA), ",
|
"Odoo Community Association (OCA), ",
|
||||||
"website": "http://www.odoomrp.com",
|
"website": "http://www.odoomrp.com",
|
||||||
'license': 'AGPL-3',
|
"license": "AGPL-3",
|
||||||
"contributors": [
|
"contributors": [
|
||||||
"Oihane Crucelaegui <oihanecrucelaegi@avanzosc.es>",
|
"Oihane Crucelaegui <oihanecrucelaegi@avanzosc.es>",
|
||||||
"Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>",
|
"Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>",
|
||||||
|
|
|
@ -4,13 +4,19 @@
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from openerp import models, api, exceptions, _
|
from openerp import models, api, exceptions, _
|
||||||
|
import logging
|
||||||
|
|
||||||
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class IrActionsReport(models.Model):
|
class IrActionsReport(models.Model):
|
||||||
_inherit = 'ir.actions.report.xml'
|
_inherit = 'ir.actions.report.xml'
|
||||||
|
|
||||||
def _format_template_name(self, text):
|
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 = unidecode(unicode(text))
|
||||||
text.lower()
|
text.lower()
|
||||||
return text.encode('iso-8859-1')
|
return text.encode('iso-8859-1')
|
||||||
|
@ -53,13 +59,13 @@ class IrActionsReport(models.Model):
|
||||||
def create(self, values):
|
def create(self, values):
|
||||||
values['report_name'] = self._format_template_name(
|
values['report_name'] = self._format_template_name(
|
||||||
values.get('report_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
|
if (values.get('report_type') in ['qweb-pdf', 'qweb-html'] and
|
||||||
values.get('report_name') and
|
values.get('report_name') and
|
||||||
values['report_name'].find('.') == -1):
|
values['report_name'].find('.') == -1):
|
||||||
raise exceptions.Warning(
|
raise exceptions.Warning(
|
||||||
_("Template Name must contain at least a dot in it's name"))
|
_("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)
|
report_xml = super(IrActionsReport, self).create(values)
|
||||||
if values.get('report_type') in ['qweb-pdf', 'qweb-html']:
|
if values.get('report_type') in ['qweb-pdf', 'qweb-html']:
|
||||||
report_view_ids = self.env.context.get('report_views', False)
|
report_view_ids = self.env.context.get('report_views', False)
|
||||||
|
@ -112,6 +118,6 @@ class IrActionsReport(models.Model):
|
||||||
module = self.report_name.split('.')[0]
|
module = self.report_name.split('.')[0]
|
||||||
report_name = self.report_name.split('.')[1]
|
report_name = self.report_name.split('.')[1]
|
||||||
arch = ('<?xml version="1.0"?>\n'
|
arch = ('<?xml version="1.0"?>\n'
|
||||||
'<t t-name="%s">\n</t>' % report_name)
|
'<t t-name="%s">\n</t>' % self.report_name)
|
||||||
self._create_qweb(self.name, report_name, module, self.model, arch)
|
self._create_qweb(self.name, report_name, module, self.model, arch)
|
||||||
self.associated_view()
|
self.associated_view()
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
|
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
|
||||||
|
|
||||||
import openerp.tests.common as common
|
import openerp.tests.common as common
|
||||||
|
from openerp import exceptions
|
||||||
|
|
||||||
|
|
||||||
class TestBaseReportAutoQwebCreate(common.TransactionCase):
|
class TestBaseReportAutoQwebCreate(common.TransactionCase):
|
||||||
|
@ -24,8 +25,8 @@ class TestBaseReportAutoQwebCreate(common.TransactionCase):
|
||||||
view_num = self.view_model.search_count(
|
view_num = self.view_model.search_count(
|
||||||
[('name', 'ilike', report_html.report_name.split('.')[1]),
|
[('name', 'ilike', report_html.report_name.split('.')[1]),
|
||||||
('type', '=', 'qweb')])
|
('type', '=', 'qweb')])
|
||||||
self.assertEqual(view_num, 1, 'Only one view must be created.')
|
|
||||||
self.assertNotEqual(view_num, 0, 'There are not related views')
|
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):
|
def test_creation_duplicate_pdf(self):
|
||||||
report_pdf = self.report_model.create({
|
report_pdf = self.report_model.create({
|
||||||
|
@ -38,8 +39,8 @@ class TestBaseReportAutoQwebCreate(common.TransactionCase):
|
||||||
view_num = self.view_model.search_count(
|
view_num = self.view_model.search_count(
|
||||||
[('name', 'ilike', report_pdf.report_name.split('.')[1]),
|
[('name', 'ilike', report_pdf.report_name.split('.')[1]),
|
||||||
('type', '=', 'qweb')])
|
('type', '=', 'qweb')])
|
||||||
self.assertEqual(view_num, 1, 'One view must be created.')
|
|
||||||
self.assertNotEqual(view_num, 0, 'There are not related views.')
|
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(
|
wizard = self.duplicate_model.with_context(
|
||||||
active_id=report_pdf.id, model=report_pdf.model).create({
|
active_id=report_pdf.id, model=report_pdf.model).create({
|
||||||
'suffix': 'copytest',
|
'suffix': 'copytest',
|
||||||
|
@ -51,6 +52,15 @@ class TestBaseReportAutoQwebCreate(common.TransactionCase):
|
||||||
view_num2 = self.view_model.search_count(
|
view_num2 = self.view_model.search_count(
|
||||||
[('name', 'ilike', report_pdf_copy.report_name.split('.')[1]),
|
[('name', 'ilike', report_pdf_copy.report_name.split('.')[1]),
|
||||||
('type', '=', 'qweb')])
|
('type', '=', 'qweb')])
|
||||||
|
self.assertNotEqual(view_num2, 0, 'There are not related views.')
|
||||||
self.assertEqual(view_num2, view_num,
|
self.assertEqual(view_num2, view_num,
|
||||||
'Same view numbers must have been created.')
|
'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',
|
||||||
|
})
|
||||||
|
|
|
@ -20,6 +20,5 @@
|
||||||
</button>
|
</button>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
</openerp>
|
</openerp>
|
||||||
|
|
Loading…
Reference in New Issue