From 74f3cbc6a662d818db062ebc2fffec8816f73383 Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Tue, 14 Apr 2015 09:21:40 +0200 Subject: [PATCH] [IMP] New design : menus reorganization - Several Modules have been splitted into several apps Examples : Human Resources : Splitted into Leaves, Recruitment, Expenses, Appraisals, Timesheets, Employees, Payroll Marketing : Mass Mailing, Events, ... Messaging : Chat, Agenda, Notes, Address Book, ... - Generally, the related reports have been moved in the apps, as last menu - Also, configuration menu (no_one group) have been moved into a config root menu exception made for the warehouse and lunch modules - Configuration for typical frontend modules have been moved into the website settings Related modules : Ecommerce, blog, slides, forum - When they are present, menus like 'product' or 'customers' have been moved ex : Customers in Sales menu, Product in POS menu - A lot of sequences and xmlids have been added or modified in this commit - List of apps : 1 Chat : Inbox, Channels 2 Agenda : Calendar 3 Notes 4 Address Book : The view contact is still laying in the mail module (1 app => 2 icons) 5 eCommerce : Still to define : Config + Orders Analysis + Shipping + incoming Amazon module 6 Sales : Dashboard (Sales Team Kanban), CRM, Sales (note that they are splitted into 2 submenus) Assignation, After-Sales (Invoicing and Services), Reports 7 Point of Sale : Dashboard (POS status), Orders, Reports 8 Project : Dashboard (Project Kanban), Search (all tasks, issues), Incoming Forecasts module, Reports Project.issue.version feature has been removed completely 9 Members : Dashboard (Members Kanban), Report, Config 10 Timesheets : Time Tracking, Approvals, Reports 11 Purchase : Purchase, Control (Products and Bills) 12 Warehouse : Dashboard (Warehouse Kanban), Operations, Inventory Control, Schedulers, Configuration 13 Manufacturing : Same menu structure 14 Mass Mailing : Mailings, Campaigns, Reports 15 Events : Events, Reports 16 Lead Automation : Campaigns, Reports 17 Surveys : Surveys, Reports 18 Human Resources : Dashboard (Departments Kanban), Employees, Contracts, Engagement (Gamification) 19 Recruitment : Job Positions, Applications, Resumes & Letters, Reports 20 Expenses : Expenses, Approvals, Reports 21 Leaves : My Leaves, Approvals, Reports 22 Appraisals : Appraisals, Interview, Reports --> Will probably be modified by the incoming refactoring 23 Payroll : Current Menu 24 Lunch : My Lunch, Manager, Configuration 25 Accounting : Same menus currently, waiting the new accounting to be merged 26 Fleet : Current menu 27 Sign : Incoming docusign module 28 No root menuitem with this sequence 29 Attendance : Attendance, Reports Sign in/out by project feature has been removed completely 30 Link Tracker (group_no_one) : Link Tracker, UTMs New view added : URL Shortner, which is the frontend view embedded in backend 31 Versionning : Website domain, Versions, Experiments 32 Slides (group_no_one) : Channels, Categories, Slides, Tags 33 No root menu item with this sequence 34 Livechat : Channels, History, Reports 35 Dashboards : My Boards, Configuration 36 App Store : Local Modules, Apps, Updates Last Settings : Incoming Dashboard Settings, Sales, ...., Website Settings General Pattern for all modules' settings : | Module_name |-- Settings : General Config view (checkbox screen) |-- Record setting 1 |-- ... |-- Record setting n Example for Sale module | Sales |-- Settings : Checkbox screen |-- Quotations |---- Quotation Templates |---- Report Layout Categories |---- Contract Template |---- Invoice Type |-- Contract |---- Deduplicate Contacts |-- Delivery |---- Delivery Methods |---- Delivery Pricelist --- addons/account/account_menuitem.xml | 4 +- .../account_accountant_data.xml | 3 +- .../account_analytic_analysis_view.xml | 9 +- addons/association/profile_association.xml | 8 +- addons/calendar/calendar_view.xml | 2 +- addons/crm/crm_lead_menu.xml | 6 +- addons/crm/crm_phonecall_menu.xml | 2 +- addons/crm/crm_view.xml | 11 +- addons/crm/report/crm_lead_report_view.xml | 2 +- .../report/crm_opportunity_report_view.xml | 2 +- .../crm/report/crm_phonecall_report_view.xml | 2 +- addons/crm/security/crm_security.xml | 2 +- addons/crm_claim/crm_claim_menu.xml | 9 +- addons/crm_claim/crm_claim_view.xml | 2 +- .../report/crm_claim_report_view.xml | 2 +- addons/crm_helpdesk/crm_helpdesk_menu.xml | 12 +- addons/crm_helpdesk/crm_helpdesk_view.xml | 2 +- .../report/crm_helpdesk_report_view.xml | 2 +- .../report/crm_lead_report_view.xml | 2 +- .../report/crm_partner_report_view.xml | 2 +- addons/delivery/delivery_view.xml | 4 +- addons/event/__openerp__.py | 2 +- addons/event/event_view.xml | 12 +- .../report/report_event_registration_view.xml | 3 +- addons/event/res_config.py | 4 +- addons/event/res_config_view.xml | 30 +++- addons/fleet/fleet_board_view.xml | 2 +- addons/fleet/fleet_view.xml | 2 +- addons/hr/hr_view.xml | 18 +- addons/hr/res_config_view.xml | 7 +- .../views/hr_applicant.xml | 2 +- addons/hr_attendance/hr_attendance_view.xml | 15 +- addons/hr_contract/hr_contract_view.xml | 2 +- addons/hr_evaluation/hr_evaluation_view.xml | 13 +- .../report/hr_evaluation_report_view.xml | 6 +- addons/hr_expense/hr_expense_view.xml | 20 ++- .../report/hr_expense_report_view.xml | 2 +- addons/hr_holidays/hr_holidays_view.xml | 23 ++- .../report/available_holidays_view.xml | 2 +- .../hr_holidays_summary_department_view.xml | 2 +- addons/hr_payroll/hr_payroll_view.xml | 22 +-- addons/hr_payroll/res_config.py | 5 +- addons/hr_payroll/res_config_view.xml | 39 ++-- addons/hr_recruitment/hr_recruitment_menu.xml | 12 +- addons/hr_recruitment/hr_recruitment_view.xml | 15 +- .../report/hr_recruitment_report_view.xml | 2 +- addons/hr_recruitment/res_config.py | 4 +- addons/hr_recruitment/res_config_view.xml | 54 ++++-- addons/hr_timesheet/__init__.py | 1 - addons/hr_timesheet/__openerp__.py | 2 - addons/hr_timesheet/hr_timesheet_view.xml | 12 +- .../report/hr_timesheet_report_view.xml | 4 +- .../hr_timesheet/test/test_hr_timesheet.yml | 64 ------- addons/hr_timesheet/wizard/__init__.py | 22 --- .../wizard/hr_timesheet_sign_in_out.py | 169 ------------------ .../wizard/hr_timesheet_sign_in_out_view.xml | 94 ---------- .../hr_timesheet_invoice_report_view.xml | 5 - .../hr_timesheet_analytic_profit_view.xml | 2 +- .../hr_timesheet_sheet_data.xml | 2 +- .../hr_timesheet_sheet_view.xml | 5 +- .../im_livechat/report/im_livechat_report.xml | 4 +- addons/im_livechat/views/im_livechat_view.xml | 6 +- .../l10n_in_hr_payroll_view.xml | 2 +- .../report/payment_advice_report_view.xml | 3 +- .../report/payslip_report_view.xml | 3 +- addons/lunch/views/lunch_views.xml | 16 +- addons/mail/__openerp__.py | 2 +- addons/mail/contacts_view.xml | 19 +- addons/mail/mail_group_view.xml | 2 +- addons/mail/mail_thread_view.xml | 17 +- addons/marketing/marketing_view.xml | 4 - addons/marketing/res_config_view.xml | 3 - .../marketing_campaign_view.xml | 10 +- .../report/campaign_analysis_view.xml | 2 +- addons/marketing_campaign/res_config.py | 4 +- addons/marketing_campaign/res_config.xml | 28 ++- addons/mass_mailing/__openerp__.py | 1 - addons/mass_mailing/models/res_config.py | 4 +- addons/mass_mailing/views/email_template.xml | 2 +- addons/mass_mailing/views/mass_mailing.xml | 25 +-- .../views/mass_mailing_report.xml | 7 +- addons/mass_mailing/views/res_config.xml | 28 ++- addons/mass_mailing/views/res_partner.xml | 6 - addons/membership/membership_view.xml | 10 +- addons/mrp/mrp_view.xml | 2 +- addons/mrp/report/mrp_report_view.xml | 2 - .../report/mrp_workorder_analysis_view.xml | 3 +- addons/note/note_view.xml | 5 +- addons/point_of_sale/point_of_sale_view.xml | 26 ++- addons/product/pricelist_view.xml | 4 +- addons/product/product_view.xml | 14 +- addons/product_margin/product_margin_view.xml | 4 +- addons/project/project_view.xml | 17 +- addons/project/report/project_report_view.xml | 4 +- addons/project/res_config_view.xml | 4 +- addons/project_issue/project_issue.py | 12 -- addons/project_issue/project_issue_data.xml | 14 -- addons/project_issue/project_issue_view.xml | 44 ----- .../report/project_issue_report.py | 2 - .../report/project_issue_report_view.xml | 1 - .../security/ir.model.access.csv | 2 - .../project_timesheet_view.xml | 5 - addons/purchase/purchase_view.xml | 36 ++-- .../purchase/report/purchase_report_view.xml | 16 +- addons/purchase/res_config_view.xml | 4 +- addons/purchase/stock_view.xml | 2 +- .../purchase_requisition_view.xml | 2 +- .../report_intrastat_view.xml | 2 +- addons/sale/report/sale_report_view.xml | 2 +- addons/sale/res_config_view.xml | 4 +- addons/sale/sale_view.xml | 10 +- addons/sale/security/sale_security.xml | 2 +- .../sale_service/views/sale_service_view.xml | 2 +- addons/sale_stock/stock_view.xml | 10 +- addons/sales_team/sales_team.xml | 6 +- addons/stock/report/report_stock_forecast.xml | 2 +- addons/stock/report/report_stock_view.xml | 2 +- addons/stock/res_config_view.xml | 5 +- addons/stock/stock_view.xml | 32 ++-- .../wizard/stock_valuation_history_view.xml | 2 +- addons/survey/views/survey_views.xml | 7 +- addons/utm/views/utm.xml | 4 +- addons/web/views/webclient_templates.xml | 5 +- addons/website/views/res_config.xml | 5 +- .../website_blog/views/website_blog_views.xml | 9 +- addons/website_crm_score/views/marketing.xml | 2 +- addons/website_crm_score/views/reporting.xml | 2 +- .../views/event_backend.xml | 9 +- addons/website_forum/views/forum.xml | 3 +- .../static/src/js/website_links_menu.js | 2 +- addons/website_links/views/website_links.xml | 2 +- addons/website_slides/__openerp__.py | 1 + .../view/website_slides_backend.xml | 12 +- .../website_version/views/marketing_view.xml | 8 +- openerp/addons/base/base_menu.xml | 12 +- openerp/addons/base/res/res_partner_view.xml | 12 +- openerp/addons/base/res/res_security.xml | 2 +- 137 files changed, 529 insertions(+), 874 deletions(-) delete mode 100644 addons/hr_timesheet/test/test_hr_timesheet.yml delete mode 100644 addons/hr_timesheet/wizard/__init__.py delete mode 100644 addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py delete mode 100644 addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml delete mode 100644 addons/mass_mailing/views/res_partner.xml diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index 754dfc3b37c..b5496cf6f5e 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -7,7 +7,7 @@ id="menu_finance" groups="group_account_user,group_account_manager,group_account_invoice" icon="fa-usd" - sequence="50"/> + sequence="25"/> @@ -21,7 +21,7 @@ - + diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml index 6343559db22..9ce012dfefb 100644 --- a/addons/account_accountant/account_accountant_data.xml +++ b/addons/account_accountant/account_accountant_data.xml @@ -5,7 +5,8 @@ + id="account.menu_finance" + sequence="25"/> diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index 4d28b838a67..c35dce559df 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -270,7 +270,7 @@

