[IMP] bundlify addons (except website)

bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 1a222b2..7347587 100644 (file)
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -144,20 +144,12 @@ for a particular financial year and for preparation of vouchers there is a modul
         'project/views/report_analyticcostledgerquantity.xml',
         'project/views/report_analyticcostledger.xml',
         'project/views/report_invertedanalyticbalance.xml',
-    ],
-    'js': [
-        'static/src/js/account_move_reconciliation.js',
-        'static/src/js/account_move_line_quickadd.js',
+        'views/account.xml',
     ],
     'qweb' : [
         "static/src/xml/account_move_reconciliation.xml",
         "static/src/xml/account_move_line_quickadd.xml",
     ],
-    'css':[
-        'static/src/css/account_move_reconciliation.css',
-        'static/src/css/account_move_line_quickadd.css',
-        'static/src/css/account_bank_and_cash.css',
-    ],
     'demo': [
         'demo/account_demo.xml',
         'project/project_demo.xml',

diff --git a/addons/account/views/account.xml b/addons/account/views/account.xml
new file mode 100644 (file)
index 0000000..15df140
--- /dev/null
+++ b/addons/account/views/account.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="account assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/account/static/src/css/account_move_reconciliation.css"/>
+                <link rel="stylesheet" href="/account/static/src/css/account_move_line_quickadd.css"/>
+                <link rel="stylesheet" href="/account/static/src/css/account_bank_and_cash.css"/>
+                <script type="text/javascript" src="/account/static/src/js/account_move_reconciliation.js"></script>
+                <script type="text/javascript" src="/account/static/src/js/account_move_line_quickadd.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index 61a9249..70a2169 100644 (file)
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -40,9 +40,7 @@ Adds menu to show relevant information to each manager.You can also view the rep
         'account_analytic_analysis_view.xml',
         'account_analytic_analysis_cron.xml',
         'res_config_view.xml',
-    ],
-    'css': [
-        'static/src/css/analytic.css'
+        'views/account_analytic_analysis.xml',
     ],
     'demo': ['analytic_account_demo.xml'],
     'test': ['test/account_analytic_analysis.yml'],

diff --git a/addons/account_analytic_analysis/views/account_analytic_analysis.xml b/addons/account_analytic_analysis/views/account_analytic_analysis.xml
new file mode 100644 (file)
index 0000000..dced073
--- /dev/null
+++ b/addons/account_analytic_analysis/views/account_analytic_analysis.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="account_analytic_analysis assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/account_analytic_analysis/static/src/css/analytic.css"/>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/auth_openid/__openerp__.py b/addons/auth_openid/__openerp__.py
index 10c77f2..f0d70f5 100644 (file)
--- a/addons/auth_openid/__openerp__.py
+++ b/addons/auth_openid/__openerp__.py
@@ -32,9 +32,10 @@ Allow users to login through OpenID.
     'maintainer': 'OpenERP s.a.',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'web'],
-    'data': ['res_users.xml'],
-    'js': ['static/src/js/auth_openid.js'],
-    'css': ['static/src/css/openid.css'],
+    'data': [
+        'res_users.xml',
+        'views/auth_openid.xml',
+    ],
     'qweb': ['static/src/xml/auth_openid.xml'],
     'external_dependencies': {
         'python' : ['openid'],

diff --git a/addons/auth_openid/views/auth_openid.xml b/addons/auth_openid/views/auth_openid.xml
new file mode 100644 (file)
index 0000000..5218744
--- /dev/null
+++ b/addons/auth_openid/views/auth_openid.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="auth_openid assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/auth_openid/static/src/css/openid.css"/>
+                <script type="text/javascript" src="/auth_openid/static/src/js/auth_openid.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/base_import/__openerp__.py b/addons/base_import/__openerp__.py
index 8c87e77..70f038a 100644 (file)
--- a/addons/base_import/__openerp__.py
+++ b/addons/base_import/__openerp__.py
@@ -29,13 +29,7 @@ Re-implement openerp's file import system:
     'auto_install': True,
     'data': [
         'security/ir.model.access.csv',
-    ],
-    'css': [
-        'static/src/css/import.css',
-    ],
-    'js': [
-        'static/lib/javascript-state-machine/state-machine.js',
-        'static/src/js/import.js',
+        'views/base_import.xml',
     ],
     'qweb': ['static/src/xml/import.xml'],
     'test': ['static/test/states.js'],

diff --git a/addons/base_import/views/base_import.xml b/addons/base_import/views/base_import.xml
new file mode 100644 (file)
index 0000000..809241c
--- /dev/null
+++ b/addons/base_import/views/base_import.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="base_import assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/base_import/static/src/css/import.css"/>
+                <script type="text/javascript" src="/base_import/static/lib/javascript-state-machine/state-machine.js"></script>
+                <script type="text/javascript" src="/base_import/static/src/js/import.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index e74238b..15c30c1 100644 (file)
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -39,11 +39,11 @@ Shows you a list of applications features to install from.
         'base_setup_views.xml',
         'res_config_view.xml',
         'res_partner_view.xml',
+        'views/base_setup.xml',
     ],
     'demo': [],
     'installable': True,
     'auto_install': False,
     'images': ['images/base_setup1.jpeg','images/base_setup2.jpeg','images/base_setup3.jpeg','images/base_setup4.jpeg',],
