From c61a66ca69b0db00902976bad97917a8f170a4d0 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Tue, 4 Aug 2020 11:33:20 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B03233=20-=20Remove=20"display=5Ftemplate"?=
 =?UTF-8?q?=20from=20datamodel=20classes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../userrightsprofile.class.inc.php           |  3 -
 .../userrightsprofile.db.class.inc.php        |  6 --
 .../userrightsprojection.class.inc.php        |  8 ---
 application/audit.rule.class.inc.php          |  1 -
 application/iotask.class.inc.php              |  1 -
 application/query.class.inc.php               |  2 -
 application/shortcut.class.inc.php            |  2 -
 core/action.class.inc.php                     |  3 -
 core/asynctask.class.inc.php                  |  2 -
 core/backgroundtask.class.inc.php             |  1 -
 core/event.class.inc.php                      |  6 --
 core/trigger.class.inc.php                    | 11 ----
 core/userrights.class.inc.php                 |  1 -
 .../model.authent-external.php                |  1 -
 .../2.x/authent-ldap/model.authent-ldap.php   |  1 -
 .../2.x/authent-local/model.authent-local.php |  1 -
 .../datamodel.itop-attachments.xml            |  1 -
 ...del.itop-bridge-virtualization-storage.xml |  1 -
 .../datamodel.itop-change-mgmt-itil.xml       |  5 --
 .../datamodel.itop-change-mgmt.xml            |  1 -
 .../datamodel.itop-config-mgmt.xml            | 62 -------------------
 .../datamodel.itop-datacenter-mgmt.xml        |  5 --
 .../datamodel.itop-enduser-devices.xml        |  8 ---
 .../datamodel.itop-incident-mgmt-itil.xml     |  1 -
 .../datamodel.itop-knownerror-mgmt.xml        |  4 --
 .../datamodel.itop-problem-mgmt.xml           |  1 -
 .../datamodel.itop-request-mgmt-itil.xml      |  1 -
 .../datamodel.itop-request-mgmt.xml           |  1 -
 .../datamodel.itop-service-mgmt-provider.xml  | 20 ------
 .../datamodel.itop-service-mgmt.xml           | 20 ------
 .../datamodel.itop-storage-mgmt.xml           | 10 ---
 .../itop-tickets/datamodel.itop-tickets.xml   |  4 --
 .../datamodel.itop-virtualization-mgmt.xml    |  6 --
 setup/moduleinstallation.class.inc.php        |  2 -
 34 files changed, 203 deletions(-)

diff --git a/addons/userrights/userrightsprofile.class.inc.php b/addons/userrights/userrightsprofile.class.inc.php
index 294164d20..e72445b8c 100644
--- a/addons/userrights/userrightsprofile.class.inc.php
+++ b/addons/userrights/userrightsprofile.class.inc.php
@@ -55,7 +55,6 @@ class URP_Profiles extends UserRightsBaseClassGUI
 			"db_table" => "priv_urp_profiles",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -243,7 +242,6 @@ class URP_UserProfile extends UserRightsBaseClassGUI
 			"db_table" => "priv_urp_userprofile",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -349,7 +347,6 @@ class URP_UserOrg extends UserRightsBaseClassGUI
 			"db_table" => "priv_urp_userorg",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
diff --git a/addons/userrights/userrightsprofile.db.class.inc.php b/addons/userrights/userrightsprofile.db.class.inc.php
index 2115f1b8d..97c839723 100644
--- a/addons/userrights/userrightsprofile.db.class.inc.php
+++ b/addons/userrights/userrightsprofile.db.class.inc.php
@@ -77,7 +77,6 @@ class URP_Profiles extends UserRightsBaseClassGUI
 			"db_table" => "priv_urp_profiles",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -336,7 +335,6 @@ class URP_UserProfile extends UserRightsBaseClassGUI
 			"db_table" => "priv_urp_userprofile",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -376,7 +374,6 @@ class URP_UserOrg extends UserRightsBaseClassGUI
 			"db_table" => "priv_urp_userorg",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -417,7 +414,6 @@ class URP_ActionGrant extends UserRightsBaseClass
 			"db_table" => "priv_urp_grant_actions",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -454,7 +450,6 @@ class URP_StimulusGrant extends UserRightsBaseClass
 			"db_table" => "priv_urp_grant_stimulus",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -491,7 +486,6 @@ class URP_AttributeGrant extends UserRightsBaseClass
 			"db_table" => "priv_urp_grant_attributes",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