- + @@ -291,7 +291,10 @@

- + + @@ -358,7 +361,7 @@ diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml index 07588acd399..8d206ea3974 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -3,13 +3,13 @@ - - - + sequence="9"/> + + diff --git a/addons/calendar/calendar_view.xml b/addons/calendar/calendar_view.xml index 725a7b7f48e..9cb229d0392 100644 --- a/addons/calendar/calendar_view.xml +++ b/addons/calendar/calendar_view.xml @@ -333,7 +333,7 @@ - + diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml index 8ede746e07e..cccc9c957ce 100644 --- a/addons/crm/crm_lead_menu.xml +++ b/addons/crm/crm_lead_menu.xml @@ -74,10 +74,10 @@ - - + - diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml index 7c76cd7342e..6df318022a5 100644 --- a/addons/crm/crm_phonecall_menu.xml +++ b/addons/crm/crm_phonecall_menu.xml @@ -49,7 +49,7 @@ + parent="base.menu_base_partner" sequence="4" /> Logged Calls diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index 5445259af36..dbffca73859 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -9,19 +9,20 @@ --> + groups="base.group_sale_manager,base.group_sale_salesman" + sequence="6"/> + parent="base.menu_sale_config" sequence="5" groups="base.group_sale_manager"/> + parent="base.menu_sale_config" sequence="1" groups="base.group_sale_manager"/> + parent="base.menu_sale_config" sequence="0" groups="base.group_sale_manager"/> + parent="base.menu_sale_config" sequence="45" groups="base.group_sale_salesman"/> diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index ede1c240dd9..169b70e1579 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -143,7 +143,7 @@ + parent="base.menu_sale_report" action="action_report_crm_lead" sequence="1"/> diff --git a/addons/crm/report/crm_opportunity_report_view.xml b/addons/crm/report/crm_opportunity_report_view.xml index c70c5670f50..5550376d96e 100644 --- a/addons/crm/report/crm_opportunity_report_view.xml +++ b/addons/crm/report/crm_opportunity_report_view.xml @@ -136,7 +136,7 @@ + parent="base.menu_sale_report" action="action_report_crm_opportunity" sequence="5"/> diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml index f306cd4b041..31e7bc8d2ad 100644 --- a/addons/crm/report/crm_phonecall_report_view.xml +++ b/addons/crm/report/crm_phonecall_report_view.xml @@ -120,7 +120,7 @@ + id="menu_report_crm_phonecalls_tree" parent="base.menu_sale_report" sequence="15"/> diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml index 10477260d27..8d280758fe6 100644 --- a/addons/crm/security/crm_security.xml +++ b/addons/crm/security/crm_security.xml @@ -42,7 +42,7 @@ - + diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml index f84003ef041..a2c8eda0822 100644 --- a/addons/crm_claim/crm_claim_menu.xml +++ b/addons/crm_claim/crm_claim_menu.xml @@ -2,9 +2,12 @@ - + parent="base.menu_base_partner" sequence="5" /> + @@ -45,7 +48,7 @@ + parent="base.menu_services" action="crm_claim_category_claim0" sequence="1"/> diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml index 5a02912a5d5..caab6fe3f95 100644 --- a/addons/crm_claim/crm_claim_view.xml +++ b/addons/crm_claim/crm_claim_view.xml @@ -4,7 +4,7 @@ + parent="base.menu_sale_config" sequence="55"/> diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index 71ea175932e..85f7c35894a 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -90,7 +90,7 @@ + action="action_report_crm_claim" parent="base.menu_sale_report" sequence="15"/> diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml index 684c278a6a2..4271f029c14 100644 --- a/addons/crm_helpdesk/crm_helpdesk_menu.xml +++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml @@ -4,9 +4,14 @@ + id="base.menu_base_partner" sequence="6"/> - + + @@ -53,8 +58,7 @@ + parent="base.menu_services" action="crm_case_helpdesk_act111" sequence="2"/> diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index e9d223e932b..0f01124ecf5 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -4,7 +4,7 @@ + parent="base.menu_sale_config" sequence="60" /> diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml index 0235312e53a..4fb241b1d1c 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml +++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml @@ -82,7 +82,7 @@ + id="menu_report_crm_helpdesks_tree" parent="base.menu_sale_report" sequence="20"/> diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml index 02294d8265e..ab272ae4bda 100644 --- a/addons/crm_partner_assign/report/crm_lead_report_view.xml +++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml @@ -77,7 +77,7 @@ + parent="base.menu_sale_report" action="action_report_crm_opportunity_assign" sequence="20"/> diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml index 6f0cc5ec748..f66f54b95b3 100644 --- a/addons/crm_partner_assign/report/crm_partner_report_view.xml +++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml @@ -52,7 +52,7 @@ + parent="base.menu_sale_report" action="action_report_crm_partner_assign" sequence="25"/> diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index 81f47e93013..ea951c10d6f 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -1,8 +1,8 @@ - - + + delivery.carrier.tree diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index 075d00e5da9..9de11b3bd61 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -23,8 +23,8 @@ Key Features 'security/event_security.xml', 'security/ir.model.access.csv', 'wizard/event_confirm_view.xml', - 'report/report_event_registration_view.xml', 'event_view.xml', + 'report/report_event_registration_view.xml', 'event_data.xml', 'event_tip_data.xml', 'res_config_view.xml', diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index ff94c38525f..d4a9c760347 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -3,8 +3,8 @@ - - + + @@ -38,7 +38,9 @@ form - + + @@ -396,7 +398,7 @@ + action="action_registration" groups="base.group_no_one"/> @@ -450,7 +452,7 @@ form - + diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index f44af530b67..1b5a9e8d7d7 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -64,8 +64,7 @@ {} - - + diff --git a/addons/event/res_config.py b/addons/event/res_config.py index 9f31c73dc41..d68aaadb97c 100644 --- a/addons/event/res_config.py +++ b/addons/event/res_config.py @@ -3,8 +3,8 @@ from openerp.osv import fields, osv class event_config_settings(osv.TransientModel): - _name='marketing.config.settings' - _inherit='marketing.config.settings' + _name='event.config.settings' + _inherit='res.config.settings' _columns = { 'module_event_sale': fields.boolean( 'Sell events tickets', diff --git a/addons/event/res_config_view.xml b/addons/event/res_config_view.xml index 8eb931e7339..61a76211e67 100644 --- a/addons/event/res_config_view.xml +++ b/addons/event/res_config_view.xml @@ -2,14 +2,19 @@ - - marketing.config.settings - + + Configure Event + event.config.settings -
- +
+
+
+ - -
+ + + + Configure Event + event.config.settings + form + inline + + + + diff --git a/addons/fleet/fleet_board_view.xml b/addons/fleet/fleet_board_view.xml index 313f863c41f..fe19fd851b0 100644 --- a/addons/fleet/fleet_board_view.xml +++ b/addons/fleet/fleet_board_view.xml @@ -64,7 +64,7 @@ - + - + diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index e1d8dc1f1f3..9293bb8848a 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -7,18 +7,14 @@ id="menu_hr_root" groups="base.group_hr_manager,base.group_hr_user,base.group_user" icon="fa-user" - sequence="90"/> - + sequence="18"/> - - + parent="menu_hr_root" sequence="99"/> @@ -240,7 +236,7 @@ - + @@ -323,8 +319,10 @@ tree,form + + parent="menu_human_resources_configuration" sequence="1" groups="base.group_no_one,base.group_hr_manager"/> Employees @@ -440,8 +438,6 @@ - - Employees hr.employee @@ -569,7 +565,7 @@ diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml index 8a55504a10f..5afa7e8ac45 100644 --- a/addons/hr/res_config_view.xml +++ b/addons/hr/res_config_view.xml @@ -128,8 +128,11 @@ inline - + + diff --git a/addons/hr_applicant_document/views/hr_applicant.xml b/addons/hr_applicant_document/views/hr_applicant.xml index bcc9771d17e..d5582db34f5 100644 --- a/addons/hr_applicant_document/views/hr_applicant.xml +++ b/addons/hr_applicant_document/views/hr_applicant.xml @@ -29,7 +29,7 @@ diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml index 5b9eebe60a2..6d4d06fed00 100644 --- a/addons/hr_attendance/hr_attendance_view.xml +++ b/addons/hr_attendance/hr_attendance_view.xml @@ -107,16 +107,19 @@ - + + - + - + + @@ -153,7 +156,9 @@ - + + hr.employee.form1 diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml index bfe04dc755a..925775cb3f4 100644 --- a/addons/hr_contract/hr_contract_view.xml +++ b/addons/hr_contract/hr_contract_view.xml @@ -211,7 +211,7 @@ - + diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index da24b8b914c..d097bff7876 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -71,9 +71,10 @@ {'search_default_user_to_review_id': [active_id], 'default_user_to_review_id': active_id} - + - + @@ -263,7 +264,7 @@ - @@ -352,7 +353,7 @@ - Interview Requests + Interviews hr.evaluation.interview @@ -362,7 +363,7 @@ - Interview Requests + Interviews hr.evaluation.interview form @@ -400,7 +401,7 @@ - diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index 60eb0126612..33c4d33f519 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -76,8 +76,10 @@ - - + + diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 0e5945856e6..fb75faaeafd 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -242,7 +242,7 @@

Click to register new expenses.

- OpenERP will ensure the whole process is followed; the expense + Odoo will ensure the whole process is followed; the expense sheet is validated by manager(s), the employee is reimbursed from his expenses, some expenses must be re-invoiced to the customers. @@ -250,14 +250,20 @@ - - - - - + + + + + + + - Expenses To Approve + Expenses to Approve hr.expense.expense form tree,form diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index d61e90e46a6..d155ed5026d 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -67,7 +67,7 @@ - + diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 8a8a1a9c0c8..2b03f208544 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -233,7 +233,10 @@ - + + + + Leave Request @@ -283,7 +286,7 @@ - + Requests to Approve @@ -318,7 +321,7 @@ - + Allocation Requests @@ -351,10 +354,10 @@ - + - Allocation Requests to Approve + Allocations to Approve hr.holidays form { @@ -385,7 +388,7 @@ - + Leaves Summary @@ -409,7 +412,7 @@ - + Employee's Leaves @@ -422,7 +425,7 @@ - + @@ -504,7 +507,9 @@ - + + diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml index 7abc01fe871..de92e887f11 100644 --- a/addons/hr_holidays/report/available_holidays_view.xml +++ b/addons/hr_holidays/report/available_holidays_view.xml @@ -56,7 +56,7 @@ name="Leaves Analysis" id="menu_hr_available_holidays_report_tree" action="action_hr_available_holidays_report" - parent="hr.menu_hr_reporting" sequence="5" /> + parent="menu_hr_holidays_report" sequence="5" /> diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml index 3fdf2847d8a..20489a60bdf 100644 --- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml +++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml @@ -31,7 +31,7 @@ diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 59bdc3fa710..1083255f968 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -3,9 +3,9 @@ - - - + + @@ -99,7 +99,7 @@ @@ -112,7 +112,7 @@ @@ -374,7 +374,7 @@ - + hr.payslip @@ -464,7 +464,7 @@ @@ -478,7 +478,7 @@ @@ -657,7 +657,7 @@ - + - + diff --git a/addons/hr_payroll/res_config.py b/addons/hr_payroll/res_config.py index 22e7f95ccaa..014e249f57d 100644 --- a/addons/hr_payroll/res_config.py +++ b/addons/hr_payroll/res_config.py @@ -21,8 +21,9 @@ from openerp.osv import fields, osv -class human_resources_configuration(osv.osv_memory): - _inherit = 'hr.config.settings' +class hr_payroll_configuration(osv.osv_memory): + _name = 'hr.payroll.config.settings' + _inherit = 'res.config.settings' _columns = { 'module_hr_payroll_account': fields.boolean('Link your payroll to accounting system', help ="""Create journal entries from payslips"""), diff --git a/addons/hr_payroll/res_config_view.xml b/addons/hr_payroll/res_config_view.xml index c40980d1d1f..11ede32164b 100644 --- a/addons/hr_payroll/res_config_view.xml +++ b/addons/hr_payroll/res_config_view.xml @@ -1,18 +1,37 @@ - - hr settings for payroll - hr.config.settings - + + Configure Payroll + hr.payroll.config.settings - -

- -
- +
+
+
+ + + +
+ + + Configure Payroll + hr.payroll.config.settings + form + inline + + + + diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml index e7a0def1a64..666aeb5b071 100644 --- a/addons/hr_recruitment/hr_recruitment_menu.xml +++ b/addons/hr_recruitment/hr_recruitment_menu.xml @@ -51,15 +51,17 @@ + id="menu_hr_recruitment_root" + sequence="19"/> - + + + diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 91d417d0838..6cc630bff22 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -1,12 +1,9 @@ - - + + @@ -617,7 +614,7 @@ @@ -658,7 +655,7 @@ @@ -698,7 +695,7 @@ diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index bc27160382c..039816a1714 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -85,7 +85,7 @@ {} - + diff --git a/addons/hr_recruitment/res_config.py b/addons/hr_recruitment/res_config.py index 731c0683481..33c5020c1e6 100644 --- a/addons/hr_recruitment/res_config.py +++ b/addons/hr_recruitment/res_config.py @@ -24,8 +24,8 @@ from openerp.osv import fields, osv class hr_applicant_settings(osv.TransientModel): - _name = 'hr.config.settings' - _inherit = ['hr.config.settings', 'fetchmail.config.settings'] + _name = 'hr.recruitment.config.settings' + _inherit = ['res.config.settings', 'fetchmail.config.settings'] _columns = { 'module_document': fields.boolean('Allow the automatic indexation of resumes', diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml index d4a16afca62..dbe8c4d9aa2 100644 --- a/addons/hr_recruitment/res_config_view.xml +++ b/addons/hr_recruitment/res_config_view.xml @@ -8,26 +8,44 @@ - - hr settings for recruitment - hr.config.settings - + + Configure Recruitment + hr.recruitment.config.settings -
-
- -
-
- -
-
- +
+
+
+ + + +
+ + + Configure Recruitment + hr.recruitment.config.settings + form + inline + + + + diff --git a/addons/hr_timesheet/__init__.py b/addons/hr_timesheet/__init__.py index b525a2b067c..dc3d8ea53b4 100644 --- a/addons/hr_timesheet/__init__.py +++ b/addons/hr_timesheet/__init__.py @@ -20,5 +20,4 @@ ############################################################################## import hr_timesheet -import wizard import report diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py index bb554756d09..ff9ebb91d93 100644 --- a/addons/hr_timesheet/__openerp__.py +++ b/addons/hr_timesheet/__openerp__.py @@ -45,7 +45,6 @@ up a management by affair. 'security/ir.model.access.csv', 'security/hr_timesheet_security.xml', 'hr_timesheet_view.xml', - 'wizard/hr_timesheet_sign_in_out_view.xml', 'report/hr_timesheet_report_view.xml', 'hr_timesheet_installer.xml', 'hr_timesheet_data.xml' @@ -53,7 +52,6 @@ up a management by affair. 'demo': ['hr_timesheet_demo.xml'], 'test': [ 'test/hr_timesheet_users.yml', - 'test/test_hr_timesheet.yml', 'test/hr_timesheet_demo.yml', ], 'installable': True, diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index ec2dd459f23..3ec03627932 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -134,10 +134,12 @@ {'default_invoice_on_timesheets':1} - + + - Timesheet Activities + Activities ir.actions.act_window hr.analytic.timesheet form @@ -156,7 +158,8 @@ - + hr.timesheet.employee.extd_form @@ -172,8 +175,5 @@ - - - diff --git a/addons/hr_timesheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet/report/hr_timesheet_report_view.xml index a52cd3e86c4..6f044d28473 100644 --- a/addons/hr_timesheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet/report/hr_timesheet_report_view.xml @@ -59,8 +59,10 @@ {} + + parent="menu_timesheets_reports" sequence="3"/> diff --git a/addons/hr_timesheet/test/test_hr_timesheet.yml b/addons/hr_timesheet/test/test_hr_timesheet.yml deleted file mode 100644 index 3da29d29677..00000000000 --- a/addons/hr_timesheet/test/test_hr_timesheet.yml +++ /dev/null @@ -1,64 +0,0 @@ -- - In order to test hr_timesheet Module in OpenERP, I make "Sign In/Sign Out for Project" to encode and - track time spent on the different projects. -- - Give the access rights of Hr Officer to create employee. -- - !context - uid: 'res_hr_timesheet_officer' -- - I create employee "Gilles Gravie" as "User". -- - !record {model: hr.employee, id: hr.employee_qdp}: - address_home_id: base.res_partner_address_8 - name: Gilles Gravie - parent_id: 'hr.employee_al' - user_id: 'base.user_demo' - product_id: product.product_product_consultant - journal_id: hr_timesheet.analytic_journal -- - Give the access rights of Employee to Sign In/Sign Out in Project. -- - !context - uid: 'res_hr_timesheet_employee' -- - On "Sign In/Sign Out by Project" wizard i click on "Sign In/Sign Out" button of this wizard. -- - !python {model: hr.sign.in.project}: | - uid = ref('base.user_demo') - state_id = self.check_state(cr, uid, [ref("hr.employee_qdp")], {"active_ids": [ref("hr_timesheet.action_hr_timesheet_sign_in")]}) - assert state_id['name'] == 'Sign in / Sign out', "Check the process of sing-in/sing-out." -- - I select start date and Perform start work on project. -- - !python {model: hr.sign.in.project}: | - import time - uid = ref('base.user_demo') - new_id = self.create(cr, uid, {'emp_id': ref('hr.employee_qdp'), 'name': 'Gilles Gravie', - 'server_date': time.strftime('%Y-%m-%d %H:%M:%S')}) - self.sign_in_result(cr, uid, [new_id], context) -- - I change my project "Thymbra" and I click on the "Change Work" button of this wizard -- - !python {model: hr.sign.out.project}: | - import time - from datetime import datetime, date, timedelta - uid = ref('base.user_demo') - new_id = self.create(cr, uid, {'account_id': ref('analytic.analytic_nebula'),'analytic_amount': 7.0, - 'date': (datetime.now()+timedelta(1)).strftime('%Y-%m-%d %H:%M:%S') , - 'date_start': time.strftime('%Y-%m-%d %H:%M:%S'), 'info': 'Create Yaml for hr module', - 'name': 'Gilles Gravie', 'server_date': time.strftime('%Y-%m-%d %H:%M:%S'), 'state': 'present'}) - - self.sign_out_result(cr, uid, [new_id], context) -- - My work for this project "Sednacom" is over and I stop working by clicking on "Stop Work" button of this wizard. -- - !python {model: hr.sign.out.project}: | - import time - from datetime import datetime, date, timedelta - uid = ref('base.user_demo') - new_id = self.create(cr, uid, {'account_id': ref('analytic.analytic_spark'), 'analytic_amount': 7.0, - 'date': (datetime.now()+timedelta(2)).strftime('%Y-%m-%d %H:%M:%S'), - 'date_start': time.strftime('%Y-%m-%d %H:%M:%S'), 'info': 'Create Yaml for hr module', - 'name': 'Gilles Gravie', 'server_date': time.strftime('%Y-%m-%d %H:%M:%S'), 'state': 'absent'}) - self.sign_out_result_end(cr, uid, [new_id], context) diff --git a/addons/hr_timesheet/wizard/__init__.py b/addons/hr_timesheet/wizard/__init__.py deleted file mode 100644 index 158c5a56fcf..00000000000 --- a/addons/hr_timesheet/wizard/__init__.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -import hr_timesheet_sign_in_out diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py deleted file mode 100644 index 44185da6685..00000000000 --- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py +++ /dev/null @@ -1,169 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## -import time - -from openerp.osv import fields, osv -from openerp.tools.translate import _ -from openerp.exceptions import UserError - -class hr_so_project(osv.osv_memory): - _name = 'hr.sign.out.project' - _description = 'Sign Out By Project' - _columns = { - 'account_id': fields.many2one('account.analytic.account', 'Project / Analytic Account', domain=[('type','=','normal')]), - 'info': fields.char('Work Description', required=True), - 'date_start': fields.datetime('Starting Date', readonly=True), - 'date': fields.datetime('Closing Date'), - 'analytic_amount': fields.float('Minimum Analytic Amount'), - 'name': fields.char('Employee\'s Name', required=True, readonly=True), - 'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('present', 'Present'), ('absent', 'Absent')], required=True, readonly=True), - 'server_date': fields.datetime('Current Date', required=True, readonly=True), - 'emp_id': fields.many2one('hr.employee', 'Employee ID') - } - - def _get_empid(self, cr, uid, context=None): - emp_obj = self.pool.get('hr.employee') - emp_ids = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context) - if emp_ids: - for employee in emp_obj.browse(cr, uid, emp_ids, context=context): - return {'name': employee.name, 'state': employee.state, 'emp_id': emp_ids[0], 'server_date':time.strftime('%Y-%m-%d %H:%M:%S')} - - def _get_empid2(self, cr, uid, context=None): - res = self._get_empid(cr, uid, context=context) - cr.execute('select name,action from hr_attendance where employee_id=%s order by name desc limit 1', (res['emp_id'],)) - - res['server_date'] = time.strftime('%Y-%m-%d %H:%M:%S') - date_start = cr.fetchone() - - if date_start: - res['date_start'] = date_start[0] - return res - - def default_get(self, cr, uid, fields_list, context=None): - res = super(hr_so_project, self).default_get(cr, uid, fields_list, context=context) - res.update(self._get_empid2(cr, uid, context=context)) - return res - - def _write(self, cr, uid, data, emp_id, context=None): - timesheet_obj = self.pool.get('hr.analytic.timesheet') - emp_obj = self.pool.get('hr.employee') - if context is None: - context = {} - hour = (time.mktime(time.strptime(data['date'] or time.strftime('%Y-%m-%d %H:%M:%S'), '%Y-%m-%d %H:%M:%S')) - - time.mktime(time.strptime(data['date_start'], '%Y-%m-%d %H:%M:%S'))) / 3600.0 - minimum = data['analytic_amount'] - if minimum: - hour = round(round((hour + minimum / 2) / minimum) * minimum, 2) - res = timesheet_obj.default_get(cr, uid, ['product_id','product_uom_id'], context=context) - - if not res['product_uom_id']: - raise UserError(_('Please define cost unit for this employee.')) - up = timesheet_obj.on_change_unit_amount(cr, uid, False, res['product_id'], hour,False, res['product_uom_id'])['value'] - - res['name'] = data['info'] - res['account_id'] = data['account_id'].id - res['unit_amount'] = hour - emp_journal = emp_obj.browse(cr, uid, emp_id, context=context).journal_id - res['journal_id'] = emp_journal and emp_journal.id or False - res.update(up) - up = timesheet_obj.on_change_account_id(cr, uid, [], res['account_id']).get('value', {}) - res.update(up) - return timesheet_obj.create(cr, uid, res, context=context) - - def sign_out_result_end(self, cr, uid, ids, context=None): - emp_obj = self.pool.get('hr.employee') - for data in self.browse(cr, uid, ids, context=context): - emp_id = data.emp_id.id - emp_obj.attendance_action_change(cr, uid, [emp_id], {'action':'sign_out', 'action_date':data.date}) - self._write(cr, uid, data, emp_id, context=context) - return {'type': 'ir.actions.act_window_close'} - - def sign_out_result(self, cr, uid, ids, context=None): - emp_obj = self.pool.get('hr.employee') - for data in self.browse(cr, uid, ids, context=context): - emp_id = data.emp_id.id - emp_obj.attendance_action_change(cr, uid, [emp_id], {'action':'action', 'action_date':data.date}) - self._write(cr, uid, data, emp_id, context=context) - return {'type': 'ir.actions.act_window_close'} - - -class hr_si_project(osv.osv_memory): - - _name = 'hr.sign.in.project' - _description = 'Sign In By Project' - _columns = { - 'name': fields.char('Employee\'s Name', readonly=True), - 'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('present', 'Present'), ('absent', 'Absent')], required=True, readonly=True), - 'date': fields.datetime('Starting Date'), - 'server_date': fields.datetime('Current Date', readonly=True), - 'emp_id': fields.many2one('hr.employee', 'Employee ID') - } - - def view_init(self, cr, uid, fields, context=None): - """ - This function checks for precondition before wizard executes - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param fields: List of fields for default value - @param context: A standard dictionary for contextual values - """ - emp_obj = self.pool.get('hr.employee') - emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context) - if not emp_id: - raise UserError(_('Please define employee for your user.')) - return False - - def check_state(self, cr, uid, ids, context=None): - obj_model = self.pool.get('ir.model.data') - emp_id = self.default_get(cr, uid, ['emp_id'], context)['emp_id'] - # get the latest action (sign_in or out) for this employee - cr.execute('select action from hr_attendance where employee_id=%s and action in (\'sign_in\',\'sign_out\') order by name desc limit 1', (emp_id,)) - res = (cr.fetchone() or ('sign_out',))[0] - in_out = (res == 'sign_out') and 'in' or 'out' - #TODO: invert sign_in et sign_out - model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_timesheet_sign_%s' % in_out)], context=context) - resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id'] - return { - 'name': _('Sign in / Sign out'), - 'view_type': 'form', - 'view_mode': 'tree,form', - 'res_model': 'hr.sign.%s.project' % in_out, - 'views': [(resource_id,'form')], - 'type': 'ir.actions.act_window', - 'target': 'new' - } - - def sign_in_result(self, cr, uid, ids, context=None): - emp_obj = self.pool.get('hr.employee') - for data in self.browse(cr, uid, ids, context=context): - emp_id = data.emp_id.id - emp_obj.attendance_action_change(cr, uid, [emp_id], {'action':'sign_in', 'action_date':data.date}) - return {'type': 'ir.actions.act_window_close'} - - def default_get(self, cr, uid, fields_list, context=None): - res = super(hr_si_project, self).default_get(cr, uid, fields_list, context=context) - emp_obj = self.pool.get('hr.employee') - emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context) - if emp_id: - for employee in emp_obj.browse(cr, uid, emp_id, context=context): - res.update({'name': employee.name, 'state': employee.state, 'emp_id': emp_id[0], 'server_date':time.strftime('%Y-%m-%d %H:%M:%S')}) - return res diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml deleted file mode 100644 index 13a678527f2..00000000000 --- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - hr.sign.in.project.message.form - hr.sign.in.project - -
- - - -
-
-
- - - - - hr.sign.in.project.form - hr.sign.in.project - -
- - - - - - -
-
-
- - - - - Sign in / Sign out by Project - hr.sign.in.project - form - tree,form - - new - Employees can encode their time spent on the different projects. A project is an analytic account and the time spent on a project generate costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet. - - - - hr.sign.out.project.form - hr.sign.out.project - -
- - - - - - - - - - - - -
-
-
- - - - - Sign in / Sign out by Project - hr.sign.out.project - form - tree,form - - new - - - - diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml index 9df754d0c1b..08597e60177 100644 --- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml +++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml @@ -1,11 +1,6 @@ - report.timesheet.line.graph diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml index c165c323315..d8b5e97f0d0 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml @@ -39,7 +39,7 @@ + parent="hr_timesheet.menu_timesheets_reports" sequence="3" icon="STOCK_PRINT"/> diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml index 4bb9a311deb..de207e62b9d 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml @@ -21,7 +21,7 @@ My Timesheet - + diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 9287c12e288..aa5685d3d4a 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -214,8 +214,9 @@ - + + - + - + - + diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml index b66eebd4644..6c589799d5f 100644 --- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml +++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml @@ -167,7 +167,7 @@ diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml index c1e39dbac79..1f3ef01630c 100644 --- a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml +++ b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml @@ -78,7 +78,8 @@ This report performs analysis on Payment Advices - + + diff --git a/addons/l10n_in_hr_payroll/report/payslip_report_view.xml b/addons/l10n_in_hr_payroll/report/payslip_report_view.xml index 18876ef240f..6b300bc3d0c 100644 --- a/addons/l10n_in_hr_payroll/report/payslip_report_view.xml +++ b/addons/l10n_in_hr_payroll/report/payslip_report_view.xml @@ -76,7 +76,8 @@ This report performs analysis on Payslip - + + diff --git a/addons/lunch/views/lunch_views.xml b/addons/lunch/views/lunch_views.xml index 9ad4a7b8393..c3a61c00995 100644 --- a/addons/lunch/views/lunch_views.xml +++ b/addons/lunch/views/lunch_views.xml @@ -1,10 +1,9 @@ - - - - + + + @@ -193,7 +192,7 @@

- + @@ -234,8 +233,7 @@

- - + @@ -254,7 +252,7 @@

- + @@ -270,7 +268,7 @@

- + diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py index b5b68aaf13c..02167ff87c5 100644 --- a/addons/mail/__openerp__.py +++ b/addons/mail/__openerp__.py @@ -67,7 +67,7 @@ Main Features 'views/email_template_view.xml', 'views/ir_actions_view.xml', 'views/res_partner_view.xml', - 'contacts_view.xml' + 'contacts_view.xml', ], 'demo': [ 'data/mail_demo.xml', diff --git a/addons/mail/contacts_view.xml b/addons/mail/contacts_view.xml index 8f99805e0d0..17f866d054f 100644 --- a/addons/mail/contacts_view.xml +++ b/addons/mail/contacts_view.xml @@ -4,7 +4,7 @@ - Contacts + Contacts ir.actions.act_window res.partner form @@ -14,13 +14,12 @@

Click to add a contact in your address book.

- Odoo helps you easily track all activities related to + Odoo helps you easily track all activities related to a customer; discussions, history of business opportunities, documents, etc.

- kanban @@ -28,7 +27,7 @@ - + tree @@ -39,15 +38,13 @@ - - - - diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml index 75b1dd2b3e0..edd008e52d0 100644 --- a/addons/mail/mail_group_view.xml +++ b/addons/mail/mail_group_view.xml @@ -157,7 +157,7 @@ - + diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 4c4547964d1..f4a3e3815d6 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -129,23 +129,23 @@ - + sequence="1"/> - - + - + + diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml index b4877359e0f..a09c41a75d8 100644 --- a/addons/marketing/marketing_view.xml +++ b/addons/marketing/marketing_view.xml @@ -6,10 +6,6 @@ - - - diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml index ab50d6e5a8b..7cf10ec6eab 100644 --- a/addons/marketing/res_config_view.xml +++ b/addons/marketing/res_config_view.xml @@ -24,8 +24,5 @@ inline - - diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index 634a719b375..76f800f981b 100644 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -184,9 +184,11 @@ - - + + @@ -275,7 +277,7 @@ {'group_by': []} - + diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml index 0912ad72f90..dbda4773f07 100644 --- a/addons/mass_mailing/views/mass_mailing.xml +++ b/addons/mass_mailing/views/mass_mailing.xml @@ -10,11 +10,12 @@ - + + - + @@ -206,7 +207,7 @@ @@ -284,7 +285,7 @@ @@ -613,7 +614,7 @@ @@ -645,11 +646,11 @@ tree,form - - + + @@ -856,7 +857,7 @@ diff --git a/addons/mass_mailing/views/mass_mailing_report.xml b/addons/mass_mailing/views/mass_mailing_report.xml index ba243273a20..4708d5bac57 100644 --- a/addons/mass_mailing/views/mass_mailing_report.xml +++ b/addons/mass_mailing/views/mass_mailing_report.xml @@ -60,8 +60,11 @@ Mass Mailing Statistics allows you to check different mailing related information like number of bounced mails, opened mails, replied mails. You can sort out your analysis by different groups to get accurate grained analysis. - + + + diff --git a/addons/mass_mailing/views/res_config.xml b/addons/mass_mailing/views/res_config.xml index 11a5b2c4dae..d2f1d1ea88e 100644 --- a/addons/mass_mailing/views/res_config.xml +++ b/addons/mass_mailing/views/res_config.xml @@ -2,12 +2,16 @@ - - marketing.config.settings.mass.mailing - marketing.config.settings - + + Configure Mass Mailing + mass.mailing.config.settings - +
+
+
- +
+ + Configure Mass Mailing + mass.mailing.config.settings + form + inline + + + + + diff --git a/addons/mass_mailing/views/res_partner.xml b/addons/mass_mailing/views/res_partner.xml deleted file mode 100644 index 14710cf8f37..00000000000 --- a/addons/mass_mailing/views/res_partner.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml index 858e8f2e319..3a13481220f 100644 --- a/addons/membership/membership_view.xml +++ b/addons/membership/membership_view.xml @@ -121,10 +121,9 @@ - - + + parent="base.menu_association" sequence="100"/> - - + @@ -276,7 +274,7 @@ - + diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 826938107c6..66d4b97dd83 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -7,7 +7,7 @@ id="base.menu_mrp_root" groups="group_mrp_user,group_mrp_manager" icon="fa-wrench" - sequence="80"/> + sequence="13"/> - diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml index 1ade4331fe7..bcddc462b2e 100644 --- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml +++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml @@ -84,7 +84,8 @@ {'search_default_Workcenter': 1} - + + diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml index 1bca50edb75..c0f85e7472e 100644 --- a/addons/note/note_view.xml +++ b/addons/note/note_view.xml @@ -182,8 +182,9 @@ - - + + + diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 46da94d28a5..c100d646f55 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -7,7 +7,7 @@ id="menu_point_root" groups="group_pos_manager,group_pos_user" icon="fa-suitcase" - sequence="30"/> + sequence="7"/> pos.order @@ -159,9 +159,8 @@ - - - + + Products @@ -190,7 +189,7 @@ + parent="menu_point_of_sale" sequence="3"/> Sale lines @@ -523,7 +522,9 @@

- + + @@ -585,9 +586,6 @@ - - Payment Methods account.journal @@ -634,7 +632,7 @@ - + @@ -936,7 +934,7 @@ - All Sessions + Sessions ir.actions.act_window pos.session form @@ -961,7 +959,7 @@ parent="menu_point_of_sale" action="action_pos_session" id="menu_pos_session_all" - sequence="1" + sequence="2" groups="group_pos_manager"/> @@ -989,8 +987,8 @@ + parent="menu_point_root" name="Dashboard" + id="menu_pos_dashboard" sequence="1"/> pos.ean_wizard diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml index c6f6bbb88e9..74112186402 100644 --- a/addons/product/pricelist_view.xml +++ b/addons/product/pricelist_view.xml @@ -3,9 +3,9 @@ + parent="base.menu_sale_config" sequence="1"/> + parent="base.menu_sale_config" groups="product.group_sale_pricelist" sequence="3"/> product.pricelist.version.form diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index becbae1ed7c..c305d9f99db 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -335,14 +335,15 @@

- + + + parent="base.menu_sales" sequence="4" /> - + product.product.tree @@ -496,7 +497,7 @@ - + product.category.search @@ -563,11 +564,6 @@

- Product Categories ir.actions.act_window diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml index 7515f6a5e2e..d211aa6cb32 100644 --- a/addons/product_margin/product_margin_view.xml +++ b/addons/product_margin/product_margin_view.xml @@ -86,8 +86,8 @@ - - + + diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 95b8ddaf04e..09f17030249 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -7,18 +7,21 @@ id="base.menu_main_pm" groups="group_project_manager,group_project_user" icon="fa-calendar" - sequence="40"/> + sequence="8"/> - + sequence="2" groups="base.group_no_one"/> + + + parent="menu_project_config" + groups="base.group_no_one" + sequence="100"/> project.task.search.form @@ -774,7 +777,7 @@ - + product.product.service.search diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 55a39e94bc6..4b46c9500f3 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -2,9 +2,9 @@ - + parent="base.menu_main_pm" sequence="99"/> report.project.task.user.pivot diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml index 35ed72f9536..684ee49cfca 100644 --- a/addons/project/res_config_view.xml +++ b/addons/project/res_config_view.xml @@ -102,8 +102,8 @@ inline - + diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index ac901b14cf4..2bba5e6ef32 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -34,17 +34,6 @@ from openerp.tools.translate import _ from openerp.exceptions import UserError, AccessError -class project_issue_version(osv.Model): - _name = "project.issue.version" - _order = "name desc" - _columns = { - 'name': fields.char('Version Number', required=True), - 'active': fields.boolean('Active', required=False), - } - _defaults = { - 'active': 1, - } - class project_issue(osv.Model): _name = "project.issue" _description = "Project Issue" @@ -241,7 +230,6 @@ class project_issue(osv.Model): 'channel': fields.char('Channel', help="Communication channel."), 'categ_ids': fields.many2many('project.category', string='Tags'), 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority', select=True), - 'version_id': fields.many2one('project.issue.version', 'Version'), 'stage_id': fields.many2one ('project.task.type', 'Stage', track_visibility='onchange', select=True, domain="[('project_ids', '=', project_id)]", copy=False), diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml index 2ed232be7a9..49854c43257 100644 --- a/addons/project_issue/project_issue_data.xml +++ b/addons/project_issue/project_issue_data.xml @@ -2,20 +2,6 @@ - - - - v1.0 - - - - v2.0 - - - - v3.0 - - mail.group diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 810c0f989fa..78d49bee9ad 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -2,46 +2,6 @@ - - - Issue Version - project.issue.version - - - - - - - - - Issue Version - project.issue.version - -
- - - - -
- - - - Versions - project.issue.version - form - -

- Click to add a new version. -

- Define here the different versions of your products on which - you can work on issues. -

- - - - - - Project Issue Tracker Form project.issue @@ -80,7 +40,6 @@ -