[MERGE] branch merged with trunk-menus-improvements-reporting-mtr

bzr revid: mtr@tinyerp.com-20120305095729-33g12fp1jqajhgbr
2012-03-05 15:27:29 +05:30 · 2012-03-05 15:27:29 +05:30 · b26fdadccc
parent 455114e0eb ff0ea4b100
commit b26fdadccc
44 changed files with 102 additions and 84 deletions
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@ -17,7 +17,7 @@
        <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
        <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
        <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" groups="account.group_account_user" sequence="6"/>
-        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="13"/>
+        <menuitem id="menu_finance_reporting" name="Accounting" parent="base.menu_reporting" sequence="35"/>
        <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting" groups="group_account_user"/>
        <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
        <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
@ -30,7 +30,7 @@
        <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
        <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="5" groups="group_account_user,group_account_manager"/>
-        <menuitem id="menu_account_reports" name="Financial Reports" parent="menu_finance_accounting" sequence="18"/>
+        <menuitem id="menu_account_reports" name="Accounting" parent="base.menu_reporting_config" sequence="18"/>

        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries"
            parent="menu_finance_periodical_processing" sequence="15"
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@ -61,7 +61,7 @@
            <field name="view_id" ref="board_account_form"/>
        </record>

-        <menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting" groups="group_account_user,group_account_manager"/>
+        <menuitem id="menu_dashboard_acc" name="Accounting" sequence="30" parent="base.menu_dasboard" groups="group_account_user,group_account_manager"/>
        <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
        <menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="14" action="open_board_account"/>

--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@ -9,6 +9,6 @@
            web_icon="images/association.png"
            web_icon_hover="images/association-hover.png"/>
        <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
-        <menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
+        <menuitem name="Association" id="base.menu_report_association" parent="base.menu_reporting" sequence="25"/>
    </data>
 </openerp>
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@ -770,7 +770,7 @@
    <menuitem name="Buyers" id="auction_buyers_menu" parent="auction_menu_root" sequence="4"/>
    <menuitem name="Bids" parent="auction_buyers_menu" action="action_bid_open" id="menu_action_bid_open"/>

-    <menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6" groups="group_auction_manager"/>
+    <menuitem name="Auction" id="auction_report_menu" parent="base.menu_reporting" sequence="70" groups="group_auction_manager"/>

    <act_window name="Deposit slip"
        context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
--- a/addons/auction/board_auction_view.xml
+++ b/addons/auction/board_auction_view.xml
@ -93,7 +93,7 @@
            <field name="view_id" ref="board_auction_form1"/>
        </record>

-        <menuitem name="Dashboard" id="menu_board_auction" parent="auction.auction_report_menu" sequence="0"/>
+        <menuitem name="Auction" id="menu_board_auction" parent="base.menu_dasboard" sequence="40"/>

        <menuitem
            name="Auction DashBoard"
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@ -66,10 +66,10 @@
      <field name="view_type">form</field>
      <field name="view_mode">form</field>
      <field name="target">new</field>
-      <field name="context">{'menu':True}</field> 
+      <field name="context">{'menu':True}</field>
    </record>

-    <menuitem parent="base.reporting_menu" name="Report Designer" action="action_report_designer_wizard" id="menu_action_report_designer_wizard" sequence="70"/>
+    <menuitem parent="base.menu_reporting_config" name="Report Designer" action="action_report_designer_wizard" id="menu_action_report_designer_wizard" sequence="1"/>

  </data>
 </openerp>
--- a/addons/board/board_data_admin.xml
+++ b/addons/board/board_data_admin.xml
@ -160,8 +160,8 @@
        <menuitem id="base.menu_administration" icon="terp-administration"  name="Settings" sequence="50" action="open_board_administration_form"/>

        <!-- add a menu item in adminitration/reporting/dashboards -->