-    'css': ['static/src/css/base_setup.css'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --git a/addons/base_setup/views/base_setup.xml b/addons/base_setup/views/base_setup.xml
new file mode 100644 (file)
index 0000000..77e91ee
--- /dev/null
+++ b/addons/base_setup/views/base_setup.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="base_setup assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/base_setup/static/src/css/base_setup.css"/>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index 87771b2..48ed286 100644 (file)
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -35,10 +35,9 @@ Allows users to create custom dashboard.
     'data': [
         'security/ir.model.access.csv',
         'board_view.xml',
-        'board_mydashboard_view.xml'
+        'board_mydashboard_view.xml',
+        'views/board.xml',
     ],
-    'js': ['static/src/js/dashboard.js'],
-    'css': ['static/src/css/dashboard.css'],
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
     'auto_install': False,

diff --git a/addons/board/views/board.xml b/addons/board/views/board.xml
new file mode 100644 (file)
index 0000000..a9bd206
--- /dev/null
+++ b/addons/board/views/board.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="board assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/board/static/src/css/dashboard.css"/>
+                <script type="text/javascript" src="/board/static/src/js/dashboard.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/calendar/__openerp__.py b/addons/calendar/__openerp__.py
index 53c0539..01007bc 100644 (file)
--- a/addons/calendar/__openerp__.py
+++ b/addons/calendar/__openerp__.py
@@ -43,15 +43,10 @@ If you need to manage your meetings, you should install the CRM module.
         'security/ir.model.access.csv',
         'calendar_view.xml',
         'contacts_view.xml',
-        'calendar_data.xml',        
-    ],
-    'js': [
-        'static/src/js/base_calendar.js'
+        'calendar_data.xml',
+        'views/calendar.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
-    'css': [
-        'static/src/css/calendar.css'
-    ],
     'test' : [
               'test/calendar_test.yml',
               'test/test_calendar_recurrent_event_case2.yml'

diff --git a/addons/calendar/views/calendar.xml b/addons/calendar/views/calendar.xml
new file mode 100644 (file)
index 0000000..5eb0438
--- /dev/null
+++ b/addons/calendar/views/calendar.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="calendar assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/calendar/static/src/css/calendar.css"/>
+                <script type="text/javascript" src="/calendar/static/src/js/base_calendar.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index d5bb98c..4619e91 100644 (file)
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -96,6 +96,7 @@ Dashboard for CRM will include:
         'base_partner_merge_view.xml',
 
         'crm_case_section_view.xml',
+        'views/crm.xml',
     ],
     'demo': [
         'crm_demo.xml',
@@ -117,12 +118,6 @@ Dashboard for CRM will include:
         'test/crm_lead_unlink.yml',
         'test/crm_lead_find_stage.yml',
     ],
-    'css': [
-        'static/src/css/crm.css'
-    ],
-    'js': [
-        'static/src/js/crm_case_section.js',
-    ],
     'installable': True,
     'application': True,
     'auto_install': False,

diff --git a/addons/crm/views/crm.xml b/addons/crm/views/crm.xml
new file mode 100644 (file)
index 0000000..c28ba72
--- /dev/null
+++ b/addons/crm/views/crm.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="crm assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/crm/static/src/css/crm.css"/>
+                <script type="text/javascript" src="/crm/static/src/js/crm_case_section.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index eae5762..540bd2a 100644 (file)
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -46,14 +46,12 @@ to an appropriate local partner, based on the distance and the weight that was a
         'portal_data.xml',
         'report/crm_lead_report_view.xml',
         'report/crm_partner_report_view.xml',
+        'views/crm_partner_assign.xml',
     ],
     'demo': [
         'res_partner_demo.xml',
         'crm_lead_demo.xml'
     ],
-    'js': [
-        'static/src/js/next.js',
-    ],
     'test': ['test/partner_assign.yml'],
     'installable': True,
     'auto_install': False,

diff --git a/addons/crm_partner_assign/views/crm_partner_assign.xml b/addons/crm_partner_assign/views/crm_partner_assign.xml
new file mode 100644 (file)
index 0000000..90094a1
--- /dev/null
+++ b/addons/crm_partner_assign/views/crm_partner_assign.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="crm_partner_assign assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/crm_partner_assign/static/src/js/next.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 5cc674f..7f387c2 100644 (file)
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -45,10 +45,10 @@ This is a complete document management system.
         'wizard/document_configuration_view.xml',
         'security/ir.model.access.csv',
         'report/document_report_view.xml',
+        'views/document.xml',
     ],
     'demo': [ 'document_demo.xml' ],
     'test': ['test/document_test2.yml'],
-    'js': ['static/src/js/document.js'],
     'installable': True,
     'auto_install': False,
     'images': ['images/1_directories.jpeg','images/2_storage_media.jpeg','images/3_directories_structure.jpeg'],

diff --git a/addons/document/views/document.xml b/addons/document/views/document.xml
new file mode 100644 (file)
index 0000000..3f14b38
--- /dev/null
+++ b/addons/document/views/document.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="document assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/document/static/src/js/document.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/edi/__openerp__.py b/addons/edi/__openerp__.py
index 72ccb32..e6fd073 100644 (file)
--- a/addons/edi/__openerp__.py
+++ b/addons/edi/__openerp__.py
@@ -35,10 +35,11 @@ documentation at http://doc.openerp.com.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'email_template'],
+    'data' : [
+        'views/edi.xml',
+    ],
     'icon': '/edi/static/src/img/knowledge.png',
     'test': ['test/edi_partner_test.yml'],
