From c73ce3b65a250066d1d66932682ecc904dcbeacc Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Tue, 23 Jun 2015 11:06:11 +0200
Subject: [PATCH] [IMP] Move action to the Report or Configuration menuitem
 when there is only one child. Example : Expense/Reports/Expenses -->
 Expense/Reports Modified modules : association, fleet, hr_attendance,
 hr_evaluation, hr_expense, hr_holidays                    hr_recruitment,
 hr_timesheet, im_livechat, mass_mailing, membership, mrp_operations          
          project, purchase, sale_service

---
 addons/association/profile_association.xml           |  1 -
 addons/fleet/fleet_view.xml                          |  2 +-
 addons/hr_attendance/hr_attendance_view.xml          |  4 +---
 addons/hr_evaluation/hr_evaluation_view.xml          |  4 +---
 .../report/hr_evaluation_report_view.xml             |  4 +---
 addons/hr_expense/hr_expense_view.xml                |  5 +----
 addons/hr_expense/report/hr_expense_report_view.xml  |  2 +-
 addons/hr_holidays/hr_holidays_view.xml              |  3 +--
 addons/hr_recruitment/hr_recruitment_view.xml        |  2 --
 .../report/hr_recruitment_report_view.xml            |  3 ++-
 addons/hr_timesheet/hr_timesheet_view.xml            |  3 +--
 .../im_livechat/report/im_livechat_report_views.xml  |  7 +------
 addons/mass_mailing/views/mass_mailing_report.xml    |  4 +---
 addons/membership/membership_view.xml                | 12 +-----------
 addons/membership/report/report_membership_view.xml  |  3 ++-
 .../report/mrp_workorder_analysis_view.xml           |  3 +--
 addons/project/project_view.xml                      | 10 ++--------
 addons/purchase/report/purchase_report_view.xml      |  3 +--
 addons/sale_service/views/sale_service_view.xml      |  2 +-
 19 files changed, 20 insertions(+), 57 deletions(-)

diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 6085d56f105..18fc8072b2e 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -9,7 +9,6 @@
             icon="fa-users"
             sequence="15"/>
         <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="100" groups="base.group_configuration"/>
-        <menuitem name="Reports" id="base.menu_report_association" parent="base.menu_association" sequence="99"/>
 
     </data>
 </openerp>
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 6515880c676..c9efd52a631 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -176,7 +176,7 @@
         </record>
 
         <menuitem name="Fleet" id="menu_root" sequence="115" groups="group_fleet_user" icon="fa-car" web_icon="fleet,static/description/icon.png"/>
-        <menuitem name="Configuration" parent="menu_root" id="fleet_configuration" sequence="3" groups="group_fleet_manager"/>
+        <menuitem name="Configuration" parent="menu_root" id="fleet_configuration" sequence="100" 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"/>
         <menuitem action="fleet_vehicle_state_act" parent="fleet_configuration" id="fleet_vehicle_state_menu" groups="group_fleet_manager"/>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index e25885e81df..33138870436 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -170,9 +170,7 @@
             <field name="view_id" ref="view_attendance_reason"/>
         </record>
 
-        <menuitem name="Configuration" parent="menu_hr_attendance_root" id="menu_hr_attendance_config" sequence="100" groups="base.group_configuration"/>
-        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" 
-            parent="menu_hr_attendance_config" groups="base.group_hr_attendance" sequence="1"/>
+        <menuitem name="Configuration" parent="menu_hr_attendance_root" id="menu_hr_attendance_config" sequence="100" groups="base.group_configuration,base.group_hr_attendance" action="open_view_attendance_reason"/>
 
         <record id="hr_attendance_employee" model="ir.ui.view">
             <field name="name">hr.employee.form1</field>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 8e1f60a313a..d298ccfe1ba 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -73,9 +73,7 @@
 
         <menuitem name="Appraisal" id="menu_hr_evaluation_root" sequence="85" web_icon="hr_evaluation,static/description/icon.png"/>
         <menuitem name="Periodic Appraisal" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4" groups="base.group_hr_manager"/>
-        <menuitem name="Configuration" id="menu_hr_evaluation_configuration" sequence="100" parent="menu_hr_evaluation_root" groups="base.group_configuration"/>
-        <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"/>
+        <menuitem name="Configuration" id="menu_hr_evaluation_configuration" sequence="100" parent="menu_hr_evaluation_root" groups="base.group_configuration,base.group_hr_manager" action="open_view_hr_evaluation_plan_tree"/>
 
         <record model="ir.ui.view" id="view_hr_evaluation_plan_phase_form">
             <field name="name">hr_evaluation.plan.phase.form</field>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index ce505a90817..332b1b0cf1b 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -93,9 +93,7 @@
     </record>
 
     <menuitem id="menu_hr_evaluation_report" parent="menu_hr_evaluation_root" sequence="99"
