diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 991d06379db..5e20c715342 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -196,10 +196,10 @@
                             </group>
                         </page>
                         <page string="Other Info">
-                            <field name="company_id"/>
-                            <field name="fiscal_position" groups="base.group_extended"/>
+                            <field name="company_id" widget="selection"/>
+                            <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                             <newline/>
-                            <field name="payment_term"/>
+                            <field name="payment_term" widget="selection"/>
                             <field name="name" select="2"/>
                             <newline/>
                             <field name="number" select="2"/>
@@ -213,7 +213,7 @@
                             <field colspan="4" name="comment" nolabel="1"/>
                         </page>
                         <page string="Payments">
-                            <field name="payment_ids" colspan="4" nolabel="1">
+                            <field name="payment_ids" colspan="4" nolabel="1" >
                                 <tree string="Payments">
                                     <field name="date"/>
                                     <field name="ref"/>
@@ -255,7 +255,7 @@
                         <page string="Invoice">
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="base.group_user"/>
                             <field name="name" select="2"/>
-                            <field name="payment_term"/>
+                            <field name="payment_term" widget="selection"/>
                             <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list"/>
                             <group col="1" colspan="2">
                                 <field name="tax_line" nolabel="1">
@@ -287,8 +287,8 @@
                             </group>
                         </page>
                         <page string="Other Info">
-                            <field name="company_id"/>
-                            <field name="fiscal_position" groups="base.group_extended,base.group_user"/>
+                            <field name="company_id" widget="selection"/>
+                            <field name="fiscal_position" groups="base.group_extended,base.group_user" widget="selection"/>
                             <newline/>
                             <field name="date_due" select="1"/>
                             <newline/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 7386fe0bd88..7dcfcc95475 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -120,7 +120,7 @@
                     <field name="name" select="1" colspan="4"/>
                     <field name="code" select="1"/>
                     <field name="parent_id"/>
-                    <field name="company_id" select="2"/>
+                    <field name="company_id" select="2" widget="selection"/>
                     <field name="user_type" select="1"/>
                     </group>
                     <notebook colspan="4">
@@ -534,7 +534,7 @@
                 <form string="Account Tax Code">
                     <field name="name" select="1"/>
                     <field name="code" select="1"/>
-                    <field name="company_id"/>
+                    <field name="company_id" widget="selection"/>
                     <field name="notprintable"/>
                     <field name="parent_id" select="1"/>
                     <field name="sign"/>
@@ -581,7 +581,7 @@
                 <form string="Account Tax">
                     <group colspan="4" col="6">
                         <field name="name" select="1"/>
-                        <field name="company_id"/>
+                        <field name="company_id" widget="selection"/>
                         <field name="description" select="1"/>
                         <field name="active" select="2"/>
                         <field name="tax_group" select="1"/>
@@ -1657,7 +1657,7 @@
                 <form string="Generate Chart of Accounts from a Chart Template">
                     <separator col="4" colspan="4" string="Generate Chart of Accounts from a Chart Template"/>
                     <label align="0.0" string="This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template" colspan="4"/>
-                    <field name="company_id" />
+                    <field name="company_id"  widget="selection"/>
                     <field name ="code_digits" />
                     <field name="chart_template_id"/>
                     <field name ="seq_journal" />
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index d93349d9f62..0eed352095a 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Fiscal Position">
                     <field name="name" select="1"/>
-                    <field name="company_id"/>
+                    <field name="company_id" widget="selection"/>
                     <newline/>
                     <field name="note" colspan="4"/>
                     <field name="tax_ids" colspan="4" widget="one2many_list">
@@ -75,8 +75,8 @@
                     <group col="2" colspan="2">
                         <separator string="Customer Accounting Properties" colspan="2"/>
                         <field name="property_account_receivable"/>
-                        <field name="property_account_position"/>
-                        <field name="property_payment_term"/>
+                        <field name="property_account_position" widget="selection"/>
+                        <field name="property_payment_term" widget="selection"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Supplier Accounting Properties" colspan="2"/>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 94e311db9c5..ef557688d99 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -48,7 +48,7 @@
                         <field name="name" select="1" colspan="4"/>
                         <field name="code" select="1"/>
                         <field name="parent_id" on_change="on_change_parent(parent_id)"/>