-    'js': ['static/src/js/edi.js'],
-    'css': ['static/src/css/edi.css'],
     'qweb': ['static/src/xml/*.xml'],
     'auto_install': False,
 }

diff --git a/addons/edi/views/edi.xml b/addons/edi/views/edi.xml
new file mode 100644 (file)
index 0000000..47b702c
--- /dev/null
+++ b/addons/edi/views/edi.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="edi assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/edi/static/src/css/edi.css"/>
+                <script type="text/javascript" src="/edi/static/src/js/edi.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index e7cf8c4..73f596a 100644 (file)
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -1,4 +1,3 @@
-
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
@@ -50,6 +49,7 @@ Key Features
         'board_association_view.xml',
         'res_partner_view.xml',
         'email_template.xml',
+        'views/event.xml',
     ],
     'demo': [
         'event_demo.xml',
@@ -58,7 +58,6 @@ Key Features
         'test/ui/event_users.yml',
         'test/process/event_draft2done.yml'
     ],
-    'css': ['static/src/css/event.css'],
     'installable': True,
     'auto_install': False,
     'images': ['images/1_event_type_list.jpeg','images/2_events.jpeg','images/3_registrations.jpeg','images/events_kanban.jpeg'],

diff --git a/addons/event/views/event.xml b/addons/event/views/event.xml
new file mode 100644 (file)
index 0000000..3162365
--- /dev/null
+++ b/addons/event/views/event.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="event assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/event/static/src/css/event.css"/>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index c522e28..0dd6340 100644 (file)
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -48,12 +48,11 @@ Both goals and badges are flexibles and can be adapted to a large range of modul
         'security/ir.model.access.csv',
         'data/goal_base.xml',
         'data/badge.xml',
+        'views/gamification.xml',
     ],
     'installable': True,
     'application': True,
     'auto_install': False,
 
-    'css': ['static/src/css/gamification.css'],
-    'js': ['static/src/js/gamification.js',],
     'qweb': ['static/src/xml/gamification.xml'],
 }

diff --git a/addons/gamification/views/gamification.xml b/addons/gamification/views/gamification.xml
new file mode 100644 (file)
index 0000000..df5f119
--- /dev/null
+++ b/addons/gamification/views/gamification.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="gamification assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/gamification/static/src/css/gamification.css"/>
+                <script type="text/javascript" src="/gamification/static/src/js/gamification.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/google_calendar/__openerp__.py b/addons/google_calendar/__openerp__.py
index 29ea958..18f2806 100644 (file)
--- a/addons/google_calendar/__openerp__.py
+++ b/addons/google_calendar/__openerp__.py
@@ -31,13 +31,12 @@ The module adds the possibility to synchronize Google Calendar with OpenERP
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['google_account','calendar'],
-    'css': ['static/src/css/google_calendar.css'],
-    'js': ['static/src/js/calendar_sync.js'],
     'qweb': ['static/src/xml/*.xml'],
     'data': [
-             'res_config_view.xml',
-             'security/ir.model.access.csv',
-            ],
+        'res_config_view.xml',
+        'security/ir.model.access.csv',
+        'views/google_calendar.xml',
+    ],
     'demo': [],
     'installable': True,
     'auto_install': False,

diff --git a/addons/google_calendar/views/google_calendar.xml b/addons/google_calendar/views/google_calendar.xml
new file mode 100644 (file)
index 0000000..d25a2fa
--- /dev/null
+++ b/addons/google_calendar/views/google_calendar.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="google_calendar assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/google_calendar/static/src/css/google_calendar.css"/>
+                <script type="text/javascript" src="/google_calendar/static/src/js/calendar_sync.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/google_drive/__openerp__.py b/addons/google_drive/__openerp__.py
index e486c2c..017f01b 100644 (file)
--- a/addons/google_drive/__openerp__.py
+++ b/addons/google_drive/__openerp__.py
@@ -27,13 +27,11 @@
     'category': 'Tools',
     'installable': True,
     'auto_install': False,
