projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
db6fb31
)
[FIX] ir.qweb: avoid errors with function fields of type datetime
author
Olivier Dony
<odo@openerp.com>
Thu, 3 Apr 2014 16:20:05 +0000
(18:20 +0200)
committer
Olivier Dony
<odo@openerp.com>
Thu, 3 Apr 2014 16:20:05 +0000
(18:20 +0200)
bzr revid: odo@openerp.com-
20140403162005
-i6lbbj6uco6dnrkq
openerp/addons/base/ir/ir_qweb.py
patch
|
blob
|
history
diff --git
a/openerp/addons/base/ir/ir_qweb.py
b/openerp/addons/base/ir/ir_qweb.py
index
e9e0386
..
f6387d8
100644
(file)
--- a/
openerp/addons/base/ir/ir_qweb.py
+++ b/
openerp/addons/base/ir/ir_qweb.py
@@
-602,7
+602,7
@@
class DateTimeConverter(osv.AbstractModel):
if isinstance(value, basestring):
value = datetime.datetime.strptime(
value, openerp.tools.DEFAULT_SERVER_DATETIME_FORMAT)
- value = column.context_timestamp(
+ value = fields.datetime.context_timestamp(
cr, uid, timestamp=value, context=context)
if options and 'format' in options: