Merge lp:~openerp-dev/openobject-addons/7.0-opw-596801-chandni into lp:openobject-addons/7.0

[Chandni Machchhar(OpenERP)]

Hello,

I have fixed the product quantity and UOS, which displayed wrong in stock.picking.out.

Problem :

After validating POS, the delivery order created and in line (stock.moves) the UOS and product quantity displayed is wrong.

Thanks,
Chandni.

Unmerged revisions

9415. By Chandni Machchhar(OpenERP) on 2013-09-05

[FIX] POS : Wrong Product quantity and UOS displayed in stock.picking.out.

=== modified file 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py	2013-09-04 14:06:28 +0000
+++ point_of_sale/point_of_sale.py	2013-09-05 13:43:19 +0000
@@ -709,11 +709,11 @@
                 move_obj.create(cr, uid, {
                     'name': line.name,
                     'product_uom': line.product_id.uom_id.id,
-                    'product_uos': line.product_id.uom_id.id,
+                    'product_uos': line.product_id.uos_id.id,
                     'picking_id': picking_id,
                     'product_id': line.product_id.id,
                     'product_uos_qty': abs(line.qty),
-                    'product_qty': abs(line.qty),
+                    'product_qty': line.qty * (line.product_id.uos_id and line.product_id.uos_coeff or 1),
                     'tracking_id': False,
                     'state': 'draft',
                     'location_id': location_id,