From b6f6f8614a29bff57afeb813111bee54a3beb37e Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Mon, 24 Mar 2014 18:46:30 +0100
Subject: [PATCH] [FIX] Handle the case where website is installed but the pdf
 generation is not called in a website request context

bzr revid: sle@openerp.com-20140324174630-43wi6nlh6bigaq7g
---
 addons/report/models/report.py          | 3 ++-
 addons/website_report/views/layouts.xml | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/report/models/report.py b/addons/report/models/report.py
index 7204cf75ab9..8abe8e544eb 100644
--- a/addons/report/models/report.py
+++ b/addons/report/models/report.py
@@ -215,7 +215,8 @@ class Report(osv.Model):
             'get_digits': self._get_digits,
             'render_doc': render_doc,
             'editable': True,  # Will active inherit_branding
-            'res_company': self.pool['res.users'].browse(cr, uid, uid).company_id
+            'res_company': self.pool['res.users'].browse(cr, uid, uid).company_id,
+            'website': False,  # Will be overidden by ir.ui.view if the request has website enabled
         })
 
         return view_obj.render(cr, uid, template, values, context=context)
diff --git a/addons/website_report/views/layouts.xml b/addons/website_report/views/layouts.xml
index 1259bfcf7f2..f5deb483374 100644
--- a/addons/website_report/views/layouts.xml
+++ b/addons/website_report/views/layouts.xml
@@ -3,7 +3,7 @@
 <data>
 <template id="editor_head" inherit_id="report.html_container" name="Editor" groups="base.group_website_publisher">
     <xpath expr="//html" position="attributes">
-        <attribute name="t-att-data-website-id">website.id if editable else None</attribute>
+        <attribute name="t-att-data-website-id">website.id if editable and website else None</attribute>
         <attribute name="t-att-data-translatable">'1' if translatable else None</attribute>
     </xpath>
 
@@ -72,7 +72,7 @@
     </xpath>
 
     <xpath expr='//body[@class="container"]/div[@id="wrapwrap"]' position="before">
-        <t t-set="languages" t-value="website.get_languages()"/>
+        <t t-set="languages" t-value="website.get_languages() if website else list()"/>
         <ul class="list-inline js_language_selector mt16" t-if="(len(languages) &gt; 1 or editable)">
             <li t-foreach="languages" t-as="lg">
                 <a t-att-href="url_for('', lang=lg[0]) + '?' + keep_query()"