[FIX] project_timesheet: retrocompatibility for 73f7a2ba35
It looks like it was possible to pass vals['date'] in date format (!= datetime format) to _create_analytic_entries. This rev. is a retrocompatible patch for73f7a2ba35
. In addition, it solves the same issue than the rev.73f7a2ba35
, but in the case the project is set on the task after the work hours are created. Seeab5ecef476
opw-628729
This commit is contained in:
parent
37f9459610
commit
22acc5d379
|
@ -118,9 +118,12 @@ class project_work(osv.osv):
|
||||||
vals_line['user_id'] = vals['user_id']
|
vals_line['user_id'] = vals['user_id']
|
||||||
vals_line['product_id'] = result['product_id']
|
vals_line['product_id'] = result['product_id']
|
||||||
if vals.get('date'):
|
if vals.get('date'):
|
||||||
timestamp = datetime.datetime.strptime(vals['date'], tools.DEFAULT_SERVER_DATETIME_FORMAT)
|
if len(vals['date']) > 10:
|
||||||
ts = fields.datetime.context_timestamp(cr, uid, timestamp, context)
|
timestamp = datetime.datetime.strptime(vals['date'], tools.DEFAULT_SERVER_DATETIME_FORMAT)
|
||||||
vals_line['date'] = ts.strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
|
ts = fields.datetime.context_timestamp(cr, uid, timestamp, context)
|
||||||
|
vals_line['date'] = ts.strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
|
||||||
|
else:
|
||||||
|
vals_line['date'] = vals['date']
|
||||||
|
|
||||||
# Calculate quantity based on employee's product's uom
|
# Calculate quantity based on employee's product's uom
|
||||||
vals_line['unit_amount'] = vals['hours']
|
vals_line['unit_amount'] = vals['hours']
|
||||||
|
@ -263,7 +266,7 @@ class task(osv.osv):
|
||||||
missing_analytic_entries[task_work.id] = {
|
missing_analytic_entries[task_work.id] = {
|
||||||
'name' : task_work.name,
|
'name' : task_work.name,
|
||||||
'user_id' : task_work.user_id.id,
|
'user_id' : task_work.user_id.id,
|
||||||
'date' : task_work.date and task_work.date[:10] or False,
|
'date' : task_work.date,
|
||||||
'account_id': acc_id,
|
'account_id': acc_id,
|
||||||
'hours' : task_work.hours,
|
'hours' : task_work.hours,
|
||||||
'task_id' : task_obj.id
|
'task_id' : task_obj.id
|
||||||
|
|
Loading…
Reference in New Issue