diff --git a/addons/userrights/userrightsprojection.class.inc.php b/addons/userrights/userrightsprojection.class.inc.php
index 081149398..36d3c2994 100644
--- a/addons/userrights/userrightsprojection.class.inc.php
+++ b/addons/userrights/userrightsprojection.class.inc.php
@@ -58,7 +58,6 @@ class URP_Profiles extends UserRightsBaseClass
 			"db_table" => "priv_urp_profiles",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -167,7 +166,6 @@ class URP_Dimensions extends UserRightsBaseClass
 			"db_table" => "priv_urp_dimensions",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -280,7 +278,6 @@ class URP_UserProfile extends UserRightsBaseClass
 			"db_table" => "priv_urp_userprofile",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -321,7 +318,6 @@ class URP_ProfileProjection extends UserRightsBaseClass
 			"db_table" => "priv_urp_profileprojection",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -402,7 +398,6 @@ class URP_ClassProjection extends UserRightsBaseClass
 			"db_table" => "priv_urp_classprojection",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -474,7 +469,6 @@ class URP_ActionGrant extends UserRightsBaseClass
 			"db_table" => "priv_urp_grant_actions",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -511,7 +505,6 @@ class URP_StimulusGrant extends UserRightsBaseClass
 			"db_table" => "priv_urp_grant_stimulus",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -548,7 +541,6 @@ class URP_AttributeGrant extends UserRightsBaseClass
 			"db_table" => "priv_urp_grant_attributes",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
diff --git a/application/audit.rule.class.inc.php b/application/audit.rule.class.inc.php
index 8d67dd471..100574440 100644
--- a/application/audit.rule.class.inc.php
+++ b/application/audit.rule.class.inc.php
@@ -43,7 +43,6 @@ class AuditRule extends cmdbAbstractObject
 			"db_table" => "priv_auditrule",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
diff --git a/application/iotask.class.inc.php b/application/iotask.class.inc.php
index 647340aa8..6ac0e7048 100644
--- a/application/iotask.class.inc.php
+++ b/application/iotask.class.inc.php
@@ -44,7 +44,6 @@ class InputOutputTask extends cmdbAbstractObject
 			"db_table" => "priv_iotask",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
diff --git a/application/query.class.inc.php b/application/query.class.inc.php
index de4fb8c60..20987d88f 100644
--- a/application/query.class.inc.php
+++ b/application/query.class.inc.php
@@ -40,7 +40,6 @@ abstract class Query extends cmdbAbstractObject
 			"db_table" => "priv_query",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "realclass",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -72,7 +71,6 @@ class QueryOQL extends Query
 			"db_table" => "priv_query_oql",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
diff --git a/application/shortcut.class.inc.php b/application/shortcut.class.inc.php
index a92e6ba75..42d220053 100644
--- a/application/shortcut.class.inc.php
+++ b/application/shortcut.class.inc.php
@@ -39,7 +39,6 @@ abstract class Shortcut extends DBObject implements iDisplay
 			"db_table" => "priv_shortcut",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "realclass",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -161,7 +160,6 @@ class ShortcutOQL extends Shortcut
 			"db_table" => "priv_shortcut_oql",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
diff --git a/core/action.class.inc.php b/core/action.class.inc.php
index cb9dd281d..8dd31bd61 100644
--- a/core/action.class.inc.php
+++ b/core/action.class.inc.php
@@ -51,7 +51,6 @@ abstract class Action extends cmdbAbstractObject
 			"db_table" => "priv_action",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "realclass",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -143,7 +142,6 @@ abstract class ActionNotification extends Action
 			"db_table" => "priv_action_notification",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -183,7 +181,6 @@ class ActionEmail extends ActionNotification
 			"db_table" => "priv_action_email",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
diff --git a/core/asynctask.class.inc.php b/core/asynctask.class.inc.php
index 0562b26b3..8911cf940 100644
--- a/core/asynctask.class.inc.php
+++ b/core/asynctask.class.inc.php
@@ -81,7 +81,6 @@ abstract class AsyncTask extends DBObject
 			"db_table" => "priv_async_task",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "realclass",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 
@@ -322,7 +321,6 @@ class AsyncSendEmail extends AsyncTask
 			"db_table" => "priv_async_send_email",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
diff --git a/core/backgroundtask.class.inc.php b/core/backgroundtask.class.inc.php
index db93f1310..002edc409 100644
--- a/core/backgroundtask.class.inc.php
+++ b/core/backgroundtask.class.inc.php
@@ -38,7 +38,6 @@ class BackgroundTask extends DBObject
 			"db_table" => "priv_backgroundtask",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 
diff --git a/core/event.class.inc.php b/core/event.class.inc.php
index ea052c131..f85c356ec 100644
--- a/core/event.class.inc.php
+++ b/core/event.class.inc.php
@@ -31,7 +31,6 @@ class Event extends DBObject implements iDisplay
 			"db_table" => "priv_event",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "realclass",
-			"display_template" => "",
 			"order_by_default" => array('date' => false)
 		);
 		MetaModel::Init_Params($aParams);
@@ -127,7 +126,6 @@ class EventNotification extends Event
 			"db_table" => "priv_event_notification",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 			"order_by_default" => array('date' => false),
 			'indexes' => array(
 				array('object_id'),
@@ -163,7 +161,6 @@ class EventNotificationEmail extends EventNotification
 			"db_table" => "priv_event_email",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 			"order_by_default" => array('date' => false)
 		);
 		MetaModel::Init_Params($aParams);
@@ -201,7 +198,6 @@ class EventIssue extends Event
 			"db_table" => "priv_event_issue",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 			"order_by_default" => array('date' => false)
 		);
 		MetaModel::Init_Params($aParams);
@@ -301,7 +297,6 @@ class EventWebService extends Event
 			"db_table" => "priv_event_webservice",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 			"order_by_default" => array('date' => false)
 		);
 		MetaModel::Init_Params($aParams);
@@ -337,7 +332,6 @@ class EventRestService extends Event
 			"db_table" => "priv_event_restservice",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 			"order_by_default" => array('date' => false)
 		);
 		MetaModel::Init_Params($aParams);
diff --git a/core/trigger.class.inc.php b/core/trigger.class.inc.php
index 7c32137b4..a89359dbe 100644
--- a/core/trigger.class.inc.php
+++ b/core/trigger.class.inc.php
@@ -50,7 +50,6 @@ abstract class Trigger extends cmdbAbstractObject
 			"db_table" => "priv_trigger",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "realclass",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -168,7 +167,6 @@ abstract class TriggerOnObject extends Trigger
 			"db_table" => "priv_trigger_onobject",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -295,7 +293,6 @@ class TriggerOnPortalUpdate extends TriggerOnObject
 			"db_table" => "priv_trigger_onportalupdate",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -328,7 +325,6 @@ abstract class TriggerOnStateChange extends TriggerOnObject
 			"db_table" => "priv_trigger_onstatechange",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -363,7 +359,6 @@ class TriggerOnStateEnter extends TriggerOnStateChange
 			"db_table" => "priv_trigger_onstateenter",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -397,7 +392,6 @@ class TriggerOnStateLeave extends TriggerOnStateChange
 			"db_table" => "priv_trigger_onstateleave",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -431,7 +425,6 @@ class TriggerOnObjectCreate extends TriggerOnObject
 			"db_table" => "priv_trigger_onobjcreate",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -465,7 +458,6 @@ class TriggerOnObjectDelete extends TriggerOnObject
 			"db_table" => "priv_trigger_onobjdelete",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -500,7 +492,6 @@ class TriggerOnObjectUpdate extends TriggerOnObject
 			"db_table" => "priv_trigger_onobjupdate",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -593,7 +584,6 @@ class lnkTriggerAction extends cmdbAbstractObject
 			"db_table" => "priv_link_action_trigger",
 			"db_key_field" => "link_id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 			"is_link" => true,
 		);
 		MetaModel::Init_Params($aParams);
@@ -633,7 +623,6 @@ class TriggerOnThresholdReached extends TriggerOnObject
 			"db_table" => "priv_trigger_threshold",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
diff --git a/core/userrights.class.inc.php b/core/userrights.class.inc.php
index 73d9be350..caa264b74 100644
--- a/core/userrights.class.inc.php
+++ b/core/userrights.class.inc.php
@@ -242,7 +242,6 @@ abstract class User extends cmdbAbstractObject
 			"db_table" => "priv_user",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
diff --git a/datamodels/2.x/authent-external/model.authent-external.php b/datamodels/2.x/authent-external/model.authent-external.php
index 2b6d8ed7b..da5bd62de 100755
--- a/datamodels/2.x/authent-external/model.authent-external.php
+++ b/datamodels/2.x/authent-external/model.authent-external.php
@@ -45,7 +45,6 @@ class UserExternal extends User
 			"db_table" => "",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
