From 3008d50bdce34d70f6482e4b659cf611e7e60d73 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Wed, 11 Sep 2013 10:56:20 +0200
Subject: [PATCH] [IMP] Add putaway / removal strategies / routes to product
 category form

bzr revid: jco@openerp.com-20130911085620-1fueywtx83jaufxf
---
 addons/stock_location/stock_location.py       |  2 +-
 addons/stock_location/stock_location_view.xml | 44 +++++++++++++++++--
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index 2247cd282a3..9fba12f6bdf 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -208,7 +208,7 @@ class product_category(osv.osv):
     _columns = {
         'route_ids': fields.many2many('stock.location.route', 'stock_location_route_categ', 'categ_id', 'route_id', 'Routes', domain="[('product_categ_selectable', '=', True)]"),
         'removal_strategy_ids': fields.one2many('product.removal', 'product_categ_id', 'Removal Strategies'),
-        #'putaway_strategy_ids': fields.one2many('product.putaway', 'product_categ_id', 'Put Away Strategies'),
+        'putaway_strategy_ids': fields.one2many('product.putaway', 'product_categ_id', 'Put Away Strategies'),
         'total_route_ids': fields.function(calculate_total_routes, relation='stock.location.route', type='many2many', string='Total routes', readonly=True),
     }
 
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index 061ec88003f..aa94e08e110 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -136,10 +136,48 @@
 			<field name="inherit_id" ref="product.product_category_form_view" />
 			<field name="arch" type="xml">
 				<xpath expr="//sheet" position="inside">
-					<group string="Strategy" colspan="4">
-						<field name="route_ids" colspan="4" widget="many2many_tags"/>
-						<field name="total_route_ids" widget="many2many_tags"/>
+					<group string="Routes" colspan="4">
+					    <div class="oe_inline">
+					        <p attrs="{'invisible':[('route_ids','=',False)]}">
+					        The routes on this category are: 
+        					<field name="route_ids" nolabel="1" widget="many2many_tags" class="oe_inline"/>
+        					</p>
+        					<p attrs="{'invisible':[('parent_id','=',False)]}">
+        					The following routes will apply to the products in this category taking into account parent categories: 
+        					<field name="total_route_ids" nolabel="1" widget="many2many_tags"/>
+        					</p>
+						</div>
 					</group>
+					<separator string="Removal Strategies"/>
+                        <div class="oe_inline">
+                        <p class="oe_grey">
+                            Removal strategies define the method used for suggesting the 
+                            location to take the products from
+                        </p>
+                        <field name="removal_strategy_ids" class ="oe_inline">
+                            <tree editable="bottom" string="removal">
+                                <field name="location_id"/>
+                                <field name="method"/>
+                            </tree>
+                        </field>
+
+                        </div>
+                        <newline/>
+                        <separator string="Putaway Strategies"/>
+                        <newline/>
+                        <div class="oe_inline">
+                        <p class="oe_grey">
+                            Putaway strategies define the method used for suggesting the 
+                            location to put the products
+                        </p>
+                        <field name="putaway_strategy_ids" class="oe_inline">
+                            <tree string="Put Away" editable="bottom">
+                                <field name="location_id"/>
+                                <field name="method"/>
+                                <field name="location_spec_id"/>
+                            </tree>
+                        </field>
+                        </div>
 				</xpath>
 			</field>
 		</record>