-        name="Reports"/>
-    <menuitem name="Appraisal" action="action_evaluation_report_all" id="menu_evaluation_report_all" 
-        parent="menu_hr_evaluation_report" sequence="2" groups="base.group_hr_manager"/>
+        name="Reports" action="action_evaluation_report_all" 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 11a7c755049..ecd17ed11b0 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -268,13 +268,10 @@
             action="action_approved_expense" sequence="15"/>
         <menuitem id="menu_hr_expense_root" name="Expenses" sequence="100" web_icon="hr_expense,static/description/icon.png"/>
         <menuitem id="menu_hr_expense_configuration" name="Configuration" parent="menu_hr_expense_root"
-            sequence="100" groups="base.group_configuration"/>
-        <menuitem id="menu_hr_product" name="Expense Products" parent="menu_hr_expense_configuration" 
-            action="hr_expense_product" groups="base.group_hr_manager"/>
+            sequence="100" groups="base.group_configuration,base.group_hr_manager" action="hr_expense_product"/>
         <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>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 64f8486e268..4520f5476a8 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -82,7 +82,7 @@
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>
 
-    <menuitem name="Expenses" action="action_hr_expense_report_all" id="menu_hr_expense_analysis" parent="menu_hr_expense_report" sequence="1"/>
+    <menuitem name="Reports" id="menu_hr_expense_report" sequence="99" parent="menu_hr_expense_root" action="action_hr_expense_report_all"/>
 
 </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index ece853a70fd..f00e0e119a5 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -508,8 +508,7 @@
 
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves" groups="base.group_hr_manager"/>
         <menuitem id="menu_hr_holidays_configuration" name="Configuration" parent="menu_hr_holidays_root"
-            sequence="100" groups="base.group_configuration"/>
-        <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"/>
+            sequence="100" groups="base.group_configuration,base.group_hr_manager" action="open_view_holiday_status"/>
 
         <!-- Holiday on resource leave -->
         <record id="resource_calendar_leave_form_inherit" model="ir.ui.view">
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index aaac3bbb8fd..b67ed0c920b 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -521,8 +521,6 @@
         name="Applications"
         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"/>
 
     <!-- Stage Tree View -->
     <record model="ir.ui.view" id="hr_recruitment_stage_tree">
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 61451148fb5..572a8a9f025 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -85,7 +85,8 @@
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
         <field name="context">{}</field>  <!-- force empty -->
     </record>
-    <menuitem name="Recruitment" action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="report_hr_recruitment" sequence="0"/>
+    <menuitem name="Reports" id="report_hr_recruitment" parent="menu_hr_recruitment_root" 
+    sequence="99" action="action_hr_recruitment_report_all"/>
     <record id="action_hr_recruitment_report_filtered_department" model="ir.actions.act_window">
         <field name="name">Recruitment Analysis</field>
         <field name="res_model">hr.recruitment.report</field>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index b6026b8ae0e..6c9114f872d 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -136,8 +136,7 @@
         </record>
 
         <menuitem name="Configuration" id="menu_hr_timesheet_config" sequence="100"
-            parent="hr_attendance.timesheet_menu_root" groups="base.group_configuration"/>
-        <menuitem parent="menu_hr_timesheet_config" id="menu_timesheet_accounts" action="act_hr_timesheet_accounts_form" sequence="2" groups="base.group_hr_manager"/>
+            parent="hr_attendance.timesheet_menu_root" groups="base.group_configuration" action="act_hr_timesheet_accounts_form"/>
         
         <record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
             <field name="name">Activities</field>
diff --git a/addons/im_livechat/report/im_livechat_report_views.xml b/addons/im_livechat/report/im_livechat_report_views.xml
index 71c8faf306c..65ad87120dd 100644
--- a/addons/im_livechat/report/im_livechat_report_views.xml
+++ b/addons/im_livechat/report/im_livechat_report_views.xml
@@ -63,12 +63,7 @@
             name="Report"
             parent="menu_livechat_root"
             sequence="50"
-            groups="im_livechat_group_manager"/>
-
-        <menuitem
-            id="livechat_support_report_session"
-            name="Support Statistics"
-            parent="menu_reporting_livechat"
+            groups="im_livechat_group_manager"
             action="im_livechat_report_action"/>
 
     </data>
diff --git a/addons/mass_mailing/views/mass_mailing_report.xml b/addons/mass_mailing/views/mass_mailing_report.xml
index b838bb9481c..f3a7741131e 100644
--- a/addons/mass_mailing/views/mass_mailing_report.xml
+++ b/addons/mass_mailing/views/mass_mailing_report.xml
@@ -62,9 +62,7 @@
 
        <menuitem name="Mass Mailing" id="mass_mailing_menu_root" sequence="60"/>
        <menuitem name="Reports" id="menu_mass_mailing_report" sequence="99"