diff --git a/datamodels/2.x/authent-ldap/model.authent-ldap.php b/datamodels/2.x/authent-ldap/model.authent-ldap.php
index 1bc8ec1eb..3d60472b1 100755
--- a/datamodels/2.x/authent-ldap/model.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/model.authent-ldap.php
@@ -40,7 +40,6 @@ class UserLDAP extends UserInternal
 			"db_table" => "",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
diff --git a/datamodels/2.x/authent-local/model.authent-local.php b/datamodels/2.x/authent-local/model.authent-local.php
index 764e2aaf3..8424c917c 100755
--- a/datamodels/2.x/authent-local/model.authent-local.php
+++ b/datamodels/2.x/authent-local/model.authent-local.php
@@ -84,7 +84,6 @@ class UserLocal extends UserInternal
 			"db_table" => "priv_user_local",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
diff --git a/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml b/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
index 677ca9937..c6a0f68b0 100755
--- a/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
+++ b/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
@@ -27,7 +27,6 @@
             <attribute id="temp_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
diff --git a/datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml b/datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml
index 8efbc12b4..69ac04184 100644
--- a/datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml
+++ b/datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml
@@ -16,7 +16,6 @@
             <attribute id="volume_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
diff --git a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
index 33498b9ee..b8eb1cb31 100755
--- a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
+++ b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
@@ -21,7 +21,6 @@
             <attribute id="ref"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/change.png</icon>
         <reconciliation>
           <attributes>
@@ -1216,7 +1215,6 @@
             <attribute id="ref"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/change.png</icon>
         <reconciliation>
           <attributes>
@@ -2013,7 +2011,6 @@
             <attribute id="ref"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/change.png</icon>
         <reconciliation>
           <attributes>
@@ -3015,7 +3012,6 @@
             <attribute id="ref"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/change.png</icon>
         <reconciliation>
           <attributes>
@@ -3709,7 +3705,6 @@
             <attribute id="ref"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/change.png</icon>
         <reconciliation>
           <attributes>
diff --git a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
index ba825474b..ad764ce5b 100755
--- a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
+++ b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
@@ -21,7 +21,6 @@
                         <attribute id="ref"/>
                     </attributes>
                 </naming>
-                <display_template/>
                 <icon>images/change.png</icon>
                 <reconciliation>
                     <attributes>
diff --git a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
index 32d508c64..e729db81f 100755
--- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
+++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
@@ -21,7 +21,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/building.png</icon>
         <reconciliation>
           <attributes>
@@ -182,7 +181,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/location.png</icon>
         <reconciliation>
           <attributes>
@@ -359,7 +357,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/team.png</icon>
         <reconciliation>
           <attributes>
@@ -535,7 +532,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/person.png</icon>
         <reconciliation>
           <attributes>
@@ -866,7 +862,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/team.png</icon>
         <reconciliation>
           <attributes>
@@ -985,7 +980,6 @@
         <naming>
           <attributes/>
         </naming>
-        <display_template/>
         <icon>images/document.png</icon>
         <reconciliation>
           <attributes>
@@ -1168,7 +1162,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/document.png</icon>
         <reconciliation>
           <attributes>
@@ -1291,7 +1284,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/document.png</icon>
         <reconciliation>
           <attributes>
@@ -1395,7 +1387,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/document.png</icon>
         <reconciliation>
           <attributes>
@@ -1497,7 +1488,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/server.png</icon>
         <reconciliation>
           <attributes>
@@ -1769,7 +1759,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/server.png</icon>
         <reconciliation>
           <attributes>
@@ -2006,7 +1995,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/server.png</icon>
         <reconciliation>
           <attributes>
@@ -2173,7 +2161,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/server.png</icon>
         <reconciliation>
           <attributes>
@@ -2458,7 +2445,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/switch.png</icon>
         <reconciliation>
           <attributes>
@@ -2734,7 +2720,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/server.png</icon>
         <reconciliation>
           <attributes>
@@ -3041,7 +3026,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/solution.png</icon>
         <reconciliation>
           <attributes>
@@ -3189,7 +3173,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/business-process.png</icon>
         <reconciliation>
           <attributes>