-    'js': [
-        'static/src/js/gdrive.js',
-    ],
     'data': [
         'security/ir.model.access.csv',
         'res_config_user_view.xml',
-        'google_drive_data.xml'
+        'google_drive_data.xml',
+        'views/google_drive.xml',
     ],
     'demo': [
         'google_drive_demo.xml'

diff --git a/addons/google_drive/views/google_drive.xml b/addons/google_drive/views/google_drive.xml
new file mode 100644 (file)
index 0000000..5017f53
--- /dev/null
+++ b/addons/google_drive/views/google_drive.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="google_drive assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/google_drive/static/src/js/gdrive.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/google_spreadsheet/__openerp__.py b/addons/google_spreadsheet/__openerp__.py
index 1ae2d48..08b0847 100644 (file)
--- a/addons/google_spreadsheet/__openerp__.py
+++ b/addons/google_spreadsheet/__openerp__.py
@@ -31,11 +31,12 @@ The module adds the possibility to display data from OpenERP in Google Spreadshe
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['board', 'google_drive'],
-    'js': [
-        'static/src/js/search.js',
+    'data' : [
+        'google_spreadsheet_view.xml',
+        'google_spreadsheet_data.xml',
+        'views/google_spreadsheet.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
-    'data': ['google_spreadsheet_view.xml', 'google_spreadsheet_data.xml'],
     'demo': [],
     'installable': True,
     'auto_install': False,

diff --git a/addons/google_spreadsheet/views/google_spreadsheet.xml b/addons/google_spreadsheet/views/google_spreadsheet.xml
new file mode 100644 (file)
index 0000000..8fe8ddf
--- /dev/null
+++ b/addons/google_spreadsheet/views/google_spreadsheet.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="google_spreadsheet assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/google_spreadsheet/static/src/js/search.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index ef72257..be678d1 100644 (file)
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -60,6 +60,7 @@ You can manage:
         'res_config_view.xml',
         'mail_hr_view.xml',
         'res_users_view.xml',
+        'views/hr.xml',
     ],
     'demo': ['hr_demo.xml'],
     'test': [
@@ -70,8 +71,6 @@ You can manage:
     'installable': True,
     'application': True,
     'auto_install': False,
-    'css': [ 'static/src/css/hr.css' ],
-    'js': [ 'static/src/js/suggestions.js' ],
     'qweb': [ 'static/src/xml/suggestions.xml' ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --git a/addons/hr/views/hr.xml b/addons/hr/views/hr.xml
new file mode 100644 (file)
index 0000000..099697d
--- /dev/null
+++ b/addons/hr/views/hr.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="hr assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/hr/static/src/css/hr.css"/>
+                <script type="text/javascript" src="/hr/static/src/js/suggestions.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index abdc1ad..72d2e26 100644 (file)
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -44,6 +44,7 @@ actions(Sign in/Sign out) performed by them.
         'wizard/hr_attendance_error_view.xml',
         'res_config_view.xml',
         'views/report_attendanceerrors.xml',
+        'views/hr_attendance.xml',
     ],
     'demo': ['hr_attendance_demo.xml'],
     'test': [
@@ -53,9 +54,7 @@ actions(Sign in/Sign out) performed by them.
     'installable': True,
     'auto_install': False,
     #web
-    "js": ["static/src/js/attendance.js"],
     'qweb': ["static/src/xml/attendance.xml"],
-    'css': ["static/src/css/slider.css"],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --git a/addons/hr_attendance/views/hr_attendance.xml b/addons/hr_attendance/views/hr_attendance.xml
new file mode 100644 (file)
index 0000000..f481ec2
--- /dev/null
+++ b/addons/hr_attendance/views/hr_attendance.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="hr_attendance assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/hr_attendance/static/src/css/slider.css"/>
+                <script type="text/javascript" src="/hr_attendance/static/src/js/attendance.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/hr_gamification/__openerp__.py b/addons/hr_gamification/__openerp__.py
index 1492542..8d34343 100644 (file)
--- a/addons/hr_gamification/__openerp__.py
+++ b/addons/hr_gamification/__openerp__.py
@@ -35,7 +35,7 @@ Badge received are displayed on the user profile.
         'security/gamification_security.xml',
         'wizard/grant_badge.xml',
         'views/gamification.xml',
+        'views/hr_gamification.xml',
     ],
-    'js': ['static/src/js/gamification.js'],
     'auto_install': True,
 }

diff --git a/addons/hr_gamification/views/hr_gamification.xml b/addons/hr_gamification/views/hr_gamification.xml
new file mode 100644 (file)
index 0000000..8d34de2
--- /dev/null
+++ b/addons/hr_gamification/views/hr_gamification.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="hr_gamification assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/hr_gamification/static/src/js/gamification.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 27c7d19..04ef0a9 100644 (file)
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -59,13 +59,10 @@ You can define the different phases of interviews and easily rate the applicant
         'res_config_view.xml',
         'survey_data_recruitment.xml',
         'hr_recruitment_data.xml',
+        'views/hr_recruitment.xml',
     ],
     'demo': ['hr_recruitment_demo.xml'],
-    'js': [
-        'static/src/js/job_position.js',
-    ],
     'test': ['test/recruitment_process.yml'],
-    'css': ['static/src/css/job_position.css'],
     'installable': True,
     'auto_install': False,
     'application': True,

diff --git a/addons/hr_recruitment/views/hr_recruitment.xml b/addons/hr_recruitment/views/hr_recruitment.xml
new file mode 100644 (file)
index 0000000..241f787
--- /dev/null
+++ b/addons/hr_recruitment/views/hr_recruitment.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="hr_recruitment assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/hr_recruitment/static/src/css/job_position.css"/>
+                <script type="text/javascript" src="/hr_recruitment/static/src/js/job_position.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index e92ab44..e96968d 100644 (file)
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -59,14 +59,13 @@ The validation can be configured in the company:
         'wizard/hr_timesheet_current_view.xml',
         'hr_timesheet_sheet_data.xml',
         'res_config_view.xml',
+        'views/hr_timesheet_sheet.xml',
     ],
     'demo': ['hr_timesheet_sheet_demo.xml'],
     'test':['test/test_hr_timesheet_sheet.yml'],
     'installable': True,
     'auto_install': False,
     'application': True,
-    'js': ['static/src/js/timesheet.js',],
-    'css': ['static/src/css/timesheet.css',],
     'qweb': ['static/src/xml/timesheet.xml',],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --git a/addons/hr_timesheet_sheet/views/hr_timesheet_sheet.xml b/addons/hr_timesheet_sheet/views/hr_timesheet_sheet.xml
