From 89af288c3b1747d59bb3ccd65a6bb85fcd542961 Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" <nch@tinyerp.com>
Date: Thu, 5 May 2011 15:56:00 +0530
Subject: [PATCH] [FIX]:AttributeError

lp bug: https://launchpad.net/bugs/675826 fixed

bzr revid: nch@tinyerp.com-20110505102600-0zch200zndsdf383
---
 openerp/tools/misc.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 1524d95d922..d0f8faec6e0 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -159,7 +159,7 @@ def exec_pg_command(name, *args):
     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 detect_server_timezone():
 
 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']