[FIX] Account voucher => import invoice on bank statement wizard now taking correct account for move line
bzr revid: mra@mra-laptop-20101005121641-oa6m1rvbrkpfv7fc
This commit is contained in:
parent
169e99a263
commit
b1b120c7e4
|
@ -72,19 +72,20 @@ class account_statement_from_invoice_lines(osv.osv_memory):
|
||||||
amount = currency_obj.compute(cr, uid, line.invoice.currency_id.id,
|
amount = currency_obj.compute(cr, uid, line.invoice.currency_id.id,
|
||||||
statement.currency.id, amount, context=ctx)
|
statement.currency.id, amount, context=ctx)
|
||||||
|
|
||||||
|
context.update({'move_line_ids': [line.id]})
|
||||||
|
result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype=(amount < 0 and 'payment' or 'receipt'), context=context)
|
||||||
voucher_res = { 'type':(amount < 0 and 'payment' or 'receipt') ,
|
voucher_res = { 'type':(amount < 0 and 'payment' or 'receipt') ,
|
||||||
'name': line.name,
|
'name': line.name,
|
||||||
'partner_id': line.partner_id.id,
|
'partner_id': line.partner_id.id,
|
||||||
'journal_id': statement.journal_id.id,
|
'journal_id': statement.journal_id.id,
|
||||||
'account_id': line.account_id.id,
|
'account_id': result.get('account_id', statement.journal_id.default_credit_account_id.id), # improve me: statement.journal_id.default_credit_account_id.id
|
||||||
'company_id':statement.company_id.id,
|
'company_id':statement.company_id.id,
|
||||||
'currency_id':statement.currency.id,
|
'currency_id':statement.currency.id,
|
||||||
'date':line.date,
|
'date':line.date,
|
||||||
'amount':abs(amount),
|
'amount':abs(amount),
|
||||||
'period_id':statement.period_id.id}
|
'period_id':statement.period_id.id}
|
||||||
voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context)
|
voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context)
|
||||||
context.update({'move_line_ids': [line.id]})
|
|
||||||
result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype=(amount < 0 and 'payment' or 'receipt'), context=context)
|
|
||||||
voucher_line_dict = False
|
voucher_line_dict = False
|
||||||
if result['value']['line_ids']:
|
if result['value']['line_ids']:
|
||||||
for line_dict in result['value']['line_ids']:
|
for line_dict in result['value']['line_ids']:
|
||||||
|
|
Loading…
Reference in New Issue