-                        <field name="company_id" select="2"/>
+                        <field name="company_id" select="2" widget="selection"/>
                         <field name="type" select="2"/>
                     </group>
                     <notebook colspan="4">
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index e63c12bf04f..0c477984351 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -30,7 +30,7 @@
                     <field name="product_id" select="2"/>
                     <field name="partner_id" select="2"/>
                     <field name="user_id" select="2"/>
-                    <field name="company_id" select="2"/>
+                    <field name="company_id" select="2" widget="selection"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
                 </form>
diff --git a/addons/account_followup/followup_view.xml b/addons/account_followup/followup_view.xml
index cd02355dc7e..ecc73f34954 100644
--- a/addons/account_followup/followup_view.xml
+++ b/addons/account_followup/followup_view.xml
@@ -45,7 +45,7 @@
             <field name="arch" type="xml">
                 <form string="Follow-Up">
                     <field name="name" select="1"/>
-                    <field name="company_id" select="1"/>
+                    <field name="company_id" select="1" widget="selection"/>
                     <separator colspan="4" string="Description"/>
                     <field colspan="4" name="description" nolabel="1" select="1"/>
                     <separator colspan="4" string="Lines"/>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 089ec8d1614..b6f42083a5c 100755
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -56,7 +56,7 @@
 							</group>
 						</page>
 						<page string="Other Info">
-							<field name="company_id" select="1"/>
+							<field name="company_id" select="1" widget="selection"/>
 							<field name="currency_id" select="1" />
 							<field name="period_id"/>
 							<field name="date" select="1"/>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 161795a89cb..260afc42d6f 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -36,7 +36,7 @@
                             <field name="sequence"/>
                             <field name="active" select="2"/>
                             <field name="user_id" select="2"/>
-                            <field name="parent_id" select="2"/>
+                            <field name="parent_id" select="2" widget="selection"/>
                             <field name="allow_unlink" select="2"/>
                             <field name="reply_to" select="2"/>
                             <field name="gateway_ids" widget="one2many_list" nolabel="1" colspan="4">
@@ -110,7 +110,7 @@
             <field name="arch" type="xml">
                 <form string="Case Category">
                     <field name="name" select="1"/>
-                    <field name="section_id" select="1"/>
+                    <field name="section_id" select="1" widget="selection"/>
                     <field name="probability"/>
                 </form>
             </field>
@@ -153,7 +153,7 @@
 
                             <separator colspan="4" string="Conditions on Case Fields"/>
                             <field name="regex_name" string="Regex on Case Name" colspan="2"/>                            
-                            <field name="trg_section_id" select="1"/>
+                            <field name="trg_section_id" select="1" widget="selection"/>
                             <field name="trg_categ_id"/>
                             <field name="trg_user_id" select="2"/>
                             <separator colspan="4" string="Conditions on Case Partner"/>
@@ -316,7 +316,7 @@
             <field name="arch" type="xml">
                 <form string="Cases">
                     <field colspan="4" name="name" select="1"/>
-                    <field colspan="2" name="section_id"/>
+                    <field colspan="2" name="section_id" widget="selection"/>
                     <field name="date" select="1"/>
                     <field name="date_deadline" select="2"/>
                     <field name="priority"/>
@@ -628,7 +628,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Email Gateway">                  
-                     <field name="section_id"/>
+                     <field name="section_id" widget="selection"/>
                       <field name="mailgateway"/>  
                      <notebook colspan="4">
                         <page string="Server Setting">                            
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index a1908c0689e..a48c54de94c 100644
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -16,7 +16,7 @@
             <form string="Bug Tracker Form">
                 <group colspan="4" col="6">
                     <field name="name" string="Title" colspan="2"/>
-                    <field name="section_id" colspan="1"/>
+                    <field name="section_id" colspan="1" widget="selection"/>
                         <label string="Resolution: " align="1.0"/>
                         <group colspan="1" col="2">
                             <field name="stage_id" select="1" nolabel="1"/>
diff --git a/addons/crm_configuration/crm_claims_view.xml b/addons/crm_configuration/crm_claims_view.xml
index b1464baad79..730072228fa 100644
--- a/addons/crm_configuration/crm_claims_view.xml
+++ b/addons/crm_configuration/crm_claims_view.xml
@@ -38,7 +38,7 @@
                     <field name="partner_id"/>
                     <field name="user_id" string="Responsible" select="2"/>
                     <newline/>
