diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index aca58156c0c..41c1c3ff4d3 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -63,7 +63,7 @@
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_user"/>
                             <newline/>
                             <field name="price_subtotal"/>
-                            <field name="company_id" groups="base.group_multi_company"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
                         </page>
                         <page string="Notes">
@@ -118,7 +118,7 @@
                     <field name="name"/>
                     <field name="type"/>
                     <field name="number"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field name="partner_id" groups="base.group_user"/>
                     <field name="amount_untaxed" sum="Untaxed amount"/>
                     <field name="amount_total" sum="Total amount"/>
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index c8513b6ee36..44cf3afde69 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -42,7 +42,7 @@
             <field name="arch" type="xml">
                 <tree string="Fiscal Position">
                     <field name="name"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 3cdd2b3187a..b66baa75d0b 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -270,7 +270,7 @@
                     <field name="code" select="1"/>
                     <field name="type" select="2"/>
                     <field name="active" select="2"/>
-                    <field name="company_id"/>
+                    <field name="company_id" widget="selection"/>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 793b9ba643d..af4df969e9f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -110,7 +110,7 @@
                         <field name="name" select="1"/>
                         <field name="code" select="1"/>
                         <field name="active" select="2"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Work Center">
@@ -239,7 +239,7 @@
                       <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
                       <field name="name" select="1"/>
                       <field name="code" select="1"/>
-                      <field name="company_id" select="1" groups="base.group_multi_company"/>
+                      <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
                     <field name="product_uom"/>
@@ -456,7 +456,7 @@
                         <button type="action" name="%(mrp.wizard_change_production_qty)d" string="Change Qty" states="ready,confirmed,in_production" icon="gtk-ok"/>
                         <field name="product_uos_qty" groups="product.group_uos"/>
                         <field name="product_uos" groups="product.group_uos"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
 
                     <notebook colspan="4">
@@ -685,7 +685,7 @@
                         <separator colspan="2" string="References"/>
                         <field name="name" select="1" string="Requisition Reason"/>
                         <field name="origin" select="2"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator colspan="2" string="Planification"/>
@@ -824,7 +824,7 @@
                     <field name="active" select="1"/>
                     <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" select="1" widget="selection"/>
                     <field name="location_id" select="2"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     <field name="product_id" on_change="onchange_product_id(product_id)" select="1"/>
                     <field name="product_uom"/>
                     <field name="product_min_qty"/>
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 92d1591e0a4..df83c9253cf 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -15,7 +15,7 @@
                     <field colspan="4" name="pricelist_id" select="1"/>
                     <field name="date_start" select="1"/>
                     <field name="date_end" select="1"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field colspan="4" name="items_id" nolabel="1" widget="one2many_list"/>
                 </form>
             </field>
@@ -70,7 +70,7 @@
                     <field name="product_id" on_change="product_id_change(product_id)" select="1"/>
                     <field name="product_tmpl_id" select="1"/>
                     <field name="categ_id" select="1"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <newline/>
                     <field name="min_quantity"/>
                     <field name="sequence"/>
@@ -117,7 +117,7 @@
                     <field name="active" select="1"/>
                     <field name="type" select="1"/>
                     <field name="currency_id" select="1"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field colspan="4" name="version_id" nolabel="1">
                         <form string="Pricelist Version">
                             <field name="name" select="1"/>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index db167cfdd33..f472e40fe36 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -408,7 +408,7 @@
                     <field name="product_code"/>
                     <field name="delay"/>
                     <field name="qty"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field colspan="4" groups="base.group_extended" name="pricelist_ids" nolabel="1" widget="one2many_list">
                         <tree editable="bottom" string="Pricelist">
                             <field name="min_quantity"/>
@@ -433,7 +433,7 @@
                     <field name="delay"/>
                     <field name="qty"/>
                     <field name="product_code"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0279367c248..d074da533bf 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -23,7 +23,7 @@
                     <notebook colspan="4">
                         <page string="Administration">
                             <field name="warn_manager"/>
-                            <field name="company_id" select="1" groups="base.group_multi_company"/>
+                            <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                             <field name="priority"/>
                             <field name="timesheet_id"/>
                             <field name="active" select="2"/>
@@ -175,7 +175,7 @@
                     <field name="hours" select="1" widget="float_time"/>
                     <field name="date" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </form>
             </field>
         </record>
@@ -334,7 +334,7 @@
                             </group>
                             <separator string="Miscelleanous" colspan="4"/>
                             <field name="type" widget="selection"/>
