diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index bd1c7b8fd8b..7807da48746 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -86,7 +86,7 @@
                                         <newline/>
                                         <field name="unit_amount"/>
                                         <field name="unit_quantity"/>
-                                        <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)" widget="selection"/>
+                                        <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)"/>
                                     </group>
                                     <group colspan="2" col="2" groups="analytic.group_analytic_accounting">
                                         <separator string="Customer Project" colspan="2"/>
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index a5d53fbf31d..351e5fc8d2d 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -321,6 +321,15 @@ class mrp_bom(osv.osv):
                 result = result + res[0]
                 result2 = result2 + res[1]
         return result, result2
+    
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        if context is None:
+            context = {}
+        bom_data = self.read(cr, uid, id, [], context=context)
+        default.update({'name': bom_data['name'] + _(' (copy)')})
+        return super(mrp_bom, self).copy_data(cr, uid, id, default, context=context)
 
 mrp_bom()
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 14d0d11e7ea..1eb8570ca29 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -324,11 +324,11 @@
                         <field name="code" select="1" string="Reference" groups="base.group_extended"/>
                         <newline/>
                         <field name="product_qty"/>
-                        <field name="product_uom" widget="selection"/>
-                        <field name="routing_id" widget="selection" groups="base.group_extended"/>
+                        <field name="product_uom"/>
+                        <field name="routing_id"  groups="base.group_extended"/>
                         <newline/>
                         <field name="product_uos_qty" groups="product.group_uos" />
-                        <field name="product_uos" widget="selection" groups="product.group_uos"/>
+                        <field name="product_uos"  groups="product.group_uos"/>
                         <newline/>
                         <field name="type" groups="base.group_extended"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
@@ -569,8 +569,8 @@
                         <field name="origin"/>
                         <field name="product_id" on_change="product_id_change(product_id)"/>
                         <field name="product_qty"/>
-                        <group colspan="2" col="3">
-                        <field name="product_uom" widget="selection"/>
+                        <group colspan="2" col="4">
+                        <field name="product_uom"/>
                         <button type="action"
                             icon="terp-accessories-archiver+"
                             name="%(mrp.action_change_production_qty)d"
@@ -584,7 +584,7 @@
                     <notebook colspan="4">
                         <page string="Consumed Products">
                             <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
-                            <field name="routing_id" groups="base.group_extended" select="1" widget="selection"/>
+                            <field name="routing_id" groups="base.group_extended" select="1"/>
                             <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
                             <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                             <separator string="" colspan="4"/>
@@ -594,7 +594,7 @@
                                 <tree colors="blue:state in ('draft');black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
                                     <field name="product_id" />
                                     <field name="product_qty"  string="Qty"/>
-                                    <field name="product_uom"  string="UOM" widget="selection"/>
+                                    <field name="product_uom"  string="UOM"/>
                                     <field name="location_id"  string="Source Loc."/>
                                     <field name="state" invisible="1"/>
                                     <button name="%(stock.move_consume)d"
@@ -613,7 +613,7 @@
                                    <tree colors="red:scrapped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel') " string="Consumed Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
                                        <field name="product_qty" readonly="1" string="Qty"/>
-                                       <field name="product_uom" readonly="1" string="UOM" widget="selection"/>
+                                       <field name="product_uom" readonly="1" string="UOM"/>
                                        <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
                                        <field name="prodlot_id" context="{'product_id': product_id}"/>
                                        <field name="state" invisible="1"/>
@@ -634,7 +634,6 @@
                             <group col="9" colspan="4">
                                 <field name="state"/>
                                 <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
-                                <button name="action_compute" states="draft" string="Compute Data" type="object" icon="terp-stock_format-scientific"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
                                 <button name="button_produce" states="ready" string="Start Production" icon="terp-gtk-jump-to-ltr"/>
                                 <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
@@ -648,7 +647,7 @@
                                 <tree string="Products to Finish">
                                     <field name="product_id" />
                                     <field name="product_qty"  string="Qty"/>
-                                    <field name="product_uom"  string="UOM" widget="selection"/>
+                                    <field name="product_uom"  string="UOM"/>
                                     <field name="location_id"  string="Source Loc." />
                                     <field name="state" invisible="1"/>
                                     <button name="%(stock.action_partial_move)d" 
@@ -667,7 +666,7 @@
                                    <tree colors="red:scrapped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
                                        <field name="product_qty" readonly="1" string="Qty"/>
-                                       <field name="product_uom" readonly="1" string="UOM" widget="selection"/>
+                                       <field name="product_uom" readonly="1" string="UOM"/>
                                        <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
                                        <field name="prodlot_id" context="{'product_id': product_id}"/>
                                        <field name="scrapped" invisible="1"/>
@@ -681,6 +680,10 @@
                                </field>
                         </page>
                         <page string="Work Orders" groups="base.group_extended">
+                            <button name="action_compute" states="draft"
+                                string="Compute Data" type="object"
+                                icon="terp-stock_format-scientific"
+                                colspan="4" />
                             <field colspan="4" name="workcenter_lines" nolabel="1">
                                 <form string="Production Work Centers">
                                     <field colspan="4" name="name"/>
@@ -699,6 +702,10 @@
                             </field>
                         </page>
                         <page string="Scheduled Products">
+                            <button name="action_compute" states="draft"
+                                string="Compute Data" type="object"
+                                icon="terp-stock_format-scientific"
+                                colspan="4" />
                             <field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/>
                         </page>
                         <page string="Extra Information">
@@ -906,7 +913,7 @@
 
         <act_window
             domain="[('bom_id','=',False)]"
-            context="{'search_default_product_id': [active_id]}"
+            context="{'search_default_product_id': [active_id],'default_product_id':active_id}"
             id="act_product_product_2_mrp_bom"
             name="Bill of Materials"
             res_model="mrp.bom"
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 96b96f3af21..a2274d3326a 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -63,10 +63,10 @@
                         <field name="product_id" on_change="onchange_product_id(product_id)"/>
                         <field name="location_id" domain="[('usage','=','internal')]"/>
                         <field name="product_qty"/>
-                        <field name="product_uom" widget="selection"/>
+                        <field name="product_uom"/>
 
                         <field name="product_uos_qty" groups="product.group_uos,base.group_extended"/>
-                        <field name="product_uos" widget="selection" groups="product.group_uos,base.group_extended"/>
+                        <field name="product_uos"  groups="product.group_uos,base.group_extended"/>
 
                         <separator colspan="4" string="Status"/>
                         <field colspan="4" name="message" readonly="1"/>
diff --git a/addons/product/product.py b/addons/product/product.py
index 2b99f48a062..e28fd175dc7 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -450,6 +450,7 @@ class product_product(osv.osv):
     _description = "Product"
     _table = "product_product"
     _inherits = {'product.template': 'product_tmpl_id'}
+    _order = 'default_code'
     _columns = {
         'qty_available': fields.function(_product_qty_available, method=True, type='float', string='Real Stock'),
         'virtual_available': fields.function(_product_virtual_available, method=True, type='float', string='Virtual Stock'),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index a78de705e57..b92abe65dd2 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -117,8 +117,8 @@
 
                             <group colspan="2" col="2" name="uom">
                                 <separator string="Unit of Measure" colspan="2"/>
-                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" widget="selection"/>
-                                <field name="uom_po_id" widget="selection" groups="base.group_extended"/>
+                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
+                                <field name="uom_po_id" groups="base.group_extended"/>
                             </group>
 
                             <group colspan="2" col="2" name="uos" groups="product.group_uos">
@@ -459,7 +459,7 @@
                     <field name="product_name" groups="base.group_extended"/>
                     <field name="product_code" groups="base.group_extended"/>
                     <field name="min_qty"/>
-                    <field name="product_uom" widget="selection"/>
+                    <field name="product_uom"/>
                     <field name="delay"/>
                     <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">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index eeb0a92d019..b649e7feec8 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -694,7 +694,7 @@
                                                 string="Scrap" type="action" groups="base.group_extended"
                                                 icon="gtk-convert" context="{'scrap': True}"
                                                 states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        <field name="product_uom" string="Unit Of Measure" widget="selection" colspan="4"/>
+                                        <field name="product_uom" string="Unit Of Measure" colspan="4"/>
                                         <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
                                         <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
                                         <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]" colspan="4"/>
@@ -887,7 +887,7 @@
                                                 string="Scrap" type="action"
                                                 icon="gtk-convert" context="{'scrap': True}"
                                                 states="draft,waiting,confirmed,assigned" colspan="1" groups="base.group_extended"/>
-                                        <field name="product_uom" string="Unit Of Measure" widget="selection" colspan="4" />
+                                        <field name="product_uom" string="Unit Of Measure" colspan="4" />
                                         <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4" />
                                         <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4" />
                                         <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]" colspan="4" />
@@ -1107,7 +1107,7 @@
                                                 string="Scrap" type="action" groups="base.group_extended"
                                                 icon="gtk-convert" context="{'scrap': True}"
                                                 states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        <field name="product_uom" string="Unit Of Measure" widget="selection" colspan="4"/>
+                                        <field name="product_uom" string="Unit Of Measure" colspan="4"/>
                                         <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
                                         <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
                                         <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]" colspan="4"/>
@@ -1362,7 +1362,7 @@
                     <group colspan="4" col="7">
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                        <field name="product_uom" string="Unit Of Measure" widget="selection"/>
+                        <field name="product_uom" string="Unit Of Measure"/>
                         <button name="%(stock.move_scrap)d" groups="base.group_extended"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
@@ -1558,7 +1558,7 @@
                     <group colspan="4" col="7">
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                        <field name="product_uom" string="Unit Of Measure" widget="selection"/>
+                        <field name="product_uom" string="Unit Of Measure"/>
                         <button name="%(stock.move_scrap)d" groups="base.group_extended"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"