[MERGE] fix the serialized field domain in the model view.

bzr revid: vmt@openerp.com-20121204150004-lq8t7qgeimeskysf
This commit is contained in:
Vo Minh Thu 2012-12-04 16:00:04 +01:00
commit a1e2fdb69c
2 changed files with 2 additions and 1 deletions

View File

@ -209,6 +209,7 @@ class ir_model(osv.osv):
else:
x_name = a._columns.keys()[0]
x_custom_model._rec_name = x_name
a._rec_name = x_name
class ir_model_fields(osv.osv):
_name = 'ir.model.fields'

View File

@ -44,7 +44,7 @@
<field name="selection" attrs="{'required': [('ttype','in',['selection','reference'])], 'readonly': [('ttype','not in',['selection','reference'])]}"/>
<field name="size" attrs="{'required': [('ttype','in',['char','reference'])], 'readonly': [('ttype','not in',['char','reference'])]}"/>
<field name="domain" attrs="{'readonly': [('relation','=','')]}"/>
<field name="serialization_field_id" attrs="{'readonly': [('state','=','base')]}" domain="[('ttype','=','serialized'), ('model_id', '=', model_id)]"/>
<field name="serialization_field_id" attrs="{'readonly': [('state','=','base')]}" domain="[('ttype','=','serialized'), ('model_id', '=', parent.model)]"/>
</group>
<group>
<field name="required"/>