[IMP] report_crm: changed the menu name and remove the unused code

bzr revid: sbh@tinyerp.com-20100303080952-02gsv4sb2m3c8fls

diff --git a/addons/report_crm/report_crm_claim_view.xml b/addons/report_crm/report_crm_claim_view.xml
index 269d3f8..d870d9d 100644 (file)
--- a/addons/report_crm/report_crm_claim_view.xml
+++ b/addons/report_crm/report_crm_claim_view.xml
@@ -89,8 +89,8 @@
            </record>        
       
         
-        <menuitem name="Claim" id="menu_crm_claim_tree" parent="crm.next_id_52"/>
-        <menuitem action="action_report_crm_claim" id="menu_crm_claim_user_tree" parent="menu_crm_claim_tree"/>
+        
+        <menuitem name="Claim" action="action_report_crm_claim" id="menu_crm_claim_user_tree" parent="crm.next_id_52"/>
 
 
   </data>

diff --git a/addons/report_crm/report_crm_fundraising_view.xml b/addons/report_crm/report_crm_fundraising_view.xml
index e3c19a2..3b421c4 100644 (file)
--- a/addons/report_crm/report_crm_fundraising_view.xml
+++ b/addons/report_crm/report_crm_fundraising_view.xml
@@ -67,7 +67,7 @@
         </record>
         
         <record id="action_report_crm_fundraising" model="ir.actions.act_window">
-            <field name="name">Fundraising by User and Section</field>
+            <field name="name">Fundraising</field>
             <field name="res_model">report.crm.fundraising</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
@@ -82,8 +82,8 @@
                <field name="view_id" ref="view_crm_fundraising_tree"/>
                <field name="act_window_id" ref="action_report_crm_fundraising"/>
            </record>             
-        <menuitem name="Fundraising" id="menu_crm_fundraising_tree" parent="crm.next_id_52"/>
-        <menuitem action="action_report_crm_fundraising" id="menu_crm_fundraising_user_tree" parent="menu_crm_fundraising_tree"/>
+        
+        <menuitem name="Fundraising" action="action_report_crm_fundraising" id="menu_crm_fundraising_user_tree" parent="crm.next_id_52"/>
         
        </data>
 </openerp>

diff --git a/addons/report_crm/report_crm_lead_view.xml b/addons/report_crm/report_crm_lead_view.xml
index c19b16f..2fece1d 100644 (file)
--- a/addons/report_crm/report_crm_lead_view.xml
+++ b/addons/report_crm/report_crm_lead_view.xml
@@ -69,6 +69,7 @@
             <field name="view_mode">graph,tree</field>
             <field name="view_id" ref="view_crm_lead_graph"/>
             <field name="search_view_id" ref="view_crm_lead_filter"/>
+           
         </record>
                        
                <record model="ir.actions.act_window.view" id="action_report_crm_lead_tree">
@@ -86,59 +87,6 @@
            </record>        
 
             
-   
-        
-       <!--   Leads by Section  
-
-        <record id="view_report_crm_lead_section_tree" model="ir.ui.view">
-            <field name="name">report.crm.lead.section.tree</field>
-            <field name="model">report.crm.lead.section</field>
-            <field name="inherit_id" ref="view_report_crm_case_section_tree"/>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <field name="nbr_cases" position="after">
-                       <field name="avg_answers"/>
-                       <field name="perc_done" select="2"/>
-                    <field name="perc_cancel" select="2"/>
-                    <field name="delay_close"/>
-                </field>
-            </field>
-        </record>
-
-        <record id="view_report_crm_lead_section_graph" model="ir.ui.view">
-            <field name="name">report.crm.lead.section.graph</field>
-            <field name="model">report.crm.lead.section</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Leads by Section" type="bar">
-                    <field name="name"/>
-                    <field name="nbr_cases" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-               <record id="view_report_crm_lead_section_filter" model="ir.ui.view">
-            <field name="name">report.crm.lead.section.select</field>
-            <field name="model">report.crm.lead.section</field>
-            <field name="inherit_id" ref="view_report_crm_case_section_filter"/>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <field name="nbr_cases" position="before">
-                </field>
-            </field>
-        </record>
-
-        <record id="action_report_crm_lead_section_tree" model="ir.actions.act_window">
-            <field name="name">Leads by Section</field>
-            <field name="res_model">report.crm.lead.section</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="view_id" ref="view_report_crm_lead_section_graph"/>
-            <field name="search_view_id" ref="view_report_crm_lead_section_filter"/>
-        </record>
-        <menuitem action="action_report_crm_lead_section_tree" id="menu_crm_lead_section_tree" parent="menu_crm_leads_tree"/>
-      -->
-     
         <menuitem name="Leads" id="menu_crm_leads_tree" parent="crm.next_id_52" action="action_report_crm_lead"/>       
   </data>
 </openerp>

diff --git a/addons/report_crm/report_crm_opportunity_view.xml b/addons/report_crm/report_crm_opportunity_view.xml
index 95ed4dc..69fa142 100644 (file)
--- a/addons/report_crm/report_crm_opportunity_view.xml
+++ b/addons/report_crm/report_crm_opportunity_view.xml
@@ -79,58 +79,6 @@
                <field name="view_id" ref="view_crm_opportunity_tree"/>
                <field name="act_window_id" ref="action_report_crm_opportunity"/>
            </record>                
