diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2008-06-18 06:17:51 +0000 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2008-06-18 06:17:51 +0000 |
| commit | fa01eef6448ec8680a4e93fa20d3d1f427f52891 (patch) | |
| tree | d9e76b58f658ac715571d7bf0ed5dc6c9cba5382 /bin/addons/base | |
| parent | cb951a24fc5d524c55e9a0f523dbf8a9e40e6691 (diff) | |
Bugfix
bzr revid: fp@tinyerp.com-f569c6dea92caa683cadc6d3e64e46225d713494
Diffstat (limited to 'bin/addons/base')
| -rw-r--r-- | bin/addons/base/ir/ir_translation.py | 1 | ||||
| -rw-r--r-- | bin/addons/base/res/res_user.py | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/bin/addons/base/ir/ir_translation.py b/bin/addons/base/ir/ir_translation.py index 5f0c1f7c01a..150cf9d4b3d 100644 --- a/bin/addons/base/ir/ir_translation.py +++ b/bin/addons/base/ir/ir_translation.py @@ -42,6 +42,7 @@ TRANSLATION_TYPE = [ ('wizard_view', 'Wizard View'), ('xsl', 'XSL'), ('help', 'Help'), + ('code', 'Code'), ] class ir_translation(osv.osv, Cacheable): diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py index 3e121bbb5bc..fa74346829f 100644 --- a/bin/addons/base/res/res_user.py +++ b/bin/addons/base/res/res_user.py @@ -89,6 +89,8 @@ def _lang_get(self, cr, uid, context={}): res = obj.read(cr, uid, ids, ['code', 'name'], context) res = [(r['code'], r['name']) for r in res] return res +def _tz_get(self,cr,uid, context={}): + return [(x, x) for x in pytz.all_timezones] class users(osv.osv): _name = "res.users" @@ -107,7 +109,7 @@ class users(osv.osv): 'company_id': fields.many2one('res.company', 'Company'), 'rule_groups': fields.many2many('ir.rule.group', 'user_rule_group_rel', 'user_id', 'rule_group_id', 'Rules', domain="[('global', '<>', True)]"), 'context_lang': fields.selection(_lang_get, 'Language', required=True), - 'context_tz': fields.selection([(x, x) for x in pytz.all_timezones], 'Timezone') + 'context_tz': fields.selection(_tz_get, 'Timezone') } def read(self,cr, uid, ids, fields=None, context=None, load='_classic_read'): result = super(users, self).read(cr, uid, ids, fields, context, load) |