Merge lp:~qtheuret/unifield-wm/sync_ref_qt_ref_41 into lp:unifield-wm/ref-sync

[jftempo]

Unmerged revisions

430. By Quentin THEURET @Amaris on 2014-03-12

REF-41 [FIX] Remove raise statement to ignore lines with 0.00 quantity on reception

=== modified file 'sync_so/picking.py'
--- sync_so/picking.py	2014-03-11 15:19:58 +0000
+++ sync_so/picking.py	2014-03-14 08:14:53 +0000
@@ -206,7 +206,6 @@
                     # UF-2148: if the line contains 0 qty, just ignore it!
                     qty = data.get('quantity', 0)
                     if qty == 0:
-                        raise
                         message = "Line number " + str(ln) + " with quantity 0 is ignored!"
                         self._logger.info(message)
                         continue
@@ -267,23 +266,25 @@
                     line_proc_ids = move_proc.search(cr, uid, [
                         ('wizard_id', '=', in_processor),
                         ('move_id', '=', move_id),
+                        ('quantity', '=', 0.00),
                     ], context=context)
                     data['move_id'] = move_id
                     data['wizard_id'] = in_processor
                     if not line_proc_ids:
+                        data['ordered_quantity'] = data['quantity']
                         self.pool.get('stock.move.in.processor').create(cr, uid, data, context=context)
                     else:
                         for line in move_proc.browse(cr, uid, line_proc_ids, context=context):
                             if line.product_id.id == data.get('product_id') and \
                                line.uom_id.id == data.get('uom_id') and \
-                               (line.prodlot_id and line.prdolot_id.id == data.get('prodlot_id')) or (not line.prodlot_id and not data.get('prodlot_id')) and \
+                               (line.prodlot_id and line.prodlot_id.id == data.get('prodlot_id')) or (not line.prodlot_id and not data.get('prodlot_id')) and \
                                (line.asset_id and line.asset_id.id == data.get('asset_id')) or (not line.asset_id and not data.get('asset_id')):
-                                data['quantity'] += line.quantity
-                                move_proc.write(cr, uid, [line.id], {'quantity': data['quantity']}, context=context)
+                                move_proc.write(cr, uid, [line.id], data, context=context)
                                 break
                         else:
+                            data['ordered_quantity'] = data['quantity']
                             move_proc.create(cr, uid, data, context=context)
-
+                            
             # for the last Shipment of an FO, no new INcoming shipment will be created --> same value as in_id
             new_picking = self.do_incoming_shipment(cr, uid, in_processor, context)