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 8c666dba095..decc6d5618b 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 @@
                 </t>
             </t>
 
+            <t t-call-assets="web.assets_common"/>
             <t t-call-assets="website.assets_frontend"/>
 
             <t t-raw="head or ''" name='layout_head'/>
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index 588c2dedf9f..9a054772695 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -433,7 +433,9 @@ class configmanager(object):
 
         self.options['root_path'] = os.path.abspath(os.path.expanduser(os.path.expandvars(os.path.dirname(openerp.__file__))))
         if not self.options['addons_path'] or self.options['addons_path']=='None':
-            self.options['addons_path'] = os.path.join(self.options['root_path'], 'addons')
+            base_addons = os.path.join(self.options['root_path'], 'addons')
+            main_addons = os.path.abspath(os.path.join(self.options['root_path'], '../addons'))
+            self.options['addons_path'] = '%s,%s' % (base_addons, main_addons)
         else:
             self.options['addons_path'] = ",".join(
                     os.path.abspath(os.path.expanduser(os.path.expandvars(x)))
