[FIX] sale, crm_claim, crm_helpdesk: report menus

crm claims and helpdesk reports should be in Sales Report menu, not in project
The sales report menu is now defined in sales_team, which is a common dependance between crm and sales, instead of redefining this menu in each modules

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index b0e6404..3b76e45 100644 (file)
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -23,9 +23,6 @@
         <menuitem id="menu_crm_config_phonecall" name="Phone Calls"
             parent="base.menu_base_config" sequence="45" groups="base.group_sale_salesman"/>
 
-        <menuitem id="base.next_id_64" name="Sales"
-            parent="base.menu_reporting" sequence="1"/>
-
         <!-- crm.tracking.medium -->
         <record id="crm_tracking_medium_view_tree" model="ir.ui.view">
             <field name="name">crm.tracking.medium.tree</field>

diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index bc9293e..06de0ce 100644 (file)
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -81,13 +81,8 @@
             <field name="act_window_id" ref="action_report_crm_claim"/>
         </record>
 
-        <menuitem id="base.menu_project_report" name="Project"
-            groups="base.group_no_one"
-            parent="base.menu_reporting" sequence="30"/>
-
         <menuitem name="Claims Analysis" id="menu_report_crm_claim_tree"
-            action="action_report_crm_claim" parent="base.menu_project_report" sequence="15"/>
-
+            action="action_report_crm_claim" parent="base.next_id_64" sequence="15"/>
 
     </data>
 </openerp>

diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index adc788a..a70c38f 100644 (file)
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -77,12 +77,8 @@
             <field name="act_window_id" ref="action_report_crm_helpdesk"/>
         </record>
 
-        <menuitem id="base.menu_project_report" name="Project"
-            groups="base.group_no_one"
-            parent="base.menu_reporting" sequence="30"/>
-
         <menuitem name="Helpdesk Analysis" action="action_report_crm_helpdesk"
-            id="menu_report_crm_helpdesks_tree" parent="base.menu_project_report" sequence="20"/>
+            id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" sequence="20"/>
 
     </data>
 </openerp>

diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index acba427..bc7c6ee 100644 (file)
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -86,7 +86,6 @@
         <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="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"/>
 
 </data>

diff --git a/addons/sales_team/sales_team.xml b/addons/sales_team/sales_team.xml
index cd2442b..2882f1c 100644 (file)
--- a/addons/sales_team/sales_team.xml
+++ b/addons/sales_team/sales_team.xml
@@ -207,5 +207,7 @@
             </xpath>
         </template>
 
+        <menuitem id="base.next_id_64" name="Sales" parent="base.menu_reporting" sequence="1" groups="base.group_sale_manager"/>
+
     </data>
 </openerp>