[MERGE] Merged Tejas' branch

bzr revid: jvo@tinyerp.com-20110421084935-ilfag4nnnoa591p9
This commit is contained in:
Jay Vora (OpenERP) 2011-04-21 14:19:35 +05:30
commit 4d69993ce9
1 changed files with 1 additions and 4 deletions

View File

@ -21,7 +21,6 @@
import time
import netsvc
from osv import fields, osv
from tools.translate import _
@ -193,9 +192,7 @@ class hr_expense_expense(osv.osv):
account_journal.write(cr, uid, [journal.id],{'analytic_journal_id':analytic_journal_ids[0]})
inv_id = invoice_obj.create(cr, uid, inv, {'type': 'in_invoice'})
invoice_obj.button_compute(cr, uid, [inv_id], {'type': 'in_invoice'}, set_total=True)
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_open', cr)
self.write(cr, uid, [exp.id], {'invoice_id': inv_id, 'state': 'invoiced'})
res = inv_id
return res