-        <menuitem id="base.menu_reporting" name="Reporting" parent="base.menu_administration" sequence="11" groups="base.group_extended"/>
-        <menuitem id="base.menu_dashboard" name="Dashboards" parent="base.menu_reporting" sequence="0"/>
+        <menuitem id="base.menu_reporting_board" name="Reporting" parent="base.menu_administration" sequence="11" groups="base.group_extended"/>
+        <menuitem id="base.menu_dashboard" name="Dashboards" parent="base.menu_reporting_board" sequence="0"/>
        <menuitem id="base.menu_dashboard_admin" action="open_board_administration_form" parent="base.menu_dashboard" icon="terp-graph"/>

 </data>
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@ -68,7 +68,7 @@
        <field name="search_view_id" ref="view_board_search"/>
    </record>

-    <menuitem action="action_view_board_list_form" id="menu_view_board_form" parent="base.reporting_menu" sequence="1"/>
+    <menuitem action="action_view_board_list_form" id="menu_view_board_form" parent="base.menu_reporting_config" sequence="2"/>

 </data>
 </openerp>
--- a/addons/crm/board_crm_statistical_view.xml
+++ b/addons/crm/board_crm_statistical_view.xml
@ -107,10 +107,10 @@
            <field name="view_id" ref="board_crm_statistical_form"/>
        </record>

-	    <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
+	    <menuitem id="board.menu_sales_dasboard" name="Sales" sequence="1" parent="base.menu_dasboard"/>

        <menuitem
-            name="CRM Dashboard" parent="board.menu_dasboard"
+            name="CRM Dashboard" parent="board.menu_sales_dasboard"
            action="open_board_statistical_dash"
            sequence="0"
            id="menu_board_statistics_dash"
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@ -2,7 +2,7 @@
 <openerp>
    <data>

-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" 
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0"
            groups="base.group_sale_manager,base.group_sale_salesman"/>

        <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
@ -17,8 +17,8 @@
        <menuitem id="menu_crm_config_phonecall" name="Phone Calls"
            parent="base.menu_base_config" sequence="5" groups="base.group_extended"/>

-        <menuitem id="base.next_id_64" name="Reporting"
-            parent="base.menu_base_partner" sequence="11" />
+        <menuitem id="base.next_id_64" name="Sales"
+            parent="base.menu_reporting" sequence="1" />


        <!-- crm.case.channel -->
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@ -263,10 +263,10 @@

       <menuitem name="Leads Analysis" id="menu_report_crm_leads_tree"
            groups="base.group_extended"
-            parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/>
+            parent="base.next_id_64" action="action_report_crm_lead" sequence="1"/>

       <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
-            parent="base.next_id_64" action="action_report_crm_opportunity" sequence="4"/>
+            parent="base.next_id_64" action="action_report_crm_opportunity" sequence="5"/>

    </data>
 </openerp>
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@ -157,7 +157,7 @@
        <menuitem name="Phone Calls Analysis"
            groups="base.group_extended"
            action="action_report_crm_phonecall"
-            id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="5"/>
+            id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="15"/>

    </data>
 </openerp>
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@ -8,6 +8,13 @@
            web_icon="images/project.png"
            web_icon_hover="images/project-hover.png"/>

+        <menuitem
+            icon="terp-project" id="base.menu_main_pm"
+            name="Project" sequence="10"
+            groups="base.group_extended,base.group_sale_salesman"
+            web_icon="images/project.png"
+            web_icon_hover="images/project-hover.png"/>
+
        <menuitem id="base.menu_aftersale" name="After-Sale Services"
            groups="base.group_extended,base.group_sale_salesman"
            parent="base.menu_main_pm" sequence="2" />
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@ -190,9 +190,13 @@
            <field name="act_window_id" ref="action_report_crm_claim"/>
        </record>

+        <menuitem id="base.menu_project_report" name="Project"
+            groups="base.group_extended"
+            parent="base.menu_reporting" sequence="30"/>
+
        <menuitem name="Claims Analysis" id="menu_report_crm_claim_tree"
            groups="base.group_extended"
-            action="action_report_crm_claim" parent="base.next_id_64" sequence="6"/>
+            action="action_report_crm_claim" parent="base.menu_project_report" sequence="15"/>


    </data>
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@ -191,7 +191,7 @@
        <menuitem name="Fundraising Analysis"
            action="action_report_crm_fundraising"
            groups="base.group_extended"
-            id="menu_report_crm_fundraising_tree" parent="base.next_id_64" sequence="20"/>
+            id="menu_report_crm_fundraising_tree" parent="base.next_id_64" sequence="30"/>

    </data>
 </openerp>
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
    <data noupdate="1">
