Merge lp:~openerp-dev/openobject-addons/6.0-opw-16347-skh into lp:openobject-addons/6.0

[Somesh Khare]

Hello Sir,

[Fix] : Wrong product quantities in Invoice lines Reference with the OPW case: 16347.

Thanks,
SKH

=== modified file 'stock/stock.py'
--- stock/stock.py	2011-07-20 05:43:46 +0000
+++ stock/stock.py	2011-07-22 12:46:37 +0000
@@ -437,7 +437,6 @@
                        """,
                        (id, id, product_id))
             results += cr.dictfetchall()
-
             total = 0.0
             results2 = 0.0
 
@@ -1067,7 +1066,6 @@
                 uos_id = move_line.product_uos and move_line.product_uos.id or False
                 if not uos_id and inv_type in ('out_invoice', 'out_refund'):
                     uos_id = move_line.product_uom.id
-
                 account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, partner.property_account_position, account_id)
                 invoice_line_id = invoice_line_obj.create(cr, uid, {
                     'name': name,
@@ -1925,11 +1923,11 @@
                     done.append(move.id)
                     pickings[move.picking_id.id] = 1
                     r = res.pop(0)
-                    cr.execute('update stock_move set location_id=%s, product_qty=%s where id=%s', (r[1], r[0], move.id))
+                    cr.execute('update stock_move set location_id=%s, product_qty=%s , product_uos_qty=%s where id=%s', (r[1], r[0], r[0] * move.product_id.uos_coeff, move.id))
 
                     while res:
                         r = res.pop(0)
-                        move_id = self.copy(cr, uid, move.id, {'product_qty': r[0], 'location_id': r[1]})
+                        move_id = self.copy(cr, uid, move.id, {'product_qty': r[0],'product_uos_qty': r[0] * move.product_id.uos_coeff,'location_id': r[1]})
                         done.append(move_id)
         if done:
             count += len(done)