From 60ecdf7bebe45661858fdbdf002c496245848bcc Mon Sep 17 00:00:00 2001
From: Albert Cervera i Areny <albert@nan-tic.com>
Date: Sun, 30 Oct 2011 14:01:36 +0100
Subject: [PATCH] Remove redundant field 'name' from ir.property.

issue2188
review153002
---
 CHANGELOG               | 1 +
 trytond/ir/property.py  | 7 +++----
 trytond/ir/property.xml | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4595009908..7b9164bb30 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 Version 2.2.0 - 2011-10-24
 * Bug fixes (see mercurial logs for details)
+* Remove name field in ir.property
 * Add wizard to show views
 * Switched from .csv to .po for translations
 * Search on Many2One fields include inactive records
diff --git a/trytond/ir/property.py b/trytond/ir/property.py
index ec08703131..73a175ca53 100644
--- a/trytond/ir/property.py
+++ b/trytond/ir/property.py
@@ -11,7 +11,7 @@ class Property(ModelSQL, ModelView):
     "Property"
     _name = 'ir.property'
     _description = __doc__
-    name = fields.Char('Name')
+    _rec_name = 'field'
     value = fields.Reference('Value', selection='models_get')
     res = fields.Reference('Resource', selection='models_get', select=1)
     field = fields.Many2One('ir.model.field', 'Field',
@@ -110,9 +110,8 @@ class Property(ModelSQL, ModelView):
             return res[names[0]]
         return res
 
-    def _set_values(self, name, model, res_id, val, field_id):
+    def _set_values(self, model, res_id, val, field_id):
         return {
-            'name': name,
             'value': val,
             'res': model + ',' + str(res_id),
             'field': field_id,
@@ -174,7 +173,7 @@ class Property(ModelSQL, ModelView):
         res = False
         if (val != default_val):
             for res_id in ids:
-                vals = self._set_values(name, model, res_id, val, field_id)
+                vals = self._set_values(model, res_id, val, field_id)
                 with Transaction().set_user(0, set_context=True):
                     res = self.create(vals)
         return res
diff --git a/trytond/ir/property.xml b/trytond/ir/property.xml
index 00bed26996..ce51d3c3f8 100644
--- a/trytond/ir/property.xml
+++ b/trytond/ir/property.xml
@@ -9,8 +9,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="arch" type="xml">
                 <![CDATA[
                 <form string="Property">
-                    <label name="name"/>
-                    <field name="name" colspan="3"/>
                     <label name="field"/>
                     <field name="field" colspan="3"/>
                     <label name="value"/>
@@ -27,7 +25,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="arch" type="xml">
                 <![CDATA[
                 <tree string="Properties">
-                    <field name="name"/>
                     <field name="field"/>
                     <field name="value"/>
                     <field name="res"/>