-
        <menuitem
            icon="terp-project" id="base.menu_main_pm"
            name="Project" sequence="10"
            web_icon="images/project.png"
            web_icon_hover="images/project-hover.png"/>

-        <menuitem id="base.menu_aftersale" name="After-Sale Services"
-            parent="base.menu_main_pm" sequence="2" />
+        <menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_main_pm" />

 <!-- Help Desk (menu) -->

--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@ -156,9 +156,13 @@
            <field name="act_window_id" ref="action_report_crm_helpdesk"/>
        </record>

+        <menuitem id="base.menu_project_report" name="Project"
+            groups="base.group_extended"
+            parent="base.menu_reporting" sequence="30"/>
+
        <menuitem name="Helpdesk Analysis" action="action_report_crm_helpdesk"
            groups="base.group_extended"
-            id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" sequence="7"/>
+            id="menu_report_crm_helpdesks_tree" parent="base.menu_project_report" sequence="20"/>

    </data>
 </openerp>
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@ -12,7 +12,7 @@
                    <group>
                        <filter string="Last 30 Days" icon="terp-go-month" name="this_month"
                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-week" string="7 Days" 
+                        <filter icon="terp-go-week" string="7 Days"
                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
                        <separator orientation="vertical" />
                        <filter icon="terp-check"
@ -152,17 +152,17 @@
            <field name="view_id" ref="view_report_crm_opportunity_assign_tree"/>
            <field name="act_window_id" ref="action_report_crm_opportunity_assign"/>
       </record>
-       
+
       <record model="ir.actions.act_window.view" id="action_report_crm_lead_assign_graph">
            <field name="sequence" eval="2"/>
            <field name="view_mode">graph</field>
            <field name="view_id" ref="view_report_crm_lead_assign_graph"/>
            <field name="act_window_id" ref="action_report_crm_opportunity_assign"/>
-       </record>       
+       </record>

       <menuitem id="menu_report_crm_opportunities_assign_tree"
           groups="base.group_extended"
-           parent="base.next_id_64" action="action_report_crm_opportunity_assign" sequence="5"/>
+           parent="base.next_id_64" action="action_report_crm_opportunity_assign" sequence="20"/>

    </data>
 </openerp>
--- a/addons/crm_partner_assign/report/crm_partner_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml
@ -77,7 +77,7 @@

       <menuitem id="menu_report_crm_partner_assign_tree"
           groups="base.group_extended"
-           parent="base.next_id_64" action="action_report_crm_partner_assign" sequence="5"/>
+           parent="base.next_id_64" action="action_report_crm_partner_assign" sequence="25"/>

    </data>
 </openerp>
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@ -35,10 +35,10 @@

        <menuitem id="menu_reporting" name="Reporting" sequence="2" parent="knowledge.menu_document"/>
         <menuitem
-            name="Dashboard"
+            name="Document"
            id="menu_reports_document"
-            parent="menu_reporting"
-            sequence="0"
+            parent="base.menu_dasboard"
+            sequence="45"
            groups="base.group_system"/>


--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@ -62,6 +62,8 @@
            <field name="view_mode">form</field>
            <field name="view_id" ref="board_associations_manager_form"/>
        </record>
+        <menuitem id="menus_event_dashboard" name="Association"
+            parent="base.menu_dasboard" sequence="20"/>
        <menuitem
            name="Event Dashboard" parent="base.menu_report_association"
            action="open_board_associations_manager"
--- a/addons/hr/hr_board.xml
+++ b/addons/hr/hr_board.xml
@ -25,8 +25,8 @@
    </record>

    <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" action="open_board_hr"/>
-    <menuitem id="menu_hr_reporting" parent="menu_hr_root" name="Reporting" sequence="10" />
-    <menuitem id="menu_hr_dashboard" parent="menu_hr_reporting"  name="Dashboard" sequence="0"/>
+    <menuitem id="menu_hr_reporting" parent="base.menu_reporting" name="Human Resources" sequence="40" />
+    <menuitem id="menu_hr_dashboard" parent="base.menu_dasboard"  name="Human Resources" sequence="35"/>
    <menuitem id="menu_hr_dashboard_user" parent="menu_hr_dashboard" action="open_board_hr" icon="terp-graph" sequence="4"/>

    <!-- This board view will be complete by other hr_* modules-->
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@ -3,8 +3,8 @@
    <data>
        <menuitem
            id="hr.menu_hr_reporting"
