HR_TIMESHEET_INVOICE: fix wizard for new analytic account on invoice line
bzr revid: mga@tinyerp.com-a1d39ebaaa14788370d01578b459d5032fd01f35
This commit is contained in:
parent
39c54916db
commit
3f63e5c22a
|
@ -108,6 +108,7 @@ class final_invoice_create(wizard.interface):
|
||||||
'product_id': product_id,
|
'product_id': product_id,
|
||||||
'uos_id': product.uom_id.id,
|
'uos_id': product.uom_id.id,
|
||||||
'account_id': account_id[0],
|
'account_id': account_id[0],
|
||||||
|
'account_analytic_id': account.id,
|
||||||
}
|
}
|
||||||
|
|
||||||
amount_total += round((price * ( 1.0 - (factor.factor or 0.0)/100.0)), 2) * qty
|
amount_total += round((price * ( 1.0 - (factor.factor or 0.0)/100.0)), 2) * qty
|
||||||
|
|
|
@ -63,7 +63,6 @@ class invoice_create(wizard.interface):
|
||||||
'payment_term': (partner.property_payment_term and partner.property_payment_term[0]) or False,
|
'payment_term': (partner.property_payment_term and partner.property_payment_term[0]) or False,
|
||||||
'account_id': partner.property_account_receivable[0],
|
'account_id': partner.property_account_receivable[0],
|
||||||
'currency_id': account.pricelist_id.currency_id.id,
|
'currency_id': account.pricelist_id.currency_id.id,
|
||||||
#'project_id': account.id
|
|
||||||
}
|
}
|
||||||
last_invoice = pool.get('account.invoice').create(cr, uid, curr_invoice)
|
last_invoice = pool.get('account.invoice').create(cr, uid, curr_invoice)
|
||||||
invoices.append(last_invoice)
|
invoices.append(last_invoice)
|
||||||
|
@ -109,6 +108,7 @@ class invoice_create(wizard.interface):
|
||||||
'invoice_line_tax_id': [(6,0,tax)],
|
'invoice_line_tax_id': [(6,0,tax)],
|
||||||
'uos_id': product.uom_id.id,
|
'uos_id': product.uom_id.id,
|
||||||
'account_id': account_id[0],
|
'account_id': account_id[0],
|
||||||
|
'account_analytic_id': account.id,
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in New Issue