[MERGE] upstream

bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea

diff --cc addons/account/__openerp__.py
Simple merge

diff --cc addons/base_import/__openerp__.py
index 70f038a,7a7cca9..e133ab1
--- 1/addons/base_import/__openerp__.py
--- 2/addons/base_import/__openerp__.py
+++ b/addons/base_import/__openerp__.py
@@@ -29,8 -29,13 +29,7 @@@ Re-implement openerp's file import syst
      '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 --cc addons/crm/__openerp__.py
Simple merge

diff --cc addons/event/__openerp__.py
index 73f596a,86794ab..d31f408
--- 1/addons/event/__openerp__.py
--- 2/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@@ -46,10 -47,8 +46,9 @@@ Key Feature
          'event_view.xml',
          'event_data.xml',
          'report/report_event_registration_view.xml',
-         'board_association_view.xml',
          'res_partner_view.xml',
          'email_template.xml',
 +        'views/event.xml',
      ],
      'demo': [
          'event_demo.xml',

diff --cc addons/hr/__openerp__.py
Simple merge

diff --cc addons/hr_attendance/__openerp__.py
Simple merge

diff --cc addons/hr_holidays/__openerp__.py
index 90a6baf,ffd502c..8f781d4
--- 1/addons/hr_holidays/__openerp__.py
--- 2/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@@ -57,9 -57,9 +57,8 @@@ A synchronization with an internal agen
          'report/available_holidays_view.xml',
          'wizard/hr_holidays_summary_department_view.xml',
          'wizard/hr_holidays_summary_employees_view.xml',
-         'board_hr_holidays_view.xml',        
          ],
      'demo': ['hr_holidays_demo.xml',],
 -    'js': ['static/src/js/*.js'],
      'qweb': [
          'static/src/xml/*.xml',
      ],

diff --cc addons/hr_recruitment/__openerp__.py
Simple merge

diff --cc addons/hr_timesheet_sheet/__openerp__.py
Simple merge

diff --cc addons/project/__openerp__.py
index 1f82d7b,a503613..49047a9
--- 1/addons/project/__openerp__.py
--- 2/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@@ -71,10 -70,7 +70,8 @@@ Dashboard / Reports for Project Managem
          'res_partner_view.xml',
          'report/project_report_view.xml',
          'report/project_cumulative.xml',
-         'board_project_view.xml',
          'res_config_view.xml',
 +        'views/project.xml',
      ],
      'demo': ['project_demo.xml'],
      'test': [

diff --cc addons/sale_crm/__openerp__.py
Simple merge

diff --cc addons/stock/__openerp__.py
index 3eb5ddd,d2a1a77..733637b
--- 1/addons/stock/__openerp__.py
--- 2/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@@ -86,9 -86,7 +86,8 @@@ Dashboard / Reports for Warehouse Manag
          'partner_view.xml',
          'report/report_stock_move_view.xml',
          'report/report_stock_view.xml',
-         'board_warehouse_view.xml',
          'res_config_view.xml',
 +        'views/stock.xml',
      ],
      'test': [
          'test/stock_users.yml',

diff --cc addons/website/__openerp__.py
index 4cfabd9,4cfabd9..f2b3172
--- 1/addons/website/__openerp__.py
--- 2/addons/website/__openerp__.py
+++ b/addons/website/__openerp__.py
@@@ -25,8 -25,8 +25,6 @@@ OpenERP Website CM
      'demo': [
          'data/website_demo.xml',
      ],
--    'js': ['static/src/js/website.backend.js'],
      'qweb': ['static/src/xml/website.backend.xml'],
--    'css': ['static/src/css/website.backend.css'],
      'application': True,
  }

diff --cc addons/website/views/website_templates.xml
index 02f6942,dc7ce76..4df3ab5
--- 1/addons/website/views/website_templates.xml
--- 2/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@@ -11,20 -11,6 +11,28 @@@
      <link id="website_css" rel='stylesheet' href='/website/static/src/css/website.css' t-ignore="true"/>
  </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/lib/qweb/qweb2.js"></script>
 +    <script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
 +
 +    <script type="text/javascript" src="/website/static/src/js/website.js"></script>
 +
 +    <script type="text/javascript" src="/website/static/src/js/website.snippets.animation.js"></script>
 +    <script type="text/javascript" src="/web/static/lib/bootstrap/js/bootstrap.js"></script>
 +
 +</template>
 +
++<template id="assets_backend" name="website assets for backend" inherit_id="web.assets_backend">
++    <xpath expr="." position="inside">
++        <link rel="stylesheet" href="/website/static/src/css/website.backend.css"/>
++
++        <script type="text/javascript" src="/website/static/src/js/website.backend.js"></script>
++    </xpath>
++</template>
++
  <template id="website.submenu" name="Submenu">
      <li t-if="not submenu.child_id" t-att-class="
          ((submenu.url != '/' and request.httprequest.path.startswith(submenu.url)) or
@@@ -57,7 -43,7 +65,6 @@@
            t-att-data-view-xmlid="xmlid if editable else None"
            t-att-data-main-object="repr(main_object) if editable else None">
          <head>
--            <script type="text/javascript" src="/web/static/js/watch.js"></script>
              <t t-if="main_object and 'website_meta_title' in main_object">
                  <t t-set="title" t-value="main_object.website_meta_title"/>
              </t>

diff --cc addons/website_forum/__openerp__.py
index 0fce7b6,0fce7b6..8098bb7
--- 1/addons/website_forum/__openerp__.py
--- 2/addons/website_forum/__openerp__.py
+++ b/addons/website_forum/__openerp__.py
@@@ -52,7 -52,7 +52,6 @@@ Ask questions, get answers, no distract
      'demo': [
          'data/forum_demo.xml',
      ],
--    'css': ['static/src/css/website_forum.css'],
      'installable': True,
      'application': True,
  }

diff --cc addons/website_forum/views/website_forum.xml
index a59027d,f115622..c695cb6
--- 1/addons/website_forum/views/website_forum.xml
--- 2/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@@ -5,7 -5,7 +5,9 @@@
  <!-- 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">
++        <link rel='stylesheet' href="/website_forum/static/src/css/website_forum.css"/>
++
          <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 --cc addons/website_report/views/layouts.xml
index e46b3fd,9952cdc..203e711
--- 1/addons/website_report/views/layouts.xml
--- 2/addons/website_report/views/layouts.xml
+++ b/addons/website_report/views/layouts.xml
@@@ -47,10 -46,9 +46,9 @@@
  
          <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
          <script type="text/javascript" src="/web/static/lib/ckeditor/ckeditor.js"></script>
 -        <script t-if="not translatable" type="text/javascript" src="/website/static/lib/ace/ace.js"></script>
 +        <script type="text/javascript" src="/website/static/lib/ace/ace.js"></script>
          <script type="text/javascript" src="/website/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script>
          <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
-         <script type="text/javascript" src="/website/static/lib/bootstrap-tour/bootstrap-tour.js"></script>
          <!-- mutation observers shim backed by mutation events (8 < IE < 11, Safari < 6, FF < 14, Chrome < 17) -->
          <script type="text/javascript" src="/website/static/lib//jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js"></script>
          <script type="text/javascript" src="/website/static/lib/MutationObservers/test/sidetable.js"></script>