-            name="Reporting"
-            parent="hr.menu_hr_root"
+            name="Human Resources"
+            parent="base.menu_reporting"
            sequence="40" />

        <record id="view_timesheet_line_graph" model="ir.ui.view">
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@ -384,7 +384,7 @@
    </record>
    <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="6" groups="base.group_tool_manager,base.group_tool_user"/>

-    <menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting" sequence="3"/>
+    <menuitem name="Idea" parent="base.menu_reporting" id="menu_idea_reporting" sequence="65"/>

    <menuitem name="Vote Statistics" parent="menu_idea_reporting"
        id="menu_idea_vote_stat" action="action_idea_vote_stat" groups="base.group_tool_user"/>
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@ -7,9 +7,9 @@
          <menuitem name="Reporting" parent="base.menu_tools"
              id="base.menu_lunch_reporting" sequence="6" groups="base.group_tool_manager"/>

-          <menuitem name="Lunch Orders"
-              parent="base.menu_lunch_reporting"
-              id="menu_lunch_reporting_order" sequence="1" />
+          <menuitem name="Lunch"
+              parent="base.menu_reporting"
+              id="menu_lunch_reporting_order" sequence="55" />

          <menuitem name="Configuration" parent="base.menu_tools"
              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
@ -266,7 +266,7 @@
                          <field name="price" />
                     </group>
                     <notebook colspan="4">
-                         <page string="General Information"> 
+                         <page string="General Information">
                              <field name="active"/>
                              <separator string="Description" colspan="4" />
                              <field name="description" nolabel="1" colspan="4" />
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@ -90,7 +90,7 @@
        <field name="search_view_id" ref="view_campaign_analysis_search"/>
    </record>

-    <menuitem name="Reporting" id="base.menu_report_marketing" parent="base.marketing_menu"/>
+    <menuitem name="Marketing" id="base.menu_report_marketing" parent="base.menu_reporting" sequence="45"/>
    <menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="base.menu_report_marketing" sequence="2"/>

    </data>
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@ -28,8 +28,8 @@
            <field name="view_id" ref="board_mrp_manager_form"/>
        </record>

-        <menuitem id="menus_dash_mrp" name="Dashboard"
-            parent="next_id_77" sequence="0"/>
+        <menuitem id="menus_dash_mrp" name="Manufacturing"
+            parent="base.menu_dasboard" sequence="15"/>
        <menuitem
            action="open_board_manufacturing" icon="terp-graph"
            id="menu_board_manufacturing" parent="menus_dash_mrp"
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@ -41,8 +41,8 @@
                </search>
            </field>
        </record>
-        <menuitem id="next_id_77" name="Reporting"
-            parent="base.menu_mrp_root" sequence="49"/>
+        <menuitem id="next_id_77" name="Manufacturing"
+            parent="base.menu_reporting" sequence="20"/>

        <!-- stock.move compared to internal location src/dest -->

--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@ -748,7 +748,7 @@
        </record>

        <!--  Miscelleanous Operations/Reporting -->
-        <menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="20" groups="group_pos_manager"/>
+        <menuitem name="Point of Sale" parent="base.menu_reporting" id="menu_point_rep" sequence="50" groups="group_pos_manager"/>
        <!-- Invoice -->

        <record model="ir.actions.act_window" id="action_pos_sale_all">
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@ -88,7 +88,8 @@
            </field>
        </record>

-  <menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.menu_product"/>
+  <menuitem id="base.next_id_73" name="Purchase" parent="base.menu_reporting" sequence="10"/>
+  <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"/>

 </data>
 </openerp>
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@ -104,16 +104,17 @@
        </record>

        <menuitem
-            id="next_id_86"
-            name="Dashboard"
-            sequence="0"
-            parent="base.menu_project_report"/>
+            id="menu_project_dasboard"
+            name="Project"
+            sequence="25"
+            parent="base.menu_dasboard"
+            />

        <menuitem
            action="open_board_project"
            icon="terp-graph"
            id="menu_board_project"
