Merge lp:~dieck/openobject-server/dieck-6.0-lp780584 into lp:openobject-server/6.0

[Marco Dieckhoff]

FIXED Bug 780584: Field definition translate=Yes is not stored in ir.model.fields; fix was provided by xrg on http://git.hellug.gr/?p=xrg/openobject-server;a=commit;h=d7a8fa5352e995d526c

[Vo Minh Thu (thu)]

I have provided a link in the related bug report to a branch with this patch. It is based on this one but also add the column to base.sql. It casts also the integer to a bool. I will reject this patch as it doesn't work as is and another is provided.

Unmerged revisions

3429. By Panos Christeas (xrg) on 2011-05-20

FIXED Bug 780584: Field definition translate=Yes is not stored in ir.model.fields; fix was provided by xrg on http://git.hellug.gr/?p=xrg/openobject-server;a=commit;h=d7a8fa5352e995d526c

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2011-04-11 10:08:47 +0000
+++ bin/osv/orm.py	2011-05-20 08:44:32 +0000
@@ -458,6 +458,7 @@
                 'readonly': (f.readonly and 1) or 0,
                 'required': (f.required and 1) or 0,
                 'selectable': (f.selectable and 1) or 0,
+		'translate': (f.translate and 1) or 0,
                 'relation_field': (f._type=='one2many' and isinstance(f, fields.one2many)) and f._fields_id or '',
             }
             # When its a custom field,it does not contain f.select
@@ -474,13 +475,13 @@
                 vals['id'] = id
                 cr.execute("""INSERT INTO ir_model_fields (
                     id, model_id, model, name, field_description, ttype,
-                    relation,view_load,state,select_level,relation_field
+                    relation,view_load,state,select_level,relation_field, translate
                 ) VALUES (
-                    %s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s
+                    %s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s
                 )""", (
                     id, vals['model_id'], vals['model'], vals['name'], vals['field_description'], vals['ttype'],
                      vals['relation'], bool(vals['view_load']), 'base',
-                    vals['select_level'], vals['relation_field']
+                    vals['select_level'], vals['relation_field'], vals['translate']
                 ))
                 if 'module' in context:
                     name1 = 'field_' + self._table + '_' + k
@@ -497,12 +498,12 @@
                         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
+                            view_load=%s, select_level=%s, readonly=%s ,required=%s, selectable=%s, relation_field=%s, translate=%s
                         WHERE
                             model=%s AND name=%s""", (
                                 vals['model_id'], vals['field_description'], vals['ttype'],
                                 vals['relation'], bool(vals['view_load']),
-                                vals['select_level'], bool(vals['readonly']), bool(vals['required']), bool(vals['selectable']), vals['relation_field'], vals['model'], vals['name']
+                                vals['select_level'], bool(vals['readonly']), bool(vals['required']), bool(vals['selectable']), vals['relation_field'], bool(vals['translate']), vals['model'], vals['name']
                             ))
                         break
         cr.commit()