diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 1a222b2f83c..734758733aa 100644
--- 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
index 00000000000..15df140c75e
--- /dev/null
+++ b/addons/account/views/account.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index 61a92490c47..70a21692804 100644
--- 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
index 00000000000..dced07310d8
--- /dev/null
+++ b/addons/account_analytic_analysis/views/account_analytic_analysis.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/auth_openid/__openerp__.py b/addons/auth_openid/__openerp__.py
index 10c77f29965..f0d70f52fc2 100644
--- 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
index 00000000000..52187446c32
--- /dev/null
+++ b/addons/auth_openid/views/auth_openid.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/base_import/__openerp__.py b/addons/base_import/__openerp__.py
index 8c87e779b3b..70f038a08e3 100644
--- 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
index 00000000000..809241c52ca
--- /dev/null
+++ b/addons/base_import/views/base_import.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index e74238ba59c..15c30c1e71a 100644
--- 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
index 00000000000..77e91eeb6cd
--- /dev/null
+++ b/addons/base_setup/views/base_setup.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index 87771b2f518..48ed2868705 100644
--- 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
index 00000000000..a9bd206f243
--- /dev/null
+++ b/addons/board/views/board.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/calendar/__openerp__.py b/addons/calendar/__openerp__.py
index 53c0539c9d6..01007bcfa4b 100644
--- 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
index 00000000000..5eb04383986
--- /dev/null
+++ b/addons/calendar/views/calendar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index d5bb98c50a5..4619e912141 100644
--- 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
index 00000000000..c28ba723d24
--- /dev/null
+++ b/addons/crm/views/crm.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index eae57624970..540bd2a5d3e 100644
--- 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
index 00000000000..90094a1fd2d
--- /dev/null
+++ b/addons/crm_partner_assign/views/crm_partner_assign.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 5cc674fcf45..7f387c22b0b 100644
--- 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
index 00000000000..3f14b387bdf
--- /dev/null
+++ b/addons/document/views/document.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/edi/__openerp__.py b/addons/edi/__openerp__.py
index 72ccb32d701..e6fd0738cbf 100644
--- 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
index 00000000000..47b702c35be
--- /dev/null
+++ b/addons/edi/views/edi.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index e7cf8c4c749..73f596ac00e 100644
--- 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
index 00000000000..31623659eba
--- /dev/null
+++ b/addons/event/views/event.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index c522e287725..0dd634099ae 100644
--- 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
index 00000000000..df5f119d6c1
--- /dev/null
+++ b/addons/gamification/views/gamification.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/google_calendar/__openerp__.py b/addons/google_calendar/__openerp__.py
index 29ea95831a9..18f2806976b 100644
--- 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
index 00000000000..d25a2fa2406
--- /dev/null
+++ b/addons/google_calendar/views/google_calendar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/google_drive/__openerp__.py b/addons/google_drive/__openerp__.py
index e486c2c2d34..017f01b5f07 100644
--- 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
index 00000000000..5017f53f1a8
--- /dev/null
+++ b/addons/google_drive/views/google_drive.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/google_spreadsheet/__openerp__.py b/addons/google_spreadsheet/__openerp__.py
index 1ae2d48d349..08b08475212 100644
--- 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
index 00000000000..8fe8ddfcb8c
--- /dev/null
+++ b/addons/google_spreadsheet/views/google_spreadsheet.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index ef7225788f6..be678d13927 100644
--- 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
index 00000000000..099697d67d0
--- /dev/null
+++ b/addons/hr/views/hr.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index abdc1ad8cc1..72d2e26b160 100644
--- 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
index 00000000000..f481ec29053
--- /dev/null
+++ b/addons/hr_attendance/views/hr_attendance.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr_gamification/__openerp__.py b/addons/hr_gamification/__openerp__.py
index 14925421cb1..8d34343f30e 100644
--- 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
index 00000000000..8d34de257d3
--- /dev/null
+++ b/addons/hr_gamification/views/hr_gamification.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 27c7d194b74..04ef0a9f576 100644
--- 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
index 00000000000..241f787053e
--- /dev/null
+++ b/addons/hr_recruitment/views/hr_recruitment.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index e92ab4400bd..e96968dfced 100644
--- 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
index 00000000000..7a13b9ecad4
--- /dev/null
+++ b/addons/hr_timesheet_sheet/views/hr_timesheet_sheet.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/im/__openerp__.py b/addons/im/__openerp__.py
index 45e64775299..63a5148a747 100644
--- 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
index 00000000000..ef91b1c62a6
--- /dev/null
+++ b/addons/im/views/im.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index 955a1278c03..127e096f92f 100644
--- 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
index 00000000000..e4595359720
--- /dev/null
+++ b/addons/lunch/views/lunch.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 59d2e5f81ee..b1cf4901a0a 100644
--- 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
index 00000000000..827cc3c76c9
--- /dev/null
+++ b/addons/mail/views/mail.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
index 91b57ac5b5a..e96cc910920 100644
--- 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 7892feacacc..56537a33de4 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -1,6 +1,13 @@
+
+
+
+
+
+
+