@@ -3301,7 +3284,6 @@
             <attribute id="system_name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/application.png</icon>
         <reconciliation>
           <attributes>
@@ -3482,7 +3464,6 @@
             <attribute id="system_name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/middleware.png</icon>
         <reconciliation>
           <attributes>
@@ -3616,7 +3597,6 @@
             <attribute id="system_name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/database.png</icon>
         <reconciliation>
           <attributes>
@@ -3750,7 +3730,6 @@
             <attribute id="system_name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/webserver.png</icon>
         <reconciliation>
           <attributes>
@@ -3884,7 +3863,6 @@
             <attribute id="system_name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/application.png</icon>
         <reconciliation>
           <attributes>
@@ -3997,7 +3975,6 @@
             <attribute id="system_name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/application.png</icon>
         <reconciliation>
           <attributes>
@@ -4109,7 +4086,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/middleware.png</icon>
         <reconciliation>
           <attributes>
@@ -4233,7 +4209,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/database-schema.png</icon>
         <reconciliation>
           <attributes>
@@ -4355,7 +4330,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/webapp.png</icon>
         <reconciliation>
           <attributes>
@@ -4487,7 +4461,6 @@
             <attribute id="version"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/software.png</icon>
         <reconciliation>
           <attributes>
@@ -4644,7 +4617,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/patch.png</icon>
         <reconciliation>
           <attributes>
@@ -4731,7 +4703,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/patch.png</icon>
         <reconciliation>
           <attributes>
@@ -4819,7 +4790,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/patch.png</icon>
         <reconciliation>
           <attributes>
@@ -4907,7 +4877,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/licence.png</icon>
         <reconciliation>
           <attributes>
@@ -5087,7 +5056,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/licence.png</icon>
         <reconciliation>
           <attributes>
@@ -5225,7 +5193,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/licence.png</icon>
         <reconciliation>
           <attributes>
@@ -5357,7 +5324,6 @@
             <attribute id="document_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -5436,7 +5402,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -5498,7 +5463,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -5565,7 +5529,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -5613,7 +5576,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -5661,7 +5623,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -5709,7 +5670,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -5777,7 +5737,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -5900,7 +5859,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -5961,7 +5919,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -6030,7 +5987,6 @@
             <attribute id="document_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -6111,7 +6067,6 @@
             <attribute id="softwareinstance_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -6192,7 +6147,6 @@
             <attribute id="functionalci_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -6273,7 +6227,6 @@
             <attribute id="document_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -6354,7 +6307,6 @@
             <attribute id="contact_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -6435,7 +6387,6 @@
             <attribute id="document_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -6515,7 +6466,6 @@
             <attribute id="ip_mask"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/subnet.png</icon>
         <reconciliation>
           <attributes>
@@ -6713,7 +6663,6 @@
             <attribute id="vlan_tag"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/vlan.png</icon>
         <reconciliation>
           <attributes>
@@ -6831,7 +6780,6 @@
             <attribute id="vlan_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -6917,7 +6865,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/interface.png</icon>
         <reconciliation>
           <attributes>
@@ -6979,7 +6926,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/interface.png</icon>
         <reconciliation>
           <attributes>
@@ -7123,7 +7069,6 @@
             <attribute id="connectableci_name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/interface.png</icon>
         <reconciliation>
           <attributes>
@@ -7245,7 +7190,6 @@
             <attribute id="vlan_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -7334,7 +7278,6 @@
             <attribute id="connectableci_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -7591,7 +7534,6 @@
             <attribute id="functionalci_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -7672,7 +7614,6 @@
             <attribute id="applicationsolution_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -7753,7 +7694,6 @@
             <attribute id="person_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -7851,7 +7791,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/group.png</icon>
         <reconciliation>
           <attributes>
@@ -8011,7 +7950,6 @@
             <attribute id="group_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
diff --git a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
index 77836cdf3..770ef6df7 100755
--- a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
+++ b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
@@ -15,7 +15,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/rack.png</icon>
         <reconciliation>
           <attributes>
@@ -198,7 +197,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/enclosure.png</icon>
         <reconciliation>
           <attributes>
@@ -388,7 +386,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/power-connection.png</icon>
         <reconciliation>
           <attributes>
@@ -555,7 +552,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/power-connection.png</icon>
         <reconciliation>
           <attributes>
@@ -715,7 +711,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/pdu.png</icon>
         <reconciliation>
           <attributes>
