diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index bcda66e8679..0e044d3a347 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -248,7 +248,7 @@
                         <field name="name" select="1"/>
                         <field name="code" select="1" string="Reference" groups="base.group_extended"/>
                         <newline/>
-                        <field name="product_uom" widget="selection"/>
+                        <field name="product_uom"/>
                         <field name="product_qty"/>
                         <field name="routing_id" widget="selection" groups="base.group_extended"/>
                         <newline/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index ecf09f4ae53..525dbee024b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -477,10 +477,11 @@ class stock_picking(osv.osv):
             'internal': _('Internal picking'),
             'delivery': _('Delivery order')
         }
+        new_id = super(stock_picking, self).create(cr, user, vals, context)
         if not vals.get('auto_picking', False):
             message = type_list.get(vals.get('type', False), _('Picking')) + " '" + (vals['name'] or "n/a") + "' "+ _("created.")
-            self.log(cr, user, id, message)
-        return super(stock_picking, self).create(cr, user, vals, context)
+            self.log(cr, user, new_id, message)
+        return new_id
 
     _columns = {
         'name': fields.char('Reference', size=64, select=True),