[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9686 rev-id: dle@openerp...

bzr revid: dle@openerp.com-20131210160657-c88vzssdkvfi6n96

diff --cc addons/crm/crm_lead_view.xml
index 36a7e91,7c087eb..4bfa0c4
--- 1/addons/crm/crm_lead_view.xml
--- 2/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@@ -410,10 -409,10 +410,10 @@@
                          <group>
                              <group>
                                  <field name="partner_id"
 -                                    on_change="onchange_partner_id(partner_id, email_from)"
 +                                    on_change="on_change_partner_id(partner_id)"
                                      string="Customer"
                                      context="{'default_name': partner_name, 'default_email': email_from, 'default_phone': phone}"/>
-                                 <field name="email_from" string="Email"/>
+                                 <field name="email_from" string="Email" widget="email"/>
                                  <field name="phone"/>
                              </group>
  

diff --cc addons/stock/stock_view.xml
Simple merge