Odoo Addons (MOVED TO GITHUB)

Merge lp:~invitu/openobject-addons/7.0-fix-1190313 into lp:openobject-addons/7.0

  1. 7.0-fix-1190313
  2. Merge into 7.0
Proposed by invitu
Status: Needs review
Proposed branch: lp:~invitu/openobject-addons/7.0-fix-1190313
Merge into: lp:openobject-addons/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
edi/models/edi.py (+1/-1)
To merge this branch: bzr merge lp:~invitu/openobject-addons/7.0-fix-1190313
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+170881@code.launchpad.net

Description of the change

[IMP] allow webkit reports in edi (bug 1190313)

To post a comment you must log in.

Unmerged revisions

9261. By invitu

[IMP] allow webkit reports in edi (bug 1190313)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'edi/models/edi.py'
--- edi/models/edi.py 2013-06-07 11:38:29 +0000
+++ edi/models/edi.py 2013-06-21 17:21:30 +0000
@@ -414,7 +414,7 @@
414 at the beginning of ``edi_export``, before the call to ``super()``."""414 at the beginning of ``edi_export``, before the call to ``super()``."""
415 ir_actions_report = self.pool.get('ir.actions.report.xml')415 ir_actions_report = self.pool.get('ir.actions.report.xml')
416 matching_reports = ir_actions_report.search(cr, uid, [('model','=',self._name),416 matching_reports = ir_actions_report.search(cr, uid, [('model','=',self._name),
417 ('report_type','=','pdf'),417 ('report_type','in',('pdf','webkit')),
418 ('usage','=','default')])418 ('usage','=','default')])
419 if matching_reports:419 if matching_reports:
420 report = ir_actions_report.browse(cr, uid, matching_reports[0])420 report = ir_actions_report.browse(cr, uid, matching_reports[0])