[MERGE] forward port of branch saas-3 up to fe8845a
This commit is contained in:
commit
ee8919af84
|
@ -1151,9 +1151,10 @@ class account_move_line(osv.osv):
|
||||||
move_ids = set()
|
move_ids = set()
|
||||||
for line in self.browse(cr, uid, ids, context=context):
|
for line in self.browse(cr, uid, ids, context=context):
|
||||||
move_ids.add(line.move_id.id)
|
move_ids.add(line.move_id.id)
|
||||||
context['journal_id'] = line.journal_id.id
|
localcontext = dict(context)
|
||||||
context['period_id'] = line.period_id.id
|
localcontext['journal_id'] = line.journal_id.id
|
||||||
result = super(account_move_line, self).unlink(cr, uid, [line.id], context=context)
|
localcontext['period_id'] = line.period_id.id
|
||||||
|
result = super(account_move_line, self).unlink(cr, uid, [line.id], context=localcontext)
|
||||||
move_ids = list(move_ids)
|
move_ids = list(move_ids)
|
||||||
if check and move_ids:
|
if check and move_ids:
|
||||||
move_obj.validate(cr, uid, move_ids, context=context)
|
move_obj.validate(cr, uid, move_ids, context=context)
|
||||||
|
|
Loading…
Reference in New Issue