new file mode 100644 (file)
index 0000000..7a13b9e
--- /dev/null
+++ b/addons/hr_timesheet_sheet/views/hr_timesheet_sheet.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="hr_timesheet_sheet assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/hr_timesheet_sheet/static/src/css/timesheet.css"/>
+                <script type="text/javascript" src="/hr_timesheet_sheet/static/src/js/timesheet.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/im/__openerp__.py b/addons/im/__openerp__.py
index 45e6477..63a5148 100644 (file)
--- a/addons/im/__openerp__.py
+++ b/addons/im/__openerp__.py
@@ -16,16 +16,9 @@ chat in real time. It support several chats in parallel.
     'data': [
         'security/ir.model.access.csv',
         'security/im_security.xml',
+        'views/im.xml',
     ],
     'depends' : ['base', 'web'],
-    'js': [
-        'static/src/js/im_common.js',
-        'static/src/js/im.js',
-    ],
-    'css': [
-        'static/src/css/im.css',
-        'static/src/css/im_common.css',
-    ],
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
     'auto_install': False,

diff --git a/addons/im/views/im.xml b/addons/im/views/im.xml
new file mode 100644 (file)
index 0000000..ef91b1c
--- /dev/null
+++ b/addons/im/views/im.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="im assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/im/static/src/css/im.css"/>
+                <link rel="stylesheet" href="/im/static/src/css/im_common.css"/>
+                <script type="text/javascript" src="/im/static/src/js/im_common.js"></script>
+                <script type="text/javascript" src="/im/static/src/js/im.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index 955a127..127e096 100644 (file)
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -40,10 +40,18 @@ In addition to a full meal and supplier management, this module offers the possi
 
 If you want to save your employees' time and avoid them to always have coins in their pockets, this module is essential.
     """,
-    'data': ['security/lunch_security.xml','lunch_view.xml','wizard/lunch_order_view.xml','wizard/lunch_validation_view.xml','wizard/lunch_cancel_view.xml','lunch_report.xml',
+    'data': [
+        'security/lunch_security.xml',
+        'lunch_view.xml',
+        'wizard/lunch_order_view.xml',
+        'wizard/lunch_validation_view.xml',
+        'wizard/lunch_cancel_view.xml',
+        'lunch_report.xml',
         'report/report_lunch_order_view.xml',
-        'security/ir.model.access.csv','views/report_lunchorder.xml'],
-    'css':['static/src/css/lunch.css'],
+        'security/ir.model.access.csv',
+        'views/report_lunchorder.xml',
+        'views/lunch.xml',
+    ],
     'images': ['images/new_order.jpeg','images/lunch_account.jpeg','images/order_by_supplier_analysis.jpeg','images/alert.jpeg'],
     'demo': ['lunch_demo.xml',],
     'installable': True,

diff --git a/addons/lunch/views/lunch.xml b/addons/lunch/views/lunch.xml
new file mode 100644 (file)
index 0000000..e459535
--- /dev/null
+++ b/addons/lunch/views/lunch.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="lunch assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/lunch/static/src/css/lunch.css"/>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 59d2e5f..b1cf490 100644 (file)
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -63,6 +63,7 @@ Main Features
         'security/ir.model.access.csv',
         'mail_alias_view.xml',
         'res_users_view.xml',
+        'views/mail.xml',
     ],
     'demo': [
         'data/mail_demo.xml',
@@ -78,18 +79,6 @@ Main Features
         'images/join_a_group.jpeg',
         'images/share_a_message.jpeg',
     ],
-    'css': [
-        'static/src/css/mail.css',
-        'static/src/css/mail_group.css',
-        'static/src/css/announcement.css',
-    ],
-    'js': [
-        'static/src/js/mail.js',
-        'static/src/js/mail_followers.js',
-        'static/src/js/many2many_tags_email.js',
-        'static/src/js/announcement.js',
-        'static/src/js/suggestions.js',
-    ],
     'qweb': [
         'static/src/xml/mail.xml',
         'static/src/xml/mail_followers.xml',

diff --git a/addons/mail/views/mail.xml b/addons/mail/views/mail.xml
new file mode 100644 (file)
index 0000000..827cc3c
--- /dev/null
+++ b/addons/mail/views/mail.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="mail assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/mail/static/src/css/mail.css"/>
+                <link rel="stylesheet" href="/mail/static/src/css/mail_group.css"/>
+                <link rel="stylesheet" href="/mail/static/src/css/announcement.css"/>
+                <script type="text/javascript" src="/mail/static/src/js/mail.js"></script>
+                <script type="text/javascript" src="/mail/static/src/js/mail_followers.js"></script>
+                <script type="text/javascript" src="/mail/static/src/js/many2many_tags_email.js"></script>
+                <script type="text/javascript" src="/mail/static/src/js/announcement.js"></script>
+                <script type="text/javascript" src="/mail/static/src/js/suggestions.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
index 91b57ac..e96cc91 100644 (file)
--- a/addons/mass_mailing/__openerp__.py
+++ b/addons/mass_mailing/__openerp__.py
@@ -49,15 +49,9 @@ professional emails and reuse templates in a few clicks.
         'views/res_partner.xml',
         'views/email_template.xml',
         'security/ir.model.access.csv',
-    ],
-    'js': [
-        'static/src/js/mass_mailing.js',
+        'views/mass_mailing.xml',
     ],
     'qweb': [],
-    'css': [
-        'static/src/css/mass_mailing.css',
-        'static/src/css/email_template.css'
-    ],
     'demo': [
         'data/mass_mailing_demo.xml',
     ],

diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index 7892fea..56537a3 100644 (file)
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+        <template id="assets_backend" name="mass_mailing assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/mass_mailing/static/src/css/mass_mailing.css"/>
+                <link rel="stylesheet" href="/mass_mailing/static/src/css/email_template.css"/>
+                <script type="text/javascript" src="/mass_mailing/static/src/js/mass_mailing.js"></script>
+            </xpath>
+        </template>
 
         <!-- Marketing / Mass Mailing -->
         <menuitem name="Mass Mailing" id="mass_mailing_campaign"

diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
index 2653c55..4194add 100644 (file)
--- a/addons/note/__openerp__.py
+++ b/addons/note/__openerp__.py
@@ -48,15 +48,13 @@ Notes can be found in the 'Home' menu.
         'security/ir.model.access.csv',
         'note_data.xml',
         'note_view.xml',
+        'views/note.xml',
     ],
     'demo': [
         'note_demo.xml',
     ],
     'test': [
     ],
-    'css': [
-        'static/src/css/note.css',
-    ],
     'images': [
         'images/note_kanban.jpeg',
         'images/note.jpeg',

diff --git a/addons/note/views/note.xml b/addons/note/views/note.xml
new file mode 100644 (file)
index 0000000..0c17243
--- /dev/null
+++ b/addons/note/views/note.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="note assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/note/static/src/css/note.css"/>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index b99e6d8..0d0ef5a 100644 (file)
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -12,16 +12,17 @@ pads (by default, http://ietherpad.com/).
     """,
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
-    'depends': ['base'],
-    'data': ['res_company.xml'],
+    'depends': ['web'],
+    'data': [
+        'res_company.xml',
+        'views/pad.xml',
+    ],
     'demo': ['pad_demo.xml'],
     'installable': True,
     'auto_install': False,
     'web': True,
