Merge lp:~unifield-team/unifield-wm/uf-2179 into lp:unifield-wm

[jftempo]

=== modified file 'specific_rules/stock.py'
--- specific_rules/stock.py	2015-11-09 09:46:22 +0000
+++ specific_rules/stock.py	2016-01-22 15:33:21 +0000
@@ -244,17 +244,29 @@
     _inherit = 'stock.inventory.line'
     
     def _get_error_msg(self, cr, uid, ids, field_name, args, context=None):
+        prodlot_obj = self.pool.get('stock.production.lot')
+        dt_obj = self.pool.get('date.tools')
         res = {}
         
         for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = ''
             if not line.location_id:
-                res[line.id] = 'You must define a stock location'
+                res[line.id] = _('You must define a stock location')
             if line.hidden_batch_management_mandatory and not line.prodlot_name:
-                res[line.id] = 'You must define a batch number'
+                res[line.id] = _('You must define a batch number')
             elif line.hidden_perishable_mandatory and not line.expiry_date:
-                res[line.id] = 'You must define an expiry date'
-        
+                res[line.id] = _('You must define an expiry date')
+            elif line.prodlot_name and line.expiry_date and line.product_id:
+                prodlot_ids = prodlot_obj.search(cr, uid, [
+                    ('name', '=', line.prodlot_name),
+                    ('product_id', '=', line.product_id.id),
+                ], context=context)
+                if prodlot_ids:
+                    prodlot = prodlot_obj.browse(cr, uid, prodlot_ids[0], context=context)
+                    life_date = dt_obj.get_date_formatted(cr, uid, datetime=prodlot.life_date)
+                    if prodlot.life_date != line.expiry_date:
+                        res[line.id] = _('The batch number \'%s\' is already in the system but its expiry date is %s') % (line.prodlot_name, life_date)
+
         return res
     
     _columns = {