[MERGE] forward port of branch 8.0 up to 491372e

[odoo/odoo.git] / addons / report / static / src / js / qwebactionmanager.js

diff --git a/addons/report/static/src/js/qwebactionmanager.js b/addons/report/static/src/js/qwebactionmanager.js
index 088c40e..d285e4a 100644 (file)
--- a/addons/report/static/src/js/qwebactionmanager.js
+++ b/addons/report/static/src/js/qwebactionmanager.js
@@ -9,6 +9,22 @@ openerp.report = function(instance) {
             error: c.rpc_error.bind(c)
         });
     }
+    var show_pdf = function(session, response, c, options, self) {
+        response.push("pdf_viewer")
+        session.show_pdf({
+            url: '/report/download',
+            data: {data: JSON.stringify(response)},
+            complete: function(){
+                openerp.web.unblockUI();
+                if (!self.dialog) {
+                    options.on_close();
+                }
+                self.dialog_stop();
+                window.scrollTo(0,0);
+            },
+            error: c.rpc_error.bind(c)
+        });
+    }
 
     instance.web.ActionManager = instance.web.ActionManager.extend({
         ir_actions_report_xml: function(action, options) {
@@ -79,7 +95,12 @@ workers to print a pdf version of the reports.'), true);
  support for table-breaking between pages.<br><br><a href="http://wkhtmltopdf.org/" \
  target="_blank">wkhtmltopdf.org</a>'), true);
                         }
-                        return trigger_download(self.session, response, c);
+                        if(action.hasOwnProperty('pdf_viewer')){
+                            return show_pdf(self.session, response, c, options, self);
+                        }
+                        else {
+                            return trigger_download(self.session, response, c );
+                        }
                     });
                 } else if (action.report_type === 'controller') {
                     return trigger_download(self.session, response, c);