-
-        
-<!--       Opportunity by Section  
-
-        <record id="view_report_crm_opportunity_section_tree" model="ir.ui.view">
-            <field name="name">report.crm.opportunity.section.tree</field>
-            <field name="model">report.crm.opportunity.section</field>
-            <field name="inherit_id" ref="view_report_crm_case_section_tree"/>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <field name="nbr_cases" position="after">
-                       <field name="avg_answers"/>
-                       <field name="perc_done" select="2"/>
-                    <field name="perc_cancel" select="2"/>
-                    <field name="delay_close"/>
-                </field>
-            </field>
-        </record>
-
-        <record id="view_report_crm_opportunity_section_graph" model="ir.ui.view">
-            <field name="name">report.crm.opportunity.section.graph</field>
-            <field name="model">report.crm.opportunity.section</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Opportunity by Section" type="bar">
-                    <field name="name"/>
-                    <field name="nbr_cases" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-               <record id="view_report_crm_opportunity_section_filter" model="ir.ui.view">
-            <field name="name">report.crm.opportunity.section.select</field>
-            <field name="model">report.crm.opportunity.section</field>
-            <field name="inherit_id" ref="view_report_crm_case_section_filter"/>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <field name="nbr_cases" position="before">
-                </field>
-            </field>
-        </record>
-
-        <record id="action_report_crm_opportunity_section_tree" model="ir.actions.act_window">
-            <field name="name">Opportunity by Section</field>
-            <field name="res_model">report.crm.opportunity.section</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="view_id" ref="view_report_crm_opportunity_section_graph"/>
-            <field name="search_view_id" ref="view_report_crm_opportunity_section_filter"/>
-        </record>
-        <menuitem action="action_report_crm_opportunity_section_tree" id="menu_crm_opportunity_section_tree" parent="menu_crm_opportunity_tree"/>
-        -->
         <menuitem name="Opportinities" action="action_report_crm_opportunity_tree" id="menu_crm_opportunity_tree" parent="crm.next_id_52"/>        
        </data>
 </openerp>

diff --git a/addons/report_crm/report_crm_phonecall_view.xml b/addons/report_crm/report_crm_phonecall_view.xml
index 99dfc65..d1264f1 100644 (file)
--- a/addons/report_crm/report_crm_phonecall_view.xml
+++ b/addons/report_crm/report_crm_phonecall_view.xml
@@ -82,7 +82,7 @@
         </record>
         
         <record id="action_report_crm_phonecall" model="ir.actions.act_window">
-            <field name="name">Phone calls by User and Section</field>
+            <field name="name">Phone calls</field>
             <field name="res_model">report.crm.phonecall</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
@@ -96,59 +96,8 @@
                <field name="view_id" ref="view_crm_phonecall_tree"/>
                <field name="act_window_id" ref="action_report_crm_phonecall"/>
            </record>        
-              
-        <menuitem name="Phone Calls" id="menu_crm_phonecalls_tree" parent="crm.next_id_52"/>
-        <menuitem action="action_report_crm_phonecall" id="menu_crm_phonecall_tree" parent="menu_crm_phonecalls_tree"/>
         
-<!--           Phone calls by Section  
-
-        <record id="view_report_crm_phonecall_section_tree" model="ir.ui.view">
-            <field name="name">report.crm.phonecall.section.tree</field>
-            <field name="model">report.crm.phonecall.section</field>
-            <field name="inherit_id" ref="view_report_crm_case_section_tree"/>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <field name="nbr_cases" position="after">
-                       <field name="avg_answers"/>
-                       <field name="perc_done" select="2"/>
-                    <field name="perc_cancel" select="2"/>
-                    <field name="delay_close"/>
-                </field>
-            </field>
-        </record>
-
-        <record id="view_report_crm_phonecall_section_graph" model="ir.ui.view">
-            <field name="name">report.crm.phonecall.section.graph</field>
-            <field name="model">report.crm.phonecall.section</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Phone calls by Section" type="bar">
-                    <field name="name"/>
-                    <field name="nbr_cases" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-               <record id="view_report_crm_phonecall_section_filter" model="ir.ui.view">
-            <field name="name">report.crm.phonecall.section.select</field>
-            <field name="model">report.crm.phonecall.section</field>
-            <field name="inherit_id" ref="view_report_crm_case_section_filter"/>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <field name="nbr_cases" position="before">
-                </field>
-            </field>
-        </record>
-
-        <record id="action_report_crm_phonecall_section_tree" model="ir.actions.act_window">
-            <field name="name">Phone calls by Section</field>
-            <field name="res_model">report.crm.phonecall.section</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="view_id" ref="view_report_crm_phonecall_section_graph"/>
-            <field name="search_view_id" ref="view_report_crm_phonecall_section_filter"/>
-        </record>
-        <menuitem action="action_report_crm_phonecall_section_tree" id="menu_crm_phonecall_section_tree" parent="menu_crm_phonecalls_tree"/>-->-->
+        <menuitem  name="Phone Calls" action="action_report_crm_phonecall" id="menu_crm_phonecall_tree" parent="crm.next_id_52"/>
         
   </data>
 </openerp>