From 0d096bfd568bfe36baa0ad09e14657e62871e208 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Mon, 30 Apr 2007 10:16:11 +0000
Subject: [PATCH] CLIENT,KERNEL: add timezone to display datetime
bzr revid: ced-56c288f5372ac542a407ad619940bcf4adfcac4d
---
bin/addons/base/base_update.xml | 12 +++++++++++-
bin/addons/base/ir/ir_ui_view.py | 2 +-
bin/service/web_services.py | 4 ++++
bin/tools/convert.py | 10 ++++++++++
4 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index fda4c2a..4bb2296 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -33,7 +33,17 @@
lang
-
+
+
+
+
+
+
+
+
+ tz
+
+
diff --git a/bin/addons/base/ir/ir_ui_view.py b/bin/addons/base/ir/ir_ui_view.py
index bcef65b..cfbc0ab 100644
--- a/bin/addons/base/ir/ir_ui_view.py
+++ b/bin/addons/base/ir/ir_ui_view.py
@@ -44,7 +44,7 @@ class view(osv.osv):
'name': fields.char('View Name',size=64, required=True),
'model': fields.char('Model', size=64, required=True),
'priority': fields.integer('Priority', required=True),
- 'type': fields.selection((('tree','Tree'),('form','Form')), 'View Type', required=True),
+ 'type': fields.selection((('tree','Tree'),('form','Form'),('graph', 'Graph')), 'View Type', required=True),
'arch': fields.text('View Architecture', required=True),
'inherit_id': fields.many2one('ir.ui.view', 'Inherited View'),
'field_parent': fields.char('Childs Field',size=64)
diff --git a/bin/service/web_services.py b/bin/service/web_services.py
index 940ad3a..49f0282 100644
--- a/bin/service/web_services.py
+++ b/bin/service/web_services.py
@@ -263,6 +263,7 @@ class common(netsvc.Service):
self.exportMethod(self.ir_del)
self.exportMethod(self.about)
self.exportMethod(self.login)
+ self.exportMethod(self.timezone_get)
def ir_set(self, db, uid, password, keys, args, name, value, replace=True, isobject=False):
security.check(db, uid, password)
@@ -304,6 +305,9 @@ The whole source code is distributed under the terms of the
GNU Public Licence.
(c) 2003-TODAY, Fabien Pinckaers - Tiny sprl''')
+
+ def timezone_get(self, db, login, password):
+ return time.tzname[0]
common()
class objects_proxy(netsvc.Service):
diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index 638c801..d2d89d7 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -54,6 +54,16 @@ def _eval_xml(self,node, pool, cr, uid, idref):
import time
idref['time'] = time
idref['ref'] = lambda x: self.id_get(cr, False, x)
+ try:
+ import pytz
+ except:
+ import netsvc
+ logger = netsvc.Logger()
+ logger.notifyChannel("init", netsvc.LOG_INFO, 'could not find pytz library')
+ class pytzclass(object):
+ all_timezones=[]
+ pytz=pytzclass()
+ idref['pytz'] = pytz
return eval(a_eval, idref)
if t == 'xml':
def _process(s, idref):
--
1.7.10.4