Merge lp:~alexaubin/unifield-server/US-3252 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/kit/kit.py'
--- bin/addons/kit/kit.py	2016-08-18 08:32:03 +0000
+++ bin/addons/kit/kit.py	2017-11-28 10:56:17 +0000
@@ -297,21 +297,56 @@
             prodlot_id = datas[0]['composition_lot_id'][0]
         # update the context with needed data
         context.update(kit_id=kit_id, product_id=product_id, prodlot_id=prodlot_id)
-        
+
         return context
-    
+
+    def assert_available_stock(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
+        assert isinstance(ids, list)
+
+        for kit in self.browse(cr, uid, ids, context=context):
+
+            def qty_available(id_):
+                request_context = context.copy()
+                request_context.update({ 'states': ('done',),
+                                         'what': ('in', 'out'),
+                                         'location_usage': ['internal'],
+                                         'location_category': ['stock', 'consumption_unit'] })
+                return self.pool.get("product.product").get_product_available(cr, uid, [id_], context=request_context)[id_]
+
+            # For kits with a batch, take the stock of the batch
+            # Otherwise, take the global stock of the product
+            if kit.composition_reference:
+                product_id = kit.composition_product_id.id
+            else:
+                product_id = kit.composition_lot_id.id
+
+            stock = qty_available(product_id)
+
+            if stock <= 0:
+                raise osv.except_osv(_('Error'),
+                                     _('This kit product / batch is not available in stock !'))
+
+
     def substitute_items(self, cr, uid, ids, context=None):
         '''
         substitute lines from the composition kit with created new lines
         '''
+
         # we need the context for the wizard switch
         if context is None:
             context = {}
+
+        self.assert_available_stock(cr, uid, ids, context=context)
+
         # data
         name = _("Substitute Kit Items")
         model = 'substitute'
         step = 'substitute' # this value is used in substitute wizard for attrs of src location
         wiz_obj = self.pool.get('wizard')
+
         # get a context with needed data
         wiz_context = self._get_new_context(cr, uid, ids, context=dict(context))
         # open the selected wizard
@@ -336,6 +371,9 @@
         # we need the context for the wizard switch
         if context is None:
             context = {}
+
+        self.assert_available_stock(cr, uid, ids, context=context)
+
         # data
         name = _("De-Kitting")
         model = 'substitute'

=== modified file 'bin/addons/kit/wizard/substitute.py'
--- bin/addons/kit/wizard/substitute.py	2016-08-18 08:32:03 +0000
+++ bin/addons/kit/wizard/substitute.py	2017-11-28 10:56:17 +0000
@@ -51,25 +51,33 @@
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
-            
+
         for obj in self.browse(cr, uid, ids, context=context):
             for item in obj.composition_item_ids:
                 # integrity is not met
                 if item.integrity_status_func_substitute_item != 'empty':
                     return False
-        
+
         return True
-    
+
     def validate_item_from_stock(self, cr, uid, ids, context=None):
         '''
         both integrity and availability must be OK
-        
+
         'availability_status_func_substitute_item'
         'integrity_status_func_substitute_item'
-        
+
         return True or False
         '''
+        if context is None:
+            context = {}
+
+        kit_obj = self.pool.get('composition.kit')
+
         for obj in self.browse(cr, uid, ids, context=context):
+
+            kit_obj.assert_available_stock(cr, uid, [obj.kit_id.id], context=context)
+
             for item in obj.replacement_item_ids:
                 # integrity is not met
                 if item.integrity_status_func_substitute_item != 'empty':
@@ -376,36 +384,12 @@
             available_qty = res['value']['qty_substitute_item']
             if available_qty < 1.0:
                 # we display the back button - hide close button
-                return self.confirmation_de_kitting(cr, uid, ids, context=dict(context, display_back_confirm=True, display_close_confirm=False))
+                raise osv.except_osv(_("Error"),
+                                     _("The Kit \'%s\' is not available from selected source location \'%s\'"
+                                     %(obj.product_id_substitute.name, obj.source_location_id.name)))
             else:
                 return self._do_de_kitting(cr, uid, ids, context=context)
-    
-    def confirmation_de_kitting(self, cr, uid, ids, context=None):
-        '''
-        open confirmation wizard
-        '''
-        # objects
-        wiz_obj = self.pool.get('wizard')
-        
-        # to de kitting
-        for obj in self.browse(cr, uid, ids, context=context):
-            # data
-            name = _("The Kit \'%s\' is not available from selected source location \'%s\'. Are you sure you want to process the Dekitting?")%(obj.product_id_substitute.name, obj.source_location_id.name)
-            model = 'confirm'
-            step = context.get('step', 'default')
-            question = 'The Kit \'%s\' is not available from selected source location \'%s\'. Are you sure you want to process the Dekitting?'
-            clazz = 'substitute'
-            func = '_do_de_kitting'
-            args = [ids]
-            kwargs = {}
-            # open the selected wizard - context['active_ids']
-            res = wiz_obj.open_wizard(cr, uid, context['active_ids'], name=name, model=model, step=step, context=dict(context, question=question,
-                                                                                                    callback={'clazz': clazz,
-                                                                                                              'func': func,
-                                                                                                              'args': args,
-                                                                                                              'kwargs': kwargs}))
-        return res
-    
+
     def _do_de_kitting(self, cr, uid, ids, context=None):
         '''
         de-kitting method

=== modified file 'bin/addons/stock/product.py'
--- bin/addons/stock/product.py	2016-08-26 14:25:42 +0000
+++ bin/addons/stock/product.py	2017-11-28 10:56:17 +0000
@@ -216,6 +216,15 @@
                             order='NO_ORDER', context=context)
             else:
                 location_ids = context['location']
+        elif context.get('location_category', False) and context.get('location_usage', False):
+            location_category = context.get('location_category')
+            location_usage = context.get('location_usage')
+            assert isinstance(location_category, list)
+            assert isinstance(location_usage, list)
+            location_ids = stock_location_obj.search(cr, uid,
+                        [('location_category','in', location_category),
+                         ('usage', 'in', location_usage)],
+                        order='NO_ORDER', context=context)
         else:
             location_ids = []
             wids = stock_warehouse_obj.search(cr, uid, [], order='NO_ORDER', context=context)