diff --git a/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml b/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml
index 1a4075d3e..df35c4af2 100644
--- a/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml
+++ b/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml
@@ -15,7 +15,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/mobile-phone.png</icon>
         <reconciliation>
           <attributes>
@@ -168,7 +167,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/phone.png</icon>
         <reconciliation>
           <attributes>
@@ -320,7 +318,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/mobile-phone.png</icon>
         <reconciliation>
           <attributes>
@@ -495,7 +492,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/ipphone.png</icon>
         <reconciliation>
           <attributes>
@@ -647,7 +643,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/tablet.png</icon>
         <reconciliation>
           <attributes>
@@ -796,7 +791,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/laptop.png</icon>
         <reconciliation>
           <attributes>
@@ -1047,7 +1041,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/printer.png</icon>
         <reconciliation>
           <attributes>
@@ -1232,7 +1225,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/peripherals.png</icon>
         <reconciliation>
           <attributes>
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
index 438800651..96f726bbf 100755
--- a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
+++ b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
@@ -21,7 +21,6 @@
 						<attribute id="ref"/>
 					</attributes>
 				</naming>
-				<display_template/>
 				<icon>images/incident.png</icon>
 				<reconciliation>
 					<attributes>
diff --git a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml b/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
index 18615843b..f88388431 100755
--- a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
+++ b/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
@@ -18,7 +18,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/known-error.png</icon>
         <reconciliation>
           <attributes>
@@ -239,7 +238,6 @@
         <naming>
           <attributes/>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -413,7 +411,6 @@
             <attribute id="title"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/faq.png</icon>
         <reconciliation>
           <attributes>
@@ -552,7 +549,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
diff --git a/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml b/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
index d0d7cbca4..d6eb544cc 100755
--- a/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
+++ b/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
@@ -21,7 +21,6 @@
                         <attribute id="ref"/>
                     </attributes>
                 </naming>
-                <display_template/>
                 <icon>images/problem.png</icon>
                 <reconciliation>
                     <attributes>
diff --git a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
index 051be1e49..b11ce5256 100755
--- a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
+++ b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
@@ -21,7 +21,6 @@
 						<attribute id="ref"/>
 					</attributes>
 				</naming>
-				<display_template/>
 				<icon>images/user-request.png</icon>
 				<reconciliation>
 					<attributes>
diff --git a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
index 317a97795..9e41292b0 100755
--- a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
+++ b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
@@ -21,7 +21,6 @@
                         <attribute id="ref"/>
                     </attributes>
                 </naming>
-                <display_template/>
                 <icon>images/user-request.png</icon>
                 <reconciliation>
                     <attributes>
diff --git a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
index 79dac4563..2f691ced3 100755
--- a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
+++ b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
@@ -60,7 +60,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/contract.png</icon>
         <reconciliation>
           <attributes>
@@ -348,7 +347,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -396,7 +394,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/contract.png</icon>
         <reconciliation>
           <attributes>
@@ -569,7 +566,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/contract.png</icon>
         <reconciliation>
           <attributes>
@@ -750,7 +746,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="contact_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -831,7 +826,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="document_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -912,7 +906,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="functionalci_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -991,7 +984,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/service.png</icon>
         <reconciliation>
           <attributes>
@@ -1074,7 +1066,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/service.png</icon>
         <reconciliation>
           <attributes>
@@ -1266,7 +1257,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="document_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -1347,7 +1337,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="contact_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -1426,7 +1415,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/service.png</icon>
         <reconciliation>
           <attributes>
@@ -1579,7 +1567,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/sla.png</icon>
         <reconciliation>
           <attributes>
@@ -1719,7 +1706,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/slt.png</icon>
         <reconciliation>
           <attributes>
@@ -1867,7 +1853,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="slt_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -1988,7 +1973,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="service_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -2085,7 +2069,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="providercontract_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -2166,7 +2149,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="functionalci_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -2245,7 +2227,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/service.png</icon>
         <reconciliation>
           <attributes>
@@ -2352,7 +2333,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="contact_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
diff --git a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
index a6d50d78a..f95903e77 100755
--- a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
+++ b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
@@ -60,7 +60,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/contract.png</icon>
         <reconciliation>
           <attributes>
@@ -348,7 +347,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -396,7 +394,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/contract.png</icon>
         <reconciliation>
           <attributes>
@@ -544,7 +541,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/contract.png</icon>
         <reconciliation>
           <attributes>
