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

fix merge error 

bzr revid: christophe@tinyerp.com-20080813135216-4dfw23y6jvb60tjh
This commit is contained in:
Christophe Simonis 2008-08-13 15:52:16 +02:00
parent b1cbe8d9fd
commit 3cf0eebe87
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/osv/orm.py
View File

@ -345,16 +345,10 @@ class orm_template(object):
(('field_'+self._table+'_'+k)[:64], context['module'], 'ir.model.fields', id)
)
else:
<<<<<<< TREE
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']))
=======
for key, val in vals.items():
if cols[k][key] != vals[key]:
print 'Different', cols[k][key], vals[key], k, key, self._name
#print 'Different', cols[k][key], vals[key], k, key, self._name
cr.execute('update ir_model_fields set field_description=%s where model=%s and name=%s', (vals['field_description'], vals['model'], vals['name']))
>>>>>>> MERGE-SOURCE
cr.commit()
cr.execute("""UPDATE ir_model_fields SET
model_id=%s, field_description=%s, ttype=%s, relate=%s, relation=%s,