Merge lp:~openerp-dev/openobject-addons/6.1-bug-1084412-dhs into lp:openobject-addons/6.1

[Dhruti Shastri(OpenERP)]

Unmerged revisions

7092. By Dhruti Shastri(OpenERP) on 2012-12-05

[FIX][sale] : product_qty on invoice takes the quantities from pickings canceled

=== modified file 'sale/sale.py'
--- sale/sale.py	2012-10-09 12:16:14 +0000
+++ sale/sale.py	2012-12-05 10:41:27 +0000
@@ -1019,8 +1019,14 @@
                     return line.product_uos_qty or 0.0
                 return line.product_uom_qty
             else:
-                return self.pool.get('procurement.order').quantity_get(cr, uid,
-                        line.procurement_id.id, context=context)
+                cancel_moves = 0.0
+                for moves in line.move_ids:
+                    if moves.state == 'cancel':
+                        cancel_moves += moves.product_qty
+                return line.product_uom_qty - cancel_moves
+                                    
+            return self.pool.get('procurement.order').quantity_get(cr, uid,
+                         line.procurement_id.id, context=context)
 
         def _get_line_uom(line):
             if (line.order_id.invoice_quantity=='order') or not line.procurement_id: