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

[MERGE] sync with 7.0 (getting needed orm revision) 

bzr revid: mat@openerp.com-20140213130150-9ltjazqiru5apv5k
This commit is contained in:
Martin Trigaux 2014-02-13 14:01:50 +01:00
parent 3668f09108 6e99d7a6cb
commit 21842a4fc4
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openerp/osv/orm.py
View File

@ -765,8 +765,6 @@ class BaseModel(object):
(name_id, context['module'], 'ir.model', model_id)
)
cr.commit()
cr.execute("SELECT * FROM ir_model_fields WHERE model=%s", (self._name,))
cols = {}
for rec in cr.dictfetchall():
@ -834,7 +832,6 @@ class BaseModel(object):
for key, val in vals.items():
if cols[k][key] != vals[key]:
cr.execute('update ir_model_fields set field_description=%s where model=%s and name=%s', (vals['field_description'], vals['model'], vals['name']))
cr.commit()
cr.execute("""UPDATE ir_model_fields SET
model_id=%s, field_description=%s, ttype=%s, relation=%s,
view_load=%s, select_level=%s, readonly=%s ,required=%s, selectable=%s, relation_field=%s, translate=%s, serialization_field_id=%s
@ -845,7 +842,6 @@ class BaseModel(object):
vals['select_level'], bool(vals['readonly']), bool(vals['required']), bool(vals['selectable']), vals['relation_field'], bool(vals['translate']), vals['serialization_field_id'], vals['model'], vals['name']
))
break
cr.commit()
#
# Goal: try to apply inheritance at the instanciation level and