From 863edbaaf29eddbce8fad80ed7d66659acd8e9a9 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 20 May 2014 17:06:25 +0200
Subject: [PATCH] Seperate assets_common from other bundles

---
 addons/point_of_sale/controllers/main.py   | 1 +
 addons/stock/controllers/main.py           | 1 +
 addons/web/views/webclient_templates.xml   | 3 ++-
 addons/website/views/website_templates.xml | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/controllers/main.py b/addons/point_of_sale/controllers/main.py
index 3cd10993d07..694f59f386c 100644
--- a/addons/point_of_sale/controllers/main.py
+++ b/addons/point_of_sale/controllers/main.py
@@ -36,6 +36,7 @@ html_template = """<!DOCTYPE html>
         <link rel="stylesheet" href="/point_of_sale/static/src/fonts/font-awesome-4.0.3/css/font-awesome.min.css" /> 
         <link rel="stylesheet" href="/point_of_sale/static/src/css/pos.css" />
         <link rel="stylesheet" href="/point_of_sale/static/src/css/keyboard.css" />
+        <script type="text/javascript" src="/web/js/web.assets_common"></script>
         <script type="text/javascript" src="/web/js/web.assets_backend"></script>
         <script type="text/javascript">
             $(function() {
diff --git a/addons/stock/controllers/main.py b/addons/stock/controllers/main.py
index 48742c6c19a..dda444c8627 100644
--- a/addons/stock/controllers/main.py
+++ b/addons/stock/controllers/main.py
@@ -26,6 +26,7 @@ html_template = """<!DOCTYPE html>
         <link rel="stylesheet" href="/web/static/lib/bootstrap/css/bootstrap.css" />
         <link rel="stylesheet" href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css" />
         <link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css" />
+        <script type="text/javascript" src="/web/js/web.assets_common"></script>
         <script type="text/javascript" src="/web/js/web.assets_backend"></script>
         <script type="text/javascript">
             $(function() {
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 5a6c6aaea4c..2b022d86f30 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -43,7 +43,6 @@
         </template>
 
         <template id="web.assets_backend">
-            <t t-call="web.assets_common"/>
             <!-- Datejs -->
             <script type="text/javascript" src="/web/static/lib/datejs/core.js"></script>
             <script type="text/javascript" src="/web/static/lib/datejs/parser.js"></script>
@@ -137,6 +136,7 @@
         <template id="web.webclient_bootstrap" name="Webclient Bootstrap">
             <t t-call="web.layout">
                 <t t-set="head">
+                    <t t-call-assets="web.assets_common"/>
                     <t t-call-assets="web.assets_backend"/>
                     <script type="text/javascript">
                         $(function() {
@@ -242,6 +242,7 @@
                     <link rel="stylesheet" href="/web/static/lib/qunit/qunit.css"/>
                     <script src="/web/static/lib/qunit/qunit.js"></script>
 
+                    <t t-call="web.assets_common"/>
                     <t t-call="web.assets_backend"/>
 
                     <script type="text/javascript" id="qunit_config">
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 890d6080039..c62a31a95e1 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -12,7 +12,6 @@
 </template>
 
 <template id="website.assets_frontend" name="Website assets">
-    <t t-call="web.assets_common"/>
     <t t-call="website.theme"/>
 
     <script type="text/javascript" src="/web/static/src/js/watch.js"></script>
@@ -89,6 +88,7 @@
                 <link rel="alternate" t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=force_lang)" t-att-hreflang="lg[0].replace('_', '-').lower()" />
             </t>
 
+            <t t-call-assets="web.assets_common"/>
             <t t-call-assets="website.assets_frontend"/>
 
             <t t-raw="head or ''" name='layout_head'/>