← Back to branch summary

~openerp-dev/openobject-server/trunk-partner_reference_terms-ypa

« back to all changes in this revision

Viewing changes to openerp/addons/base/ir/ir_actions.py

  • Committer: Richard Mathot (OpenERP)
  • Date: 2014-04-14 09:11:37 UTC
  • mfrom: (5120.1.60 origin/trunk)
  • Revision ID: rim@openerp.com-20140414091137-icatnn1humn7kisc
[MERGE] Sync with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
openerp/addons/base/ir/ir_actions.py
104
104
            cr.execute("SELECT * FROM ir_act_report_xml WHERE report_name=%s", (name,))
105
105
            r = cr.dictfetchone()
106
106
            if r:
107
 
                if r['report_rml'] or r['report_rml_content_data']:
 
107
                if r['report_type'] in ['qweb-pdf', 'qweb-html']:
 
108
                    return r['report_name']
 
109
                elif r['report_rml'] or r['report_rml_content_data']:
108
110
                    if r['parser']:
109
111
                        kwargs = { 'parser': operator.attrgetter(r['parser'])(openerp.addons) }
110
112
                    else:
127
129
        Look up a report definition and render the report for the provided IDs.
128
130
        """
129
131
        new_report = self._lookup_report(cr, name)
130
 
        return new_report.create(cr, uid, res_ids, data, context)
 
132
        # in order to use current yml test files with qweb reports
 
133
        if isinstance(new_report, (str, unicode)):
 
134
            return self.pool['report'].get_pdf(cr, uid, res_ids, new_report, data=data, context=context), 'pdf'
 
135
        else:
 
136
            return new_report.create(cr, uid, res_ids, data, context)
131
137
 
132
138
    _name = 'ir.actions.report.xml'
133
139
    _inherit = 'ir.actions.actions'
944
950
            'uid': uid,
945
951
            'user': user,
946
952
            'context': context,
947
 
            'workflow': workflow
 
953
            'workflow': workflow,
 
954
            'Warning': openerp.exceptions.Warning,
948
955
        }
949
956
 
950
957
    def run(self, cr, uid, ids, context=None):