projects
/
odoo
/
odoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/odoo/odoo
[odoo/odoo.git]
/
addons
/
project_timesheet
/
project_timesheet.py
diff --git
a/addons/project_timesheet/project_timesheet.py
b/addons/project_timesheet/project_timesheet.py
index
36e5734
..
c51a9d8
100644
(file)
--- a/
addons/project_timesheet/project_timesheet.py
+++ b/
addons/project_timesheet/project_timesheet.py
@@
-118,7
+118,9
@@
class project_work(osv.osv):
vals_line['user_id'] = vals['user_id']
vals_line['product_id'] = result['product_id']
if vals.get('date'):
vals_line['user_id'] = vals['user_id']
vals_line['product_id'] = result['product_id']
if vals.get('date'):
- vals_line['date' ] = vals['date'][:10]
+ timestamp = datetime.datetime.strptime(vals['date'], tools.DEFAULT_SERVER_DATETIME_FORMAT)
+ ts = fields.datetime.context_timestamp(cr, uid, timestamp, context)
+ vals_line['date'] = ts.strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
# Calculate quantity based on employee's product's uom
vals_line['unit_amount'] = vals['hours']
# Calculate quantity based on employee's product's uom
vals_line['unit_amount'] = vals['hours']