diff options
137 files changed, 529 insertions, 874 deletions
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"/> <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="2"/> <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3"/> @@ -21,7 +21,7 @@ <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/> <menuitem id="periodical_processing_bank_statements" name="Bank Statements" parent="menu_finance_periodical_processing"/> <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" groups="account.group_account_user" sequence="9"/> - <menuitem id="menu_finance_reporting" name="Accounting" parent="base.menu_reporting" sequence="35"/> + <menuitem id="menu_finance_reporting" name="Reports" parent="menu_finance" sequence="99"/> <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting" groups="group_account_user" sequence="8"/> <menuitem id="menu_finance_reports" name="Reporting" parent="menu_finance" sequence="10" groups="group_account_user,group_account_manager"/> <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reports"/> 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 @@ <!-- Top menu item --> <menuitem name="Accounting" icon="fa-book" - id="account.menu_finance"/> + id="account.menu_finance" + sequence="25"/> <menuitem id="account.menu_account_config" name="Accounting" parent="base.menu_config" sequence="3"/> </data> 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 @@ </p> </field> </record> - <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/> + <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="3"/> <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="8" parent="base.menu_sales"/> <!-- Action Sales/Invoicing/Time and Material to Invoice --> @@ -291,7 +291,10 @@ </p> </field> </record> - <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"/> + <menuitem id="base.menu_aftersale" name="After-Sale" + groups="base.group_sale_salesman" + parent="base.menu_base_partner" sequence="5" /> + <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_aftersale" sequence="1"/> <menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="base.menu_invoiced" sequence="5"/> <!-- Action Show all invoices related to a contract --> @@ -358,7 +361,7 @@ <menuitem id= "base.menu_sales_config" - parent= "base.menu_base_config" + parent= "base.menu_sale_config" sequence= "1" name= "Sales" /> 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 @@ <data> <!-- Top menu item --> - <menuitem name="Association" + <menuitem name="Members" id="base.menu_association" groups="base.group_sale_salesman" icon="fa-group" - sequence="45"/> - <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30"/> - <menuitem name="Association" id="base.menu_report_association" parent="base.menu_reporting" sequence="23"/> + sequence="9"/> + <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="100"/> + <menuitem name="Reports" id="base.menu_report_association" parent="base.menu_association" sequence="99"/> </data> </openerp> 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 @@ - <menuitem name="Calendar" id="mail_menu_calendar" parent="mail.mail_my_stuff" sequence="10" action="action_calendar_event"/> + <menuitem name="Agenda" id="mail_menu_calendar" sequence="2" action="action_calendar_event"/> <menuitem id="menu_calendar_configuration" name="Calendar" parent="base.menu_custom" groups="base.group_no_one"/> <menuitem id="menu_calendar_event_type" parent="menu_calendar_configuration" action="action_calendar_event_type" groups="base.group_no_one"/> <menuitem id="menu_calendar_alarm" parent="menu_calendar_configuration" action="action_calendar_alarm" groups="base.group_no_one"/> 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 @@ <field name="act_window_id" ref="crm_lead_opportunities"/> </record> - <menuitem name="Sales" id="base.menu_sales" parent="base.menu_base_partner" sequence="1"/> - <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" sequence="3" + <menuitem name="CRM" id="base.menu_crm" parent="base.menu_base_partner" sequence="2"/> + <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_crm" sequence="1" action="crm_lead_all_leads"/> - <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" sequence="4" + <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_crm" sequence="2" action="crm_lead_opportunities" groups="base.group_sale_salesman,base.group_sale_manager"/> 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 @@ <menuitem name="Phone Calls" id="menu_crm_case_phone" groups="base.group_sale_salesman" - parent="base.menu_base_partner" sequence="2" /> + parent="base.menu_base_partner" sequence="4" /> <record model="ir.actions.act_window" id="crm_phonecall_category_phone_incoming0"> <field name="name">Logged Calls</field> 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 @@ --> <menuitem name="Sales" id="base.menu_base_partner" - groups="base.group_sale_manager,base.group_sale_salesman"/> + groups="base.group_sale_manager,base.group_sale_salesman" + sequence="6"/> <menuitem id="base.menu_crm_config_lead" name="Leads & Opportunities" - parent="base.menu_base_config" sequence="5" groups="base.group_sale_manager"/> + parent="base.menu_sale_config" sequence="5" groups="base.group_sale_manager"/> <menuitem id="base.menu_crm_config_opportunity" name="Opportunities" - parent="base.menu_base_config" sequence="1" groups="base.group_sale_manager"/> + parent="base.menu_sale_config" sequence="1" groups="base.group_sale_manager"/> <menuitem id="base.menu_sale_config_sales" name="Sales" - parent="base.menu_base_config" sequence="0" groups="base.group_sale_manager"/> + parent="base.menu_sale_config" sequence="0" groups="base.group_sale_manager"/> <menuitem id="menu_crm_config_phonecall" name="Phone Calls" - parent="base.menu_base_config" sequence="45" groups="base.group_sale_salesman"/> + parent="base.menu_sale_config" sequence="45" groups="base.group_sale_salesman"/> <!-- CRM.LOST.REASON VIEWS --> <record id="crm_lost_reason_view_form" model="ir.ui.view"> 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 @@ </record> <menuitem name="Leads Analysis" id="menu_report_crm_leads_tree" groups="base.group_sale_manager" - parent="base.next_id_64" action="action_report_crm_lead" sequence="1"/> + parent="base.menu_sale_report" action="action_report_crm_lead" sequence="1"/> </data> </openerp> 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 @@ <field name="act_window_id" ref="action_report_crm_opportunity"/> </record> <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree" - parent="base.next_id_64" action="action_report_crm_opportunity" sequence="5"/> + parent="base.menu_sale_report" action="action_report_crm_opportunity" sequence="5"/> </data> </openerp> 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 @@ <menuitem name="Phone Calls Analysis" groups="base.group_sale_salesman" action="action_report_crm_phonecall" - id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="15"/> + id="menu_report_crm_phonecalls_tree" parent="base.menu_sale_report" sequence="15"/> </data> </openerp> 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 @@ <field name="groups_id" eval="[(4,ref('base.group_sale_manager')),(4,ref('base.group_sale_salesman'))]"/> </record> - <record model="ir.ui.menu" id="base.menu_base_config"> + <record model="ir.ui.menu" id="base.menu_sale_config"> <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/> </record> 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 @@ <openerp> <data> - <menuitem id="base.menu_aftersale" name="After-Sale Services" + <menuitem id="base.menu_aftersale" name="After-Sale" groups="base.group_sale_salesman" - parent="base.menu_base_partner" sequence="3" /> + parent="base.menu_base_partner" sequence="5" /> + <menuitem id="base.menu_services" name="Services" + groups="base.group_sale_salesman" + parent="base.menu_aftersale" sequence="2" /> <!-- Claims Menu --> <record model="ir.actions.act_window" id="crm_claim_category_claim0"> @@ -45,7 +48,7 @@ <menuitem name="Claims" id="menu_crm_case_claims" - parent="base.menu_aftersale" action="crm_claim_category_claim0" sequence="1"/> + parent="base.menu_services" action="crm_claim_category_claim0" sequence="1"/> <!-- Claim Stages --> <menuitem id="menu_claim_stage_view" name="Stages" action="crm_claim_stage_act" parent="menu_config_claim" sequence="20"/> 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 @@ <menuitem id="menu_config_claim" name="Claim" groups="base.group_no_one" - parent="base.menu_base_config" sequence="55"/> + parent="base.menu_sale_config" sequence="55"/> <!-- Claims categories --> 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 @@ </record> <menuitem name="Claims Analysis" id="menu_report_crm_claim_tree" - action="action_report_crm_claim" parent="base.next_id_64" sequence="15"/> + action="action_report_crm_claim" parent="base.menu_sale_report" sequence="15"/> </data> </openerp> 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 @@ <!-- Top menu item --> <menuitem name="Sales" - id="base.menu_base_partner"/> + id="base.menu_base_partner" sequence="6"/> - <menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_base_partner" /> + <menuitem id="base.menu_aftersale" name="After-Sale" + groups="base.group_sale_salesman" + parent="base.menu_base_partner" sequence="5" /> + <menuitem id="base.menu_services" name="Services" sequence="2" + parent="base.menu_aftersale" + groups="base.group_sale_salesman"/> <!-- Help Desk (menu) --> @@ -53,8 +58,7 @@ </record> <menuitem name="Helpdesk and Support" id="menu_help_support_main" - groups="base.group_sale_salesman" - parent="base.menu_aftersale" action="crm_case_helpdesk_act111" sequence="2"/> + parent="base.menu_services" action="crm_case_helpdesk_act111" sequence="2"/> </data> </openerp> 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 @@ <!-- Helpdesk Support Categories Configuration Menu--> <menuitem id="menu_config_helpdesk" name="Helpdesk" groups="base.group_no_one" - parent="base.menu_base_config" sequence="60" /> + parent="base.menu_sale_config" sequence="60" /> <!-- Helpdesk Support Categories --> 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 @@ </record> <menuitem name="Helpdesk Analysis" action="action_report_crm_helpdesk" - id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" sequence="20"/> + id="menu_report_crm_helpdesks_tree" parent="base.menu_sale_report" sequence="20"/> </data> </openerp> 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 @@ </record> <menuitem id="menu_report_crm_opportunities_assign_tree" - parent="base.next_id_64" action="action_report_crm_opportunity_assign" sequence="20"/> + parent="base.menu_sale_report" action="action_report_crm_opportunity_assign" sequence="20"/> </data> </openerp> 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 @@ </record> <menuitem id="menu_report_crm_partner_assign_tree" - parent="base.next_id_64" action="action_report_crm_partner_assign" sequence="25"/> + parent="base.menu_sale_report" action="action_report_crm_partner_assign" sequence="25"/> </data> </openerp> 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 @@ <openerp> <data> <!-- Delivery Carriers --> - <menuitem id="menu_delivery" name="Delivery" parent="stock.menu_stock_configuration" groups="stock.group_stock_manager" sequence="50"/> - <menuitem id="sale_menu_delivery" name="Delivery" parent="base.menu_base_config" groups="base.group_sale_manager" sequence="12"/> + <menuitem id="menu_delivery" name="Delivery" parent="stock.menu_stock_config_settings" groups="stock.group_stock_manager" sequence="50"/> + <menuitem id="sale_menu_delivery" name="Delivery" parent="base.menu_sale_config" groups="base.group_sale_manager" sequence="12"/> <record id="view_delivery_carrier_tree" model="ir.ui.view"> <field name="name">delivery.carrier.tree</field> 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 @@ <data> <!-- Main menu items --> - <menuitem name="Events" id="event_main_menu" parent="base.marketing_menu" sequence="2" groups="marketing.group_marketing_user"/> - <menuitem name="Events" id="event_configuration" parent="base.menu_marketing_config_root" sequence="1" groups="marketing.group_marketing_user"/> + <menuitem name="Events" id="event_main_menu" sequence="15" groups="marketing.group_marketing_user"/> + <menuitem parent="event_main_menu" id="menu_reporting_events" sequence="99" groups="event.group_event_manager" name="Reports"/> <!-- EVENT.TYPE VIEWS --> <record model="ir.ui.view" id="view_event_type_form"> @@ -38,7 +38,9 @@ <field name="view_type">form</field> </record> - <menuitem name="Events Types" id="menu_event_type" action="action_event_type" parent="event.event_configuration" groups="base.group_no_one"/> + <menuitem id="menu_event_configuration" name="Event" parent="base.menu_config" + sequence="14"/> + <menuitem name="Events Types" id="menu_event_type" action="action_event_type" parent="menu_event_configuration" groups="base.group_no_one"/> <!-- EVENT.REGISTRATION ACTIONS --> <record id="act_event_registration_from_event" model="ir.actions.act_window"> @@ -396,7 +398,7 @@ <menuitem name="Attendees" id="menu_action_registration" parent="event.event_main_menu" - action="action_registration" groups="event.group_event_manager,event.group_event_user"/> + action="action_registration" groups="base.group_no_one"/> <!-- EVENT.MAIL VIEWS --> <record model="ir.ui.view" id="view_event_mail_form"> @@ -450,7 +452,7 @@ <field name="view_type">form</field> </record> - <menuitem name="Events Mail Schedulers" id="menu_event_type" action="action_event_mail" parent="event.event_configuration" groups="base.group_no_one"/> + <menuitem name="Events Mail Schedulers" id="menu_event_type" action="action_event_mail" parent="menu_event_configuration" groups="base.group_no_one"/> </data> </openerp> 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 @@ <field name="context">{}</field> <!-- force empty --> </record> - <menuitem parent="base.menu_reporting" id="menu_reporting_events" sequence="50" groups="event.group_event_manager" name="Events"/> - <menuitem parent="menu_reporting_events" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="event.group_event_manager"/> + <menuitem parent="event.menu_reporting_events" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="event.group_event_manager"/> </data> </openerp> 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 @@ <openerp> <data> - <record id="view_event_configuration" model="ir.ui.view"> - <field name="model">marketing.config.settings</field> - <field name="inherit_id" ref="marketing.view_marketing_configuration"/> + <record id="view_event_configuration" model="ir.ui.view"> + <field name="name">Configure Event</field> + <field name="model">event.config.settings</field> <field name="arch" type="xml"> - <div name="config_setting" position="inside"> - <separator string="Event Features"/> + <form string="Configure Event" class="oe_form_configuration"> + <header> + <button string="Apply" type="object" name="execute" class="oe_highlight"/> + or + <button string="Cancel" type="object" name="cancel" class="oe_link"/> + </header> + <separator string="Mass Mailing"/> <group> - <label for="id" string="Settings"/> + <label for="id" string="Settings"/> <div> <div name="module_event_sale"> <field name="module_event_sale" class="oe_inline"/> @@ -33,9 +38,20 @@ </div> </div> </group> - </div> + </form> </field> </record> + + <record id="action_event_configuration" model="ir.actions.act_window"> + <field name="name">Configure Event</field> + <field name="res_model">event.config.settings</field> + <field name="view_mode">form</field> + <field name="target">inline</field> + </record> + + <menuitem id="menu_event_global_settings" name="Settings" + parent="menu_event_configuration" sequence="0" action="action_event_configuration"/> + </data> </openerp> 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 @@ <field name="act_window_id" ref="action_fleet_reporting_costs_non_effective"/> </record> - <menuitem name="Fleet" parent="base.menu_reporting" id="menu_fleet_reporting" sequence="90" groups="group_fleet_manager"/> + <menuitem name="Reports" parent="menu_root" id="menu_fleet_reporting" sequence="99" groups="group_fleet_manager"/> <menuitem id="menu_fleet_reporting_costs" parent="menu_fleet_reporting" diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index ea7964443dc..67303a4df41 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -175,7 +175,7 @@ </field> </record> - <menuitem name="Fleet" id="menu_root" sequence="110" groups="group_fleet_user" icon="fa-car"/> + <menuitem name="Fleet" id="menu_root" sequence="26" groups="group_fleet_user" icon="fa-car"/> <menuitem name="Configuration" parent="menu_root" id="fleet_configuration" sequence="3" groups="group_fleet_manager"/> <menuitem action="fleet_vehicle_model_act" parent="fleet_configuration" id="fleet_vehicle_model_menu" groups="base.group_no_one"/> <menuitem action="fleet_vehicle_model_brand_act" parent="fleet_configuration" id="fleet_vehicle_model_brand_menu" groups="base.group_no_one"/> 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"/> - <menuitem id="menu_hr_reporting" parent="base.menu_reporting" name="Human Resources" sequence="60" - groups="base.group_hr_manager"/> + sequence="18"/> <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/> <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_user" sequence="50"/> <menuitem id="menu_hr_configuration_employees" name="Employees" parent="hr.menu_hr_configuration" groups="base.group_hr_user" sequence="1"/> <menuitem id="menu_hr_configuration_recruitment" name="Recruitment" parent="hr.menu_hr_configuration" groups="base.group_hr_user" sequence="2"/> - <menuitem id="menu_hr_configuration_timesheets_attendances" name="Timesheets & Attendances" parent="hr.menu_hr_configuration" groups="base.group_hr_user" sequence="3"/> - <menuitem id="menu_hr_configuration_expenses" name="Expenses" parent="hr.menu_hr_configuration" groups="base.group_hr_manager" sequence="4"/> <menuitem id="menu_hr_reporting_timesheet" name="Reports" - parent="menu_hr_reporting" sequence="6"/> + parent="menu_hr_root" sequence="99"/> <!--Employee form view --> <record id="view_employee_form" model="ir.ui.view"> @@ -240,7 +236,7 @@ </field> </record> - <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/> + <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_root"/> <!-- Employee architecture --> <record id="view_partner_tree2" model="ir.ui.view"> @@ -323,8 +319,10 @@ <field name="view_mode">tree,form</field> </record> + <menuitem id="menu_human_resources_configuration" name="Human Resources" parent="base.menu_config" + sequence="15"/> <menuitem action="open_view_categ_form" id="menu_view_employee_category_form" - parent="hr.menu_hr_configuration_employees" sequence="1" groups="base.group_no_one,base.group_hr_manager"/> + parent="menu_human_resources_configuration" sequence="1" groups="base.group_no_one,base.group_hr_manager"/> <record id="hr_employee_normal_action_tree" model="ir.actions.act_window"> <field name="name">Employees</field> @@ -440,8 +438,6 @@ </field> </record> - <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_user"/> - <record model="ir.actions.act_window" id="act_employee_from_department"> <field name="name">Employees</field> <field name="res_model">hr.employee</field> @@ -569,7 +565,7 @@ <menuitem action="open_module_tree_department" id="menu_hr_department_tree" - parent="menu_hr_main" + parent="menu_hr_root" sequence="1" groups="group_multi_departments"/> 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 @@ <field name="target">inline</field> </record> - <menuitem id="menu_human_resources_configuration" name="Human Resources" parent="base.menu_config" - sequence="15" action="action_human_resources_configuration"/> + <menuitem id="menu_human_resources_global_settings" name="Settings" + parent="menu_human_resources_configuration" + action="action_human_resources_configuration" + sequence="0"/> + </data> </openerp> 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 @@ <menuitem name="Resumes and Letters" - parent="base.menu_crm_case_job_req_main" + parent="hr_recruitment.menu_hr_recruitment_root" id="menu_crm_case_categ0_act_job02" action="hr_applicant_resumes" sequence="3"/> </data> 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 @@ <field name="view_id"></field> <!-- force empty --> </record> - <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="5" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/> + <menuitem id="timesheet_menu_root" name="Timesheets" sequence="10" icon="fa-user" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/> + <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="timesheet_menu_root" sequence="5" /> - <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="10" groups="base.group_hr_attendance"/> + <menuitem id="menu_hr_attendance_root" name="Attendances" sequence="29" groups="base.group_hr_attendance"/> - <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="20" groups="base.group_hr_attendance"/> + <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance_root" sequence="20" groups="base.group_hr_attendance"/> + <menuitem name="Reports" parent="menu_hr_attendance_root" sequence="99" + id="menu_hr_attendance_report"/> <menuitem action="action_hr_attendance_graph" id="menu_hr_attendance_graph" - parent="hr.menu_hr_reporting" + parent="menu_hr_attendance_report" sequence="3" /> @@ -153,7 +156,9 @@ <field name="view_id" ref="view_attendance_reason"/> </record> - <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_hr_configuration_timesheets_attendances" groups="base.group_hr_attendance" sequence="1"/> + <menuitem name="Attendance" parent="base.menu_config" id="menu_hr_attendance_config" sequence="29"/> + <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" + parent="menu_hr_attendance_config" groups="base.group_hr_attendance" sequence="1"/> <record id="hr_attendance_employee" model="ir.ui.view"> <field name="name">hr.employee.form1</field> 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 @@ </record> <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="hr.menu_hr_configuration_employees" sequence="3" groups="base.group_no_one"/> - <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_hr_manager"/> + <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_root" name="Contracts" sequence="4" groups="base.group_hr_manager"/> </data> </openerp> 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 @@ <field name="context">{'search_default_user_to_review_id': [active_id], 'default_user_to_review_id': active_id}</field> </record> - <menuitem name="Appraisal" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="25"/> + <menuitem name="Appraisal" id="menu_hr_evaluation_root" sequence="25"/> <menuitem name="Periodic Appraisal" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4" groups="base.group_hr_manager"/> - <menuitem parent="hr.menu_hr_configuration_employees" id="menu_open_view_hr_evaluation_plan_tree" + <menuitem name="Appraisal" id="menu_hr_evaluation_configuration" sequence="22" parent="base.menu_config"/> + <menuitem parent="menu_hr_evaluation_configuration" id="menu_open_view_hr_evaluation_plan_tree" action="open_view_hr_evaluation_plan_tree" sequence="5" groups="base.group_hr_manager"/> <record model="ir.ui.view" id="view_hr_evaluation_plan_phase_form"> @@ -263,7 +264,7 @@ </field> </record> - <menuitem name="Appraisals" parent="menu_eval_hr" id="menu_open_view_hr_evaluation_tree" + <menuitem name="Appraisals" parent="menu_hr_evaluation_root" id="menu_open_view_hr_evaluation_tree" action="open_view_hr_evaluation_tree" groups="base.group_hr_user"/> <record model="ir.ui.view" id="view_hr_evaluation_interview_form"> @@ -352,7 +353,7 @@ </record> <record id="view_evaluation_calendar" model="ir.ui.view"> - <field name="name">Interview Requests</field> + <field name="name">Interviews</field> <field name="model">hr.evaluation.interview</field> <field name="arch" type="xml"> <calendar string="Interview Request" color="user_to_review_id" date_start="deadline"> @@ -362,7 +363,7 @@ </record> <record model="ir.actions.act_window" id="action_hr_evaluation_interview_tree"> - <field name="name">Interview Requests</field> + <field name="name">Interviews</field> <field name="res_model">hr.evaluation.interview</field> <field name="view_type">form</field> <field name="view_id" eval="False"/> @@ -400,7 +401,7 @@ <field name="act_window_id" ref="action_hr_evaluation_interview_tree"/> </record> - <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests" + <menuitem name="Interviews" parent="menu_hr_evaluation_root" id="menu_open_hr_evaluation_interview_requests" action="action_hr_evaluation_interview_tree"/> <!-- Email Compose message Action--> 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 @@ <field name="act_window_id" ref="action_evaluation_report_all"/> </record> - - <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="2" groups="base.group_hr_manager"/> + <menuitem id="menu_hr_evaluation_report" parent="menu_hr_evaluation_root" sequence="99" + name="Reports"/> + <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" + parent="menu_hr_evaluation_report" sequence="2" groups="base.group_hr_manager"/> </data> </openerp> 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 @@ <p class="oe_view_nocontent_create"> Click to register new expenses. </p><p> - 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 @@ </field> </record> - <menuitem id="menu_expense_approved" parent="account.menu_finance_payables" action="action_approved_expense" sequence="8"/> - <menuitem id="menu_hr_product" name="Expense Products" parent="hr.menu_hr_configuration_expenses" action="hr_expense_product" groups="base.group_hr_manager"/> - <menuitem id="next_id_49" name="Expenses" sequence="15" parent="hr.menu_hr_root"/> - <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49"/> - <menuitem action="action_request_approve_expense" id="menu_expense_to_approve" name="Expenses to Approve" parent="next_id_49" groups="base.group_hr_user"/> + <menuitem id="menu_expense_approved" parent="account.menu_finance_payables" + action="action_approved_expense" sequence="8"/> + <menuitem id="menu_hr_expense_configuration" name="Expenses" parent="base.menu_config" + sequence="20"/> + <menuitem id="menu_hr_product" name="Expense Products" parent="menu_hr_expense_configuration" + action="hr_expense_product" groups="base.group_hr_manager"/> + <menuitem id="menu_hr_expense_root" name="Expenses" sequence="20"/> + <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="menu_hr_expense_root"/> + <menuitem action="action_request_approve_expense" id="menu_expense_to_approve" name="Approvals" + parent="menu_hr_expense_root" groups="base.group_hr_user"/> + <menuitem name="Reports" id="menu_hr_expense_report" sequence="99" parent="menu_hr_expense_root"/> <record id="hr_expense_action_from_department" model="ir.actions.act_window"> - <field name="name">Expenses To Approve</field> + <field name="name">Expenses to Approve</field> <field name="res_model">hr.expense.expense</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> 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 @@ <field name="search_view_id" ref="view_hr_expense_report_search"/> </record> - <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="1"/> + <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_analysis" parent="menu_hr_expense_report" sequence="1"/> </data> </openerp> 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 @@ </field> </record> - <menuitem name="Leaves" parent="hr.menu_hr_root" id="menu_open_ask_holidays" sequence="20"/> + <menuitem name="Leaves" id="menu_hr_holidays_root" sequence="21"/> + <menuitem name="My Leaves" id="menu_hr_holidays_my_leaves" parent="menu_hr_holidays_root" sequence="1"/> + <menuitem name="Approvals" id="menu_hr_holidays_approvals" parent="menu_hr_holidays_root" sequence="2"/> + <menuitem name="Reports" id="menu_hr_holidays_report" parent="menu_hr_holidays_root" sequence="99"/> <record model="ir.actions.act_window" id="open_ask_holidays"> <field name="name">Leave Request</field> @@ -283,7 +286,7 @@ <field name="act_window_id" ref="open_ask_holidays"/> </record> - <menuitem parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/> + <menuitem parent="menu_hr_holidays_my_leaves" id="menu_open_ask_holidays_new" action="open_ask_holidays"/> <record model="ir.actions.act_window" id="request_approve_holidays"> <field name="name">Requests to Approve</field> @@ -318,7 +321,7 @@ <field name="act_window_id" ref="request_approve_holidays"/> </record> - <menuitem name="Leave Requests to Approve" parent="menu_open_ask_holidays" id="menu_request_approve_holidays" action="request_approve_holidays" groups="base.group_hr_user"/> + <menuitem name="Leave Requests to Approve" parent="menu_hr_holidays_approvals" id="menu_request_approve_holidays" action="request_approve_holidays" groups="base.group_hr_user"/> <record model="ir.actions.act_window" id="open_allocation_holidays"> <field name="name">Allocation Requests</field> @@ -351,10 +354,10 @@ <field name="act_window_id" ref="open_allocation_holidays"/> </record> - <menuitem parent="menu_open_ask_holidays" id="menu_open_allocation_holidays" action="open_allocation_holidays"/> + <menuitem parent="menu_hr_holidays_my_leaves" id="menu_open_allocation_holidays" action="open_allocation_holidays"/> <record model="ir.actions.act_window" id="request_approve_allocation"> - <field name="name">Allocation Requests to Approve</field> + <field name="name">Allocations to Approve</field> <field name="res_model">hr.holidays</field> <field name="view_type">form</field> <field name="context">{ @@ -385,7 +388,7 @@ <field name="act_window_id" ref="request_approve_allocation"/> </record> - <menuitem parent="menu_open_ask_holidays" id="menu_request_approve_allocation" action="request_approve_allocation" groups="base.group_hr_manager"/> + <menuitem parent="menu_hr_holidays_approvals" id="menu_request_approve_allocation" action="request_approve_allocation" groups="base.group_hr_manager"/> <record model="ir.actions.act_window" id="open_company_allocation"> <field name="name">Leaves Summary</field> @@ -409,7 +412,7 @@ <field name="search_view_id" ref="view_hr_holidays_filter"/> </record> - <menuitem name="Leaves Summary" parent="menu_open_ask_holidays" id="menu_open_company_allocation" action="open_company_allocation" sequence="40"/> + <menuitem name="Leaves Summary" parent="menu_hr_holidays_my_leaves" id="menu_open_company_allocation" action="open_company_allocation" sequence="40"/> <record model="ir.actions.act_window" id="open_employee_leaves"> <field name="name">Employee's Leaves</field> @@ -422,7 +425,7 @@ <field name="search_view_id" ref="view_hr_holidays_filter"/> </record> - <menuitem name="Employee's Leaves" parent="menu_open_ask_holidays" id="menu_open_employee_leave" groups="base.group_hr_manager,base.group_hr_user" action="open_employee_leaves" sequence="41"/> + <menuitem name="Employee's Leaves" parent="menu_hr_holidays_report" id="menu_open_employee_leave" groups="base.group_hr_manager,base.group_hr_user" action="open_employee_leaves" sequence="41"/> <!-- Holidays status --> <record id="view_holidays_status_filter" model="ir.ui.view"> @@ -504,7 +507,9 @@ </record> <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves" groups="base.group_hr_manager"/> - <menuitem name="Leave Types" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration_employees" sequence="4" groups="base.group_hr_manager"/> + <menuitem id="menu_hr_holidays_configuration" name="Leaves" parent="base.menu_config" + sequence="21"/> + <menuitem name="Leave Types" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="menu_hr_holidays_configuration" sequence="4" groups="base.group_hr_manager"/> <!-- Holiday on resource leave --> <record id="resource_calendar_leave_form_inherit" model="ir.ui.view"> 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" /> </data> 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 @@ <menuitem name="Leaves by Department" - parent="hr.menu_hr_reporting_timesheet" + parent="menu_hr_holidays_report" action="action_hr_holidays_summary_dept" id="menu_account_central_journal" icon="STOCK_PRINT"/> 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 @@ <data> <!-- Root Menus --> - <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll" groups="base.group_hr_manager" sequence="45"/> - <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="30"/> - <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/> + <menuitem id="menu_hr_payroll_configuration" name="Payroll" parent="base.menu_config" + sequence="23" groups="base.group_hr_manager"/> + <menuitem id="menu_hr_payroll_root" name="Payroll" sequence="23"/> <!-- Contract View --> <record id="hr_contract_form_inherit" model="ir.ui.view"> @@ -99,7 +99,7 @@ <menuitem id="menu_hr_payroll_structure_view" action="action_view_hr_payroll_structure_list_form" - parent="payroll_configure" + parent="menu_hr_payroll_configuration" sequence="2" /> <record id="action_view_hr_payroll_structure_tree" model="ir.actions.act_window"> @@ -112,7 +112,7 @@ <menuitem id="menu_hr_payroll_structure_tree" action="action_view_hr_payroll_structure_tree" - parent="payroll_configure" + parent="menu_hr_payroll_configuration" sequence="2" icon="STOCK_INDENT" /> @@ -374,7 +374,7 @@ <field name="search_view_id" ref="view_hr_payslip_filter"/> </record> - <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll" groups="base.group_hr_user"/> + <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_payroll_root" groups="base.group_hr_user"/> <record id="act_hr_employee_payslip_list" model="ir.actions.act_window"> <field name="res_model">hr.payslip</field> @@ -464,7 +464,7 @@ <menuitem id="menu_hr_salary_rule_category" action="action_hr_salary_rule_category" - parent="payroll_configure" + parent="menu_hr_payroll_configuration" sequence="11" groups="base.group_no_one" /> @@ -478,7 +478,7 @@ <menuitem id="menu_hr_salary_rule_category_tree_view" action="action_hr_salary_rule_category_tree_view" - parent="payroll_configure" + parent="menu_hr_payroll_configuration" sequence="12" icon="STOCK_INDENT" groups="base.group_no_one" @@ -541,7 +541,7 @@ <menuitem id="menu_action_hr_contribution_register_form" action="action_contribution_register_form" - parent="payroll_configure" + parent="menu_hr_payroll_configuration" sequence="14" /> @@ -657,7 +657,7 @@ <field name="search_view_id" ref="view_hr_rule_filter"/> </record> - <menuitem id="menu_action_hr_salary_rule_form" action="action_salary_rule_form" parent="payroll_configure" sequence="12"/> + <menuitem id="menu_action_hr_salary_rule_form" action="action_salary_rule_form" parent="menu_hr_payroll_configuration" sequence="12"/> <act_window name="All Children Rules" @@ -734,7 +734,7 @@ <field name="view_id" ref="hr_payslip_run_tree"/> <field name="search_view_id" ref="hr_payslip_run_filter"/> </record> - <menuitem action="action_hr_payslip_run_tree" id="menu_hr_payslip_run" parent="menu_hr_root_payroll"/> + <menuitem action="action_hr_payslip_run_tree" id="menu_hr_payslip_run" parent="menu_hr_payroll_root"/> <!-- Shortcuts --> 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 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - <record id="view_hr_config_inherit" model="ir.ui.view"> - <field name="name">hr settings for payroll</field> - <field name="model">hr.config.settings</field> - <field name="inherit_id" ref="hr.view_human_resources_configuration"/> + <record id="view_hr_payroll_configuration" model="ir.ui.view"> + <field name="name">Configure Payroll</field> + <field name="model">hr.payroll.config.settings</field> <field name="arch" type="xml"> - <xpath expr="//div[@name='hr_payroll']" position="after"> - <div> - <field name="module_hr_payroll_account" class="oe_inline"/> - <label for="module_hr_payroll_account"/> - </div> - </xpath> + <form string="Configure Payroll" class="oe_form_configuration"> + <header> + <button string="Apply" type="object" name="execute" class="oe_highlight"/> + or + <button string="Cancel" type="object" name="cancel" class="oe_link"/> + </header> + <separator string="Payroll"/> + <group> + <label for="id" string="Settings"/> + <div> + <field name="module_hr_payroll_account" class="oe_inline"/> + <label for="module_hr_payroll_account"/> + </div> + </group> + </form> </field> </record> + + <record id="action_hr_payroll_configuration" model="ir.actions.act_window"> + <field name="name">Configure Payroll</field> + <field name="res_model">hr.payroll.config.settings</field> + <field name="view_mode">form</field> + <field name="target">inline</field> + </record> + + <menuitem id="menu_hr_payroll_global_settings" name="Settings" + parent="menu_hr_payroll_configuration" sequence="0" action="action_hr_payroll_configuration"/> + </data> </openerp> 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 @@ <menuitem name="Recruitment" - id="base.menu_crm_case_job_req_main" - parent="hr.menu_hr_root" - sequence="1"/> + id="menu_hr_recruitment_root" + sequence="19"/> <!-- ALL JOBS REQUESTS --> - <menuitem parent="base.menu_crm_case_job_req_main" id="hr.menu_hr_job_position" action="action_hr_job" sequence="1"/> + <menuitem parent="menu_hr_recruitment_root" id="hr.menu_hr_job_position" action="action_hr_job" sequence="1"/> <menuitem name="Applications" - parent="base.menu_crm_case_job_req_main" + parent="menu_hr_recruitment_root" id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job" sequence="2"/> + <menuitem name="Reports" id="report_hr_recruitment" parent="menu_hr_recruitment_root" + sequence="99"/> + </data> </openerp> 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 @@ <?xml version="1.0"?> <openerp> <data> - - <menuitem name="Recruitment" - id="menu_hr_recruitment_recruitment" - parent="hr.menu_hr_configuration" - groups="base.group_hr_manager" - sequence="2"/> + + <menuitem id="menu_hr_recruitment_configuration" name="Recuitment" parent="base.menu_config" + sequence="19"/> <!-- Stage --> <record id="hr_job_stage_act" model="ir.actions.act_window"> @@ -617,7 +614,7 @@ <menuitem id="menu_hr_recruitment_stage" name="Stages" - parent="menu_hr_recruitment_recruitment" + parent="menu_hr_recruitment_configuration" action="hr_recruitment_stage_act" sequence="1" groups="base.group_no_one"/> @@ -658,7 +655,7 @@ <menuitem id="menu_hr_recruitment_degree" name="Degrees" - parent="menu_hr_recruitment_recruitment" + parent="menu_hr_recruitment_configuration" action="hr_recruitment_degree_action" sequence="5" groups="base.group_no_one"/> @@ -698,7 +695,7 @@ <menuitem id="menu_hr_recruitment_source" - parent="menu_hr_recruitment_recruitment" + parent="menu_hr_recruitment_configuration" action="hr_recruitment_source_action" groups="base.group_no_one" sequence="10"/> 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 @@ <field name="search_view_id" ref="view_hr_recruitment_report_search"/> <field name="context">{}</field> <!-- force empty --> </record> - <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="0"/> + <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="report_hr_recruitment" sequence="0"/> </data> </openerp> 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 @@ </record> </data> <data> - <record id="view_hr_apll_config_settings" model="ir.ui.view"> - <field name="name">hr settings for recruitment</field> - <field name="model">hr.config.settings</field> - <field name="inherit_id" ref="hr.view_human_resources_configuration"/> + <record id="view_hr_recruitment_configuration" model="ir.ui.view"> + <field name="name">Configure Recruitment</field> + <field name="model">hr.recruitment.config.settings</field> <field name="arch" type="xml"> - <div name="recruitment" position="inside"> - <div> - <field name="module_document" class="oe_inline"/> - <label for="module_document"/> - </div> - </div> - <xpath expr="//div[@name='hr_recruitment']" position="after"> - <div attrs="{'invisible': ['|',('module_hr_recruitment','=',False),('alias_domain', '=', False)]}"> - <label string="Default job email address"/> - <field name="alias_prefix" class="oe_inline" attrs="{'required': [('alias_domain', '!=', False)]}"/> - @ - <field name="alias_domain" class="oe_inline" readonly="1"/> - </div> - </xpath> + <form string="Configure HR Recruitment" class="oe_form_configuration"> + <header> + <button string="Apply" type="object" name="execute" class="oe_highlight"/> + or + <button string="Cancel" type="object" name="cancel" class="oe_link"/> + </header> + <separator string="Recruitment"/> + <group> + <label for="id" string="Settings"/> + <div> + <field name="module_document" class="oe_inline"/> + <label for="module_document"/> + </div> + <div attrs="{'invisible': [('alias_domain', '=', False)]}"> + <label string="Default job email address"/> + <field name="alias_prefix" class="oe_inline" attrs="{'required': [('alias_domain', '!=', False)]}"/> + @ + <field name="alias_domain" class="oe_inline" readonly="1"/> + </div> + + </group> + </form> </field> </record> + + <record id="action_hr_recruitment_configuration" model="ir.actions.act_window"> + <field name="name">Configure Recruitment</field> + <field name="res_model">hr.recruitment.config.settings</field> + <field name="view_mode">form</field> + <field name="target">inline</field> + </record> + + <menuitem id="menu_hr_recruitment_global_settings" name="Settings" + parent="menu_hr_recruitment_configuration" sequence="0" action="action_hr_recruitment_configuration"/> + </data> </openerp> 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 @@ <field name="context">{'default_invoice_on_timesheets':1}</field> </record> - <menuitem parent="hr.menu_hr_configuration_timesheets_attendances" id="menu_timesheet_accounts" action="act_hr_timesheet_accounts_form" sequence="2" groups="base.group_hr_manager"/> + <menuitem name="Timesheets" id="menu_hr_timesheet_config" sequence="10" + parent="base.menu_config"/> + <menuitem parent="menu_hr_timesheet_config" id="menu_timesheet_accounts" action="act_hr_timesheet_accounts_form" sequence="2" groups="base.group_hr_manager"/> <record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window"> - <field name="name">Timesheet Activities</field> + <field name="name">Activities</field> <field name="type">ir.actions.act_window</field> <field name="res_model">hr.analytic.timesheet</field> <field name="view_type">form</field> @@ -156,7 +158,8 @@ </field> </record> - <menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/> + <menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form" + groups="base.group_no_one"/> <record id="hr_timesheet_employee_extd_form" model="ir.ui.view"> <field name="name">hr.timesheet.employee.extd_form</field> @@ -172,8 +175,5 @@ </field> </record> - <menuitem id="menu_hr_timesheet_reports" parent="hr.menu_hr_reporting" sequence="5" name="Timesheet"/> - - </data> </openerp> 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 @@ <field name="context">{}</field> <!-- force empty --> </record> + <menuitem id="menu_timesheets_reports" name="Reports" + parent="hr_attendance.timesheet_menu_root" sequence="99" groups="base.group_hr_manager"/> <menuitem action="action_hr_timesheet_report_stat_all" id="menu_hr_timesheet_report_all" - parent="hr.menu_hr_reporting" groups="base.group_hr_manager" sequence="3"/> + parent="menu_timesheets_reports" sequence="3"/> </data> </openerp> 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 (<http://tiny.be>). -# -# 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 <http://www.gnu.org/licenses/>. -# -############################################################################## - -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 (<http://tiny.be>). -# -# 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 <http://www.gnu.org/licenses/>. -# -############################################################################## -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 @@ -<?xml version="1.0" encoding="utf-8"?> -<openerp> - <data> - <record id="view_hr_timesheet_sign_in_message" model="ir.ui.view"> - <field name="name">hr.sign.in.project.message.form</field> - <field name="model">hr.sign.in.project</field> - <field name="arch" type="xml"> - <form string="Sign In/Out by Project"> - <group> - <separator colspan="4" string="Sign In/Out by Project"/> - <label colspan="4" nolabel="1" string="Employees can encode their time spent on the different projects they are assigned on. A project is an analytic account and the time spent on a project generates costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet."/> - </group> - <footer> - <button string="Sign in / Sign out" name="check_state" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> - </footer> - </form> - </field> - </record> - - <record id="view_hr_timesheet_sign_in" model="ir.ui.view"> - <field name="name">hr.sign.in.project.form</field> - <field name="model">hr.sign.in.project</field> - <field name="arch" type="xml"> - <form string="Sign In/Out by Project"> - <group colspan="4" > - <separator string="Sign in" colspan="4"/> - <field name="name" readonly="True" /> - <field name="state" readonly="True" /> - <field name="server_date"/> - <label string="(local time on the server side)" colspan="2"/> - <field name="date"/> - <label string="(Keep empty for current time)" colspan="2"/> - </group> - <footer> - <button string="Start Working" name="sign_in_result" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> - </footer> - </form> - </field> - </record> - - <record id="action_hr_timesheet_sign_in" model="ir.actions.act_window"> - <field name="name">Sign in / Sign out by Project</field> - <field name="res_model">hr.sign.in.project</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="view_id" ref="view_hr_timesheet_sign_in_message"/> - <field name="target">new</field> - <field name="help">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.</field> - </record> - - <record id="view_hr_timesheet_sign_out" model="ir.ui.view"> - <field name="name">hr.sign.out.project.form</field> - <field name="model">hr.sign.out.project</field> - <field name="arch" type="xml"> - <form string="Sign In/Out by Project"> - <group colspan="4" > - <separator string="General Information" colspan="4" /> - <field name="name" readonly="True" /> - <field name="state" readonly="True" /> - <field name="date_start"/> - <field name="server_date"/> - <separator string="Work done in the last period" colspan="4" /> - <field name="account_id" colspan="2"/> - <field name="info" colspan="2"/> - <field name="date"/> - <label string="(Keep empty for current time)" colspan="2"/> - <field name="analytic_amount"/> - </group> - - <footer> - <button string="Change Work" name="sign_out_result" type="object" class="oe_highlight"/> - <button string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> - </footer> - </form> - </field> - </record> - - <record id="action_hr_timesheet_sign_out" model="ir.actions.act_window"> - <field name="name">Sign in / Sign out by Project</field> - <field name="res_model">hr.sign.out.project</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="view_id" ref="view_hr_timesheet_sign_out"/> - <field name="target">new</field> - </record> - - </data> -</openerp> 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 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - <menuitem - id="hr.menu_hr_reporting" - name="Human Resources" - parent="base.menu_reporting" - sequence="60" /> <record id="view_timesheet_line_graph" model="ir.ui.view"> <field name="name">report.timesheet.line.graph</field> 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 @@ <menuitem action="action_hr_timesheet_analytic_profit" id="menu_hr_timesheet_analytic_profit" - parent="hr.menu_hr_reporting_timesheet" sequence="3" icon="STOCK_PRINT"/> + parent="hr_timesheet.menu_timesheets_reports" sequence="3" icon="STOCK_PRINT"/> </data> </openerp> 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 @@ <field name="name">My Timesheet</field> </record> - <menuitem name="My Current Timesheet" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_attendance.menu_hr_time_tracking" action="ir_actions_server_timsheet_sheet" sequence="1"/> + <menuitem name="Weekly" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_attendance.menu_hr_time_tracking" action="ir_actions_server_timsheet_sheet" sequence="2"/> <!-- Timesheet sheet related subtypes for messaging / Chatter --> <record id="mt_timesheet_confirmed" model="mail.message.subtype"> 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 @@ </field> </record> - <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking" - sequence="11" groups="base.group_hr_user"/> + <menuitem id="menu_timesheet_approvals" name="Approvals" parent="hr_attendance.timesheet_menu_root" sequence="6" groups="base.group_hr_user"/> + <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="menu_timesheet_approvals" + sequence="11" /> <!-- Company inheritancy diff --git a/addons/im_livechat/report/im_livechat_report.xml b/addons/im_livechat/report/im_livechat_report.xml index ccf5896e04d..f1c7d124716 100644 --- a/addons/im_livechat/report/im_livechat_report.xml +++ b/addons/im_livechat/report/im_livechat_report.xml @@ -58,9 +58,9 @@ </record> - <menuitem id="menu_reporting_livechat" name="Livechat" parent="base.menu_reporting" sequence="50"/> + <menuitem id="menu_reporting_livechat" name="Report" parent="menu_livechat_root" sequence="50" groups="group_im_livechat_manager"/> - <menuitem name="Support Statistics" parent="menu_reporting_livechat" id="livechat_support_report_session" action="action_livechat_support_report" groups="group_im_livechat_manager" /> + <menuitem name="Support Statistics" parent="menu_reporting_livechat" id="livechat_support_report_session" action="action_livechat_support_report"/> </data> </openerp>
\ No newline at end of file diff --git a/addons/im_livechat/views/im_livechat_view.xml b/addons/im_livechat/views/im_livechat_view.xml index 9c8a28c39e9..3ffeb68b637 100644 --- a/addons/im_livechat/views/im_livechat_view.xml +++ b/addons/im_livechat/views/im_livechat_view.xml @@ -287,11 +287,11 @@ <!-- Menu items --> - <menuitem name="Live Chat" parent="mail.mail_feeds_main" id="im_livechat" groups="group_im_livechat"/> + <menuitem id="menu_livechat_root" groups="group_im_livechat" name="Live Chat" sequence="34"/> - <menuitem name="Channels" parent="im_livechat" id="support_channels" action="action_support_channels" groups="group_im_livechat" sequence="5"/> + <menuitem name="Channels" parent="menu_livechat_root" id="support_channels" action="action_support_channels" groups="group_im_livechat" sequence="5"/> - <menuitem name="History" parent="im_livechat" id="session_history" action="action_session_history" groups="group_im_livechat" sequence="10"/> + <menuitem name="History" parent="menu_livechat_root" id="session_history" action="action_session_history" groups="group_im_livechat" sequence="10"/> </data> </openerp> 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 @@ <menuitem action="action_view_hr_bank_advice_tree" id="hr_menu_payment_advice" - parent="hr_payroll.menu_hr_root_payroll" + parent="hr_payroll.menu_hr_payroll_root" /> <record id="view_advice_line_form" model="ir.ui.view"> 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 @@ <field name="help">This report performs analysis on Payment Advices</field> </record> - <menuitem action="action_payment_advice_report_all" id="menu_reporting_payment_advice" parent="hr.menu_hr_reporting" sequence="5" groups="base.group_hr_manager"/> + <menuitem name="Reports" id="menu_l10n_in_hr_payroll_report" parent="hr_payroll.menu_hr_payroll_root" sequence="99" groups="base.group_hr_manager"/> + <menuitem action="action_payment_advice_report_all" id="menu_reporting_payment_advice" parent="menu_l10n_in_hr_payroll_report" sequence="5" /> </data> </openerp> 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 @@ <field name="help">This report performs analysis on Payslip</field> </record> - <menuitem action="action_payslip_report_all" id="menu_reporting_payslip" parent="hr.menu_hr_reporting" sequence="5" groups="base.group_hr_manager"/> + <menuitem name="Reports" id="menu_l10n_in_hr_payroll_report" parent="hr_payroll.menu_hr_payroll_root" sequence="99" groups="base.group_hr_manager"/> + <menuitem action="action_payslip_report_all" id="menu_reporting_payslip" parent="menu_l10n_in_hr_payroll_report" sequence="5" groups="base.group_hr_manager"/> </data> </openerp> 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 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> <!-- Top menu item --> - <menuitem id='menu_lunch' name='Lunch' sequence="100" groups="group_lunch_user" icon="fa-cutlery"/> - <menuitem name="Lunch" parent="menu_lunch" id="menu_lunch_title" sequence="50" /> - <menuitem name="Administrate Orders" parent="menu_lunch" id="menu_lunch_admin" sequence="51" groups="group_lunch_manager"/> - <menuitem name="Administrate Cash Moves" parent="menu_lunch" id="menu_lunch_cash" sequence="52" groups="group_lunch_manager"/> + <menuitem id='menu_lunch' name='Lunch' sequence="24" groups="group_lunch_user" icon="fa-cutlery"/> + <menuitem name="My Lunch" parent="menu_lunch" id="menu_lunch_title" sequence="50" /> + <menuitem name="Manager" parent="menu_lunch" id="menu_lunch_admin" sequence="51" groups="group_lunch_manager"/> <menuitem name="Configuration" parent="menu_lunch" id="menu_lunch_config" sequence="53" groups="group_lunch_manager"/> <!--View Search to group/filter by Supplier and time--> @@ -193,7 +192,7 @@ </p> </field> </record> - <menuitem name="Today's Orders by Supplier" parent="menu_lunch_admin" id="lunch_order_line_menu_by_supplier" action="lunch_order_line_action_by_supplier" /> + <menuitem name="Today's Orders" parent="menu_lunch_admin" id="lunch_order_line_menu_by_supplier" action="lunch_order_line_action_by_supplier" /> <!--Action for control Supplier--> <record id="lunch_order_line_action_control_suppliers" model="ir.actions.act_window"> @@ -234,8 +233,7 @@ </p> </field> </record> - <menuitem name="Control Accounts" parent="menu_lunch_cash" id="lunch_cashmove_menu_control_accounts" action="lunch_cashmove_action_control_accounts" /> - + <menuitem name="Control Accounts" parent="menu_lunch_admin" id="lunch_cashmove_menu_control_accounts" action="lunch_cashmove_action_control_accounts"/> <!--Action for Payment cashmove--> <record id="lunch_cashmove_action_payment" model="ir.actions.act_window"> @@ -254,7 +252,7 @@ </p> </field> </record> - <menuitem name="Employee Payments" parent="menu_lunch_cash" id="lunch_cashmove_menu_payment" action="lunch_cashmove_action_payment" /> + <menuitem name="Employee Payments" parent="menu_lunch_admin" id="lunch_cashmove_menu_payment" action="lunch_cashmove_action_payment"/> <!--Action for Products--> <record id="lunch_product_action" model="ir.actions.act_window"> @@ -270,7 +268,7 @@ </p> </field> </record> - <menuitem name="Products" parent="menu_lunch_config" id="lunch_product_menu" action="lunch_product_action" /> + <menuitem name="Products" parent="menu_lunch_config" id="lunch_product_menu" action="lunch_product_action"/> <!--Action for Product categories--> <record id="lunch_product_category_action" model="ir.actions.act_window"> 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 @@ <record id="action_contacts" model="ir.actions.act_window"> - <field name="name">Contacts</field> + <field name="name">Contacts</field> <field name="type">ir.actions.act_window</field> <field name="res_model">res.partner</field> <field name="view_type">form</field> @@ -14,13 +14,12 @@ <p class="oe_view_nocontent_create"> Click to add a contact in your address book. </p><p> - 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. </p> </field> </record> - <record id="action_contacts_view_kanban" model="ir.actions.act_window.view"> <field eval="0" name="sequence"/> <field name="view_mode">kanban</field> @@ -28,7 +27,7 @@ <field name="act_window_id" ref="action_contacts"/> </record> <record id="action_contacts_view_tree" model="ir.actions.act_window.view"> - <field name="sequence" eval="1"/> + <field name="sequence" eval="1"/> <field name="view_mode">tree</field> <field name="view_id" ref="base.view_partner_tree"/> <field name="act_window_id" ref="action_contacts"/> @@ -39,15 +38,13 @@ <field name="view_id" ref="base.view_partner_form"/> <field name="act_window_id" ref="action_contacts"/> </record> - - <menuitem name="Contacts" - id="menu_contacts" - parent="mail.mail_my_stuff" - sequence="11" + + + <menuitem name="Contacts" + id="menu_contacts" + sequence="4" action="action_contacts" groups="base.group_user,base.group_partner_manager"/> </data> </openerp> - - 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 @@ </record> <!-- left-side menu: Groups !--> - <menuitem id="mail_group_root" parent="mail_feeds_main" sequence="12" name="My Groups"/> + <menuitem id="mail_group_root" parent="mail_feeds_main" sequence="2" name="Channel"/> <menuitem id="mail_allgroups" parent="mail_group_root" sequence="100" action="action_view_groups"/> </data> </openerp> 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 @@ <!-- MENU --> <!-- Top menu item --> - <menuitem name="Messaging" + <menuitem name="Chat" id="mail.mail_feeds_main" groups="base.group_user" icon="fa-envelope" - sequence="10"/> + sequence="1"/> <!-- Left-side menu: Feeds --> - <menuitem id="mail.mail_feeds" name="Messaging" parent="mail.mail_feeds_main" groups="base.group_user" sequence="10"/> - <menuitem id="mail_my_stuff" name="Organizer" parent="mail.mail_feeds_main"/> + <menuitem id="mail.mail_inbox" name="Inbox" parent="mail.mail_feeds_main" groups="base.group_user" sequence="1" action="action_mail_inbox_feeds"/> - <record id="mail_inboxfeeds" model="ir.ui.menu"> +<!-- <record id="mail_inboxfeeds" model="ir.ui.menu"> <field name="name">Inbox</field> <field name="sequence" eval="10"/> <field name="action" ref="action_mail_inbox_feeds"/> - <field name="parent_id" ref="mail.mail_feeds"/> + <field name="parent_id" ref="mail.mail_inbox"/> </record> - <record id="mail_tomefeeds" model="ir.ui.menu"> + --> + <!-- <record id="mail_tomefeeds" model="ir.ui.menu"> <field name="name">To: me</field> <field name="sequence" eval="11"/> <field name="action" ref="action_mail_to_me_feeds"/> @@ -162,6 +162,7 @@ <field name="sequence" eval="16"/> <field name="action" ref="action_mail_archives_feeds"/> <field name="parent_id" ref="mail.mail_feeds"/> - </record> + </record> + --> </data> </openerp> 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 @@ <menuitem name="Marketing" id="base.marketing_menu" sequence="85" icon="fa-check-square-o"/> - <!-- Reporting for Marketing --> - <menuitem name="Marketing" id="base.marketing_reporting_menu" sequence="49" - parent="base.menu_reporting" groups="marketing.group_marketing_user"/> - <!-- Marketing main configuration menu --> <menuitem name="Configuration" id="base.menu_marketing_config_root" sequence="30" parent="base.marketing_menu"/> 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 @@ <field name="target">inline</field> </record> - <menuitem id="menu_marketing_configuration" name="Marketing" parent="base.menu_config" - sequence="14" action="action_marketing_configuration"/> - </data> </openerp> 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 @@ </field> </record> - <menuitem name="Lead Automation" id="menu_marketing_campaign" parent="base.marketing_menu" groups="marketing.group_marketing_user,marketing.group_marketing_manager" + <menuitem name="Lead Automation" id="menu_marketing_campaign_root" groups="marketing.group_marketing_user,marketing.group_marketing_manager" sequence="3"/> - <menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="30"/> + <menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign_root" action="action_marketing_campaign_form" sequence="1"/> + <menuitem name="Reports" id="report_marketing_campaign" parent="menu_marketing_campaign_root" + sequence="99"/> <!-- Marketing Segments --> <record model="ir.ui.view" id="view_marketing_campaign_segment_form"> @@ -275,7 +277,7 @@ <field name="context">{'group_by': []}</field> </record> - <menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing_campaign" action="action_marketing_campaign_segment_form" sequence="20"/> + <menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing_campaign_root" action="action_marketing_campaign_segment_form" sequence="2"/> <!-- Marketing Activities @@ -460,7 +462,7 @@ <field name="context">{'group_by': []}</field> </record> - <menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing_campaign" action="action_marketing_campaign_workitem" sequence="10"/> + <menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing_campaign_root" action="action_marketing_campaign_workitem" sequence="3"/> </data> </openerp> diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml index 47b0e26e31b..2defcb6b810 100644 --- a/addons/marketing_campaign/report/campaign_analysis_view.xml +++ b/addons/marketing_campaign/report/campaign_analysis_view.xml @@ -82,7 +82,7 @@ <field name="search_view_id" ref="view_campaign_analysis_search"/> </record> - <menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="base.marketing_reporting_menu" sequence="20"/> + <menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="report_marketing_campaign" sequence="20"/> </data> </openerp> diff --git a/addons/marketing_campaign/res_config.py b/addons/marketing_campaign/res_config.py index cdd897fcdf0..c1567dda2f8 100644 --- a/addons/marketing_campaign/res_config.py +++ b/addons/marketing_campaign/res_config.py @@ -4,8 +4,8 @@ from openerp.osv import fields, osv class MarketingCampaignConfig(osv.TransientModel): - _name = 'marketing.config.settings' - _inherit = 'marketing.config.settings' + _name = 'marketing.campaign.config.settings' + _inherit = 'res.config.settings' _columns = { 'module_marketing_campaign_crm_demo': fields.boolean( diff --git a/addons/marketing_campaign/res_config.xml b/addons/marketing_campaign/res_config.xml index 92c5f7389dc..3f8e570a7c2 100644 --- a/addons/marketing_campaign/res_config.xml +++ b/addons/marketing_campaign/res_config.xml @@ -2,12 +2,16 @@ <openerp> <data> - <record id="view_marketing_configuration" model="ir.ui.view"> - <field name="name">marketing.campaign.config.settings</field> - <field name="model">marketing.config.settings</field> - <field name="inherit_id" ref="marketing.view_marketing_configuration"/> + <record id="view_marketing_campaign_configuration" model="ir.ui.view"> + <field name="name">Configure Marketing Campaign</field> + <field name="model">marketing.campaign.config.settings</field> <field name="arch" type="xml"> - <xpath expr="//div[@name='config_setting']" position="after"> + <form string="Configure Marketing Campaign" class="oe_form_configuration"> + <header> + <button string="Apply" type="object" name="execute" class="oe_highlight"/> + or + <button string="Cancel" type="object" name="cancel" class="oe_link"/> + </header> <separator string="Marketing Campaigns"/> <group> <label for="id" string="Settings"/> @@ -16,9 +20,21 @@ <label for="module_marketing_campaign_crm_demo"/> </div> </group> - </xpath> + </form> </field> </record> + <record id="action_marketing_campaign_configuration" model="ir.actions.act_window"> + <field name="name">Configure Marketing Campaign</field> + <field name="res_model">marketing.campaign.config.settings</field> + <field name="view_mode">form</field> + <field name="target">inline</field> + </record> + + <menuitem id="menu_marketing_campaign_configuration" name="Lead Automation" parent="base.menu_config" + sequence="14"/> + <menuitem id="menu_marketing_campaign_settings" name="Settings" + parent="menu_marketing_campaign_configuration" sequence="0" action="action_marketing_campaign_configuration"/> + </data> </openerp> diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py index c79fcae50ea..a4ee7fe8b4a 100644 --- a/addons/mass_mailing/__openerp__.py +++ b/addons/mass_mailing/__openerp__.py @@ -47,7 +47,6 @@ professional emails and reuse templates in a few clicks. 'views/mass_mailing_report.xml', 'views/mass_mailing.xml', 'views/res_config.xml', - 'views/res_partner.xml', 'views/email_template.xml', 'views/website_mass_mailing.xml', 'views/snippets.xml', diff --git a/addons/mass_mailing/models/res_config.py b/addons/mass_mailing/models/res_config.py index 4b3757b7dca..235798e6b27 100644 --- a/addons/mass_mailing/models/res_config.py +++ b/addons/mass_mailing/models/res_config.py @@ -4,8 +4,8 @@ from openerp.osv import fields, osv class MassMailingConfiguration(osv.TransientModel): - _name = 'marketing.config.settings' - _inherit = 'marketing.config.settings' + _name = 'mass.mailing.config.settings' + _inherit = 'res.config.settings' _columns = { 'group_mass_mailing_campaign': fields.boolean( diff --git a/addons/mass_mailing/views/email_template.xml b/addons/mass_mailing/views/email_template.xml index b00af41a16f..73fb508b44b 100644 --- a/addons/mass_mailing/views/email_template.xml +++ b/addons/mass_mailing/views/email_template.xml @@ -88,7 +88,7 @@ <!-- Add Templates in Marketing / Mass mailing menu --> <menuitem name="Mail Templates" id="menu_email_template" - parent="menu_view_mass_mailing_config" sequence="3" + parent="menu_mass_mailing_configuration" sequence="3" action="action_email_template_marketing"/> </data> 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 @@ </template> <!-- Marketing / Mass Mailing --> - <menuitem name="Mass Mailing" id="mass_mailing_campaign" - parent="base.marketing_menu" sequence="1" groups="marketing.group_marketing_user"/> + <menuitem name="Mass Mailing" id="mass_mailing_menu_root" sequence="14"/> + <menuitem name="Mailings" id="mass_mailing_menu" + parent="mass_mailing_menu_root" sequence="1" groups="marketing.group_marketing_user"/> <!-- Marketing / Configuration --> - <menuitem name="Configuration" id="marketing_configuration" - parent="base.marketing_menu" sequence="99"/> + <menuitem name="Configuration" id="mass_mailing_configuration" + parent="mass_mailing_menu_root" sequence="99"/> <!-- MAIL MAIL STATISTICS !--> <record model="ir.ui.view" id="view_mail_mail_statistics_search"> @@ -206,7 +207,7 @@ </record> <menuitem name="Contacts" id="menu_email_mass_mailing_contacts" - parent="mass_mailing_campaign" sequence="4" groups="base.group_no_one" + parent="mass_mailing_menu" sequence="4" groups="base.group_no_one" action="action_view_mass_mailing_contacts"/> <!-- MASS MAILING LIST --> @@ -284,7 +285,7 @@ </record> <menuitem name="Mailing Lists" id="menu_email_mass_mailing_lists" - parent="mass_mailing_campaign" sequence="3" + parent="mass_mailing_menu" sequence="3" action="action_view_mass_mailing_lists"/> <!-- MASS MAILING !--> @@ -613,7 +614,7 @@ </record> <menuitem name="Mass Mailings" id="menu_email_mass_mailings" - parent="mass_mailing_campaign" sequence="2" + parent="mass_mailing_menu" sequence="2" action="action_view_mass_mailings"/> <!-- MASS MAILING CAMPAIGN STAGE !--> @@ -645,11 +646,11 @@ <field name="view_mode">tree,form</field> </record> - <menuitem name="Mass Mailing" id= "menu_view_mass_mailing_config" - parent="base.menu_marketing_config_root" sequence="4" groups="marketing.group_marketing_user"/> - + <menuitem id="menu_mass_mailing_configuration" name="Mass Mailing" parent="base.menu_config" + sequence="14" groups="marketing.group_marketing_user"/> + <menuitem name="Campaign Stages" id="menu_view_mass_mailing_stages" - parent="menu_view_mass_mailing_config" sequence="1" + parent="menu_mass_mailing_configuration" sequence="1" groups="mass_mailing.group_mass_mailing_campaign" action="action_view_mass_mailing_stages"/> @@ -856,7 +857,7 @@ </record> <menuitem name="Campaigns" id="menu_email_campaigns" - parent="mass_mailing_campaign" sequence="1" + parent="mass_mailing_menu_root" sequence="5" action="action_view_mass_mailing_campaigns" groups="mass_mailing.group_mass_mailing_campaign"/> 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 @@ <field name="help">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.</field> </record> - <menuitem name="Mass Mailing Analysis" id="menu_mass_mailing_report" sequence="1" - parent="base.marketing_reporting_menu" action="action_mail_statistics_report"/> + <menuitem name="Mass Mailing" id="mass_mailing_menu_root" sequence="14"/> + <menuitem name="Reports" id="menu_mass_mailing_report" sequence="99" + parent="mass_mailing_menu_root"/> + <menuitem name="Mass Mailing Analysis" id="menu_mass_mailing_analysis" sequence="1" + parent="menu_mass_mailing_report" action="action_mail_statistics_report"/> </data> </openerp> 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 @@ <openerp> <data> - <record id="view_marketing_configuration_mass_mailing" model="ir.ui.view"> - <field name="name">marketing.config.settings.mass.mailing</field> - <field name="model">marketing.config.settings</field> - <field name="inherit_id" ref="marketing.view_marketing_configuration"/> + <record id="view_mass_mailing_configuration" model="ir.ui.view"> + <field name="name">Configure Mass Mailing</field> + <field name="model">mass.mailing.config.settings</field> <field name="arch" type="xml"> - <xpath expr="//div[@name='config_setting']" position="after"> + <form string="Configure Mass Mailing" class="oe_form_configuration"> + <header> + <button string="Apply" type="object" name="execute" class="oe_highlight"/> + or + <button string="Cancel" type="object" name="cancel" class="oe_link"/> + </header> <separator string="Mass Mailing"/> <group> <label for="id" string="Settings"/> @@ -16,9 +20,21 @@ <label for="group_mass_mailing_campaign"/> </div> </group> - </xpath> + </form> </field> </record> + <record id="action_mass_mailing_configuration" model="ir.actions.act_window"> + <field name="name">Configure Mass Mailing</field> + <field name="res_model">mass.mailing.config.settings</field> + <field name="view_mode">form</field> + <field name="target">inline</field> + </record> + + <menuitem id="menu_mass_mailing_configuration" name="Mass Mailing" parent="base.menu_config" + sequence="14"/> + <menuitem id="menu_mass_mailing_global_settings" name="Settings" + parent="menu_mass_mailing_configuration" sequence="0" action="action_mass_mailing_configuration"/> + </data> </openerp> 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 @@ -<?xml version="1.0"?> -<openerp> - <data> - - </data> -</openerp> 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 @@ <field name="act_window_id" ref="action_membership_products"/> </record> - <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="10"/> - <menuitem name="Members" id="menu_membership" sequence="0" parent="base.menu_association"/> + <menuitem name="Members" id="base.menu_association" icon="terp-calendar" sequence="9"/> <menuitem name="Configuration" id="base.menu_marketing_config_association" - parent="base.menu_association" sequence="30"/> + parent="base.menu_association" sequence="100"/> <menuitem name="Membership Products" @@ -212,8 +211,7 @@ <field name="view_id" ref="base.res_partner_kanban_view"/> <field name="act_window_id" ref="action_membership_members"/> </record> - - <menuitem name="Members" parent="menu_membership" id="menu_members" sequence="2" action="action_membership_members"/> + <menuitem name="Dashboard" id="menu_membership" sequence="0" parent="base.menu_association" action="action_membership_members"/> <!-- PARTNERS --> @@ -276,7 +274,7 @@ </record> <!-- MEMBERSHIP/REPORTING --> - <menuitem name="Association" id="base.menu_report_association" parent="base.menu_reporting" sequence="23"/> + <menuitem name="Reports" id="base.menu_report_association" parent="base.menu_association" sequence="99"/> </data> </openerp> 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"/> <menuitem name="Manufacturing" id="menu_mrp_manufacturing" diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml index e4de1d743c9..8f1641967a8 100644 --- a/addons/mrp/report/mrp_report_view.xml +++ b/addons/mrp/report/mrp_report_view.xml @@ -38,8 +38,6 @@ </search> </field> </record> - <menuitem id="next_id_77" name="Manufacturing" - parent="base.menu_reporting" sequence="48"/> <!-- stock.move compared to internal location src/dest --> 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 @@ <field name="context">{'search_default_Workcenter': 1}</field> </record> - <menuitem name="Work Order Analysis" action="action_report_mrp_workorder" id="menu_report_mrp_workorders_tree" parent="mrp.next_id_77"/> + <menuitem name="Reports" id="menu_mrp_report" parent="base.menu_mrp_root" sequence="99"/> + <menuitem name="Work Order Analysis" action="action_report_mrp_workorder" id="menu_report_mrp_workorders_tree" parent="menu_mrp_report"/> </data> </openerp> 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 @@ </field> </record> - <menuitem name="Notes" id="menu_note_notes" parent="mail.mail_my_stuff" sequence="20" action="note.action_note_note"/> - <menuitem name="Stages" id="menu_notes_stage" parent="mail.mail_my_stuff" action="note.action_note_stage" sequence="21" groups="base.group_no_one"/> + <menuitem name="Notes" id="menu_note_notes" sequence="3" action="note.action_note_note"/> + <menuitem name="Notes" id="menu_note_configuration" sequence="3" parent="base.menu_config" groups="base.group_no_one"/> + <menuitem name="Stages" id="menu_notes_stage" parent="menu_note_configuration" action="note.action_note_stage" sequence="21" /> </data> </openerp> 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"/> <record model="ir.ui.view" id="view_pos_pos_form"> <field name="name">pos.order</field> @@ -159,9 +159,8 @@ </field> </record> - <menuitem name="Daily Operations" id="menu_point_of_sale" parent="menu_point_root" sequence="10"/> - <menuitem parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="2" groups="group_pos_manager,group_pos_user"/> - <menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="15" /> + <menuitem name="Orders" id="menu_point_of_sale" parent="menu_point_root" sequence="10"/> + <menuitem parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1" groups="group_pos_manager,group_pos_user"/> <record id="product_template_action" model="ir.actions.act_window"> <field name="name">Products</field> @@ -190,7 +189,7 @@ <menuitem action="product_template_action" id="menu_pos_products" - parent="menu_point_of_sale_product" sequence="0"/> + parent="menu_point_of_sale" sequence="3"/> <record model="ir.ui.view" id="view_pos_order_line"> <field name="name">Sale lines</field> @@ -523,7 +522,9 @@ </p> </field> </record> - <menuitem action="product_pos_category_action" id="menu_product_pos_category" parent="menu_point_of_sale_product" sequence="2" /> + <menuitem name="Point of Sales" parent="base.menu_config" + id="menu_point_config_product" sequence="3" groups="group_pos_manager"/> + <menuitem action="product_pos_category_action" id="menu_product_pos_category" parent="menu_point_config_product" sequence="20" /> <!-- END --> <record id="action_edit_ean" model="ir.actions.act_window"> @@ -585,9 +586,6 @@ <!-- END --> - <menuitem name="Configuration" parent="menu_point_root" - id="menu_point_config_product" sequence="25" groups="group_pos_manager"/> - <record id="action_account_journal_form" model="ir.actions.act_window"> <field name="name">Payment Methods</field> <field name="res_model">account.journal</field> @@ -634,7 +632,7 @@ </record> <!-- Miscellaneous Operations/Reporting --> - <menuitem name="Point of Sale" parent="base.menu_reporting" id="menu_point_rep" sequence="4" groups="group_pos_manager"/> + <menuitem name="Reports" parent="menu_point_root" id="menu_point_rep" sequence="99" groups="group_pos_manager"/> <!-- Invoice --> <record model="ir.actions.act_window" id="action_pos_invoice"> @@ -936,7 +934,7 @@ <record model="ir.actions.act_window" id="action_pos_session"> - <field name="name">All Sessions</field> + <field name="name">Sessions</field> <field name="type">ir.actions.act_window</field> <field name="res_model">pos.session</field> <field name="view_type">form</field> @@ -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"/> <record id="view_pos_order_filter" model="ir.ui.view"> @@ -989,8 +987,8 @@ </record> <menuitem action="action_pos_session_opening" - parent="menu_point_of_sale" - id="menu_pos_session_opening" sequence="0"/> + parent="menu_point_root" name="Dashboard" + id="menu_pos_dashboard" sequence="1"/> <record model="ir.ui.view" id="pos_ean13_generator"> <field name="name">pos.ean_wizard</field> 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 @@ <data> <menuitem id="base.menu_sale_config_sales" name="Sales" - parent="base.menu_base_config" sequence="0"/> + parent="base.menu_sale_config" sequence="1"/> <menuitem id="menu_product_pricelist_main" name="Pricelists" - parent="base.menu_base_config" groups="product.group_sale_pricelist" sequence="3"/> + parent="base.menu_sale_config" groups="product.group_sale_pricelist" sequence="3"/> <record id="product_pricelist_version_form_view" model="ir.ui.view"> <field name="name">product.pricelist.version.form</field> 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 @@ </p> </field> </record> - + + <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="3"/> <menuitem action="product_template_action" id="menu_product_template_action" - parent="base.menu_product" sequence="1" /> + parent="base.menu_sales" sequence="4" /> <!-- product product --> - <menuitem id="prod_config_main" name="Products" parent="base.menu_base_config" sequence="2" groups="base.group_no_one"/> + <menuitem id="prod_config_main" name="Products" parent="base.menu_sale_config" sequence="2" groups="base.group_no_one"/> <record id="product_product_tree_view" model="ir.ui.view"> <field name="name">product.product.tree</field> @@ -496,7 +497,7 @@ </field> </record> - <menuitem id="product.menu_products" action="product.product_normal_action_sell" parent="base.menu_product" groups="base.group_no_one" sequence="10"/> + <menuitem id="product.menu_products" action="product.product_normal_action_sell" parent="base.menu_sales" groups="base.group_no_one" sequence="99"/> <record id="product_category_search_view" model="ir.ui.view"> <field name="name">product.category.search</field> @@ -563,11 +564,6 @@ </p> </field> </record> - <menuitem - action="product_category_action" - id="product.menu_products_category" - parent="base.menu_product" - sequence="30" groups="base.group_no_one"/> <record id="product_category_action_form" model="ir.actions.act_window"> <field name="name">Product Categories</field> <field name="type">ir.actions.act_window</field> 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 @@ </field> </record> - <menuitem id="base.next_id_73" name="Purchase" parent="base.menu_reporting" sequence="36"/> - <menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.next_id_73"/> + <menuitem id="menu_product_account_report" name="Products" sequence="50" parent="account.menu_finance_generic_reporting"/> + <menuitem action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="menu_product_account_report"/> </data> </openerp> 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"/> - <menuitem name="Project" + <menuitem name="Search" id="menu_project_management" parent="base.menu_main_pm" - sequence="1"/> + sequence="2" groups="base.group_no_one"/> + + <menuitem id="menu_project_config" name="Project" parent="base.menu_config" + sequence="2"/> <menuitem name="Configuration" id="base.menu_definitions" - parent="base.menu_main_pm" - groups="group_project_manager" - sequence="60"/> + parent="menu_project_config" + groups="base.group_no_one" + sequence="100"/> <record id="view_task_search_form" model="ir.ui.view"> <field name="name">project.task.search.form</field> @@ -774,7 +777,7 @@ <menuitem action="open_task_type_form" id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1" groups="base.group_no_one"/> - <menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1"/> + <menuitem action="open_view_project_all" id="menu_projects" name="Dashboard" parent="base.menu_main_pm" sequence="1"/> <record id="product_search_form_view_procurment_consume" model="ir.ui.view"> <field name="name">product.product.service.search</field> 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 @@ <openerp> <data> - <menuitem id="base.menu_project_report" name="Project" + <menuitem id="base.menu_project_report" name="Reports" groups="project.group_project_manager" - parent="base.menu_reporting" sequence="5"/> + parent="base.menu_main_pm" sequence="99"/> <record id="view_task_project_user_pivot" model="ir.ui.view"> <field name="name">report.project.task.user.pivot</field> 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 @@ <field name="target">inline</field> </record> - <menuitem id="base.menu_project_config" name="Project" parent="base.menu_config" - sequence="2" action="action_config_settings"/> + <menuitem id="base.menu_project_general_settings" name="Settings" parent="menu_project_config" + sequence="0" action="action_config_settings"/> </data> </openerp> 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 @@ <openerp> <data noupdate="1"> - <!-- Case type_id --> - <!-- For Bugs --> - <record model="project.issue.version" id="type1"> - <field name="name">v1.0</field> - </record> - - <record model="project.issue.version" id="type2"> - <field name="name">v2.0</field> - </record> - - <record model="project.issue.version" id="type3"> - <field name="name">v3.0</field> - </record> - <!-- notify all employees of module installation --> <record model="mail.message" id="module_install_notification"> <field name="model">mail.group</field> 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 @@ <openerp> <data> - - <record model="ir.ui.view" id="project_issue_version_search_view"> - <field name="name">Issue Version</field> - <field name="model">project.issue.version</field> - <field name="arch" type="xml"> - <search string="Issue Version"> - <field name="name" string="Issue Version"/> - <field name="active"/> - </search> - </field> - </record> - <record model="ir.ui.view" id="project_issue_version_form_view"> - <field name="name">Issue Version</field> - <field name="model">project.issue.version</field> - <field name="arch" type="xml"> - <form string="Issue Version"> - <group col="2"> - <field name="name"/> - <field name="active"/> - </group> - </form> - </field> - </record> - <record id="project_issue_version_action" model="ir.actions.act_window"> - <field name="name">Versions</field> - <field name="res_model">project.issue.version</field> - <field name="view_type">form</field> - <field name="help" type="html"> - <p class="oe_view_nocontent_create"> - Click to add a new version. - </p><p> - Define here the different versions of your products on which - you can work on issues. - </p> - </field> - </record> - - <menuitem action="project_issue_version_action" id="menu_project_confi" name="Issues Versions" parent="base.menu_definitions" sequence="2"/> - - <record model="ir.ui.view" id="project_issue_form_view"> <field name="name">Project Issue Tracker Form</field> <field name="model">project.issue</field> @@ -80,7 +40,6 @@ </div> </group> <group> - <field name="version_id" groups="base.group_user"/> <field name="priority" groups="base.group_user" widget="priority"/> <label for="task_id" groups="base.group_user"/> <div groups="base.group_user"> @@ -131,7 +90,6 @@ <field name="project_id"/> <field name="priority" string="Priority" groups="base.group_user"/> <field name="create_date"/> - <field name="version_id" widget="selection"/> <field name="user_id"/> <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/> <field name="stage_id" widget="selection" readonly="1"/> @@ -221,7 +179,6 @@ <div> <b><field name="name"/></b> <br/> <field name="partner_id"/> <br/> - <field name="version_id"/> </div> <div class="oe_kanban_footer_left"> <field name="categ_ids"/> @@ -280,7 +237,6 @@ <field name="name" string="Feature description"/> <field name="partner_id"/> <field name="priority" string="Priority"/> - <field name="version_id"/> <field name="user_id"/> <field name="stage_id" widget="selection" readonly="1"/> </tree> diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index a8ffda0cc2c..0be4a1807f9 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -46,7 +46,6 @@ class project_issue_report(osv.osv): 'company_id' : fields.many2one('res.company', 'Company'), 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority'), 'project_id':fields.many2one('project.project', 'Project',readonly=True), - 'version_id': fields.many2one('project.issue.version', 'Version'), 'user_id' : fields.many2one('res.users', 'Assigned to',readonly=True), 'partner_id': fields.many2one('res.partner','Contact'), 'channel': fields.char('Channel', readonly=True, help="Communication Channel."), @@ -72,7 +71,6 @@ class project_issue_report(osv.osv): c.company_id as company_id, c.priority as priority, c.project_id as project_id, - c.version_id as version_id, 1 as nbr, c.partner_id, c.channel, diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index 96f6f1af87d..df56c466aba 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -47,7 +47,6 @@ <field name="project_id"/> <field name="user_id"/> <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/> - <field name="version_id"/> <field name="stage_id"/> <filter string="Unassigned" name="unassigned" domain="[('user_id','=',False)]"/> <separator/> diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv index dd6617c07d8..d23f1b06b4d 100644 --- a/addons/project_issue/security/ir.model.access.csv +++ b/addons/project_issue/security/ir.model.access.csv @@ -1,8 +1,6 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_project_issue_user,project.issue,model_project_issue,project.group_project_user,1,1,1,1
access_project_issue_report_all,project.issue.report,model_project_issue_report,project.group_project_manager,1,1,1,1
-access_project_issue_version_project,project_issue_version manager,model_project_issue_version,project.group_project_manager,1,1,1,1
-access_project_issue_version_project_user,project_issue_version user,model_project_issue_version,project.group_project_user,1,0,0,0
access_resource_calendar_project_manager,resource.calendar.project.manager,resource.model_resource_calendar,project.group_project_manager,1,1,1,1
access_project_issue_report_user,project.issue.report user,model_project_issue_report,project.group_project_user,1,0,0,0
access_crm_team,crm.team,sales_team.model_crm_team,project.group_project_user,1,0,0,0
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index 6d7264a231c..e725a4296dd 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -87,11 +87,6 @@ </p> </field> </record> - <menuitem action="hr_timesheet.action_hr_timesheet_sign_in" - id="menu_hr_timesheet_sign_in" - parent="hr_attendance.menu_hr_attendance" - sequence="5" groups="base.group_hr_attendance" /> - <menuitem id="menu_project_billing" name="Invoicing" parent="base.menu_main_pm" sequence="5" groups="project.group_project_manager"/> diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 40e8a5ea723..220149c453c 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -7,15 +7,11 @@ id="base.menu_purchase_root" groups="group_purchase_manager,group_purchase_user" icon="fa-shopping-cart" - sequence="60"/> + sequence="11"/> <menuitem id="menu_procurement_management" name="Purchase" parent="base.menu_purchase_root" sequence="1" /> - <menuitem id="menu_purchase_config_purchase" name="Configuration" - groups="group_purchase_manager" - parent="base.menu_purchase_root" sequence="100"/> - <record id="purchase_pricelist_version_action" model="ir.actions.act_window"> <field name="name">Pricelist Versions</field> <field name="type">ir.actions.act_window</field> @@ -34,9 +30,10 @@ </p> </field> </record> + <menuitem id="menu_purchase_config" name="Purchases" parent="base.menu_config" sequence="4" groups="group_purchase_manager"/> <menuitem id="menu_purchase_config_pricelist" name="Pricelists" - parent="menu_purchase_config_purchase" sequence="50" groups="product.group_purchase_pricelist"/> + parent="menu_purchase_config" sequence="50" groups="product.group_purchase_pricelist"/> <menuitem action="product.product_pricelist_action_for_purchase" id="menu_product_pricelist_action2_purchase" parent="menu_purchase_config_pricelist" sequence="1" groups="product.group_purchase_pricelist" /> @@ -54,7 +51,7 @@ parent="menu_purchase_config_pricelist" sequence="60" /> <menuitem id="menu_product_in_config_purchase" name="Products" - parent="menu_purchase_config_purchase" sequence="30" groups="base.group_no_one"/> + parent="menu_purchase_config" sequence="30" groups="base.group_no_one"/> <menuitem action="product.product_category_action_form" id="menu_product_category_config_purchase" @@ -77,18 +74,21 @@ parent="menu_procurement_management" action="base.action_partner_supplier_form" sequence="15"/> + <!-- Purchase Control Menu --> + <menuitem id="menu_purchase_control" name="Control" parent="base.menu_purchase_root" sequence="4"/> + <!--Inventory control--> - <menuitem id="menu_procurement_management_inventory" name="Incoming Products" - parent="base.menu_purchase_root" sequence="4"/> - <menuitem action="stock.action_receipt_picking_move" id="menu_action_picking_tree_in_move" + <menuitem id="menu_procurement_management_inventory" name="Products" + parent="menu_purchase_control" sequence="4"/> + <menuitem action="stock.action_receipt_picking_move" id="menu_action_picking_tree_in_move" parent="menu_procurement_management_inventory" sequence="11"/> <!--Invoice control--> - <menuitem id="menu_procurement_management_invoice" name="Invoice Control" - parent="base.menu_purchase_root" sequence="6"/> + <menuitem id="menu_procurement_management_invoice" name="Bills" + parent="menu_purchase_control" sequence="6"/> <record id="action_invoice_pending" model="ir.actions.act_window"> - <field name="name">On Draft Invoices</field> + <field name="name">Draft Bills</field> <field name="res_model">account.invoice</field> <field name="view_type">form</field> <field name="view_mode">tree,form,calendar,pivot,graph</field> @@ -143,14 +143,8 @@ sequence="13"/> <!-- Product menu--> - <menuitem id="menu_procurement_management_product" name="Products" - parent="base.menu_purchase_root" sequence="8"/> - - <menuitem name="Products by Category" id="menu_product_by_category_purchase_form" action="product.product_category_action" - parent="menu_procurement_management_product" sequence="2" groups="base.group_no_one"/> - <menuitem name="Products" id="menu_procurement_partner_contact_form" action="product_normal_action_puchased" - parent="menu_procurement_management_product" sequence="1"/> + parent="menu_procurement_management" sequence="20"/> <record model="ir.ui.view" id="purchase_order_calendar"> <field name="name">purchase.order.calendar</field> @@ -548,7 +542,7 @@ </record> <record id="purchase_line_form_action2" model="ir.actions.act_window"> - <field name="name">On Purchase Order Lines</field> + <field name="name">Purchase Order Lines</field> <field name="type">ir.actions.act_window</field> <field name="res_model">purchase.order.line</field> <field name="domain">[('order_id.invoice_method','=','manual'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field> diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index c323ab546fa..52a3c0b5afe 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -94,21 +94,9 @@ <field name="help">Purchase Analysis allows you to easily check and analyse your company purchase history and performance. From this menu you can track your negotiation performance, the delivery performance of your suppliers, etc.</field> </record> - <menuitem id="base.next_id_73" name="Purchase" parent="base.menu_reporting" sequence="37" + <menuitem id="base.purchase_report" name="Reports" parent="base.menu_purchase_root" sequence="99" groups="purchase.group_purchase_manager"/> - <menuitem action="action_purchase_order_report_all" id="menu_action_purchase_order_report_all" parent="base.next_id_73" sequence="3"/> - - <!--<record id="action_stock_move_report_po" model="ir.actions.act_window"> - <field name="name">Receptions Analysis</field> - <field name="res_model">report.stock.move</field> - <field name="view_type">form</field> - <field name="view_mode">graph</field> - <field name="search_view_id" ref="stock.view_stock_search"/> - <field name="view_id" ref="stock.view_stock_graph"/> - <field name="context">{'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,'search_default_year':1,}</field> - <field name="help">Reception Analysis allows you to easily check and analyse your company order receptions and the performance of your supplier's deliveries.</field> - </record> - <menuitem action="action_stock_move_report_po" id="menu_action_stock_move_report_po" parent="stock.next_id_61" sequence="1"/>--> + <menuitem action="action_purchase_order_report_all" id="menu_action_purchase_order_report_all" parent="base.purchase_report" sequence="3"/> </data> </openerp> diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml index 44dce04960f..b6051586fd4 100644 --- a/addons/purchase/res_config_view.xml +++ b/addons/purchase/res_config_view.xml @@ -104,8 +104,8 @@ <field name="target">inline</field> </record> - <menuitem id="menu_purchase_config" name="Purchases" parent="base.menu_config" - sequence="4" action="action_purchase_configuration"/> + <menuitem id="menu_purchase_general_settings" name="Settings" parent="menu_purchase_config" + sequence="0" action="action_purchase_configuration"/> <record id="view_account_config" model="ir.ui.view"> <field name="name">account settings</field> diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index fcfe2229c76..3f85f3dd70d 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -61,7 +61,7 @@ </record> <record id="action_picking_tree_picking_to_invoice" model="ir.actions.act_window"> - <field name="name">On Incoming Shipments</field> + <field name="name">Incoming Shipments</field> <field name="res_model">stock.picking</field> <field name="type">ir.actions.act_window</field> <field name="view_type">form</field> diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml index ccc20e6aeb8..4671596ae98 100644 --- a/addons/purchase_requisition/purchase_requisition_view.xml +++ b/addons/purchase_requisition/purchase_requisition_view.xml @@ -166,7 +166,7 @@ <record model="ir.actions.act_window" id="action_purchase_requisition"> - <field name="name">Calls for Tenders</field> + <field name="name">Purchase Tenders</field> <field name="type">ir.actions.act_window</field> <field name="res_model">purchase.requisition</field> <field name="view_type">form</field> diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml index f1147d7f28c..87150c0f5f7 100644 --- a/addons/report_intrastat/report_intrastat_view.xml +++ b/addons/report_intrastat/report_intrastat_view.xml @@ -113,6 +113,6 @@ </record> <menuitem action="action_report_intrastat_tree_all" id="menu_report_intrastat_all" - parent="stock.next_id_61" sequence="6"/> + parent="stock.menu_warehouse_report" sequence="6"/> </data> </openerp> diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 08401d70b2e..b19207e9c7c 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -96,7 +96,7 @@ <field name="help">This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.</field> </record> - <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="10"/> + <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.menu_sale_report" sequence="10"/> </data> </openerp> diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml index baa890d15cd..ff1ebdb4bd8 100644 --- a/addons/sale/res_config_view.xml +++ b/addons/sale/res_config_view.xml @@ -109,7 +109,9 @@ </record> <menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config" - sequence="1" action="base_setup.action_sale_config"/> + sequence="1"/> + <menuitem id="base.menu_sale_general_settings" name="Settings" parent="base.menu_sale_config" + sequence="0" action="base_setup.action_sale_config"/> <record id="view_account_config" model="ir.ui.view"> <field name="name">account settings</field> diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index d02f6e58272..3f572dd4a04 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -9,17 +9,15 @@ --> <menuitem name="Sales" id="base.menu_base_partner" - groups="base.group_sale_salesman,base.group_sale_manager"/> + groups="base.group_sale_salesman,base.group_sale_manager" sequence="6"/> <menuitem id= "base.menu_sales_config" - parent= "base.menu_base_config" + parent= "base.menu_sale_config" sequence= "1" name= "Sales" groups= "base.group_sale_manager,base.group_sale_salesman,account.group_account_manager,account.group_account_user"/> - <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/> - <record id="view_sale_order_calendar" model="ir.ui.view"> <field name="name">sale.order.calendar</field> <field name="model">sale.order</field> @@ -314,7 +312,7 @@ </field> </record> - <menuitem action="action_orders" id="menu_sale_order" parent="base.menu_sales" sequence="6" groups="base.group_sale_salesman,base.group_sale_manager"/> + <menuitem action="action_orders" id="menu_sale_order" parent="base.menu_sales" sequence="2" groups="base.group_sale_salesman,base.group_sale_manager"/> <record id="action_orders_exception" model="ir.actions.act_window"> <field name="name">Sales in Exception</field> @@ -364,7 +362,7 @@ <menuitem id="menu_sale_quotations" action="action_quotations" parent="base.menu_sales" - sequence="5"/> + sequence="1"/> <record id="action_order_tree" model="ir.actions.act_window"> <field name="name">Old Quotations</field> diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml index 89a4043129a..165d9fa2486 100644 --- a/addons/sale/security/sale_security.xml +++ b/addons/sale/security/sale_security.xml @@ -56,7 +56,7 @@ <record model="ir.ui.menu" id="base.menu_base_partner"> <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/> </record> - <record model="ir.ui.menu" id="base.menu_base_config"> + <record model="ir.ui.menu" id="base.menu_sale_config"> <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/> </record> diff --git a/addons/sale_service/views/sale_service_view.xml b/addons/sale_service/views/sale_service_view.xml index cd7f5ce5824..6e6e3ba7179 100644 --- a/addons/sale_service/views/sale_service_view.xml +++ b/addons/sale_service/views/sale_service_view.xml @@ -66,7 +66,7 @@ </p> </field> </record> - <menuitem id="menu_products_projects" name="Products" parent="base.menu_main_pm" sequence="3" /> + <menuitem id="menu_products_projects" name="Products" parent="base.menu_main_pm" sequence="3" groups="base.group_no_one"/> <menuitem action="open_service_type_products" id="menu_products_services" name="Services" parent="menu_products_projects" sequence="1" /> </data> </openerp> diff --git a/addons/sale_stock/stock_view.xml b/addons/sale_stock/stock_view.xml index 2c7c80ba25f..e24be11a030 100644 --- a/addons/sale_stock/stock_view.xml +++ b/addons/sale_stock/stock_view.xml @@ -13,12 +13,12 @@ <field name="context">{'default_type': 'out', 'contact_display': 'partner_address', 'search_default_to_invoice': 1, 'search_default_done': 1}</field> <field name="search_view_id" ref="stock.view_picking_internal_search"/> </record> - <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"/> - <menuitem action="outgoing_picking_list_to_invoice" id="menu_action_picking_list_to_invoice" parent="base.menu_invoiced" groups="sale_stock.group_invoice_deli_orders" sequence="20"/> - - - + <menuitem id="base.menu_aftersale" name="After-Sale" + groups="base.group_sale_salesman" + parent="base.menu_base_partner" sequence="5" /> + <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_aftersale" sequence="1"/> + <menuitem action="outgoing_picking_list_to_invoice" id="menu_action_picking_list_to_invoice" parent="base.menu_invoiced" groups="sale_stock.group_invoice_deli_orders" sequence="20"/> <record id="stock_location_route_form_view_inherit" model="ir.ui.view"> <field name="name">stock.location.route.form</field> diff --git a/addons/sales_team/sales_team.xml b/addons/sales_team/sales_team.xml index 159d70d7fc1..7c1f86e45a7 100644 --- a/addons/sales_team/sales_team.xml +++ b/addons/sales_team/sales_team.xml @@ -4,7 +4,7 @@ <menuitem name="Sales" id="base.menu_base_partner" icon="fa-credit-card" - groups="base.group_sale_salesman,base.group_sale_manager"/> + groups="base.group_sale_salesman,base.group_sale_manager" sequence="6"/> <!-- Case Teams Salesteams kanban view --> @@ -181,7 +181,7 @@ </field> </record> - <menuitem id="sales_team.menu_sales_team_act" action="crm_team_salesteams_act" sequence="1" parent="base.menu_sales" groups="base.group_multi_salesteams"/> + <menuitem id="sales_team.menu_sales_team_act" action="crm_team_salesteams_act" sequence="1" parent="base.menu_base_partner" groups="base.group_multi_salesteams" name="Dashboard"/> <!-- add css / js --> <template id="assets_backend" name="sales_team assets" inherit_id="web.assets_backend"> @@ -191,7 +191,7 @@ </xpath> </template> - <menuitem id="base.next_id_64" name="Sales" parent="base.menu_reporting" sequence="1" groups="base.group_sale_manager"/> + <menuitem id="base.menu_sale_report" name="Reports" parent="base.menu_base_partner" sequence="99" groups="base.group_sale_manager"/> </data> </openerp> diff --git a/addons/stock/report/report_stock_forecast.xml b/addons/stock/report/report_stock_forecast.xml index 269611c8777..34dc5a07dff 100644 --- a/addons/stock/report/report_stock_forecast.xml +++ b/addons/stock/report/report_stock_forecast.xml @@ -48,6 +48,6 @@ <field name="view_id" ref="view_stock_level_forecast_pivot"/> </record> - <menuitem action="action_stock_level_forecast_report" id="menu_report_product_forecast" parent="next_id_61" sequence="3" /> + <menuitem action="action_stock_level_forecast_report" id="menu_report_product_forecast" parent="menu_warehouse_report" sequence="3" /> </odoo> diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml index 305431c537d..4c52c03720c 100644 --- a/addons/stock/report/report_stock_view.xml +++ b/addons/stock/report/report_stock_view.xml @@ -54,7 +54,7 @@ <field name="help">Display the latest Inventories and Moves done on your products and easily sort them with specific filtering criteria. If you do frequent and partial inventories, you need this report in order to ensure that the stock of each product is controlled at least once a year. This also lets you find out which products have seen little move lately and may deserve special measures (discounted sale, quality control...)</field> </record> - <menuitem parent="next_id_61" action="action_stock_line_date" id="menu_report_stock_line_date" sequence="2"/> + <menuitem parent="menu_warehouse_report" action="action_stock_line_date" id="menu_report_stock_line_date" sequence="2"/> </data> </openerp> diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml index b7f530747ea..192db1e5c3f 100644 --- a/addons/stock/res_config_view.xml +++ b/addons/stock/res_config_view.xml @@ -121,7 +121,8 @@ </record> <menuitem id="menu_stock_config_settings" name="Warehouse" parent="base.menu_config" - sequence="5" action="action_stock_config_settings"/> - + sequence="5" groups="group_stock_manager"/> + <menuitem id="menu_stock_general_settings" name="Settings" parent="menu_stock_config_settings" + sequence="0" action="action_stock_config_settings"/> </data> </openerp> diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index fdcc9da7bd7..0700e4825a5 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -7,29 +7,30 @@ id="menu_stock_root" groups="group_stock_manager,group_stock_user" icon="fa-archive" - sequence="70"/> + sequence="12"/> <menuitem id="menu_stock_warehouse_mgmt" name="Operations" parent="menu_stock_root" sequence="1"/> - <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager"/> - <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1" groups="base.group_no_one"/> - <menuitem id="menu_reordering_rules_config" name="Schedulers Management" parent="menu_stock_configuration" sequence="3" groups="base.group_no_one"/> - <menuitem id="menu_routes_config" name="Routes" parent="menu_stock_configuration" sequence="2" groups="base.group_no_one"/> + <menuitem id="menu_stock_config_settings" name="Warehouse" parent="base.menu_config" + sequence="5" groups="group_stock_manager"/> + <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_config_settings" sequence="1" groups="base.group_no_one"/> + <menuitem id="menu_reordering_rules_config" name="Schedulers Management" parent="menu_stock_config_settings" sequence="3" groups="base.group_no_one"/> + <menuitem id="menu_routes_config" name="Routes" parent="menu_stock_config_settings" sequence="2" groups="base.group_no_one"/> <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="2"/> <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/> <menuitem id="menu_product_in_config_stock" name="Products" - parent="stock.menu_stock_configuration" sequence="4" groups="base.group_no_one"/> + parent="stock.menu_stock_config_settings" sequence="4" groups="base.group_no_one"/> <menuitem id="menu_packs_config" name="Packs" - parent="stock.menu_stock_configuration" sequence="5" groups="base.group_no_one"/> + parent="stock.menu_stock_config_settings" sequence="5" groups="base.group_no_one"/> <menuitem action="product.product_category_action_form" id="menu_product_category_config_stock" parent="stock.menu_product_in_config_stock" sequence="2"/> <menuitem action="product.product_normal_action" id="menu_product_variant_config_stock" name="Products" - parent="stock.menu_traceability" sequence="5"/> + parent="stock.menu_stock_inventory_control" sequence="1"/> <menuitem action="product.product_template_action" id="menu_product_template_config_stock" parent="stock.menu_product_in_config_stock" sequence="1"/> @@ -44,7 +45,7 @@ parent="menu_product_in_config_stock" sequence="5" groups="product.group_uom"/> <menuitem action="product.product_uom_form_action" id="menu_stock_uom_form_action" - parent="menu_stock_configuration" sequence="35" groups="product.group_uom"/> + parent="menu_stock_config_settings" sequence="35" groups="product.group_uom"/> <record id="stock_inventory_line_tree" model="ir.ui.view"> <field name="name">stock.inventory.line.tree</field> @@ -1480,12 +1481,13 @@ <menuitem action="action_picking_type_form" id="menu_action_picking_type_form" - parent="menu_stock_warehouse_mgmt" sequence="1"/> + parent="menu_stock_root" sequence="0" + name="Dashboard"/> <menuitem id="menu_pickingtype" name="Types of Operation" - parent="stock.menu_stock_configuration" + parent="stock.menu_stock_config_settings" action="action_picking_type_list" /> @@ -1795,13 +1797,13 @@ </record> <!-- Procurements are located in Warehouse menu hierarchy, MRP users should come to Stock application to use it. --> - <menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" sequence="3" groups="stock.group_stock_manager"/> + <menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" sequence="50" groups="stock.group_stock_manager"/> <menuitem action="action_procurement_compute" id="menu_procurement_compute" parent="menu_stock_sched" groups="base.group_no_one" sequence="2"/> <menuitem action="procurement.action_compute_schedulers" id="menu_stock_proc_schedulers" parent="menu_stock_sched" sequence="1" groups="stock.group_stock_manager"/> <menuitem action="procurement.procurement_exceptions" id="menu_stock_procurement_action" parent="menu_stock_sched" sequence="50" groups="stock.group_stock_manager"/> - <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5"/> + <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_config_settings" sequence="5"/> <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="stock.menu_reordering_rules_config" sequence="1"/> - <menuitem id="stock.next_id_61" name="Warehouse" sequence="40" parent="base.menu_reporting" groups="group_stock_manager"/> + <menuitem id="stock.menu_warehouse_report" name="Reports" sequence="99" parent="stock.menu_stock_root" groups="group_stock_manager"/> <menuitem id="menu_quants" name="Quantitative Valuation" parent="menu_traceability" sequence="20" action="quantsact" groups="base.group_no_one"/> <menuitem id="menu_procurement_rules" name="Global Procurement Rules" parent="stock.menu_routes_config" action="procrules" groups="base.group_no_one" sequence="3"/> <menuitem id="menu_stock_location_path" name="Global Push Rules" parent="stock.menu_routes_config" action="stolocpath" groups="base.group_no_one" sequence="4"/> @@ -2023,7 +2025,7 @@ </record> <!-- Barcode Nomenclatures --> - <menuitem parent="menu_stock_configuration" action="barcodes.action_barcode_nomenclature_form" id="menu_wms_barcode_nomenclature_all" + <menuitem parent="menu_stock_config_settings" action="barcodes.action_barcode_nomenclature_form" id="menu_wms_barcode_nomenclature_all" sequence="50"/> </data> diff --git a/addons/stock_account/wizard/stock_valuation_history_view.xml b/addons/stock_account/wizard/stock_valuation_history_view.xml index f6b1f5f62d1..38dd2cbf0a5 100644 --- a/addons/stock_account/wizard/stock_valuation_history_view.xml +++ b/addons/stock_account/wizard/stock_valuation_history_view.xml @@ -36,7 +36,7 @@ <field name="view_id" ref="view_wizard_valuation_history"/> <field name="target">new</field> </record> - <menuitem id="menu_action_wizard_valuation_history" action="action_wizard_stock_valuation_history" parent="stock.next_id_61" sequence="1"/> + <menuitem id="menu_action_wizard_valuation_history" action="action_wizard_stock_valuation_history" parent="stock.menu_warehouse_report" sequence="1"/> <record id="view_stock_history_report_tree" model="ir.ui.view"> <field name="name">Stock Value At Date</field> diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml index 7d23fabbb5f..f1c369cd414 100644 --- a/addons/survey/views/survey_views.xml +++ b/addons/survey/views/survey_views.xml @@ -587,14 +587,15 @@ <!-- MENU ELEMENTS --> <!-- Left menu categories--> - <menuitem name="Surveys" id="menu_surveys" parent="base.marketing_menu" sequence="25" groups="base.group_survey_user"/> + <menuitem name="Surveys" id="menu_surveys" sequence="25" groups="base.group_survey_user"/> <!-- Left menu elements: Survey --> <menuitem name="Surveys" id="menu_survey_form" action="action_survey_form" parent="menu_surveys" sequence="1"/> - <menuitem name="Answers" id="menu_survey_type_form1" action="action_survey_user_input" parent="menu_surveys" sequence="1"/> + <menuitem name="Answers" id="menu_survey_type_form1" action="action_survey_user_input" parent="menu_surveys" sequence="1" groups="base.group_no_one"/> + <!-- Left menu elements: Technical Configuration --> - <menuitem name="Surveys" id="menu_surveys_configuration" parent="base.menu_marketing_config_root" groups="base.group_no_one" sequence="2" /> + <menuitem name="Surveys" id="menu_surveys_configuration" parent="base.menu_config" groups="base.group_no_one" sequence="17" /> <menuitem name="Pages" id="menu_survey_page_form1" action="action_survey_page_form" parent="menu_surveys_configuration" sequence="1"/> <menuitem name="Questions" id="menu_survey_question_form1" action="action_survey_question_form" parent="menu_surveys_configuration" sequence="2"/> <menuitem name="Labels" id="menu_survey_label_form1" action="action_survey_label_form" parent="menu_surveys_configuration" sequence="3"/> diff --git a/addons/utm/views/utm.xml b/addons/utm/views/utm.xml index 2e8356be727..e51497b22fe 100644 --- a/addons/utm/views/utm.xml +++ b/addons/utm/views/utm.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - <menuitem name="UTMs" id="marketing_utm" - parent="base.marketing_menu" groups="marketing.group_marketing_user" sequence="99"/> + <menuitem id="menu_link_tracker_root" name="Link Tracker" groups="base.group_no_one" sequence="30"/> + <menuitem name="UTMs" id="marketing_utm" groups="marketing.group_marketing_user" parent="menu_link_tracker_root" sequence="99"/> <!-- utm.campaign --> <record model="ir.ui.view" id="utm_campaign_tree"> diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml index 3478a96c786..3cd7485c694 100644 --- a/addons/web/views/webclient_templates.xml +++ b/addons/web/views/webclient_templates.xml @@ -196,8 +196,9 @@ <t t-foreach="menu_data['children']" t-as="menu"> <div style="display: none" class="oe_secondary_menu" t-att-data-menu-parent="menu['id']"> <t t-foreach="menu['children']" t-as="menu"> - <div class="oe_secondary_menu_section"> - <t t-esc="menu['name']"/> + <div class="oe_secondary_menu_section"> + <t t-if="menu['children']"><t t-esc="menu['name']"/></t> + <t t-if="not menu['children']"><t t-call="web.menu_link"/></t> </div> <t t-call="web.menu_secondary_submenu"/> </t> diff --git a/addons/website/views/res_config.xml b/addons/website/views/res_config.xml index ae41f05d8ff..91abcdb19de 100644 --- a/addons/website/views/res_config.xml +++ b/addons/website/views/res_config.xml @@ -109,8 +109,9 @@ <field name="target">inline</field> </record> - <menuitem id="menu_website_configuration" parent="base.menu_config" - sequence="90" action="action_website_configuration"/> + <menuitem id="menu_website_configuration" sequence="90" parent="base.menu_config" name="Website"/> + <menuitem id="menu_website_global_configuration" parent="menu_website_configuration" + sequence="0" action="action_website_configuration" name="Settings"/> </data> </openerp> diff --git a/addons/website_blog/views/website_blog_views.xml b/addons/website_blog/views/website_blog_views.xml index 259bd20dda7..8e43249eabf 100644 --- a/addons/website_blog/views/website_blog_views.xml +++ b/addons/website_blog/views/website_blog_views.xml @@ -1,8 +1,7 @@ <?xml version="1.0"?> <openerp> <data> - <menuitem name="Knowledge" id="knowledge.menu_document"/> - <menuitem name="Blog Posts" id="menu_wiki" parent="knowledge.menu_document" sequence="20" /> + <menuitem name="Blog" id="menu_website_blog_root" sequence="20" parent="website.menu_website_configuration"/> <!-- Blog views --> <record model="ir.ui.view" id="view_blog_blog_list"> @@ -114,7 +113,7 @@ </p> </field> </record> - <menuitem id="menu_page" parent="menu_wiki" name="Blog Posts" action="action_blog_post" sequence="10"/> + <menuitem id="menu_page" parent="menu_website_blog_root" name="Blog Posts" action="action_blog_post" sequence="10"/> <record model="ir.actions.act_window" id="action_blog_blog"> <field name="name">Blogs</field> @@ -122,7 +121,7 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> </record> - <menuitem id="menu_blog" parent="menu_wiki" name="Blogs" action="action_blog_blog" sequence="20"/> + <menuitem id="menu_blog" parent="menu_website_blog_root" name="Blogs" action="action_blog_blog" sequence="20"/> <record model="ir.ui.view" id="blog_tag_tree"> <field name="name">blog_tag_tree</field> @@ -159,6 +158,6 @@ <field name="view_id" ref="blog_tag_tree"/> </record> - <menuitem id="menu_blog_tag" parent="menu_wiki" name="Blog Tags" action="action_tags" sequence="40" /> + <menuitem id="menu_blog_tag" parent="menu_website_blog_root" name="Blog Tags" action="action_tags" sequence="40" /> </data> </openerp> diff --git a/addons/website_crm_score/views/marketing.xml b/addons/website_crm_score/views/marketing.xml index a754f6435f4..2d5d873664c 100644 --- a/addons/website_crm_score/views/marketing.xml +++ b/addons/website_crm_score/views/marketing.xml @@ -47,7 +47,7 @@ </record> <!-- Score Menu Item --> - <menuitem id="leads_menu" name="Leads Management" parent="base.marketing_menu" groups="marketing.group_marketing_user"/> + <menuitem id="leads_menu" name="Leads Management" parent="base.menu_base_partner" groups="marketing.group_marketing_user" sequence="4"/> <!-- Action to display the leads that have a particular score --> <record model="ir.actions.act_window" id="score_leads"> diff --git a/addons/website_crm_score/views/reporting.xml b/addons/website_crm_score/views/reporting.xml index eaab4b62bc7..557bfeef48f 100644 --- a/addons/website_crm_score/views/reporting.xml +++ b/addons/website_crm_score/views/reporting.xml @@ -73,7 +73,7 @@ </record> <!-- PageView Menu Item --> - <menuitem id="pageview_menu" name="Website Pages" parent="base.marketing_reporting_menu" action="website_crm_score_pageviews" /> + <menuitem id="pageview_menu" name="Website Pages" parent="base.menu_sale_report" action="website_crm_score_pageviews" /> </data> </openerp>
\ No newline at end of file diff --git a/addons/website_event_track/views/event_backend.xml b/addons/website_event_track/views/event_backend.xml index e60e5955215..7eb6a103d7d 100644 --- a/addons/website_event_track/views/event_backend.xml +++ b/addons/website_event_track/views/event_backend.xml @@ -179,7 +179,7 @@ Tracks define the agenda of your event. These can be a talk, a round table, a me </p></field> </record> - <menuitem name="Event Tracks" id="menu_event_track" action="action_event_track" parent="event.event_main_menu" groups="event.group_event_user"/> + <menuitem name="Event Tracks" id="menu_event_track" action="action_event_track" parent="event.event_main_menu" groups="base.group_no_one"/> <!-- EVENTS/CONFIGURATION/EVENT locations --> <record model="ir.ui.view" id="view_event_location_form"> @@ -209,7 +209,7 @@ Tracks define the agenda of your event. These can be a talk, a round table, a me <field name="res_model">event.track.location</field> </record> <menuitem name="Event Locations" id="menu_event_track_location" - action="action_event_track_location" parent="event.event_configuration" + action="action_event_track_location" parent="event.menu_event_configuration" groups="base.group_no_one"/> <!-- EVENTS/CONFIGURATION/EVENT Sponsor Types --> @@ -241,7 +241,7 @@ Tracks define the agenda of your event. These can be a talk, a round table, a me <field name="name">Sponsor Types</field> <field name="res_model">event.sponsor.type</field> </record> - <menuitem id="menu_event_sponsor_type" action="action_event_sponsor_type" parent="event.event_configuration" groups="base.group_no_one"/> + <menuitem id="menu_event_sponsor_type" action="action_event_sponsor_type" parent="event.menu_event_configuration" groups="base.group_no_one"/> <!-- EVENT.SPONSOR VIEWS --> <record model="ir.ui.view" id="view_event_sponsor_tree"> @@ -301,7 +301,8 @@ Tracks define the agenda of your event. These can be a talk, a round table, a me <field name="name">Track Tags</field> <field name="res_model">event.track.tag</field> </record> - <menuitem id="menu_event_track_tag" action="action_event_track_tag" parent="event.event_configuration" groups="base.group_no_one"/> + <menuitem id="menu_event_track_tag" action="action_event_track_tag" + parent="event.menu_event_configuration" groups="base.group_no_one"/> <!-- Events Organisation/CONFIGURATION/EVENTS --> <record model="ir.ui.view" id="view_event_form"> diff --git a/addons/website_forum/views/forum.xml b/addons/website_forum/views/forum.xml index b0d20af04db..41569412842 100644 --- a/addons/website_forum/views/forum.xml +++ b/addons/website_forum/views/forum.xml @@ -3,7 +3,8 @@ <data> <!-- MAIN FORUM MENU --> <menuitem name="Forum" id="menu_website_forum" - parent="mail.mail_feeds_main" sequence="50" groups="base.group_website_designer"/> + parent="website.menu_website_configuration" sequence="50" groups="base.group_website_designer"/> + <!-- FORUM VIEWS --> <record id="view_forum_forum_list" model="ir.ui.view"> diff --git a/addons/website_links/static/src/js/website_links_menu.js b/addons/website_links/static/src/js/website_links_menu.js index 6ef30e93314..77c865a182d 100644 --- a/addons/website_links/static/src/js/website_links_menu.js +++ b/addons/website_links/static/src/js/website_links_menu.js @@ -9,4 +9,4 @@ $(document).ready(function () { $('#o_website_links_share_page').attr('href', '/r?u=' + encodeURIComponent(window.location.href)); }); -})();
\ No newline at end of file +})(); diff --git a/addons/website_links/views/website_links.xml b/addons/website_links/views/website_links.xml index 9ea8f83d271..bbe875d8c89 100644 --- a/addons/website_links/views/website_links.xml +++ b/addons/website_links/views/website_links.xml @@ -163,7 +163,7 @@ <field name="view_mode">graph,tree,form</field> </record> - <menuitem id="menu_url_shortener_main" name="Link Tracker" parent="base.marketing_menu" groups="base.group_no_one"/> + <menuitem id="menu_url_shortener_main" name="Link Tracker" parent="utm.menu_link_tracker_root" groups="base.group_no_one"/> <menuitem id="menu_url_shortener_links" name="Tracked Links" parent="menu_url_shortener_main" action="action_website_links"/> </data> </openerp> diff --git a/addons/website_slides/__openerp__.py b/addons/website_slides/__openerp__.py index 731af0b644e..87e22dbbdec 100644 --- a/addons/website_slides/__openerp__.py +++ b/addons/website_slides/__openerp__.py @@ -31,4 +31,5 @@ Share and Publish Videos, Presentations and Documents' 'data/website_slides_demo.xml' ], 'installable': True, + 'application': True, } diff --git a/addons/website_slides/view/website_slides_backend.xml b/addons/website_slides/view/website_slides_backend.xml index e3ebff945a0..b69a2fbac8b 100644 --- a/addons/website_slides/view/website_slides_backend.xml +++ b/addons/website_slides/view/website_slides_backend.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - <menuitem name="Marketing" id="base.marketing_menu" sequence="85" groups="base.group_user"/> - <menuitem id="menu_slides" parent="base.marketing_menu" name="Slides" groups="marketing.group_marketing_user"/> + <menuitem name="Slides" id="menu_website_slides_root" sequence="32" groups="base.group_no_one"/> <!-- SLIDE.TAG --> <record id="view_slide_tag_form" model="ir.ui.view"> @@ -32,7 +31,7 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> </record> - <menuitem action="action_slide_tag" id="menu_slide_tag" parent="menu_slides" sequence="10" groups="base.group_no_one"/> + <menuitem action="action_slide_tag" id="menu_slide_tag" parent="menu_website_slides_root" sequence="10" groups="base.group_no_one"/> <!-- SLIDE.SLIDE --> <record id="view_slide_slide_form" model="ir.ui.view"> @@ -150,7 +149,7 @@ <field name="view_type">form</field> <field name="view_mode">tree,form,graph</field> </record> - <menuitem action="action_slides_slides" id="submenu_action_slides_slides" parent="menu_slides" sequence="3"/> + <menuitem action="action_slides_slides" id="submenu_action_slides_slides" parent="menu_website_slides_root" sequence="3"/> <!-- SLIDE.CATEGORY --> <record model="ir.ui.view" id="view_slides_category_form"> @@ -186,7 +185,7 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> </record> - <menuitem action="action_ir_slide_category" id="menu_action_ir_slide_category" parent="menu_slides" sequence="2"/> + <menuitem action="action_ir_slide_category" id="menu_action_ir_slide_category" parent="menu_website_slides_root" sequence="2"/> <!-- SLIDE.CHANNEL VIEWS --> <record model="ir.ui.view" id="view_slide_channel_form"> @@ -267,7 +266,8 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> </record> - <menuitem action="action_slide_channels" id="menu_action_slide_channels" parent="menu_slides" sequence="1"/> + <menuitem action="action_slide_channels" id="menu_action_slide_channels" + parent="menu_website_slides_root" sequence="1"/> </data> </openerp> diff --git a/addons/website_version/views/marketing_view.xml b/addons/website_version/views/marketing_view.xml index b9d7c0750e9..d1c4c6ebc72 100644 --- a/addons/website_version/views/marketing_view.xml +++ b/addons/website_version/views/marketing_view.xml @@ -224,10 +224,10 @@ <field name="view_mode">tree,form</field> </record> - <menuitem name="Website" id="website_menu" sequence="10" parent="base.marketing_menu" groups="marketing.group_marketing_user"/> - <menuitem action="action_website_view" id="menu_website_view" parent="website_menu"/> - <menuitem action="action_version" id="menu_action_version" parent="website_menu" groups="base.group_no_one"/> - <menuitem action="action_experiment" id="menu_action_experiment" parent="website_menu"/> + <menuitem name="Versionning" id="menu_website_version_root" sequence="32" groups="marketing.group_marketing_user"/> + <menuitem action="action_website_view" id="menu_website_view" parent="menu_website_version_root"/> + <menuitem action="action_version" id="menu_action_version" parent="menu_website_version_root" groups="base.group_no_one"/> + <menuitem action="action_experiment" id="menu_action_experiment" parent="menu_website_version_root"/> <record id="google_analytics_configuration" model="ir.actions.act_window"> <field name="name">Google Analytics Configuration</field> diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml index 8686f57defe..28bf7f6a5da 100644 --- a/openerp/addons/base/base_menu.xml +++ b/openerp/addons/base/base_menu.xml @@ -1,20 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> <!-- Top menu item --> - <menuitem name="Reporting" - id="menu_reporting" - groups="base.group_user" - icon="fa-signal" - sequence="170"/> - <menuitem id="menu_reporting_dashboard" name="Dashboards" parent="menu_reporting" sequence="0"/> - <menuitem id="menu_reporting_config" name="Configuration" parent="menu_reporting" sequence="100" groups="base.group_system"/> + <menuitem id="menu_board_root" name="Dashboards" sequence="35"/> + <menuitem id="menu_reporting_dashboard" name="Dashboards" parent="menu_board_root" sequence="0"/> + <menuitem id="menu_reporting_config" name="Configuration" parent="menu_board_root" sequence="100" groups="base.group_system"/> <!-- Top menu item --> <menuitem name="Settings" id="menu_administration" icon="fa-gear" sequence="500"/> - <menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/> + <menuitem id="menu_management" name="Modules" sequence="499"/> <menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/> <menuitem id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/> <menuitem id="menu_users" name="Users" parent="menu_administration" sequence="4"/> diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index e15b9a96a60..40bf8ae8c13 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -6,11 +6,12 @@ <menuitem name="Sales" id="menu_base_partner" groups="base.group_sale_salesman" - sequence="20"/> + sequence="6"/> - <menuitem id="base.menu_sales" parent="base.menu_base_partner" name="Sales" sequence="1" /> - <menuitem id="menu_base_config" parent="menu_base_partner" name="Configuration" sequence="30" groups="group_system"/> - <menuitem id="menu_config_address_book" parent="menu_base_config" name="Contacts" sequence="4" groups="group_system"/> + <!-- This menu will disappear, I commented it for tests purpose --> + <menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config" + sequence="1"/> + <menuitem id="menu_config_address_book" parent="base.menu_sale_config" name="Contacts" sequence="4" groups="group_system"/> <!-- Partner Titles --> <record id="view_partner_title_tree" model="ir.ui.view"> @@ -448,7 +449,8 @@ <field name="view_id" ref="view_partner_tree"/> <field name="act_window_id" ref="action_partner_form"/> </record> - <menuitem id="menu_partner_form" parent="base.menu_sales" action="action_partner_form" sequence="2"/> + <menuitem name="CRM" id="base.menu_crm" parent="base.menu_base_partner" sequence="2"/> + <menuitem id="menu_partner_form" parent="base.menu_crm" action="action_partner_form" sequence="4"/> <record id="action_partner_customer_form" model="ir.actions.act_window"> <field name="name">Customers</field> diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml index a8184c5ebb9..1eeb95161ec 100644 --- a/openerp/addons/base/res/res_security.xml +++ b/openerp/addons/base/res/res_security.xml @@ -10,7 +10,7 @@ <field name="name">Contacts</field> <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/> </record> - <record model="ir.ui.menu" id="menu_base_config"> + <record model="ir.ui.menu" id="base.menu_sale_config"> <field name="name">Configuration</field> <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/> </record> |