~stephane-openerp/openobject-addons/move_search_capability

« back to all changes in this revision

Viewing changes to stock/wizard/wizard_return.py

  • Committer: Jay(Open ERP)
  • Author(s): Quentin Theuret
  • Date: 2010-07-30 12:15:44 UTC
  • Revision ID: jvo@tinyerp.com-20100730121544-oh6cf9f4u54w988q
[FIX] Stock : Return picking wizard improved

Show diffs side-by-side

added added

removed removed

Lines of Context:
72
72
    for move in move_obj.browse(cr, uid, data['form'].get('returns',[])):
73
73
        move_qty = data['form']['return%s' % move.id]
74
74
        if (not move_qty) or (move_qty <= 0.0):
75
 
            raise wizard.except_wizard(_('Warning !'), _('You cannot return a packing with a product quantity zero or less!'))
 
75
            continue
76
76
        if not new_picking:
77
77
            if pick.type in ['out','delivery']:
78
78
                new_type='in'
80
80
                new_type='out'
81
81
            else:
82
82
                new_type='internal'
83
 
            new_picking=pick_obj.copy(cr, uid, pick.id, {'name':'%s (return)' % pick.name,
 
83
            new_picking = pick_obj.copy(cr, uid, pick.id, {'name':'%s (return)' % pick.name,
84
84
                    'move_lines':[], 'state':'draft', 'type':new_type, 
85
85
                    'date':date_cur, 'invoice_state':data['form']['invoice_state'],})
86
 
        new_location=move.location_dest_id.id
 
86
        new_location = move.location_dest_id.id
87
87
 
88
 
        new_move=move_obj.copy(cr, uid, move.id, {
 
88
        new_move = move_obj.copy(cr, uid, move.id, {
89
89
            'product_qty': move_qty,
90
90
            'product_uos_qty': uom_obj._compute_qty(cr, uid, move.product_uom.id,
91
91
                move_qty, move.product_uos.id),
97
97
        if new_picking:
98
98
            wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
99
99
        pick_obj.force_assign(cr, uid, [new_picking], context)
 
100
    else:
 
101
        raise wizard.except_wizard(_('Warning !'), _('You cannot return a packing with a product quantity zero or less!'))
100
102
    return new_picking
101
103
 
102
104
def _action_open_window(self, cr, uid, data, context):