-                    <field name="section_id"/>
+                    <field name="section_id" widget="selection"/>
                     <field name="date" string="Date of Claim"/>
                     <field name="categ_id" string="Type of claim" select="1" on_change="onchange_categ_id(categ_id)"/>
                         <label string="Stage: " align="1.0"/>
@@ -102,7 +102,7 @@
                            <field name="name"/>
                            <field name="partner_id"/>
                            <field name="user_id"/>
-                           <field name="section_id"/>
+                           <field name="section_id" widget="selection"/>
                            <field name="state"/>
                         </tree>
                     </field>
diff --git a/addons/crm_configuration/crm_config_view.xml b/addons/crm_configuration/crm_config_view.xml
index a4066bdd47f..87ee5c2524e 100644
--- a/addons/crm_configuration/crm_config_view.xml
+++ b/addons/crm_configuration/crm_config_view.xml
@@ -99,7 +99,7 @@
         <field name="arch" type="xml">
             <form string="Stage">
             	<field name="name" select="1"/>
-                <field name="section_id" select="1"/>
+                <field name="section_id" select="1" widget="selection"/>
                 <field name="sequence"/>
             </form>
         </field>
diff --git a/addons/crm_configuration/crm_fund_view.xml b/addons/crm_configuration/crm_fund_view.xml
index 87919838797..9398786ec25 100644
--- a/addons/crm_configuration/crm_fund_view.xml
+++ b/addons/crm_configuration/crm_fund_view.xml
@@ -36,7 +36,7 @@
             <form string="Funds Form">
                 <group colspan="4" col="6">
                     <field name="name" select="1" string="Name" colspan="2"/>
-                    <field name="section_id" colspan="1"/>
+                    <field name="section_id" colspan="1" widget="selection"/>
                     <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)"/>
                     <newline/>
                     <field name="date" string="Next Meeting"/>
diff --git a/addons/crm_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
index 4c3f1d8ed37..bb109a3c488 100644
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -38,7 +38,7 @@
             <form string="Jobs - Recruitment Form">
                 <group colspan="4" col="7">
                     <field name="name" string="Description" colspan="2"/>
-                    <field name="section_id" colspan="1"/>
+                    <field name="section_id" colspan="1" widget="selection"/>
                     <field name="user_id" string="Responsible" select="2"/>
                     <button name="set_partner" string="Convert to Partner" icon="terp-partner"/>
                     <newline/>
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index eb171394414..5a98e4121dd 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -14,7 +14,7 @@
             <form string="Prospects Form">
                 <group colspan="4" col="7">
                     <field name="name" select="1" string="Prospect Subject"/>
-                    <field name="section_id" colspan="1"/>
+                    <field name="section_id" colspan="1" widget="selection"/>
                     <label string="Stage: " align="1.0"/>
                     <group colspan="1" col="2">
                         <field name="stage_id" select="1" nolabel="1"/>
@@ -93,7 +93,7 @@
                            <field name="name"/>
                            <field name="partner_id"/>
                            <field name="user_id"/>
-                           <field name="section_id"/>
+                           <field name="section_id" widget="selection"/>
                            <field name="state"/>
                        </tree>
                     </field>
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
index 6f5ebcd9e88..5e14263b590 100644
--- a/addons/crm_configuration/crm_meeting_view.xml
+++ b/addons/crm_configuration/crm_meeting_view.xml
@@ -13,7 +13,7 @@
             <form string="Meetings Form">
                 <group colspan="4" col="6">
                     <field name="name" select="1" string="Title"/>
-                    <field name="section_id"/>
+                    <field name="section_id" widget="selection"/>
                     <field name="user_id" select="2" string="Responsible" required="1"/>
                     <newline/>
                     <field name="date" string="Meeting Date" required="1"/>
@@ -110,7 +110,7 @@
                 <field name="id"/>
                 <field name="name" string="Title"/>
                 <field name="date" string="Next Meeting"/>
-                <field name="section_id"/>
+                <field name="section_id" widget="selection"/>
                 <field name="priority"/>
                 <field name="categ_id"/>
                 <field name="category2_id" string="Type"/>
@@ -131,7 +131,7 @@
             <calendar string="Meetings" date_start="date" color="user_id" date_delay="duration">
                 <field name="name"/>
                 <field name="partner_id"/>