-            parent="next_id_86"
+            parent="menu_project_dasboard"
            sequence="1"/>

        <menuitem
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@ -2,10 +2,10 @@
 <openerp>
    <data>

-        <menuitem id="base.menu_project_report" name="Reporting"
+        <menuitem id="base.menu_project_report" name="Project"
            groups="project.group_project_manager"
-            parent="base.menu_main_pm" sequence="50"/>
-        <menuitem id="project_report_task" name="Tasks"
+            parent="base.menu_reporting" sequence="30"/>
+        <menuitem id="project_report_task" name="Tasks Analysis"
            parent="base.menu_project_report"/>

        <record id="view_task_project_user_tree" model="ir.ui.view">
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@ -79,7 +79,7 @@
            <field name="usage">menu</field>
            <field name="view_id" ref="board_project_issue_form"/>
        </record>
-        <menuitem id="menu_deshboard_project_issue" name="Project Issue Dashboard" parent="project.next_id_86"
+        <menuitem id="menu_deshboard_project_issue" name="Project Issue Dashboard" parent="project.menu_project_dasboard"
             icon="terp-graph"
            action="open_board_project_issue"/>

--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@ -214,8 +214,8 @@
            <field name="help">With its global system to schedule all resources of a company (people and material), OpenERP allows you to encode and then automatically compute tasks and phases scheduling, track resource allocation and availability.</field>
        </record>
 <!--        <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>-->
-        <menuitem id="base.menu_project_long_term" name="Long Term Planning"
-            parent="base.menu_main_pm" />
+        <menuitem id="base.menu_project_long_term" name="Planning"
+            parent="base.menu_main_pm" sequence="3"/>

        <menuitem action="action_account_analytic_planning_form"
            id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager"/>
@ -299,7 +299,7 @@
            <menuitem  action="action_account_analytic_planning_stat_form"
                       icon="terp-graph"
                       id="menu_board_planning"
-                       parent="project.next_id_86"/>
+                       parent="project.menu_project_dasboard"/>

 <!--        Analytic account Form -->

--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@ -98,7 +98,7 @@
        </record>
        <menuitem
            id="menu_deshboard_scurm"
-            name="Scrum Dashboard" parent="project.next_id_86"
+            name="Scrum Dashboard" parent="project.menu_project_dasboard"
            icon="terp-graph"
            action="open_board_project_scrum"/>

--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@ -3,8 +3,8 @@
 <data>
          <menuitem
            id="hr.menu_hr_reporting"
-            name="Reporting"
-            parent="hr.menu_hr_root"
+            name="Human Resources"
+            parent="base.menu_reporting"
            sequence="40" />

        <!-- Report for Users' Timesheet and Task Hours per Month -->
@ -43,7 +43,7 @@
                        <filter icon="terp-go-month"
                            string=" Month-1 "
                            domain="[('name','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('name','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Task hours of last month"/>            		
+                            help="Task hours of last month"/>
 	            		<separator orientation="vertical"/>
 	                    <field name="user_id"/>
                	</group>
@ -58,7 +58,7 @@
            	</search>
            </field>
        </record>
-        
+
        <record id="view_task_hour_per_month_graph" model="ir.ui.view">
            <field name="name">report.timesheet.task.user.graph</field>
            <field name="model">report.timesheet.task.user</field>
@ -71,7 +71,7 @@
                 </graph>
            </field>
        </record>
-                
+
        <record id="action_report_timesheet_task_user" model="ir.actions.act_window">
            <field name="name">Task Hours Per Month</field>
            <field name="res_model">report.timesheet.task.user</field>
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@ -4,8 +4,8 @@

        <menuitem
            id="menu_purchase_deshboard"
-            name="Dashboard"
-            parent="base.next_id_73" sequence="0"/>
+            name="Purchase"
+            parent="base.menu_dasboard" sequence="5"/>

        <record id="purchase_draft" model="ir.actions.act_window">
            <field name="name">Request for Quotations</field>
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@ -172,7 +172,7 @@
    </record>