@@ -722,7 +718,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="contact_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -803,7 +798,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="document_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -884,7 +878,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="functionalci_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -963,7 +956,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/service.png</icon>
         <reconciliation>
           <attributes>
@@ -1046,7 +1038,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/service.png</icon>
         <reconciliation>
           <attributes>
@@ -1260,7 +1251,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="document_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -1341,7 +1331,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="contact_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -1420,7 +1409,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/service.png</icon>
         <reconciliation>
           <attributes>
@@ -1573,7 +1561,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/sla.png</icon>
         <reconciliation>
           <attributes>
@@ -1713,7 +1700,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/slt.png</icon>
         <reconciliation>
           <attributes>
@@ -1861,7 +1847,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="slt_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -1982,7 +1967,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="service_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -2079,7 +2063,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="providercontract_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -2160,7 +2143,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="functionalci_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -2239,7 +2221,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/service.png</icon>
         <reconciliation>
           <attributes>
@@ -2345,7 +2326,6 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="contact_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
diff --git a/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml b/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml
index b7f24aaaf..a1ad4b745 100644
--- a/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml
+++ b/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml
@@ -15,7 +15,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/storageArea.png</icon>
         <reconciliation>
           <attributes>
@@ -265,7 +264,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/switch-san.png</icon>
         <reconciliation>
           <attributes>
@@ -512,7 +510,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/tapelibrary.png</icon>
         <reconciliation>
           <attributes>
@@ -759,7 +756,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/nas.png</icon>
         <reconciliation>
           <attributes>
@@ -1006,7 +1002,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/tape.png</icon>
         <reconciliation>
           <attributes>
@@ -1099,7 +1094,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/filesystem.png</icon>
         <reconciliation>
           <attributes>
@@ -1207,7 +1201,6 @@
             <attribute id="datacenterdevice_name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/fc-interface.png</icon>
         <reconciliation>
           <attributes>
@@ -1316,7 +1309,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/volume.png</icon>
         <reconciliation>
           <attributes>
@@ -1471,7 +1463,6 @@
             <attribute id="volume_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -1562,7 +1553,6 @@
             <attribute id="san_id"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
index 98cbc3ab6..44793e0ed 100755
--- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
+++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
@@ -27,7 +27,6 @@
 						<attribute id="ref"/>
 					</attributes>
 				</naming>
-				<display_template/>
 				<icon/>
 				<reconciliation>
 					<attributes>
@@ -376,7 +375,6 @@
 						<attribute id="contact_id"/>
 					</attributes>
 				</naming>
-				<display_template/>
 				<icon/>
 				<reconciliation>
 					<attributes>
@@ -482,7 +480,6 @@
 						<attribute id="functionalci_id"/>
 					</attributes>
 				</naming>
-				<display_template/>
 				<icon/>
 				<reconciliation>
 					<attributes>
@@ -590,7 +587,6 @@
 						<attribute id="name"/>
 					</attributes>
 				</naming>
-				<display_template/>
 				<icon>images/workorder.png</icon>
 				<reconciliation>
 					<attributes>
diff --git a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
index 30a137c50..d8adde482 100644
--- a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
+++ b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
@@ -15,7 +15,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -141,7 +140,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon/>
         <reconciliation>
           <attributes>
@@ -260,7 +258,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/hypervisor.png</icon>
         <reconciliation>
           <attributes>
@@ -408,7 +405,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/cluster.png</icon>
         <reconciliation>
           <attributes>
@@ -534,7 +530,6 @@
             <attribute id="name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/virtualmachine.png</icon>
         <reconciliation>
           <attributes>
@@ -767,7 +762,6 @@
             <attribute id="virtualmachine_name"/>
           </attributes>
         </naming>
-        <display_template/>
         <icon>images/interface.png</icon>
         <reconciliation>
           <attributes>
diff --git a/setup/moduleinstallation.class.inc.php b/setup/moduleinstallation.class.inc.php
index d64d23220..663d7a807 100644
--- a/setup/moduleinstallation.class.inc.php
+++ b/setup/moduleinstallation.class.inc.php
@@ -39,7 +39,6 @@ class ModuleInstallation extends cmdbAbstractObject
 			"db_table" => "priv_module_install",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
@@ -81,7 +80,6 @@ class ExtensionInstallation extends cmdbAbstractObject
 				"db_table" => "priv_extension_install",
 				"db_key_field" => "id",
 				"db_finalclass_field" => "",
-				"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();