From d29cc529804edcdbdd6babe358327ff781738ac0 Mon Sep 17 00:00:00 2001
From: noz <noz@tinyerp.com>
Date: Thu, 10 Jun 2010 15:02:15 +0530
Subject: [PATCH 1/2] [FIX] Fixed logging of picking on creation.

bzr revid: noz@tinyerp.com-20100610093215-rvlukbhmquxxft5g
---
 addons/stock/stock.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 87d8acf05f3..b9477ddcf14 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),

From 7ec18af659d3292659a95f00dffebaf388bbac5b Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 10 Jun 2010 17:30:33 +0530
Subject: [PATCH 2/2] [MOD] mrp_bom : removed widget selection from product_uom
 field

bzr revid: vir@tinyerp.com-20100610120033-tuidb9bdobf0o3rk
---
 addons/mrp/mrp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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/>