Merge lp:~unifield-team/unifield-wm/wm-2418-rw-fix into lp:unifield-wm

[Quentin THEURET @Amaris]

=== modified file 'delivery_mechanism/delivery_mechanism.py'
--- delivery_mechanism/delivery_mechanism.py	2014-07-24 12:09:53 +0000
+++ delivery_mechanism/delivery_mechanism.py	2014-08-06 12:52:43 +0000
@@ -694,8 +694,11 @@
 
                     remaining_out_qty = line.quantity
                     out_move = None
-                    for out_move in out_moves:
-                        out_move = move_obj.browse(cr, uid, out_move.id, context=context)
+                    for lst_out_move in out_moves:
+                        if remaining_out_qty <= 0.00:
+                            break
+
+                        out_move = move_obj.browse(cr, uid, lst_out_move.id, context=context)
 
                         # List the Picking Ticket that need to be created from the Draft Picking Ticket
                         if out_move.picking_id.type == 'out' \
@@ -732,15 +735,25 @@
                             })
                             move_obj.write(cr, uid, [out_move.id], out_values, context=context)
                             processed_out_moves.append(out_move.id)
+                            remaining_out_qty = 0.00
                         else:
                             # Just update the data of the initial out move
+                            processed_qty = lst_out_move is out_moves[-1] and uom_partial_qty or out_move.product_qty
                             out_values.update({
-                                'product_qty': uom_partial_qty,
+                                'product_qty': processed_qty,
                                 'product_uom': line.uom_id.id,
                                 'in_out_updated': sync_in and False or True
                             })
                             move_obj.write(cr, uid, [out_move.id], out_values, context=context)
                             processed_out_moves.append(out_move.id)
+                            
+                            if line.uom_id.id != out_move.product_uom.id:
+                                uom_processed_qty = uom_obj._compute_qty(cr, uid, out_move.product_uom.id, processed_qty, line.uom_id.id)
+                            else:
+                                uom_processed_qty = processed_qty
+
+                            remaining_out_qty -= uom_processed_qty
+
 
                 # Decrement the inital move, cannot be less than zero
                 diff_qty = move.product_qty - count

=== modified file 'msf_outgoing/msf_outgoing.py'
--- msf_outgoing/msf_outgoing.py	2014-07-28 15:51:36 +0000
+++ msf_outgoing/msf_outgoing.py	2014-08-06 12:52:43 +0000
@@ -101,7 +101,7 @@
     a shipment presents the data from grouped stock moves in a 'sequence' way
     '''
     _name = 'shipment'
-    _description = 'represents a group of pack families'
+    _description = 'Shipment'
 
     def copy(self, cr, uid, copy_id, default=None, context=None):
         '''
@@ -945,7 +945,7 @@
             #assert shipment.state == 'packed', 'cannot ship a shipment which is not in correct state - packed - %s' % shipment.state
             if shipment.state != 'packed':
                 raise osv.except_osv(_('Error, packing in wrong state !'),
-                    _('Cannot make a shipment which is in a wrong correct state - should be "packed" but here it is ' + shipment.state))
+                    _('Cannot make a shipment which is in a wrong correct state - should be "packed" but here it is - %s' % shipment.state))
 
             # the state does not need to be updated - function
             # update actual ship date (shipment_actual_date) to today + time