[MERGE] Forward-port 8.0 up to d706adb

diff --combined addons/website/views/website_templates.xml
index 935f8ff,afc2b59..8924c07
--- 1/addons/website/views/website_templates.xml
--- 2/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@@ -129,7 -129,7 +129,7 @@@
                                      <li class="dropdown" t-ignore="true" t-if="website.user_id != user_id">
                                          <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                                              <b>
 -                                                <span t-esc="user_id.name"/>
 +                                                <span t-esc="(len(user_id.name)&gt;25) and (user_id.name[:23]+'...') or user_id.name"/>
                                                  <span class="caret"></span>
                                              </b>
                                          </a>
@@@ -152,8 -152,8 +152,8 @@@
                      </div>
                      <div class="container mt16 mb8">
                          <div class="pull-right" t-ignore="true" t-if="not editable">
-                             Create a <a href="https://www.odoo.com/page/website-builder">free website</a> with
-                             <a class="label label-danger" href="https://www.odoo.com/">Odoo</a>
+                             Create a <a href="http://www.odoo.com/page/website-builder">free website</a> with
+                             <a class="label label-danger" href="http://www.odoo.com/page/website-builder">Odoo</a>
                          </div>
                          <div class="pull-left text-muted">
                              Copyright &amp;copy; <span t-field="res_company.name">Company name</span>

diff --combined openerp/addons/base/res/res_partner_view.xml
index 4269b56,2981449..a453683
--- 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
@@@ -31,6 -31,7 +31,7 @@@
                      <group col="4">
                          <field name="name"/>
                          <field name="shortcut"/>
+                         <field name="domain"/>
                      </group>
                  </form>
              </field>
@@@ -182,8 -183,8 +183,8 @@@
                              <field name="fax"/>
                              <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>
  
@@@ -311,17 -312,12 +312,17 @@@
                                  <group>
                                      <field name="ref"/>
                                      <field name="lang"/>
 -                                    <field name="date"/>
                                  </group>
 -                                <group>
 +                            </group>
 +                            <group>
 +                                <group string="Mailing" name="mailing">
                                      <field name="active"/>
                                  </group>
                              </group>
 +                            <group>
 +                                <group name="invoicing"/>
 +                                <group name="point_of_sale"/>
 +                            </group>
                          </page>
                      </notebook>
                  </sheet>