openerp-dev-web team mailing list archive

["Naresh\(OpenERP\)" <nch@xxxxxxxxxxx>]

Naresh(OpenERP) has proposed merging lp:~openerp-dev/openobject-server/trunk-bug-675826-nch into lp:openobject-server.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #675826 in OpenERP Server: "AttributeError: 'bool' object has no attribute 'upper'"
  https://bugs.launchpad.net/openobject-server/+bug/675826

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-675826-nch/+merge/60038
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-675826-nch/+merge/60038
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/trunk-bug-675826-nch.

=== modified file 'openerp/tools/misc.py'
--- openerp/tools/misc.py	2011-03-28 07:59:20 +0000
+++ openerp/tools/misc.py	2011-05-05 10:28:28 +0000
@@ -159,7 +159,7 @@
     if not prog:
         raise Exception('Couldn\'t find %s' % name)
     args2 = (prog,) + args
-    
+
     return subprocess.call(args2)
 
 def exec_pg_command_pipe(name, *args):
@@ -1283,6 +1283,9 @@
 
 def get_server_timezone():
     # timezone detection is safe in multithread, so lazy init is ok here
+    if config['timezone'] and  \
+        not isinstance(config['timezone'], basestring):
+      return 'UTC'
     if (not config['timezone']):
         config['timezone'] = detect_server_timezone()
     return config['timezone']