[MERGE] Merged with lp:addons

bzr revid: ron@tinyerp.com-20111128051149-60x5e2nqfnwmpd7x

diff --combined addons/crm/crm_lead_view.xml
index e297642,bed2e11..fad7859
--- 1/addons/crm/crm_lead_view.xml
--- 2/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@@ -35,7 -35,7 +35,7 @@@
              <field name="res_model">crm.case.categ</field>
              <field name="view_type">form</field>
              <field name="view_id" ref="crm_case_categ_tree-view"/>
-             <field name="context">{'object_id': 'crm.lead'}</field>
+             <field name="context" eval="{'object_id': ref('model_crm_lead')}"/>
              <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
              <field name="help">Create specific categories that fit your company's activities to better classify and analyse your leads and opportunities. Such categories could for instance reflect your product structure or the different types of sales you do.</field>
          </record>
@@@ -59,11 -59,10 +59,11 @@@
                          widget="selection"
                          domain="[('object_id.model','=','crm.lead')]"/>
                      <button
 -                         name="convert_opportunity"
 +                         name="%(crm.action_crm_lead2opportunity_partner)d"
                           string="Convert to Opportunity"
                           help="Convert to Opportunity" icon="gtk-go-forward"
 -                         type="object"/>
 +                         type="action"
 +                         />
                      <newline />
                      <field name="user_id" />
                      <field name="section_id" widget="selection" />
@@@ -690,7 -689,6 +690,7 @@@
                      domain="[('state','=','pending')]"/>
                  <separator orientation="vertical"/>
                  <field name="name" string="Opportunity / Customer" filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
 +                <field name="partner_id" string="Customer / Email" filter_domain="['|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]"/>
                  <field name="user_id">
                      <filter icon="terp-personal-"
                          domain="[('user_id','=', False)]"