From 3cf0eebe87775b2ea8a8979b69ea575616cf1bf7 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Wed, 13 Aug 2008 15:52:16 +0200 Subject: [PATCH] fix merge error bzr revid: christophe@tinyerp.com-20080813135216-4dfw23y6jvb60tjh --- bin/osv/orm.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/bin/osv/orm.py b/bin/osv/orm.py index e9a307c73fa..cd42f265128 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -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,