[MERGE] jco branch with few bugfixes

bzr revid: qdp-launchpad@openerp.com-20140407175001-g4rx6rft090ul2li

addons/purchase/purchase.py

@@ -695,6 +695,7 @@ class purchase_order(osv.osv):
             'procurement_id': False,
             'origin': order.name,
             'route_ids': order.picking_type_id.warehouse_id and [(6, 0, [x.id for x in order.picking_type_id.warehouse_id.route_ids])] or [],
+            'warehouse_id':order.picking_type_id.warehouse_id.id,
         }
 
         diff_quantity = order_line.product_qty

addons/stock/procurement.py

@@ -347,7 +347,7 @@ class procurement_order(osv.osv):
         product_obj = self.pool.get('product.product')
         return product_obj._product_available(cr, uid,
                 [order_point.product_id.id],
-                {'location': order_point.location_id.id})[order_point.product_id.id]['virtual_available']
+                context={'location': order_point.location_id.id})[order_point.product_id.id]['virtual_available']
 
     def _procure_orderpoint_confirm(self, cr, uid, use_new_cursor=False, company_id=False, context=None):
         '''

addons/stock/product.py

@@ -88,7 +88,7 @@ class product_product(osv.osv):
                 wids = warehouse_obj.search(cr, uid, [], context=context)
 
             for w in warehouse_obj.browse(cr, uid, wids, context=context):
-                location_ids.append(w.lot_stock_id.id)
+                location_ids.append(w.view_location_id.id)
 
         operator = context.get('compute_child',True) and 'child_of' or 'in'
         domain = context.get('force_company', False) and ['&', ('company_id', '=', context['force_company'])] or []
@@ -136,7 +136,6 @@ class product_product(osv.osv):
 
         moves_in = dict(map(lambda x: (x['product_id'][0], x['product_qty']), moves_in))
         moves_out = dict(map(lambda x: (x['product_id'][0], x['product_qty']), moves_out))
-
         res = {}
         for id in ids:
             res[id] = {

addons/stock/stock.py

@@ -1794,14 +1794,20 @@ class stock_move(osv.osv):
             #   to receive goods without triggering the push rules again (which would duplicate chained operations)
             if not move.move_dest_id and not move.origin_returned_move_id:
                 domain = [('location_from_id', '=', move.location_dest_id.id)]
-                if move.warehouse_id:
-                    domain += ['|', ('warehouse_id', '=', move.warehouse_id.id), ('warehouse_id', '=', False)]
                 #priority goes to the route defined on the product and product category
                 route_ids = [x.id for x in move.product_id.route_ids + move.product_id.categ_id.total_route_ids]
                 rules = push_obj.search(cr, uid, domain + [('route_id', 'in', route_ids)], order='route_sequence, sequence', context=context)
                 if not rules:
-                    #but if there's no rule matching, we try without filtering on routes
-                    rules = push_obj.search(cr, uid, domain, order='route_sequence, sequence', context=context)
+                    #then we search on the warehouse if a rule can apply
+                    if move.warehouse_id:
+                        wh_route_ids = [x.id for x in move.warehouse_id.route_ids]
+                    elif move.picking_type_id and move.picking_type_id.warehouse_id:
+                        wh_route_ids = [x.id for x in move.picking_type_id.warehouse_id.route_ids]
+                    if wh_route_ids:
+                        rules = push_obj.search(cr, uid, domain + [('route_id', 'in', wh_route_ids)], order='route_sequence, sequence', context=context)
+                    if not rules:
+                        #if no specialized push rule has been found yet, we try to find a general one
+                        rules = push_obj.search(cr, uid, domain, order='route_sequence, sequence', context=context)
                 if rules:
                     rule = push_obj.browse(cr, uid, rules[0], context=context)
                     push_obj._apply(cr, uid, rule, move, context=context)
@@ -2978,6 +2984,8 @@ class stock_warehouse(osv.osv):
         wh_route_ids.append((4, crossdock_route_id))
         dummy, pull_rules_list = self._get_push_pull_rules(cr, uid, warehouse, warehouse.delivery_steps != 'ship_only' and warehouse.reception_steps != 'one_step', values, crossdock_route_id, context=context)
         for pull_rule in pull_rules_list:
+            # Fixed cross-dock is logically mto
+            pull_rule['procure_method'] = 'make_to_order'
             pull_obj.create(cr, uid, vals=pull_rule, context=context)
 
         #create route selectable on the product to resupply the warehouse from another one