-                <field name="section_id"/>
+                <field name="section_id" widget="selection"/>
             </calendar>
         </field>
     </record>
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index 45ae181368a..0e30b8cd733 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -14,7 +14,7 @@
             <form string="Opportunities">
                 <group colspan="4" col="7">
                     <field name="name" select="1" string="Opportunity" colspan="2"/>
-                    <field name="section_id" colspan="1"/>
+                    <field name="section_id" colspan="1" widget="selection"/>
                     <field name="user_id" select="2" string="Responsible"/>
                     <button string="Schedule a Phone Call"
                         name="%(wizard_crm_reschedule_phone_call)d" icon="gtk-redo" type="action" />                    
@@ -88,7 +88,7 @@
                            <field name="name"/>
                            <field name="partner_id"/>
                            <field name="user_id"/>
-                           <field name="section_id"/>
+                           <field name="section_id" widget="selection"/>
                            <field name="state"/>
                        </tree>
                     </field>
diff --git a/addons/crm_configuration/crm_phonecall_view.xml b/addons/crm_configuration/crm_phonecall_view.xml
index 8b7a0605754..74b4f91de37 100644
--- a/addons/crm_configuration/crm_phonecall_view.xml
+++ b/addons/crm_configuration/crm_phonecall_view.xml
@@ -36,7 +36,7 @@
             <form string="Claims">
                 <group colspan="4" col="7">
                     <field name="name" string="Subject"/>
-                    <field name="section_id" colspan="1"/>
+                    <field name="section_id" colspan="1" widget="selection"/>
                     <field name="user_id" string="Assigned to" select="2"/>
                     <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"/>                    
                     <newline/>
diff --git a/addons/crm_configuration/crm_report_view.xml b/addons/crm_configuration/crm_report_view.xml
index bd6c39d552e..49f38b25c3a 100644
--- a/addons/crm_configuration/crm_report_view.xml
+++ b/addons/crm_configuration/crm_report_view.xml
@@ -31,7 +31,7 @@
             <form string="Cases by Section and Category2">
                 <field name="name"/>
                 <field name="user_id"/>
-                <field name="section_id" select="1"/>
+                <field name="section_id" select="1" widget="selection"/>
                 <field name="category2_id" select="1"/>
                 <field name="stage_id"/>
                 <field name="amount_revenue"/>
@@ -98,7 +98,7 @@
             <form string="Cases by Section and Stage">
                 <field name="name"/>
                 <field name="user_id"/>
-                <field name="section_id" select="1"/>
+                <field name="section_id" select="1" widget="selection"/>
                 <field name="stage_id"/>
                 <field name="amount_revenue"/>
                 <field name="nbr" select="1"/>
@@ -163,7 +163,7 @@
             <form string="Cases by Section, Category and Stage">
                 <field name="name"/>
                 <field name="user_id"/>
-                <field name="section_id" select="1"/>
+                <field name="section_id" select="1" widget="selection"/>
                 <field name="categ_id"/>
                 <field name="stage_id"/>
                 <field name="nbr" select="1"/>
@@ -217,7 +217,7 @@
             <form string="Cases by Section, Category and Type">
                 <field name="name"/>
                 <field name="user_id"/>
-                <field name="section_id" select="1"/>
+                <field name="section_id" select="1" widget="selection"/>
                 <field name="categ_id"/>
                 <field name="category2_id"/>
                 <field name="stage_id"/>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 2bd219dcf7d..7c6b2bccc9e 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -14,7 +14,7 @@
             <field name="arch" type="xml">
                 <form string="department">
 					<field colspan="4" name="name" select="1"/>
-					<field name="company_id" select="1"/>
+					<field name="company_id" select="1" widget="selection"/>
 					<field name="parent_id" select="2"/>
 					<field colspan="4" name="manager_id" select="1"/>
                     <notebook colspan="4" >
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 10a6c6b5d85..a46ea40193d 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -27,7 +27,7 @@
                     <group colspan="4" col="4">
                         <field name="name" select="1"/>
                         <field name="active" select="1"/>
-                        <field name="company_id"/>
+                        <field name="company_id" widget="selection"/>
                         <field name="user_id"/>
                     </group>
                     <notebook colspan="4">
