From cac70450e0331daee3193b7a38d8d59a5f3ad81c Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Wed, 11 Sep 2013 11:56:05 +0200
Subject: [PATCH] [IMP] Push apply has to take into account routes from
 categories

bzr revid: jco@openerp.com-20130911095605-5g21o94170cpll48
---
 addons/stock/stock_view.xml             |  3 ++-
 addons/stock_location/stock_location.py | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 95f6a2880f5..69b20c02fda 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -605,7 +605,8 @@
                     <notebook>
                         <page string="Products">
                             <field name="pack_operation_exist" invisible="1"/>
-                            <button name="action_pack" string="Create Package" type="object" attrs="{'invisible': ['|',('pack_operation_exist', '=', False),('state', 'not in', ('draft','assigned','confirmed'))]}"/>
+                            <button name="action_pack" string="Create Package" type="object" attrs="{'invisible': ['|',('pack_operation_exist', '=', False),('state', 'not in', ('draft','assigned','confirmed'))]}"
+                                groups="stock.group_tracking_lot"/>
                             <button name="do_split" string="Split" groups="base.group_no_one" type="object" attrs="{'invisible': ['|',('pack_operation_exist', '=', False),('state','!=','assigned')]}"/>
                             <field name="pack_operation_ids" attrs="{'invisible': [('pack_operation_exist', '=', False)]}">
                                 <tree editable="top">
diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index 9fba12f6bdf..f7f99a457f4 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -244,16 +244,16 @@ class stock_move(osv.osv):
     }
 
     def _push_apply(self, cr, uid, moves, context):
+        categ_obj = self.pool.get("product.category")
+        push_obj = self.pool.get("stock.location.path")
         for move in moves:
             if not move.move_dest_id:
-                for route in move.product_id.route_ids:
-                    found = False
-                    for rule in route.push_ids:
-                        if rule.location_from_id.id == move.location_dest_id.id:
-                            self.pool.get('stock.location.path')._apply(cr, uid, rule, move, context=context)
-                            found = True
-                            break
-                    if found: break
+                categ_id = move.product_id.categ_id.id
+                routes = [x.id for x in move.product_id.route_ids] + categ_obj.calculate_total_routes(cr, uid, [categ_id], False, False, context=context)[categ_id]
+                rules = push_obj.search(cr, uid, [('route_id', 'in', routes), ('location_from_id', '=', move.location_dest_id.id)], context=context)
+                if rules: 
+                    rule = push_obj.browse(cr, uid, rules[0], context=context)
+                    push_obj._apply(cr, uid, rule, move, context=context)
         return True
 
     # Create the stock.move.putaway records