diff --git a/addons/stock/stock.py b/addons/stock/stock.py index f1e2ee95de6..e773528edbb 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -741,7 +741,7 @@ class stock_picking(osv.osv): wf_service = netsvc.LocalService("workflow") for pick in self.browse(cr, uid, ids): if pick.state == 'draft': - wf_service.trg_validate(uid, 'stock.picking', pick.id,'button_confirm', cr) + wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_confirm', cr) move_ids = [x.id for x in pick.move_lines if x.state == 'confirmed'] if not move_ids: raise osv.except_osv(_('Warning !'),_('Not enough stock, unable to reserve the products.')) diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py index 2015cd3113b..946cb7c9542 100644 --- a/addons/stock/wizard/stock_partial_picking.py +++ b/addons/stock/wizard/stock_partial_picking.py @@ -84,16 +84,16 @@ class stock_partial_picking(osv.osv_memory): separator_extended = '' for field in res['fields']: if type == 'in': + separator_extended = '''''' for node in nodes: - separator_extended = '''''' node.set('string', '_Receive') - if type == 'internal': + elif type == 'internal': + separator_extended = '''''' for node in nodes: - separator_extended = '''''' node.set('string', '_Move') - if type == 'out': + elif type == 'out': + separator_extended = '''''' for node in nodes: - separator_extended = '''''' node.set('string', '_Deliver') res['arch'] = etree.tostring(doc)