odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]:project_timesheet impossible to edit task work 

bzr revid: pja@tinyerp.com-20120905113313-c2cbi37xqr6mnvrc
This commit is contained in:
Amit Parik 2012-09-05 17:03:13 +05:30 committed by Jalpesh Patel (OpenERP)
parent 2d6829b70e
commit ca9c797275
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/project_timesheet/project_timesheet.py
View File

@ -166,10 +166,7 @@ class project_work(osv.osv):
vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name']) or '/')
if 'user_id' in vals:
vals_line['user_id'] = vals['user_id']
result = self.get_user_related_details(cr, uid, vals.get('user_id', task.user_id.id))
for fld in ('product_id', 'general_account_id', 'journal_id', 'product_uom_id'):
if result.get(fld, False):
vals_line[fld] = result[fld]
if 'date' in vals:
vals_line['date'] = vals['date'][:10]
@ -177,7 +174,10 @@ class project_work(osv.osv):
default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
vals_line['unit_amount'] = vals['hours']
prod_id = vals_line.get('product_id', line_id.product_id.id) # False may be set
result = self.get_user_related_details(cr, uid, vals.get('user_id', task.user_id.id))
for fld in ('product_id', 'general_account_id', 'journal_id', 'product_uom_id'):
if result.get(fld, False):
vals_line[fld] = result[fld]
if result.get('product_uom_id',False) and (not result['product_uom_id'] == default_uom):
vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id'])