diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 6fe56bc7f12..59d86351cd6 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -139,20 +139,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/analytic_contract_hr_expense/__openerp__.py b/addons/analytic_contract_hr_expense/__openerp__.py index 8e807923550..9689154e613 100644 --- a/addons/analytic_contract_hr_expense/__openerp__.py +++ b/addons/analytic_contract_hr_expense/__openerp__.py @@ -33,7 +33,6 @@ This module is for modifying account analytic view to show some data related to 'depends': ['hr_expense','account_analytic_analysis'], 'data': ['analytic_contract_hr_expense_view.xml'], 'demo': [], - 'css' : [], 'installable': True, 'auto_install': True, } 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/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py index 2aaaf61d3dd..141bff5a0c1 100644 --- a/addons/auth_signup/__openerp__.py +++ b/addons/auth_signup/__openerp__.py @@ -42,6 +42,5 @@ Allow users to sign up and reset their password 'res_users_view.xml', 'views/auth_signup_login.xml', ], - 'js': [], 'bootstrap': True, } diff --git a/addons/base_import/__openerp__.py b/addons/base_import/__openerp__.py index 7a7cca9be0e..e133ab1ebff 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'], } 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_import_module/__openerp__.py b/addons/base_import_module/__openerp__.py index ba37462642c..09ebca9cf41 100644 --- a/addons/base_import_module/__openerp__.py +++ b/addons/base_import_module/__openerp__.py @@ -14,8 +14,6 @@ for customization purpose. 'installable': True, 'auto_install': False, 'data': [], - 'css': [], - 'js': [], 'qweb': [], 'test': [], } 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 f0417db1bf6..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/*.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 805c9384dcc..d53f785d174 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -92,6 +92,7 @@ Dashboard for CRM will include: 'base_partner_merge_view.xml', 'crm_case_section_view.xml', + 'views/crm.xml', ], 'demo': [ 'crm_demo.xml', @@ -113,12 +114,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..b1b11bddcff 100644 --- a/addons/crm_partner_assign/__openerp__.py +++ b/addons/crm_partner_assign/__openerp__.py @@ -51,9 +51,6 @@ to an appropriate local partner, based on the distance and the weight that was a '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/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..71a6daeaff4 --- /dev/null +++ b/addons/edi/views/edi.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index 86794ab61fc..d31f408ab92 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -1,4 +1,3 @@ - # -*- coding: utf-8 -*- ############################################################################## # @@ -49,6 +48,7 @@ Key Features 'report/report_event_registration_view.xml', 'res_partner_view.xml', 'email_template.xml', + 'views/event.xml', ], 'demo': [ 'event_demo.xml', @@ -57,7 +57,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 9f2bd1256e7..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/*.css'], - 'js': ['static/src/js/*.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 18d57c6f299..c52eca89c8d 100644 --- a/addons/hr/__openerp__.py +++ b/addons/hr/__openerp__.py @@ -58,6 +58,7 @@ You can manage: 'res_config_view.xml', 'mail_hr_view.xml', 'res_users_view.xml', + 'views/hr.xml', ], 'demo': ['hr_demo.xml'], 'test': [ @@ -68,8 +69,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 7ff0a63a79b..6c6f31e7861 100644 --- a/addons/hr_attendance/__openerp__.py +++ b/addons/hr_attendance/__openerp__.py @@ -42,6 +42,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': [ @@ -51,9 +52,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_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py index ffd502c7ba5..8f781d4e8c5 100644 --- a/addons/hr_holidays/__openerp__.py +++ b/addons/hr_holidays/__openerp__.py @@ -59,7 +59,6 @@ A synchronization with an internal agenda (Meetings of the CRM module) is also p 'wizard/hr_holidays_summary_employees_view.xml', ], 'demo': ['hr_holidays_demo.xml',], - 'js': ['static/src/js/*.js'], 'qweb': [ 'static/src/xml/*.xml', ], diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py index 9e56ccc52ae..555329af1b4 100644 --- a/addons/hr_recruitment/__openerp__.py +++ b/addons/hr_recruitment/__openerp__.py @@ -58,13 +58,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 d86ada2d3d4..9448c3fb7c1 100644 --- a/addons/hr_timesheet_sheet/__openerp__.py +++ b/addons/hr_timesheet_sheet/__openerp__.py @@ -57,14 +57,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/hw_escpos/controllers/main.py b/addons/hw_escpos/controllers/main.py index 57fba3a4191..9fabe2e96c7 100644 --- a/addons/hw_escpos/controllers/main.py +++ b/addons/hw_escpos/controllers/main.py @@ -35,7 +35,6 @@ from PIL import Image from openerp import http from openerp.http import request -from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template from openerp.tools.translate import _ _logger = logging.getLogger(__name__) diff --git a/addons/hw_proxy/controllers/main.py b/addons/hw_proxy/controllers/main.py index c65c7966b7c..e52c20d5039 100644 --- a/addons/hw_proxy/controllers/main.py +++ b/addons/hw_proxy/controllers/main.py @@ -16,7 +16,6 @@ _logger = logging.getLogger(__name__) from openerp import http from openerp.http import request -from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template # drivers modules must add to drivers an object with a get_status() method diff --git a/addons/im/__openerp__.py b/addons/im/__openerp__.py index 84775065371..63a5148a747 100644 --- a/addons/im/__openerp__.py +++ b/addons/im/__openerp__.py @@ -16,13 +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/*.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 @@ + + + + + + + diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py index b99e6d828c9..0d0ef5a5f98 100644 --- 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 index 00000000000..b40545df097 --- /dev/null +++ b/addons/pad/views/pad.xml @@ -0,0 +1,13 @@ + + + + + + + diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py index 8b97062f0c2..79b4cbeebbf 100644 --- a/addons/point_of_sale/__openerp__.py +++ b/addons/point_of_sale/__openerp__.py @@ -77,6 +77,7 @@ Main Features 'views/report_detailsofsales.xml', 'views/report_payment.xml', 'views/report_sessionsummary.xml', + 'views/point_of_sale.xml', ], 'demo': [ 'point_of_sale_demo.xml', @@ -91,18 +92,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/controllers/main.py b/addons/point_of_sale/controllers/main.py index 0a611376916..376ab4478b2 100644 --- a/addons/point_of_sale/controllers/main.py +++ b/addons/point_of_sale/controllers/main.py @@ -36,7 +36,7 @@ html_template = """ - %(js)s + ' % i for i in js_list) - #css = "\n".join('' % i for i in css_list) r = html_template % { - 'js': js, - # 'css': css, 'modules': simplejson.dumps(module_boot(request.db)), 'init': """ var wc = new s.web.WebClient(); 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 index 00000000000..ae76f4b4bb3 --- /dev/null +++ b/addons/point_of_sale/views/point_of_sale.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py index 2ee81218f82..407d2a7990a 100644 --- 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 index 00000000000..7421c435840 --- /dev/null +++ b/addons/portal/views/portal.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/addons/portal_project_issue/__openerp__.py b/addons/portal_project_issue/__openerp__.py index cef01c52364..3581e329a75 100644 --- 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 index 00000000000..eece1977243 --- /dev/null +++ b/addons/portal_project_issue/views/portal_project_issue.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py index a503613e90b..49047a92f75 100644 --- a/addons/project/__openerp__.py +++ b/addons/project/__openerp__.py @@ -71,6 +71,7 @@ Dashboard / Reports for Project Management will include: 'report/project_report_view.xml', 'report/project_cumulative.xml', 'res_config_view.xml', + 'views/project.xml', ], 'demo': ['project_demo.xml'], 'test': [ @@ -78,7 +79,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 index 00000000000..07d05b072ed --- /dev/null +++ b/addons/project/views/project.xml @@ -0,0 +1,13 @@ + + + + + + + diff --git a/addons/report/__openerp__.py b/addons/report/__openerp__.py index c07cdc44403..97c4acbd09a 100644 --- 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/layouts.xml b/addons/report/views/layouts.xml index 4f5104c726b..685f5b054f9 100644 --- a/addons/report/views/layouts.xml +++ b/addons/report/views/layouts.xml @@ -38,11 +38,6 @@ - diff --git a/addons/report/views/report.xml b/addons/report/views/report.xml new file mode 100644 index 00000000000..313111fa9f1 --- /dev/null +++ b/addons/report/views/report.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py index dfc287c8b2a..600191b2f92 100644 --- a/addons/sale_crm/__openerp__.py +++ b/addons/sale_crm/__openerp__.py @@ -46,9 +46,6 @@ modules. 'security/ir.model.access.csv', 'report/sale_report_view.xml', ], - 'js': [ - 'static/src/js/sale_crm.js', - ], 'demo': ['sale_crm_demo.xml'], 'test': ['test/sale_crm.yml'], 'installable': True, diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py index 7cb8bed23d9..530a40a100b 100644 --- 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 index 00000000000..aa507eed3e2 --- /dev/null +++ b/addons/share/views/share.xml @@ -0,0 +1,13 @@ + + + + + + + diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index d2a1a77886a..733637bef7b 100644 --- a/addons/stock/__openerp__.py +++ b/addons/stock/__openerp__.py @@ -87,6 +87,7 @@ Dashboard / Reports for Warehouse Management will include: 'report/report_stock_move_view.xml', 'report/report_stock_view.xml', 'res_config_view.xml', + 'views/stock.xml', ], 'test': [ 'test/stock_users.yml', @@ -98,7 +99,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 index 00000000000..2d935a12475 --- /dev/null +++ b/addons/stock/views/stock.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/addons/web_analytics/__openerp__.py b/addons/web_analytics/__openerp__.py index 829bd0ddff7..d6dc2cc6734 100644 --- 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 index 00000000000..904a8671c5c --- /dev/null +++ b/addons/web_analytics/views/web_analytics.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/addons/web_linkedin/__openerp__.py b/addons/web_linkedin/__openerp__.py index 508ca240780..8269ea73e05 100644 --- 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/*.js'], - 'css': ['static/src/css/*.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 index 00000000000..1c75e5d2305 --- /dev/null +++ b/addons/web_linkedin/views/web_linkedin.xml @@ -0,0 +1,13 @@ + + + + + + + diff --git a/addons/website/__openerp__.py b/addons/website/__openerp__.py index 4cfabd942ca..f2b31726468 100644 --- a/addons/website/__openerp__.py +++ b/addons/website/__openerp__.py @@ -25,8 +25,6 @@ OpenERP Website CMS '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 --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py index f67f6ada4b9..e17b5b9721c 100644 --- a/addons/website/models/ir_ui_view.py +++ b/addons/website/models/ir_ui_view.py @@ -140,6 +140,7 @@ class view(osv.osv): slug=website.slug, res_company=request.website.company_id, user_id=self.pool.get("res.users").browse(cr, uid, uid), + translatable=context.get('lang') != request.website.default_lang_code, ) # add some values diff --git a/addons/website/models/website.py b/addons/website/models/website.py index 51dda75f516..38d1570706d 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -211,13 +211,9 @@ class website(osv.osv): Access = request.registry['ir.model.access'] is_website_publisher = Access.check(cr, uid, 'ir.ui.view', 'write', False, context) - lang = request.context['lang'] - is_master_lang = lang == request.website.default_lang_code - request.redirect = lambda url: werkzeug.utils.redirect(url_for(url)) request.context.update( editable=is_website_publisher, - translatable=not is_master_lang, ) def get_template(self, cr, uid, ids, template, context=None): diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index 31e39b3bbc4..b6f42c8b20e 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -3,6 +3,7 @@ var website = {}; openerp.website = website; + openerp.website.translatable = !!$('html').data('translatable'); /* ---------------------------------------------------- Helpers diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js index e88b1e4a6b6..5f0921abb3d 100644 --- a/addons/website/static/src/js/website.translator.js +++ b/addons/website/static/src/js/website.translator.js @@ -1,6 +1,11 @@ (function () { 'use strict'; + if (!openerp.website.translatable) { + // Temporary hack until the editor bar is moved to the web client + return; + } + var website = openerp.website; website.add_template_file('/website/static/src/xml/website.translator.xml'); var nodialog = 'website_translator_nodialog'; diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index dc7ce76b8f5..ad0c0cc43fc 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -8,7 +8,29 @@ + + + + -