-    'js': ['static/src/js/pad.js'],
     'qweb' : ['static/src/xml/*.xml'],
     'images': ['static/src/img/pad_link_companies.jpeg'],
-    'css': ['static/src/css/etherpad.css',],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --git a/addons/pad/views/pad.xml b/addons/pad/views/pad.xml
new file mode 100644 (file)
index 0000000..b40545d
--- /dev/null
+++ b/addons/pad/views/pad.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="pad assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/pad/static/src/css/etherpad.css"/>
+                <script type="text/javascript" src="/pad/static/src/js/pad.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index fa42a19..149d4f0 100644 (file)
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -75,6 +75,7 @@ Main Features
         'account_statement_report.xml',
         'res_users_view.xml',
         'res_partner_view.xml',
+        'views/point_of_sale.xml',
     ],
     'demo': [
         'point_of_sale_demo.xml',
@@ -88,18 +89,6 @@ Main Features
     ],
     'installable': True,
     'application': True,
-    'js': [
-        'static/lib/fastclick.js',
-        'static/src/js/db.js',
-        'static/src/js/models.js',
-        'static/src/js/widget_base.js',
-        'static/src/js/widget_keyboard.js',
-        'static/src/js/widgets.js',
-        'static/src/js/devices.js',
-        'static/src/js/screens.js',
-        'static/src/js/tests.js',
-        'static/src/js/main.js',
-    ],
     'qweb': ['static/src/xml/pos.xml'],
     'auto_install': False,
 }

diff --git a/addons/point_of_sale/views/point_of_sale.xml b/addons/point_of_sale/views/point_of_sale.xml
new file mode 100644 (file)
index 0000000..ae76f4b
--- /dev/null
+++ b/addons/point_of_sale/views/point_of_sale.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="point_of_sale assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/point_of_sale/static/lib/fastclick.js"></script>
+                <script type="text/javascript" src="/point_of_sale/static/src/js/db.js"></script>
+                <script type="text/javascript" src="/point_of_sale/static/src/js/models.js"></script>
+                <script type="text/javascript" src="/point_of_sale/static/src/js/widget_base.js"></script>
+                <script type="text/javascript" src="/point_of_sale/static/src/js/widget_keyboard.js"></script>
+                <script type="text/javascript" src="/point_of_sale/static/src/js/widgets.js"></script>
+                <script type="text/javascript" src="/point_of_sale/static/src/js/devices.js"></script>
+                <script type="text/javascript" src="/point_of_sale/static/src/js/screens.js"></script>
+                <script type="text/javascript" src="/point_of_sale/static/src/js/tests.js"></script>
+                <script type="text/javascript" src="/point_of_sale/static/src/js/main.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 2ee8121..407d2a7 100644 (file)
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -48,9 +48,9 @@ very handy when used in combination with the module 'share'.
         'wizard/portal_wizard_view.xml',
         'wizard/share_wizard_view.xml',
         'security/ir.model.access.csv',
+        'views/portal.xml',
     ],
     'demo': ['portal_demo.xml'],
-    'css': ['static/src/css/portal.css'],
     'auto_install': True,
     'installable': True,
 }

diff --git a/addons/portal/views/portal.xml b/addons/portal/views/portal.xml
new file mode 100644 (file)
index 0000000..7421c43
--- /dev/null
+++ b/addons/portal/views/portal.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="portal assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/portal/static/src/css/portal.css"/>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/portal_project_issue/__openerp__.py b/addons/portal_project_issue/__openerp__.py
index cef01c5..3581e32 100644 (file)
--- a/addons/portal_project_issue/__openerp__.py
+++ b/addons/portal_project_issue/__openerp__.py
@@ -35,10 +35,10 @@ This module adds issue menu and features to your portal if project_issue and por
         'security/portal_security.xml',
         'security/ir.model.access.csv',
         'portal_project_issue_view.xml',
