From dec333d8a4816958cbc214457041c2006df01e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 25 Sep 2015 16:28:03 +0200 Subject: [PATCH] [FIX] hr_equipment: rename from it assets to equipments This is a partial revert of 132dcc978674680af76a41d3e077d62a3e46dd9b. Indeed the hr_equipment module can be used to track any kind of equipment, not only IT assets. --- addons/hr_equipment/__openerp__.py | 6 ++--- addons/hr_equipment/models/hr_equipment.py | 2 +- .../hr_equipment/views/hr_equipment_views.xml | 23 ++++++++++--------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/addons/hr_equipment/__openerp__.py b/addons/hr_equipment/__openerp__.py index 3df017ac683..5e3fca4d9bd 100644 --- a/addons/hr_equipment/__openerp__.py +++ b/addons/hr_equipment/__openerp__.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- { - 'name': 'IT Assets', + 'name': 'Equipments', 'version': '1.0', 'sequence': 125, 'description': """ - Track employees' IT assets: computers, printers, software licenses and manage maintenance requests.""", + Track employees' equipment and manage maintenance requests.""", 'author': 'Odoo S.A.', 'depends': ['hr'], - 'summary': 'Equipments, IT Assets, Internal Hardware', + 'summary': 'Equipments, Assets, Internal Hardware, Allocation Tracking', 'data': [ 'security/hr_equipment.xml', 'security/ir.model.access.csv', diff --git a/addons/hr_equipment/models/hr_equipment.py b/addons/hr_equipment/models/hr_equipment.py index b363252be13..fa7ebe2e95f 100644 --- a/addons/hr_equipment/models/hr_equipment.py +++ b/addons/hr_equipment/models/hr_equipment.py @@ -76,7 +76,7 @@ class HrEquipmentCategory(models.Model): class HrEquipment(models.Model): _name = 'hr.equipment' _inherit = ['mail.thread'] - _description = 'IT Assets' + _description = 'Equipment' @api.multi def _track_subtype(self, init_values): diff --git a/addons/hr_equipment/views/hr_equipment_views.xml b/addons/hr_equipment/views/hr_equipment_views.xml index 648721a1640..da61ae8d4c5 100644 --- a/addons/hr_equipment/views/hr_equipment_views.xml +++ b/addons/hr_equipment/views/hr_equipment_views.xml @@ -343,7 +343,7 @@ - + @@ -359,7 +359,7 @@ - IT Assets + Equipments hr.equipment kanban,tree,form @@ -368,15 +368,16 @@ Click to add a new equipment.

This application helps you to track equipments used by employees. - Create some laptops, printers or phones and link each asset to an employee or departement. - You will manage allocations, issues and maintenance of equipment. + Create some laptop, printer or phone and link each equipment to + an employee or departement. You will manage allocations, issues + and maintenance of equipment.

- Assets + Equipments hr.equipment kanban,tree,form @@ -408,7 +409,7 @@ class="oe_stat_button" icon="fa-laptop" type="action"> - +