Bugfix
bzr revid: fp@tinyerp.com-f569c6dea92caa683cadc6d3e64e46225d713494
This commit is contained in:
parent
cb951a24fc
commit
fa01eef644
|
@ -42,6 +42,7 @@ TRANSLATION_TYPE = [
|
|||
('wizard_view', 'Wizard View'),
|
||||
('xsl', 'XSL'),
|
||||
('help', 'Help'),
|
||||
('code', 'Code'),
|
||||
]
|
||||
|
||||
class ir_translation(osv.osv, Cacheable):
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -279,6 +279,7 @@ class orm_template(object):
|
|||
_sequence = None
|
||||
_description = None
|
||||
_inherits = {}
|
||||
_table = None
|
||||
|
||||
def _field_create(self, cr, context={}):
|
||||
cr.execute("SELECT id FROM ir_model WHERE model='%s'" % self._name)
|
||||
|
@ -357,6 +358,8 @@ class orm_template(object):
|
|||
def __init__(self, cr):
|
||||
if not self._description:
|
||||
self._description = self._name
|
||||
if not self._table:
|
||||
self._table=self._name.replace('.','_')
|
||||
|
||||
def browse(self, cr, uid, select, context=None, list_class=None):
|
||||
if not context:
|
||||
|
@ -1079,6 +1082,8 @@ class orm_memory(orm_template):
|
|||
self.datas = {}
|
||||
self.next_id = 0
|
||||
self.check_id = 0
|
||||
print '=--=-=-=-=-='
|
||||
print self._table
|
||||
cr.execute('delete from wkf_instance where res_type=%s', (self._name,))
|
||||
|
||||
def clear(self):
|
||||
|
@ -1487,8 +1492,6 @@ class orm(orm_template):
|
|||
list_store.append(l)
|
||||
self.pool._store_function[l[5]]=list_store
|
||||
|
||||
if not self._table:
|
||||
self._table=self._name.replace('.','_')
|
||||
for (key,_,msg) in self._sql_constraints:
|
||||
self.pool._sql_error[self._table+'_'+key] = msg
|
||||
|
||||
|
|
Loading…
Reference in New Issue