Merge lp:~openbig/bigconsulting/packging_quantity into lp:bigconsulting

[gpa(OpenERP)]

solve the bug of 616640

=== modified file 'packing_barcode_check/wizard/scan_product.py'
--- packing_barcode_check/wizard/scan_product.py	2010-07-22 15:43:40 +0000
+++ packing_barcode_check/wizard/scan_product.py	2010-08-13 14:21:42 +0000
@@ -40,7 +40,8 @@
     picking_id = data['ids']
     form_ean = data['form']['ean']
     stock_move_ids = stock_move_obj.search(cr, uid, [('picking_id','=',picking_id[0])])
-
+    pick_data = pool.get("stock.picking").browse(cr, uid, picking_id[0]).tobe_scan_ids
+    
     for move_id in stock_move_ids:
         move_data = stock_move_obj.browse(cr, uid,move_id)
         if move_data.product_qty == move_data.scaned_qty:
@@ -48,11 +49,19 @@
         for ean_id in move_data.product_id.packaging:
             ean_data = pool.get("product.packaging").browse(cr, uid, ean_id.id)
             product_ean = ean_data.ean
+            quantity = ean_data.qty
             if product_ean == form_ean:
                 if move_data.product_id.track_production:
                     return 'scan_product_number'
                 else:
-                    stock_move_obj.write(cr, uid, [move_id],{'scaned_qty':move_data.scaned_qty+1}, context=context)
+                    for pick in pick_data:
+                        if pick.product_name.id == move_data.product_id.id:
+                            check_qty = pick.quantity - pick.scan_quantity
+                            if check_qty < ean_data.qty:
+                                raise osv.except_osv(_('Warning!'),
+                                     _('Unscanned quantity does not match with the product packaging quantity'))
+
+                    stock_move_obj.write(cr, uid, [move_id],{'scaned_qty':move_data.scaned_qty+quantity}, context=context)
                     return 'init'
     else:
         raise osv.except_osv(_('Warning!'),
@@ -81,10 +90,19 @@
             call_product_scan = 1
             if stock_lot_ids:
                 for stock_move_obj in move_obj.browse(cr, uid, stock_lot_ids, context):
+                    for ean_id in stock_move_obj.product_id.packaging:
+                        ean_data = pool.get("product.packaging").browse(cr, uid, ean_id.id)
+                        product_ean = ean_data.ean
+                        quantity = ean_data.qty
                     if stock_move_obj.product_qty == stock_move_obj.scaned_qty:
                         call_product_scan = 1
                         continue
-                    move_obj.write(cr, uid, [stock_move_obj.id],{'scaned_qty':stock_move_obj.scaned_qty+1}, context=context)
+                    if pick.product_name.id == stock_move_obj.product_id.id:
+                        check_qty = pick.quantity - pick.scan_quantity
+                        if check_qty < quantity:
+                            raise osv.except_osv(_('Warning!'),
+                                 _('Unscanned quantity does not match with the product packaging quantity'))    
+                    move_obj.write(cr, uid, [stock_move_obj.id],{'scaned_qty':stock_move_obj.scaned_qty+quantity}, context=context)
                     call_product_scan = 2
                     if stock_move_obj.product_qty >= stock_move_obj.scaned_qty+1:
                         call_product_scan = 1