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

[FIX] project_timesheet: accept work without date 

date field on a project.task.work is not required while it is on the hr.analytic.timesheet (with default value).
Avoid error if fill a task work without date, fallback on context_today.
This commit is contained in:
Martin Trigaux 2014-11-10 15:59:30 +01:00
parent e27afc13cb
commit ab5ecef476
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/project_timesheet/project_timesheet.py
View File

@ -119,7 +119,8 @@ class project_work(osv.osv):
vals_line['name'] = '%s: %s' % (tools.ustr(task_obj.name), tools.ustr(vals['name'] or '/'))
vals_line['user_id'] = vals['user_id']
vals_line['product_id'] = result['product_id']
vals_line['date'] = vals['date'][:10]
if vals.get('date'):
vals_line['date' ] = vals['date'][:10]
# Calculate quantity based on employee's product's uom
vals_line['unit_amount'] = vals['hours']
@ -263,7 +264,7 @@ class task(osv.osv):
missing_analytic_entries[task_work.id] = {
'name' : task_work.name,
'user_id' : task_work.user_id.id,
'date' : task_work.date[:10],
'date' : task_work.date and task_work.date[:10] or False,
'account_id': acc_id,
'hours' : task_work.hours,
'task_id' : task_obj.id