← Back to branch summary

~lepistone/openobject-addons/6.1-bug-1157497-audittrail

« back to all changes in this revision

Viewing changes to stock/wizard/stock_return_picking.py

  • Committer: Martin Trigaux
  • Date: 2013-10-01 14:45:37 UTC
  • mfrom: (7105.1.1 addons)
  • Revision ID: mat@openerp.com-20131001144537-7cnj90nz1u5qp0hg
[FIX] stock: return goods to provider wizard displays wrong picking view

Show diffs side-by-side

added added

removed removed

Lines of Context:
stock/wizard/stock_return_picking.py
202
202
        pick_obj.force_assign(cr, uid, [new_picking], context)
203
203
        # Update view id in context, lp:702939
204
204
        view_list = {
205
 
                'out': 'view_picking_out_tree',
206
 
                'in': 'view_picking_in_tree',
207
 
                'internal': 'vpicktree',
208
 
            }
209
 
        data_obj = self.pool.get('ir.model.data')
210
 
        res = data_obj.get_object_reference(cr, uid, 'stock', view_list.get(new_type, 'vpicktree'))
211
 
        context.update({'view_id': res and res[1] or False})
212
 
        return {
213
 
            'domain': "[('id', 'in', ["+str(new_picking)+"])]",
214
 
            'name': 'Picking List',
215
 
            'view_type':'form',
216
 
            'view_mode':'tree,form',
217
 
            'res_model':'stock.picking',
218
 
            'type':'ir.actions.act_window',
219
 
            'context':context,
 
205
            'out': 'action_picking_tree',
 
206
            'in': 'action_picking_tree4',
 
207
            'internal': 'action_picking_tree6',
220
208
        }
221
 
 
 
209
        data_pool = self.pool.get('ir.model.data')
 
210
        action = {}
 
211
        try:
 
212
            action_model,action_id = data_pool.get_object_reference(cr, uid, 'stock', view_list.get(new_type,'action_picking_tree6'))
 
213
        except ValueError:
 
214
            raise osv.except_osv(_('Error'), _('Object reference %s not found' % view_list.get(new_type,'action_picking_tree6')))
 
215
        if action_model:
 
216
            action_pool = self.pool.get(action_model)
 
217
            action = action_pool.read(cr, uid, action_id, context=context)
 
218
            action['domain'] = "[('id','=', "+str(new_picking)+")]"
 
219
            action['context'] = context
 
220
        return action
222
221
stock_return_picking()
223
222
 
224
223
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: