From 63986a8d02cff1ea8a6a5351d965cdb2e0be22ed Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Tue, 29 Apr 2014 11:23:07 +0200
Subject: [PATCH 1/2] [FIX] outgoing error in claim + receptions should be
 incoming

bzr revid: jco@openerp.com-20140429092307-q1ug4hng4kevcswm
---
 addons/claim_from_delivery/claim_delivery_view.xml | 2 +-
 addons/stock/product_view.xml                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/claim_from_delivery/claim_delivery_view.xml b/addons/claim_from_delivery/claim_delivery_view.xml
index 069c52cdadc..99adac8c913 100644
--- a/addons/claim_from_delivery/claim_delivery_view.xml
+++ b/addons/claim_from_delivery/claim_delivery_view.xml
@@ -17,7 +17,7 @@
             <field name="arch" type="xml">
                 <xpath expr="/form/sheet/h1" position="before">
                     <div class="oe_right oe_button_box">
-                        <button name="%(action_claim_from_delivery)d" string="Claims" type="action" attrs="{'invisible': [('picking_type_id.code', '=', 'outgoing')]}"/>
+                        <button name="%(action_claim_from_delivery)d" string="Claims" type="action"/>
                     </div>
                 </xpath>
             </field>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 0230b34ff5d..aaecf4e48e2 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -75,7 +75,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain" eval="[('picking_id.picking_type_id.code','=','outgoing'), ('location_id.usage','!=','internal'), ('location_dest_id.usage', '=', 'internal')]"/>
+            <field name="domain" eval="[('picking_id.picking_type_id.code','=','incoming'), ('location_id.usage','!=','internal'), ('location_dest_id.usage', '=', 'internal')]"/>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context" eval="'{\'search_default_product_id\': [active_id]}'"/>
             <field name="help" type="html">

From bd88fcd759e2477f3221e5b55f25392c066ab52e Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Wed, 30 Apr 2014 14:12:41 +0200
Subject: [PATCH 2/2] [IMP] Bar code scanning check if packing or lot needed,
 should work through has_group instead of settings

bzr revid: jco@openerp.com-20140430121241-wo78a9odt4bamru2
---
 addons/stock/stock.py | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7d3dba2f47b..96f42a7b996 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -720,23 +720,11 @@ class stock_picking(osv.osv):
 
     def check_group_lot(self, cr, uid, context=None):
         """ This function will return true if we have the setting to use lots activated. """
-        settings_obj = self.pool.get('stock.config.settings')
-        config_ids = settings_obj.search(cr, uid, [], limit=1, order='id DESC', context=context)
-        #If we don't have updated config until now, all fields are by default false and so should be not dipslayed
-        if not config_ids:
-            return False
-        stock_settings = settings_obj.browse(cr, uid, config_ids[0], context=context)
-        return stock_settings.group_stock_production_lot
+        return self.pool.get('res.users').has_group(cr, uid, 'stock.group_production_lot')
 
     def check_group_pack(self, cr, uid, context=None):
         """ This function will return true if we have the setting to use package activated. """
-        settings_obj = self.pool.get('stock.config.settings')
-        config_ids = settings_obj.search(cr, uid, [], limit=1, order='id DESC', context=context)
-        #If we don't have updated config until now, all fields are by default false and so should be not dipslayed
-        if not config_ids:
-            return False
-        stock_settings = settings_obj.browse(cr, uid, config_ids[0], context=context)
-        return stock_settings.group_stock_tracking_lot
+        return self.pool.get('res.users').has_group(cr, uid, 'stock.group_tracking_lot')
 
     def action_assign_owner(self, cr, uid, ids, context=None):
         for picking in self.browse(cr, uid, ids, context=context):