Replace plain SQL by orm

pull/744/head
Laurent Mignon 2016-10-06 09:52:14 +02:00 committed by Alexandre D. Díaz
parent 99adcf39ac
commit 1f5a66cd3a
1 changed files with 16 additions and 16 deletions

View File

@ -2,12 +2,12 @@
# Copyright 2013 XCG Consulting (http://odoo.consulting) # Copyright 2013 XCG Consulting (http://odoo.consulting)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
import os import os
from openerp import api, fields, models, _ import logging
from openerp import api, fields, models, SUPERUSER_ID, _
from openerp.report.interface import report_int from openerp.report.interface import report_int
from openerp.exceptions import ValidationError from openerp.exceptions import ValidationError
from openerp import addons from openerp import addons
from ..py3o_parser import Py3oParser from ..py3o_parser import Py3oParser
import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -97,23 +97,23 @@ class IrActionsReportXml(models.Model):
if not isinstance(new_report, Py3oParser): if not isinstance(new_report, Py3oParser):
new_report = None new_report = None
else: else:
cr.execute( report_data = self.search_read(
'SELECT * ' cr, SUPERUSER_ID,
'FROM ir_act_report_xml ' [("report_name", "=", name),
'WHERE report_name=%s AND report_type=%s', ("report_type", "=", "py3o")],
(name, 'py3o') ['parser', 'model', 'report_name', 'report_rml', 'header'],
) limit=1)
r = cr.dictfetchone() if report_data:
if r: report_data = report_data[0]
kwargs = {} kwargs = {}
if r['parser']: if report_data['parser']:
kwargs['parser'] = getattr(addons, r['parser']) kwargs['parser'] = getattr(addons, report_data['parser'])
new_report = Py3oParser( new_report = Py3oParser(
'report.' + r['report_name'], 'report.' + report_data['report_name'],
r['model'], report_data['model'],
os.path.join('addons', r['report_rml'] or '/'), os.path.join('addons', report_data['report_rml'] or '/'),
header=r['header'], header=report_data['header'],
register=False, register=False,
**kwargs **kwargs
) )