Merge lp:~openerp-dev/openobject-addons/6.1-opw-572997-xal into lp:openobject-addons/6.1

[Xavier ALT]

Hello,

Forward-port of v6.0 fix made by Amit, see original merge comment below:

[FIX] stock : Fixing a uos qty problem

Steps:
1). Create a product with default_uom = g, quantity = 4000
2). Create sale order with above product with Quantity(UOM) = 4000 g, Quantity(UOS)=4 kg
3). Confirm the sale order, Open the related delivery order
4). Process it with Quantity = 500 g
5). Open the current delivery order line you will see the Quantity(UOM) = 3500 g and
Quantity(UOS) = 3500 kg, Quantity(UOS) should be 3.5 kg
6). Open the related backorder same issue here.

[lp:~openerp-dev/openobject-addons/6.1-opw-572997-xal]

6774. By Xavier ALT on 2012-04-30

[FIX] stock: correctly convert partial picking/move product UoS quantity based on product UoM quantity

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-572997-port-mma/+merge/136599 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6774. By Xavier ALT on 2012-04-30

[FIX] stock: correctly convert partial picking/move product UoS quantity based on product UoM quantity

6773. By Xavier ALT on 2012-04-27

[FIX] stock: fix partial picking UoS convertion

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-03-29 15:29:29 +0000
+++ stock/stock.py	2012-04-30 17:25:26 +0000
@@ -24,6 +24,7 @@
 import time
 from operator import itemgetter
 from itertools import groupby
+from functools import partial
 
 from osv import fields, osv
 from tools.translate import _
@@ -1254,6 +1255,8 @@
 
 
             for move in too_few:
+                convert_to_uos = partial(uom_obj._compute_qty_obj, cr, uid, move.product_uom, context=context)
+                to_uos = move.product_uos or move.product_uom
                 product_qty = move_product_qty[move.id]
                 if not new_picking:
                     new_picking = self.copy(cr, uid, pick.id,
@@ -1265,7 +1268,7 @@
                 if product_qty != 0:
                     defaults = {
                             'product_qty' : product_qty,
-                            'product_uos_qty': product_qty, #TODO: put correct uos_qty
+                            'product_uos_qty': convert_to_uos(product_qty, to_uos),
                             'picking_id' : new_picking,
                             'state': 'assigned',
                             'move_dest_id': False,
@@ -1279,7 +1282,7 @@
                 move_obj.write(cr, uid, [move.id],
                         {
                             'product_qty' : move.product_qty - partial_qty[move.id],
-                            'product_uos_qty': move.product_qty - partial_qty[move.id], #TODO: put correct uos_qty
+                            'product_uos_qty': convert_to_uos(move.product_qty - partial_qty[move.id], to_uos),
                             
                         })
 
@@ -1291,10 +1294,12 @@
                     defaults.update({'prodlot_id': prodlot_ids[move.id]})
                 move_obj.write(cr, uid, [move.id], defaults)
             for move in too_many:
+                convert_to_uos = partial(uom_obj._compute_qty_obj, cr, uid, move.product_uom, context=context)
+                to_uos = move.product_uos or move.product_uom
                 product_qty = move_product_qty[move.id]
                 defaults = {
                     'product_qty' : product_qty,
-                    'product_uos_qty': product_qty, #TODO: put correct uos_qty
+                    'product_uos_qty': convert_to_uos(product_qty, to_uos),
                     'product_uom': product_uoms[move.id]
                 }
                 prodlot_id = prodlot_ids.get(move.id)
@@ -2562,11 +2567,13 @@
                                 })
 
         for move in too_few:
+            convert_to_uos = partial(uom_obj._compute_qty_obj, cr, uid, move.product_uom, context=context)
+            to_uos = move.product_uos or move.product_uom
             product_qty = move_product_qty[move.id]
             if product_qty != 0:
                 defaults = {
                             'product_qty' : product_qty,
-                            'product_uos_qty': product_qty,
+                            'product_uos_qty': convert_to_uos(product_qty, to_uos),
                             'picking_id' : move.picking_id.id,
                             'state': 'assigned',
                             'move_dest_id': False,
@@ -2580,15 +2587,17 @@
             self.write(cr, uid, [move.id],
                     {
                         'product_qty' : move.product_qty - product_qty,
-                        'product_uos_qty':move.product_qty - product_qty,
+                        'product_uos_qty': convert_to_uos(move.product_qty - product_qty, to_uos),
                     })
 
 
         for move in too_many:
+            convert_to_uos = partial(uom_obj._compute_qty_obj, cr, uid, move.product_uom, context=context)
+            to_uos = move.product_uos or move.product_uom
             self.write(cr, uid, [move.id],
                     {
                         'product_qty': move.product_qty,
-                        'product_uos_qty': move.product_qty,
+                        'product_uos_qty': convert_to_uos(move.product_qty, to_uos),
                     })
             complete.append(move)