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

[Dukai Gábor]

Unmerged revisions

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

[FIX] move.check_assign() didn't update uos

=== modified file 'wms/object/move.py'
--- wms/object/move.py	2011-08-25 07:59:37 +0000
+++ wms/object/move.py	2011-09-06 12:25:36 +0000
@@ -169,19 +169,39 @@
                     #in the same order. This is e.g. the case when using the button 'split in two' of
                     #the stock outgoing form
                     r = res.pop(0)
-                    self.write(cr, uid, move.id, {'location_id': r[1], 'product_qty': r[0], 'state': 'assigned'})
+                    values =  {
+                        'location_id': r[1],
+                        'product_qty': r[0],
+                        'state': 'assigned'
+                    }
+                    values.update(self.onchange_quantity(cr, uid, [move.id],
+                        move.product_id.id, r[0], move.product_uom.id,
+                        move.product_uos.id)['value'])
+                    self.write(cr, uid, move.id, values)
                     done.append(move.id)
                     pickings[move.picking_id.id] = 1
                     total_qty -= r[0]
 
                     while res:
                         r = res.pop(0)
-                        move_id = self.copy(cr, uid, move.id, {'product_qty': r[0], 'location_id': r[1]})
+                        values = {'product_qty': r[0], 'location_id': r[1]}
+                        values.update(self.onchange_quantity(cr, uid,
+                            [move.id], move.product_id.id, r[0],
+                            move.product_uom.id, move.product_uos.id)['value'])
+                        move_id = self.copy(cr, uid, move.id, values)
                         done.append(move_id)
                         total_qty -= r[0]
 
                     if total_qty > 0:
-                        move_id = self.copy(cr, uid, move.id, {'product_qty': total_qty, 'location_id': original_location_id, 'state': 'confirmed'}, context=context)
+                        values = {
+                            'product_qty': total_qty,
+                            'location_id': original_location_id,
+                            'state': 'confirmed'
+                        }
+                        values.update(self.onchange_quantity(cr, uid,
+                            [move.id], move.product_id.id, total_qty,
+                            move.product_uom.id, move.product_uos.id)['value'])
+                        move_id = self.copy(cr, uid, move.id, values, context=context)
 
         if done:
             count += len(done)