Merge lp:~therp-nl/openobject-addons/7.0-lp1217146-fix_undefined_lot_stock_output_id into lp:openobject-addons/7.0

[Stefan Rijnhart (Opener)]

Unmerged revisions

9387. By Stefan Rijnhart (Opener) on 2013-08-27

[FIX] Cannot create new warehouse

=== modified file 'stock/stock.py'
--- stock/stock.py	2013-08-23 09:59:12 +0000
+++ stock/stock.py	2013-08-27 08:26:34 +0000
@@ -2955,12 +2955,12 @@
 
     def _default_lot_output_id(self, cr, uid, context=None):
         try:
-            lot_input_stock_model, lot_input_stock_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_output')
-            self.pool.get('stock.location').check_access_rule(cr, uid, [lot_input_stock_id], 'read', context=context)
+            lot_output_stock_model, lot_output_stock_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_output')
+            self.pool.get('stock.location').check_access_rule(cr, uid, [lot_output_stock_id], 'read', context=context)
         except (ValueError, orm.except_orm):
             # the user does not have read access on the location or it does not exists
-            lot_output_id = False
-        return lot_output_id
+            lot_output_stock_id = False
+        return lot_output_stock_id
 
     _defaults = {
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c),