From accd3b472a1b0c01e62d47cb571a68dd88238d21 Mon Sep 17 00:00:00 2001
From: Nicolas Piganeau <npi@m4x.org>
Date: Sun, 11 Jan 2015 16:02:07 +0100
Subject: [PATCH] Fix unwanted opening of stock.picking when scrapping from
 production

---
 addons/stock/wizard/stock_move.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 7016494572d..4e034be0510 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -88,16 +88,16 @@ class stock_move_scrap(osv.osv_memory):
                              context=context)
         if context.get('active_id'):
             move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
-            return {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'stock.picking',
-                'type': 'ir.actions.act_window',
-                'res_id': move.picking_id.id,
-                'context': context
-            }
-        else:
-            return {'type': 'ir.actions.act_window_close'}
+            if move.picking_id:
+                return {
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_model': 'stock.picking',
+                    'type': 'ir.actions.act_window',
+                    'res_id': move.picking_id.id,
+                    'context': context
+                }
+        return {'type': 'ir.actions.act_window_close'}