-    <menuitem id="base.next_id_73" name="Reporting" parent="base.menu_purchase_root" sequence="8"
+    <menuitem id="base.next_id_73" name="Purchase" parent="base.menu_reporting" sequence="10"
        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"/>

@ -185,7 +185,7 @@
        <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="base.next_id_73" sequence="8"/>
+    <menuitem action="action_stock_move_report_po" id="menu_action_stock_move_report_po" parent="stock.next_id_61" sequence="1"/>

    </data>
 </openerp>
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@ -30,8 +30,8 @@
            <field name="view_id" ref="board_sales_manager_form"/>
        </record>

-        <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
-        <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_dasboard" sequence="0" groups="base.group_sale_manager"/>
+        <menuitem id="board.menu_sales_dasboard" name="Sales" sequence="1" parent="base.menu_dasboard"/>
+        <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_sales_dasboard" sequence="0" groups="base.group_sale_manager"/>


    <record id="action_quotation_for_sale" model="ir.actions.act_window">
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@ -128,8 +128,8 @@
        <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 id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="11" groups="base.group_sale_manager"/>
-    <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="1"/>
+    <menuitem id="base.next_id_64" name="Sales" parent="base.menu_reporting" sequence="1" groups="base.group_sale_manager"/>
+    <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="10"/>

    <!--This views used in board_sale module -->
    <record id="view_sales_by_partner_graph" model="ir.ui.view">
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@ -68,7 +68,7 @@
            <field name="view_id" ref="board_warehouse_form"/>
        </record>

-        <menuitem id="menu_dashboard_stock" name="Dashboard"  sequence="0" parent="stock.next_id_61"/>
+        <menuitem id="menu_dashboard_stock" name="Warehouse"  sequence="10" parent="base.menu_dasboard"/>
        <menuitem action="open_board_warehouse" icon="terp-graph"  groups="group_stock_manager"  id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
        <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5"  groups="group_stock_manager" action="open_board_warehouse"/>

--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@ -4,8 +4,9 @@

    <menuitem
        id="stock.next_id_61"
-        name="Reporting"
-        parent="stock.menu_stock_root"/>
+        name="Warehouse"
+        sequence="15"
+        parent="base.menu_reporting"/>

    <record id="view_stock_tree" model="ir.ui.view">
        <field name="name">report.stock.move.tree</field>
@ -261,7 +262,7 @@
        <field name="help">Inventory Analysis allows you to easily check and analyse your company stock levels. Sort and group by selection criteria in order to better analyse and manage your company  activities.</field>
    </record>
    <menuitem action="action_stock_inventory_report"
-        id="menu_action_stock_inventory_report" 
+        id="menu_action_stock_inventory_report"
        parent="next_id_61" sequence="4"/>


--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@ -8,7 +8,7 @@
            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
            <menuitem name="Reporting" parent="base.menu_tools"
                id="base.menu_lunch_reporting" sequence="6"/>
-            <menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
+            <menuitem name="Surveys" id="menu_reporting" parent="base.menu_reporting" sequence="60"/>
        <!--
            Survey
        -->
@ -1167,14 +1167,14 @@
            <field name="view_id" ref="survey_type_tree"></field>
        </record>

-        <act_window 
+        <act_window
            context="{'search_default_survey_id': [active_id], 'default_survey_id': active_id}"
            id="act_survey_pages"
            name="Pages"
            res_model="survey.page"
            src_model="survey"/>

-        <act_window 
+        <act_window
            context="{'search_default_survey': active_id, 'default_survey': active_id}"
            id="act_survey_question"
            name="Questions"
@ -1182,7 +1182,7 @@
            src_model="survey"/>


-        <act_window 
+        <act_window
            context="{'search_default_page_id': active_id, 'default_page_id': active_id}"
            id="act_survey_page_question"
            name="Questions"
--- a/addons/survey/wizard/survey_print.xml
+++ b/addons/survey/wizard/survey_print.xml
@ -35,7 +35,7 @@
 			<field name="target">new</field>
 		</record>

-        <menuitem name="Surveys" id="menu_print_survey_form" sequence="1"
+        <menuitem name="Print Surveys" id="menu_print_survey_form" sequence="1"
            action="action_view_survey_print" parent="menu_reporting"
            groups="base.group_tool_manager" icon="STOCK_PRINT"/>