odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Bugfix 

bzr revid: fp@tinyerp.com-65c24c59d6ffde5a6ed73ba211c0eed93a43d0f0
This commit is contained in:
Fabien Pinckaers 2008-06-20 11:11:37 +00:00
parent 4876ce552b
commit 616475fb2e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/addons/base/ir/ir_model.py
View File

@ -156,7 +156,7 @@ class ir_model_fields(osv.osv):
raise except_orm('Error', "Custom fields must have a name that starts with 'x_' !")
if self.pool.get(vals['model']):
self.pool.get(vals['model']).__init__(self.pool, cr)
#self.pool.get(vals['model'])._auto_init(cr,{})
self.pool.get(vals['model'])._auto_init(cr,{})
return res
ir_model_fields()

7
bin/osv/orm.py
View File

@ -313,7 +313,6 @@ class orm_template(object):
'relation':f._obj or 'NULL',
'group_name':f.group_name or '',
'view_load':(f.view_load and 1) or 0,
'state':'base',
'select_level':str(f.select or 0)
}
if k not in cols:
@ -327,7 +326,7 @@ class orm_template(object):
%d,%s,%s,%s,%s,%s, %s,%s,%s,%s,%s, %s
)""", (
id, vals['model_id'], vals['model'], vals['name'], vals['field_description'], vals['ttype'],
bool(vals['relate']), vals['relation'], vals['group_name'], bool(vals['view_load']), vals['state'],
bool(vals['relate']), vals['relation'], vals['group_name'], bool(vals['view_load']), 'base',
vals['select_level']
))
if 'module' in context:
@ -342,11 +341,11 @@ class orm_template(object):
cr.commit()
cr.execute("""UPDATE ir_model_fields SET
model_id=%s, field_description=%s, ttype=%s, relate=%s, relation=%s,
group_name=%s, view_load=%s, state=%s, select_level=%s
group_name=%s, view_load=%s, select_level=%s
WHERE
model=%s AND name=%s""", (
vals['model_id'],vals['field_description'],vals['ttype'],bool(vals['relate']),
vals['relation'], vals['group_name'], bool(vals['view_load']), vals['state'],
vals['relation'], vals['group_name'], bool(vals['view_load']),
vals['select_level'], vals['model'], vals['name']
))
continue