@@ -59,7 +59,7 @@
                                 <separator string="Job Information" colspan="4"/>
                                 <field name="parent_id" select="1" colspan="4"/>
 
-                                <field name="category_id" colspan="4"/>
+                                <field name="category_id" colspan="4" widget="selection"/>
                             </group>
                         </page>
                         <page string="Notes">
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index 78796226ba5..3b87ba5a29a 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -176,7 +176,7 @@
                 <form string="Leave Type">
                     <field colspan="4" name="name" select="1"/>
                     <field name="color_name" select="2"/>
-                    <field name="section_id"  select="1" />
+                    <field name="section_id"  select="1" widget="selection"/>
                     <field name="limit" select="2"/>
                     <field name="active" select="2"/>
                 </form>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index ebbbbe5912b..c2e4877a7bd 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -12,7 +12,7 @@
                     <group colspan="4" col="4">
                         <separator colspan="4" string="Invoicing Data"/>
                         <field name="pricelist_id"/>
-                        <field name="to_invoice"/>
+                        <field name="to_invoice" widget="selection" />
                         <field name="amount_max"/>
                         <field name="amount_invoiced"/>
                         <separator colspan="4" string="Status"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 04a93ac71ee..e5d54196622 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -830,7 +830,7 @@
                 <form string="Minimum Stock Rules">
                     <field name="name" select="1"/>
                     <field name="active" select="1"/>
-                    <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" 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="product_id" on_change="onchange_product_id(product_id)" select="1"/>
                     <field name="product_uom"/>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 528e3ecde22..7b55f92dcf8 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -124,7 +124,7 @@
                             <group colspan="2" col="2" name="misc">
                                 <separator string="Miscelleanous" colspan="2"/>
                                 <field name="active" select="2"/>
-                                <field name="company_id" select="2" groups="base.group_extended"/>
+                                <field name="company_id" select="2" groups="base.group_extended" widget="selection"/>
                             </group>
 
                         </page>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e51112c6af3..48ad064a7d5 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -380,7 +380,7 @@
                                 <field name="date_close" select="2"/>
                             </group>
                             <separator string="Miscelleanous" colspan="4"/>
-                            <field name="type"/>
+                            <field name="type" 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 d1a8199428a..a5052ab11b8 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -40,7 +40,7 @@
                         <field name="date_order" select="2"/>
                         <field name="invoiced" select="2"/>
                         <newline/>
-                        <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)"/>
+                        <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
                         <field name="origin" select="2"/>
                         <field name="shipped" select="2"/>
                     </group>
@@ -87,13 +87,13 @@
                                 <separator string="Delivery" colspan="2"/>
                                 <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
                                 <field name="minimum_planned_date"/>
-                                <field name="location_id"/>
+                                <field name="location_id" widget="selection"/>
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Invoice Control" colspan="2"/>
                                 <field name="invoice_method"/>
                                 <field name="invoice_id" readonly="1"/>
-                                <field name="fiscal_position" groups="base.group_extended"/>
+                                <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                             </group>
                             <newline/>
                             <separator string="Purchase Control" colspan="4"/>
diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml
index adab1dd04d1..947a457c289 100644
--- a/addons/report_crm/report_crm_view.xml
+++ b/addons/report_crm/report_crm_view.xml
@@ -33,7 +33,7 @@
                 <form string="Cases by User and Section">
                     <field name="name" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="section_id" select="1"/>
+                    <field name="section_id" select="1" widget="selection"/>
                     <field name="nbr" select="1"/>
                     <field name="state" select="1"/>
                 </form>
@@ -123,7 +123,7 @@
                 <form string="Cases by User and Section">
                     <field name="name" select="1"/>
                     <field name="categ_id" select="1"/>
-                    <field name="section_id" select="1"/>
+                    <field name="section_id" select="1" widget="selection"/>
                     <field name="nbr" select="1"/>
                     <field name="state" select="1"/>
                 </form>
diff --git a/addons/report_task/report_task_view.xml b/addons/report_task/report_task_view.xml
index 72da41da245..d40be3a38c9 100644
--- a/addons/report_task/report_task_view.xml
+++ b/addons/report_task/report_task_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Tasks by User">
                     <field name="user_id" select="1"/>
