From c50d33cb0f089b3be7745b1c39d9ca3402f44e40 Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Mon, 4 Nov 2013 13:00:08 +0100
Subject: [PATCH] [IMP] Improve and fix module stock according to APR Review
 20131030

bzr revid: jke@openerp.com-20131104120008-80g7julsalf041ki
---
 addons/stock/res_config_view.xml                     | 6 ------
 addons/stock/stock.py                                | 5 +++--
 addons/stock/stock_view.xml                          | 4 ++--
 addons/stock_complex_routes/stock_complex_routes.xml | 2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index befc46c1cf4..2ce88479c9a 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -70,12 +70,6 @@
                                 <field name="group_stock_multiple_locations" class="oe_inline"/>
                                 <label for="group_stock_multiple_locations"/>  
                             </div>
-                            <!-- TODOJKE TO REMOVE 
-                            <div>
-                                <field name="module_stock_location" class="oe_inline"/>
-                                <label for="module_stock_location"/>
-                            </div>
-                            -->
                             <div>
                                 <field name="module_claim_from_delivery" class="oe_inline"/>
                                 <label for="module_claim_from_delivery"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 3582d9683b3..1401b22a321 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2242,8 +2242,9 @@ class stock_warehouse(osv.osv):
 
     def onchange_filter_default_resupply_wh_id(self, cr, uid, ids, default_resupply_wh_id, resupply_wh_ids, context=None):
         resupply_wh_ids = set([x['id'] for x in (self.resolve_2many_commands(cr, uid, 'resupply_wh_ids', resupply_wh_ids, ['id']))])
-        resupply_wh_ids.add(default_resupply_wh_id)
-        resupply_wh_ids = list(resupply_wh_ids)
+        if default_resupply_wh_id: #If we are removing the default resupply, we don't have default_resupply_wh_id 
+            resupply_wh_ids.add(default_resupply_wh_id)
+        resupply_wh_ids = list(resupply_wh_ids)        
         return {'value': {'resupply_wh_ids': resupply_wh_ids}}
 
     def _get_inter_wh_location(self, cr, uid, warehouse, context=None):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9e794b89084..e576811ea44 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1394,7 +1394,7 @@
             <field name="arch" type="xml">
                 <tree string="Picking Types">
                     <field name="complete_name"/>
-                    <field name="sequence_id"/>
+                    <field name="sequence_id" string="Reference Sequence"/>
                     <field name="pack"/>
                 </tree>
             </field>
@@ -1408,7 +1408,7 @@
                         <group>
                             <group>
                                 <field name="name"/>
-                                <field name="sequence_id"/>
+                                <field name="sequence_id" string="Reference Sequence" />
                                 <field name="warehouse_id"/>
                                 <field name="pack"/>
                             </group>
diff --git a/addons/stock_complex_routes/stock_complex_routes.xml b/addons/stock_complex_routes/stock_complex_routes.xml
index 189b80cdfc1..5268702adcf 100644
--- a/addons/stock_complex_routes/stock_complex_routes.xml
+++ b/addons/stock_complex_routes/stock_complex_routes.xml
@@ -12,7 +12,7 @@
         
         
         <record id="picking_type_dropship" model="stock.picking.type">
-            <field name="name">dropship</field>
+            <field name="name">Dropship</field>
             <field name="sequence_id" ref="seq_picking_type_dropship"/>
             <field name="code_id">incoming</field>
             <field name="default_location_dest_id" ref="stock.stock_location_suppliers"/>