-            parent="mass_mailing_menu_root"/>
-       <menuitem name="Mass Mailing" id="menu_mass_mailing_analysis" sequence="1"
-            parent="menu_mass_mailing_report" action="action_mail_statistics_report"/>
+            parent="mass_mailing_menu_root" action="action_mail_statistics_report"/>
 
     </data>
 </openerp>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index beba550f3a5..01297e461ff 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -122,14 +122,7 @@
 
         <menuitem name="Members" id="base.menu_association" icon="terp-calendar" sequence="15" web_icon="membership,static/description/icon.png"/>
         <menuitem name="Configuration" id="base.menu_marketing_config_association"
-            parent="base.menu_association" sequence="100" groups="base.group_configuration"/>
-
-
-        <menuitem name="Membership Products"
-                  parent="base.menu_marketing_config_association"
-                  id="menu_membership_products"
-                  action="action_membership_products"
-                  sequence="1"/>
+            parent="base.menu_association" sequence="100" groups="base.group_configuration" action="action_membership_products"/>
 
 
         <!-- MEMBERSHIP/CURRENT MEMBERS -->
@@ -272,8 +265,5 @@
             </field>
         </record>
 
-        <!-- MEMBERSHIP/REPORTING -->
-        <menuitem name="Reports" id="base.menu_report_association" parent="base.menu_association" sequence="99"/>
-
     </data>
 </openerp>
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index d6d34daff7a..e99793a5e58 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -66,7 +66,8 @@
             <field name="context">{"search_default_start_date":1,"search_default_member":1, 'search_default_Revenue':1, 'search_default_this_month':1, 'search_default_salesman':1,'group_by_no_leaf':1}</field>
         </record>
 
-        <menuitem name="Members" parent="base.menu_report_association"
+        <menuitem name="Reports" parent="base.menu_association"
+            sequence="99"
             action="action_report_membership_tree"
             id="menu_report_membership"
             groups="base.group_partner_manager"/>
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
index ba7dcf95b2e..9f25cc548ac 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
+++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
@@ -84,8 +84,7 @@
             <field name="context">{'search_default_Workcenter': 1}</field>
         </record>
 
-        <menuitem name="Reports" id="menu_mrp_report" parent="base.menu_mrp_root" sequence="99"/>
-        <menuitem name="Work Order" action="action_report_mrp_workorder" id="menu_report_mrp_workorders_tree" parent="menu_mrp_report"/>
+        <menuitem name="Reports" sequence="99" action="action_report_mrp_workorder" id="menu_report_mrp_workorders_tree" parent="base.menu_mrp_root"/>
 
   </data>
 </openerp>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0ffe94ce81f..bdbac030c0e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -18,12 +18,6 @@
         <menuitem id="menu_project_config" name="Configuration" parent="base.menu_main_pm"
             sequence="100" groups="base.group_configuration"/>
 
-        <menuitem name="Configuration"
-            id="base.menu_definitions"
-            parent="menu_project_config"
-            groups="base.group_configuration"
-            sequence="100"/>
-
         <record id="view_task_search_form" model="ir.ui.view">
             <field name="name">project.task.search.form</field>
             <field name="model">project.task</field>
@@ -619,7 +613,7 @@
             </field>
         </record>
 
-        <menuitem id="menu_tasks_config" name="GTD" parent="base.menu_definitions" sequence="1"/>
+        <menuitem id="menu_tasks_config" name="GTD" parent="menu_project_config" sequence="2"/>
 
         <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"/>
 
@@ -688,7 +682,7 @@
               </p>
             </field>
         </record>
-        <menuitem action="project_tags_action" id="menu_project_tags_act" parent="base.menu_definitions" groups="base.group_no_one"/>
+        <menuitem action="project_tags_action" id="menu_project_tags_act" parent="menu_project_config" groups="base.group_no_one"/>
 
     </data>
 </openerp>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 4a46b7c22f8..e462d1cf905 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -95,8 +95,7 @@
     </record>
 
     <menuitem id="base.purchase_report" name="Reports" parent="base.menu_purchase_root" sequence="99"
-        groups="purchase.group_purchase_manager"/>
-    <menuitem name="Purchase" action="action_purchase_order_report_all" id="menu_action_purchase_order_report_all" parent="base.purchase_report" sequence="3"/>
+        groups="purchase.group_purchase_manager" action="action_purchase_order_report_all"/>
 
     </data>
 </openerp>
diff --git a/addons/sale_service/views/sale_service_view.xml b/addons/sale_service/views/sale_service_view.xml
index ede89294893..b67e266b7d6 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 action="open_service_type_products" id="menu_products_services" name="Services" parent="base.menu_definitions" sequence="1" />
+        <menuitem action="open_service_type_products" id="menu_products_services" name="Services" parent="project.menu_project_config" sequence="4" />
     </data>
 </openerp>