+        'views/portal_project_issue.xml',
     ],
     'installable': True,
     'auto_install': True,
     'category': 'Hidden',
-    'css': ['static/src/css/portal_project_issue.css'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --git a/addons/portal_project_issue/views/portal_project_issue.xml b/addons/portal_project_issue/views/portal_project_issue.xml
new file mode 100644 (file)
index 0000000..eece197
--- /dev/null
+++ b/addons/portal_project_issue/views/portal_project_issue.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="portal_project_issue assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/portal_project_issue/static/src/css/portal_project_issue.css"/>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py
index c998288..2006e2b 100644 (file)
--- a/addons/process/__openerp__.py
+++ b/addons/process/__openerp__.py
@@ -38,18 +38,13 @@ This module shows the basic processes involved in the selected modules and in th
     'depends': ['web'],
     'data': [
         'security/ir.model.access.csv',
-        'process_view.xml'
+        'process_view.xml',
+        'views/process.xml',
     ],
     'demo': [],
     'installable': True,
     'auto_install': False,
     'images': ['images/process_nodes.jpeg','images/process_transitions.jpeg', 'images/processes.jpeg'],
-    'js': [
-        'static/src/js/process.js'
-    ],
-    'css': [
-        'static/src/css/process.css'
-    ],
     'qweb': [
         'static/src/xml/*.xml'
     ],

diff --git a/addons/process/views/process.xml b/addons/process/views/process.xml
new file mode 100644 (file)
index 0000000..74093ef
--- /dev/null
+++ b/addons/process/views/process.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="process assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/process/static/src/css/process.css"/>
+                <script type="text/javascript" src="/process/static/src/js/process.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index f5ba24c..1f82d7b 100644 (file)
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -74,6 +74,7 @@ Dashboard / Reports for Project Management will include:
         'report/project_cumulative.xml',
         'board_project_view.xml',
         'res_config_view.xml',
+        'views/project.xml',
     ],
     'demo': ['project_demo.xml'],
     'test': [
@@ -81,7 +82,5 @@ Dashboard / Reports for Project Management will include:
     'installable': True,
     'auto_install': False,
     'application': True,
-    'css': ['static/src/css/project.css'],
-    'js': ['static/src/js/project.js'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --git a/addons/project/views/project.xml b/addons/project/views/project.xml
new file mode 100644 (file)
index 0000000..07d05b0
--- /dev/null
+++ b/addons/project/views/project.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="project assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/project/static/src/css/project.css"/>
+                <script type="text/javascript" src="/project/static/src/js/project.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/report/__openerp__.py b/addons/report/__openerp__.py
index c07cdc4..97c4acb 100644 (file)
--- a/addons/report/__openerp__.py
+++ b/addons/report/__openerp__.py
@@ -7,15 +7,13 @@
 Report
         """,
     'author': 'OpenERP SA',
-    'depends': ['base'],
+    'depends': ['base', 'web'],
     'data': [
         'views/layouts.xml',
         'views/views.xml',
         'data/report_paperformat.xml',
         'security/ir.model.access.csv',
-    ],
-    'js': [
-        'static/src/js/qwebactionmanager.js',
+        'views/report.xml',
     ],
     'installable': True,
     'auto_install': True,

diff --git a/addons/report/views/report.xml b/addons/report/views/report.xml
new file mode 100644 (file)
index 0000000..313111f
--- /dev/null
+++ b/addons/report/views/report.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="report assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/report/static/src/js/qwebactionmanager.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index ab94069..1a0a6c5 100644 (file)
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -46,9 +46,7 @@ modules.
         'security/sale_crm_security.xml',
         'security/ir.model.access.csv',
         'report/sale_report_view.xml',
-    ],
-    'js': [
-        'static/src/js/sale_crm.js',
+        'views/sale_crm.xml',
     ],
     'demo': ['sale_crm_demo.xml'],
     'test': ['test/sale_crm.yml'],

diff --git a/addons/sale_crm/views/sale_crm.xml b/addons/sale_crm/views/sale_crm.xml
new file mode 100644 (file)
index 0000000..0700dd6
--- /dev/null
+++ b/addons/sale_crm/views/sale_crm.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="sale_crm assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/sale_crm/static/src/js/sale_crm.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 7cb8bed..530a40a 100644 (file)
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -48,12 +48,11 @@ synchronization with other companies.
         'res_users_view.xml',
         'wizard/share_wizard_view.xml',
         'share_data.xml',
+        'views/share.xml',
     ],
     'installable': True,
     'auto_install': True,
     'web': True,
-    'js': ['static/src/js/share.js'],
-    'css': ['static/src/css/share.css'],
     'qweb' : ['static/src/xml/*.xml'],
     'images': ['images/share_wizard.jpeg','images/sharing_wizard_step1.jpeg', 'images/sharing_wizard_step2.jpeg'],
 }

diff --git a/addons/share/views/share.xml b/addons/share/views/share.xml
new file mode 100644 (file)
index 0000000..aa507ee
--- /dev/null
+++ b/addons/share/views/share.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="share assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/share/static/src/css/share.css"/>
+                <script type="text/javascript" src="/share/static/src/js/share.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index dd2a996..3eb5ddd 100644 (file)
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -88,6 +88,7 @@ Dashboard / Reports for Warehouse Management will include:
         'report/report_stock_view.xml',
         'board_warehouse_view.xml',
         'res_config_view.xml',
+        'views/stock.xml',
     ],
     'test': [
         'test/stock_users.yml',
@@ -99,7 +100,6 @@ Dashboard / Reports for Warehouse Management will include:
     'installable': True,
     'application': True,
     'auto_install': False,
-    'css': [ 'static/src/css/stock.css' ],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --git a/addons/stock/views/stock.xml b/addons/stock/views/stock.xml
new file mode 100644 (file)
index 0000000..2d935a1
--- /dev/null
+++ b/addons/stock/views/stock.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="stock assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/stock/static/src/css/stock.css"/>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/web_analytics/__openerp__.py b/addons/web_analytics/__openerp__.py
index 829bd0d..d6dc2cc 100644 (file)
--- a/addons/web_analytics/__openerp__.py
+++ b/addons/web_analytics/__openerp__.py
@@ -32,9 +32,10 @@ Collects web application usage with Google Analytics.
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['web'],
-    'data': [],
+    'data': [
+        'views/web_analytics.xml',
+    ],
     'installable': True,
     'active': False,
-    'js': ['static/src/js/web_analytics.js'],
 }
 

diff --git a/addons/web_analytics/views/web_analytics.xml b/addons/web_analytics/views/web_analytics.xml
new file mode 100644 (file)
index 0000000..904a867
--- /dev/null
+++ b/addons/web_analytics/views/web_analytics.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="web_analytics assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/web_analytics/static/src/js/web_analytics.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/web_linkedin/__openerp__.py b/addons/web_linkedin/__openerp__.py
index c1aa995..8269ea7 100644 (file)
--- a/addons/web_linkedin/__openerp__.py
+++ b/addons/web_linkedin/__openerp__.py
@@ -9,10 +9,11 @@ OpenERP Web LinkedIn module.
 ============================
 This module provides the Integration of the LinkedIn with OpenERP.
         """,
-    'data': ['web_linkedin_view.xml'],
+    'data': [
+        'web_linkedin_view.xml',
+        'views/web_linkedin.xml',
+    ],
     'depends' : ['web','crm'],
-    'js': ['static/src/js/linkedin.js'],
-    'css': ['static/src/css/linkedin.css'],
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
     'auto_install': False,

diff --git a/addons/web_linkedin/views/web_linkedin.xml b/addons/web_linkedin/views/web_linkedin.xml
new file mode 100644 (file)
index 0000000..1c75e5d
--- /dev/null
+++ b/addons/web_linkedin/views/web_linkedin.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="web_linkedin assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/web_linkedin/static/src/css/linkedin.css"/>
+                <script type="text/javascript" src="/web_linkedin/static/src/js/linkedin.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 44e0c2a..2c6c2dd 100644 (file)
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -3,7 +3,7 @@
 <data>
 
 <template id="editor_assets" inherit_id="website.editor_assets" name="Blog Editor" groups="base.group_document_user">
-    <xpath expr="//script[@id='website_tour_js']" position="after">
+    <xpath expr="." position="inside">
         <script type="text/javascript" src="/website_blog/static/src/js/website_blog.editor.js"></script>
         <script type="text/javascript" src="/website_blog/static/src/js/website.tour.blog.js"></script>
     </xpath>

diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 8b1af9a..f5cb15f 100644 (file)
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -3,7 +3,7 @@
 <data>
 
 <template id="editor_head" inherit_id="website.editor_assets" name="Event Editor" groups="event.group_event_manager">
-    <xpath expr="//script[@id='website_tour_js']" position="after">
+    <xpath expr="." position="inside">
         <script type="text/javascript" src="/website_event/static/src/js/website_event.editor.js"></script>
         <script type="text/javascript" src="/website_event/static/src/js/website.tour.event.js"></script>
     </xpath>

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index f115622..a59027d 100644 (file)
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -5,7 +5,7 @@
 <!-- Editor custo -->
 <template id="editor_head" inherit_id="website.editor_head"
     name="Event Editor">
-    <xpath expr="//script[@id='website_tour_js']" position="after">
+    <xpath expr="." position="inside">
         <script type="text/javascript" src="/website_forum/static/src/js/website.tour.forum.js"/>
         <script type="text/javascript" src="/website_forum/static/src/js/website_forum.editor.js"/>
     </xpath>

diff --git a/addons/website_hr_recruitment/views/templates.xml b/addons/website_hr_recruitment/views/templates.xml
index 3ab75e2..ac00876 100644 (file)
--- a/addons/website_hr_recruitment/views/templates.xml
+++ b/addons/website_hr_recruitment/views/templates.xml
@@ -3,7 +3,7 @@
 <data>
 
 <template id="editor_assets" inherit_id="website.editor_assets" name="Jobs Editor" groups="base.group_hr_manager">
-    <xpath expr="//script[@id='website_tour_js']" position="after">
+    <xpath expr="." position="inside">
         <script type="text/javascript" src="/website_hr_recruitment/static/src/js/website_hr_recruitment.editor.js"></script>
     </xpath>
 </template>

diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 7c1a7d5..de854f5 100644 (file)
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -11,7 +11,7 @@
 </template>
 
 <template id="editor_assets" inherit_id="website.editor_assets" name="Shop Editor" groups="base.group_sale_manager">
-  <xpath expr="//script[@id='website_tour_js']" position="after">
+  <xpath expr="." position="inside">
       <script type="text/javascript" src="/website_sale/static/src/js/website_sale.editor.js"></script>
       <script type="text/javascript" src="/website_sale/static/src/js/website.tour.shop.js"></script>
   </xpath>