-                            <field name="company_id" select="1" groups="base.group_multi_company"/>
+                            <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                             <field name="active" select="2"/>
                             <field name="partner_id" select="2"/>
                             <separator colspan="4" string="Notes"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 407dd8613dc..966c331a95e 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -43,7 +43,7 @@
                         <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
                         <field name="origin" select="2"/>
                         <field name="shipped" select="2"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Purchase Order">
@@ -160,7 +160,7 @@
                 <tree string="Purchase Order">
                     <field name="name" string="Reference"/>
                     <field name="date_order"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field name="minimum_planned_date"/>
                     <field name="partner_id"/>
                     <field name="location_id"/>
@@ -187,7 +187,7 @@
                             <field colspan="4" name="name"/>
                             <field name="date_planned"/>
                             <field name="price_unit"/>
-                            <field name="company_id" groups="base.group_multi_company"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="price_subtotal" readonly="1"/>
                         </page>
                         <page string="Notes">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index a2a19bc81ab..1ca092441ad 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -131,7 +131,7 @@
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position)"
                                                 domain="[('product_id','=',product_id)]"
                                                 groups="base.group_extended"/>
-                                            <field name="company_id" groups="base.group_multi_company"/>
+                                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                                             <separator colspan="4" string="Manual Description"/>
                                             <field colspan="4" name="name" select="2"/>
                                             <field name="price_unit" select="2"/>
@@ -355,7 +355,7 @@
                             <field name="product_uom"/>
                             <field name="product_id" readonly="1" select="1"/>
                             <field name="invoiced" select="2"/>
-                            <field name="company_id" groups="base.group_multi_company"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <separator colspan="4" string="Manual Designation"/>
                             <field colspan="4" name="name" select="2"/>
                             <field name="price_unit" select="2"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3f1e7eef33f..b2fdd20c635 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -57,7 +57,7 @@
                 <form string="Lot Inventory">
                     <field name="name" select="1"/>
                     <field name="date" select="1"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     <notebook colspan="4">
                     <page string="General Informations">
                         <field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list"/>
@@ -335,7 +335,7 @@
                     <field name="name" select="1"/>
                     <field name="active" select="2"/>
                     <field name="usage" select="1"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     <field name="account_id" select="1"/>
                     <field name="location_id"/>
                     <field name="address_id" context="{'contact_display':'partner'}"/>
@@ -417,7 +417,7 @@
                     <field name="lot_input_id"/>
                     <field name="lot_stock_id"/>
                     <field name="lot_output_id"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     <newline/>
                     <field name="partner_address_id" context="{'contact_display':'partner'}"/>
                 </form>
@@ -523,7 +523,7 @@
                         <field name="name" readonly="1"/>
                         <field name="date"/>
                         <field name="min_date" select="2"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
@@ -643,7 +643,7 @@
                         <field name="min_date" select="1"/>
                         <field name="backorder_id" select="2" readonly="1"/>
                         <field name="origin" select="2"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                         <notebook colspan="4">
                         <page string="General Information">
@@ -800,7 +800,7 @@
                         <field name="invoice_state"/>
                         <field name="backorder_id" select="2" readonly="1"/>
                         <field name="origin" select="2" readonly="1"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
@@ -876,7 +876,7 @@
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="address_id" select="1"/>
-                        <field name="company_id" select="1"/>
+                        <field name="company_id" select="1" widget="selection"/>
                    </group>
                 </search>
             </field>
@@ -945,7 +945,7 @@
                         <field name="name" readonly="1" select="1"/>
                         <field name="min_date" select="2" readonly="1"/>
                         <field name="backorder_id" select="2" readonly="1"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
@@ -1024,7 +1024,7 @@
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="address_id" select="1"/>
-                        <field name="company_id" select="1"/>
+                        <field name="company_id" select="1" widget="selection"/>
                    </group>
                 </search>
             </field>
@@ -1072,7 +1072,7 @@
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="address_id" select="1"/>
-                        <field name="company_id" select="1"/>
+                        <field name="company_id" select="1" widget="selection"/>
                    </group>
                 </search>
             </field>
@@ -1138,7 +1138,7 @@
                     <field name="product_uos" select="2"/>
                     <field colspan="4" name="name" select="2"/>
                     <field name="date"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     <field name="date_planned"/>
                     <field name="priority"/>
                     <field name="address_id" select="2" context="{'contact_display':'partner'}"/>