Merge lp:~openerp-dev/openobject-addons/6.1-opw-581987-rgo into lp:openobject-addons/6.1

[Ravi Gohil (OpenERP)]

Hello,

Currently, there is no restriction on UoM for stock.inventory.line or stock.move objects, one can select any UoM whose UoM category is not same as previous one's.

To reproduce, go to "Warehouse/Inventory Control/Physical Inventories" and in Inventory lines and Stock Moves, you can set the UoM to any type.

To fix this, I introduced "_constraints" for both the objects that will restrict users from setting Product UoM of different UoM category.

This fix also restricts user from altering the records of inventory(inventory lines, stock move) after confirming it.

Kindly review the fix.

Thanks.

[lp:~openerp-dev/openobject-addons/6.1-opw-581987-rgo]

7091. By Launchpad Translations on behalf of openerp on 2012-12-04

Launchpad automatic translations update.

7092. By Ravi Gohil (OpenERP) on 2012-12-04

[FIX] stock: There is no restriction on UoM for stock moves and stock inventory lines and one can modify the records after confirming the inventory, which shouldn't be allowed : (Maintenance Case : 581987)

Unmerged revisions

7092. By Ravi Gohil (OpenERP) on 2012-12-04

[FIX] stock: There is no restriction on UoM for stock moves and stock inventory lines and one can modify the records after confirming the inventory, which shouldn't be allowed : (Maintenance Case : 581987)

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-10-05 07:47:57 +0000
+++ stock/stock.py	2012-12-04 07:02:20 +0000
@@ -1614,6 +1614,12 @@
                 return False
         return True
 
+    def _check_uom(self, cr, uid, ids, context=None):
+        for move in self.browse(cr, uid, ids, context=context):
+            if move.product_id.uom_id.category_id.id != move.product_uom.category_id.id:
+                return False
+        return True
+
     _constraints = [
         (_check_tracking,
             'You must assign a production lot for this product',
@@ -1622,7 +1628,9 @@
             ['location_id','location_dest_id']),
         (_check_product_lot,
             'You try to assign a lot which is not from the same product',
-            ['prodlot_id'])]
+            ['prodlot_id']),
+        (_check_uom, 'UoM categories Mismatch: The move UOM and the product UOM must be in the same category.',
+            ['product_uom'])]
 
     def _default_location_destination(self, cr, uid, context=None):
         """ Gets default address of partner for destination location
@@ -2619,8 +2627,8 @@
         'name': fields.char('Inventory Reference', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date': fields.datetime('Creation Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date_done': fields.datetime('Date done'),
-        'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', states={'done': [('readonly', True)]}),
-        'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'),
+        'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', readonly=True, states={'draft': [('readonly', False)]}),
+        'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves', readonly=True, states={'draft': [('readonly', False)]}),
         'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('confirm','Confirmed'),('cancel','Cancelled')), 'State', readonly=True, select=True),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
 
@@ -2758,6 +2766,17 @@
         'state': fields.related('inventory_id','state',type='char',string='State',readonly=True),
     }
 
+    def _check_uom(self, cr, uid, ids, context=None):
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.product_id.uom_id.category_id.id != line.product_uom.category_id.id:
+                return False
+        return True
+
+    _constraints = [
+        (_check_uom, 'UoM categories Mismatch: The line UOM and the product UOM must be in the same category.',
+            ['product_uom'])
+    ]
+
     def on_change_product_id(self, cr, uid, ids, location_id, product, uom=False, to_date=False):
         """ Changes UoM and name if product_id changes.
         @param location_id: Location id