From f43f978427d96b6edac74de7af2e1d320d64cb17 Mon Sep 17 00:00:00 2001 From: openerp-sle Date: Sun, 16 Feb 2014 12:04:30 +0100 Subject: [PATCH] [FIX] Use the local bootstrap bzr revid: openerp-sle@openerp-sle.home-20140216110430-sbzd306ufay3ukxn --- addons/report/controllers/main.py | 2 +- addons/report/views/layouts.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/report/controllers/main.py b/addons/report/controllers/main.py index bd5b41d9a9d..52a949c0bd2 100644 --- a/addons/report/controllers/main.py +++ b/addons/report/controllers/main.py @@ -134,6 +134,7 @@ class Report(http.Controller): # Get some css and script in order to build a minimal html page for the report. # This page will later be sent to wkhtmltopdf. css = self._get_url_content('/report/static/src/css/reset.min.css') + css += self._get_url_content('/web/static/lib/bootstrap/css/bootstrap.css') css += self._get_url_content('/website/static/src/css/website.css') subst = self._get_url_content('/report/static/src/js/subst.js') @@ -144,7 +145,6 @@ class Report(http.Controller): - diff --git a/addons/report/views/layouts.xml b/addons/report/views/layouts.xml index bff67a9051a..45e6526cf94 100644 --- a/addons/report/views/layouts.xml +++ b/addons/report/views/layouts.xml @@ -24,7 +24,7 @@ - +