[MERGE] Forward-port 7.0 up to 9411a2da

diff --cc addons/product_visible_discount/product_visible_discount.py
Simple merge

diff --cc openerp/addons/base/res/res_partner_view.xml
index e658ddc,5f4cd26..3c3509b
--- 1/openerp/addons/base/res/res_partner_view.xml
--- 2/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@@ -181,10 -179,9 +182,10 @@@
                              <field name="phone" placeholder="e.g. +32.81.81.37.00"/>
                              <field name="mobile"/>
                              <field name="fax"/>
 -                            <field name="email" widget="email"/>
 +                            <field name="user_ids" invisible="1"/>
 +                            <field name="email" widget="email" attrs="{'required': [('user_ids','!=', [])]}"/>
-                             <field name="title" domain="[('domain', '=', 'contact')]"
-                                 options='{"no_open": True}' attrs="{'invisible': [('is_company','=', True)]}" />
+                             <field name="title" domain="[('domain','=','contact')]" options='{"no_open": True}' attrs="{'invisible': [('is_company','=',True)]}" context="{'default_domain': 'contact'}"/>
+                             <field name="title" domain="[('domain','=','partner')]" options='{"no_open": True}' attrs="{'invisible': [('is_company','=',False)]}" context="{'default_domain': 'partner'}"/>
                          </group>
                      </group>
  

diff --cc openerp/osv/orm.py
Simple merge