-                    <field name="company_id" select="1"/>
+                    <field name="company_id" select="1" widget="selection"/>
                     <field name="task_nbr" select="2"/>
                     <field name="task_hrs" select="2"/>
                     <field name="task_progress" select="2"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c6e617ae623..8fb380643e5 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Sale Shop">
                     <field name="name" select="1"/>
-                    <field name="warehouse_id" required="1" select="1"/>
+                    <field name="warehouse_id" required="1" select="1" widget="selection"/>
                     <separator colspan="4" string="Accounting"/>
                     <field name="payment_default_id"/>
                     <field domain="[('type','=','sale')]" name="pricelist_id" select="1"/>
@@ -97,7 +97,7 @@
                         <field name="name" select="1"/>
                         <field name="client_order_ref" select="2"/>
                         <field name="shipped" select="2"/>
-                        <field name="shop_id" on_change="onchange_shop_id(shop_id)" select="2"/>
+                        <field name="shop_id" on_change="onchange_shop_id(shop_id)" select="2" widget="selection"/>
                         <field name="date_order" select="1"/>
                         <field name="invoiced" select="2"/>
                     </group>
@@ -206,8 +206,8 @@
                             <field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
                             <field groups="base.group_extended" name="origin"/>
                             <field groups="base.group_extended" name="invoice_quantity" attrs="{'readonly':[('order_policy','=','prepaid'),('order_policy','=','picking')]}"/>
-                            <field name="payment_term"/>
-                            <field name="fiscal_position" groups="base.group_extended"/>
+                            <field name="payment_term" widget="selection"/>
+                            <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                             <separator colspan="4" string="Notes"/>
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index 7c329d98e71..84109a8802b 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -14,8 +14,8 @@
 				<page string="Sales &amp; Purchases" position="inside">
 					<group colspan="2" col="2">
 						<separator string="Stock Properties" colspan="2"/>
-						<field name="property_stock_customer"/>
-						<field name="property_stock_supplier"/>
+						<field name="property_stock_customer" widget="selection"/>
+						<field name="property_stock_supplier" widget="selection"/>
 					</group>
                 </page>
             </field>
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 5c6503d949a..f229ed236a6 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -225,6 +225,7 @@ class product_template(osv.osv):
             string="Procurement Location",
             method=True,
             view_load=True,
+            domain=[('usage','like','procurement')],
             help="For the current product (template), this stock location will be used, instead of the default one, as the source location for stock moves generated by procurements"),
         'property_stock_production': fields.property(
             'stock.location',
@@ -233,6 +234,7 @@ class product_template(osv.osv):
             string="Production Location",
             method=True,
             view_load=True,
+            domain=[('usage','like','production')],
             help="For the current product (template), this stock location will be used, instead of the default one, as the source location for stock moves generated by production orders"),
         'property_stock_inventory': fields.property(
             'stock.location',
@@ -241,6 +243,7 @@ class product_template(osv.osv):
             string="Inventory Location",
             method=True,
             view_load=True,
+            domain=[('usage','like','inventory')],
             help="For the current product (template), this stock location will be used, instead of the default one, as the source location for stock moves generated when you do an inventory"),
         'property_stock_account_input': fields.property('account.account',
             type='many2one', relation='account.account',
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 92fe8d54ea6..cc807731241 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -42,9 +42,9 @@
                  <page position="after" string="Information">
                     <page string="Properties">
                         <separator string="Counter-Part Locations Properties" colspan="4"/>
-                        <field name="property_stock_procurement"/>
-                        <field name="property_stock_production"/>
-                        <field name="property_stock_inventory"/>
+                        <field name="property_stock_procurement"  widget="selection"/>
+                        <field name="property_stock_production"  widget="selection"/>
+                        <field name="property_stock_inventory"  widget="selection"/>
                         <separator string="Accounting Entries" colspan="4"/>
                         <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
@@ -99,9 +99,9 @@
                 <group name="store" position="after">
                     <group col="2" colspan="2" name="store">
                         <separator string="Counter-Part Locations Properties" colspan="2"/>
-                        <field name="property_stock_procurement"/>
-                        <field name="property_stock_production"/>
-                        <field name="property_stock_inventory"/>
+                        <field name="property_stock_procurement" widget="selection" domain="[('usage','=','procurement')]"/>
+                        <field name="property_stock_production" widget="selection"/>
+                        <field name="property_stock_inventory" widget="selection"/>
                     </group>
                 </group>
             </field>