summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRavi Gohil <rgo@tinyerp.com>2016-03-25 10:04:04 +0100
committerJérome Maes <jem@openerp.com>2016-04-13 12:28:34 +0200
commitc232e3cbcbeb0f84a5bcec4d12557eacc1fbc65a (patch)
tree445bea894ba6c7c0c70913c6c5f75d7ced98b6cc
parentd36ce338772204f8823164dd903f3b745ce33d98 (diff)
[IMP] hr : remove 'complete_name' field. Use 'display_name' instead.
-rw-r--r--addons/hr/models/hr.py5
-rw-r--r--addons/hr/views/hr_views.xml2
2 files changed, 1 insertions, 6 deletions
diff --git a/addons/hr/models/hr.py b/addons/hr/models/hr.py
index e33e34bced5..ae0215a92da 100644
--- a/addons/hr/models/hr.py
+++ b/addons/hr/models/hr.py
@@ -269,13 +269,8 @@ class hr_department(osv.osv):
_description = "Department"
_inherit = ['mail.thread', 'ir.needaction_mixin']
- def _dept_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
- res = self.name_get(cr, uid, ids, context=context)
- return dict(res)
-
_columns = {
'name': fields.char('Department Name', required=True),
- 'complete_name': fields.function(_dept_name_get_fnc, type="char", string='Name'),
'active': fields.boolean('Active'),
'company_id': fields.many2one('res.company', 'Company', select=True, required=False),
'parent_id': fields.many2one('hr.department', 'Parent Department', select=True),
diff --git a/addons/hr/views/hr_views.xml b/addons/hr/views/hr_views.xml
index 63091d0e3fa..61a444a42b1 100644
--- a/addons/hr/views/hr_views.xml
+++ b/addons/hr/views/hr_views.xml
@@ -450,7 +450,7 @@
<field name="field_parent">child_ids</field>
<field name="arch" type="xml">
<tree string="Companies">
- <field name="complete_name"/>
+ <field name="display_name"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="manager_id"/>
</tree>