diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index eb011531ea2..c8f0020bbe4 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -388,21 +388,13 @@ class website_sale(http.Controller):
         else:
             partner_id = orm_partner.create(cr, SUPERUSER_ID, billing_info, context=context)
 
-        # set shipping_id
+        # create a new shipping partner
         shipping_id = None
         if checkout.get('shipping_different'):
             shipping_info = self.checkout_parse('shipping', checkout, True)
             shipping_info['type'] = 'delivery'
             shipping_info['parent_id'] = partner_id
-
-            domain = [(key, '_id' in key and '=' or 'ilike', value) for key, value in shipping_info.items()]
-            shipping_ids = orm_partner.search(cr, SUPERUSER_ID, domain, context=context)
-            
-            # save shipping informations
-            if shipping_ids:
-                shipping_id = shipping_ids[0]
-            else:
-                shipping_id = orm_partner.create(cr, SUPERUSER_ID, shipping_info, context)
+            shipping_id = orm_partner.create(cr, SUPERUSER_ID, shipping_info, context)
 
         order_info = {
             'partner_id': partner_id,
diff --git a/addons/website_sale/models/__init__.py b/addons/website_sale/models/__init__.py
index b2de3c5753e..ba031ee77da 100644
--- a/addons/website_sale/models/__init__.py
+++ b/addons/website_sale/models/__init__.py
@@ -1,3 +1,4 @@
 import product
 import res_config
 import sale_order
+import res_partner
diff --git a/addons/website_sale/models/product.py b/addons/website_sale/models/product.py
index e98954ea132..daa2a61c851 100644
--- a/addons/website_sale/models/product.py
+++ b/addons/website_sale/models/product.py
@@ -73,7 +73,6 @@ class product_template(osv.Model):
         return res
 
     _columns = {
-        'company_name': fields.char('Company Name'),
         'attribute_lines': fields.one2many('product.attribute.line', 'product_tmpl_id', 'Product attributes'),
         # TODO FIXME tde: when website_mail/mail_thread.py inheritance work -> this field won't be necessary
         'website_message_ids': fields.one2many(
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 747dea048a0..2831a225733 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -918,7 +918,7 @@
                           <input t-att-value="acquirer.id" type="radio" name="acquirer" t-att-checked="acquirers[0] == acquirer"/>
                           <img class="media-object" style="width: 60px; display: inline-block;"
                               t-att-title="acquirer.name"
-                              t-att-src="'/payment_%s/static/src/img/%s_icon.png' % (acquirer.name, acquirer.name)"/>
+                              t-att-src="'/payment_%s/static/src/img/%s_icon.png' % (acquirer.provider, acquirer.provider)"/>
                               <span t-field="acquirer.name"/>
                       </label>
                     </li>
diff --git a/addons/website_sale/views/views.xml b/addons/website_sale/views/views.xml
index f85be0e4651..fd7f61754f1 100644
--- a/addons/website_sale/views/views.xml
+++ b/addons/website_sale/views/views.xml
@@ -38,6 +38,17 @@
         </field>
     </record>
 
+    <record id="res_partner_form_view" model="ir.ui.view">
+        <field name="name">res.partner.form.inherit</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="arch" type="xml">
+            <field name="parent_id" position="after">
+                <field name="company_name" placeholder="Company Name" attrs="{'invisible': [('company_name','=', '')]}"/>
+            </field>
+        </field>
+    </record>
+
     <record model="ir.ui.view" id="product_pricelist_view">
         <field name="name">product.pricelist.website.form</field>
         <field name="model">product.pricelist</field>