summaryrefslogtreecommitdiff
path: root/bin/tools/misc.py
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2010-10-12 18:01:30 +0200
committerXavier Morel <xmo@openerp.com>2010-10-12 18:01:30 +0200
commit040f2ce15b8d6c512116ae75cb7d8bad5e499b81 (patch)
treecbaa9ef3bd9c22c7e1ce7bb28ee238d5999a62a3 /bin/tools/misc.py
parentd515172dd982402c35b7296d86ca9f4c9e5f31b4 (diff)
[FIX] use correct default callable for a datetime to get the current datetime as of the object's creation
Add staticmethods to fields.time, fields.date and fields.datetime so they can generate default values which they can actually consume bzr revid: xmo@openerp.com-20101012160130-jwgl7cok853fiyap
Diffstat (limited to 'bin/tools/misc.py')
-rw-r--r--bin/tools/misc.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index b3b3d7d9baa..81707156244 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -1323,7 +1323,10 @@ def get_server_timezone():
DEFAULT_SERVER_DATE_FORMAT = "%Y-%m-%d"
-DEFAULT_SERVER_DATETIME_FORMAT = DEFAULT_SERVER_DATE_FORMAT + " %H:%M:%S"
+DEFAULT_SERVER_TIME_FORMAT = "%H:%M:%S"
+DEFAULT_SERVER_DATETIME_FORMAT = "%s %s" % (
+ DEFAULT_SERVER_DATE_FORMAT,
+ DEFAULT_SERVER_TIME_FORMAT)
def server_to_local_timestamp(src_tstamp_str, src_format, dst_format, dst_tz_name,
tz_offset=True, ignore_unparsable_time=True):