Merge

bzr revid: sbh@tinyerp.com-20100303090425-tm6e52l4in60svap

diff --cc addons/report_crm/report_crm_claim_view.xml
Simple merge

diff --cc addons/report_crm/report_crm_lead_view.xml
index 6b02792,7ed80ab..50dacf5
--- 1/addons/report_crm/report_crm_lead_view.xml
--- 2/addons/report_crm/report_crm_lead_view.xml
+++ b/addons/report_crm/report_crm_lead_view.xml
@@@ -83,8 -84,6 +83,7 @@@
                <field name="view_id" ref="view_crm_lead_graph"/>
                <field name="act_window_id" ref="action_report_crm_lead"/>
            </record>        
 +
-             
          <menuitem name="Leads" id="menu_crm_leads_tree" parent="crm.next_id_52" action="action_report_crm_lead"/>       
    </data>
  </openerp>

diff --cc addons/report_crm/report_crm_opportunity_view.xml
index 68a5c35,6b4f7db..8ddd83a
--- 1/addons/report_crm/report_crm_opportunity_view.xml
--- 2/addons/report_crm/report_crm_opportunity_view.xml
+++ b/addons/report_crm/report_crm_opportunity_view.xml
@@@ -78,7 -78,13 +78,17 @@@
                <field name="view_mode">tree</field>
                <field name="view_id" ref="view_crm_opportunity_tree"/>
                <field name="act_window_id" ref="action_report_crm_opportunity"/>
++<<<<<<< TREE
 +          </record>                
++=======
+           </record> 
+         <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_graph">
+               <field name="sequence" eval="1"/>
+               <field name="view_mode">graph</field>
+               <field name="view_id" ref="view_crm_opportunity_graph"/>
+               <field name="act_window_id" ref="action_report_crm_opportunity"/>
+           </record>  
++>>>>>>> MERGE-SOURCE
          <menuitem name="Opportinities" action="action_report_crm_opportunity" id="menu_crm_opportunity_tree" parent="crm.next_id_52"/>        
        </data>
  </openerp>