Merge lp:~gdukai/wms/fix-837952 into lp:wms

[Dukai Gábor]

[Christophe CHAUVET (christophe-chauvet)]

Hi

Thanks thanks for submiting as a branch

on second thought, we can change this line

if 'warehouse_id' not in values or not values['warehouse_id']:

by this one

if not values.get('warehouse_id', False):

As, if key not present is return False, and if present but return False it works

Comment ?

[lp:~gdukai/wms/fix-837952]

242. By Dukai Gábor on 2011-09-02

last fix improved

[Dukai Gábor (gdukai)]

Sure, I've committed the changes.

[Christophe CHAUVET (christophe-chauvet)]

Thanks

Regards,

review: Approve

=== modified file 'wms_sale/object/picking.py'
--- wms_sale/object/picking.py	2011-03-09 13:58:38 +0000
+++ wms_sale/object/picking.py	2011-09-02 10:35:42 +0000
@@ -49,8 +49,10 @@
         purchase_obj = self.pool.get('purchase.order')
         user_obj = self.pool.get('res.users')
 
-        user = user_obj.browse(cr, uid, uid, context=context)
-        values['warehouse_id'] = user.context_warehouse_id and user.context_warehouse_id.id or False
+        if not values.get('warehouse_id', False):
+            user = user_obj.browse(cr, uid, uid, context=context)
+            values['warehouse_id'] = user.context_warehouse_id \
+                and user.context_warehouse_id.id or False
 
         ###
         ## Check if we are in sale or purchase order