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

[invitu]

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

Unmerged revisions

9261. By invitu on 2013-06-21

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

=== 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 @@
            at the beginning of ``edi_export``, before the call to ``super()``."""
         ir_actions_report = self.pool.get('ir.actions.report.xml')
         matching_reports = ir_actions_report.search(cr, uid, [('model','=',self._name),
-                                                              ('report_type','=','pdf'),
+                                                              ('report_type','in',('pdf','webkit')),
                                                               ('usage','=','default')])
         if matching_reports:
             report = ir_actions_report.browse(cr, uid, matching_reports[0])