N°6218 - 1:n & n:n - Read mode: No refresh of tab count on Add/Remove in pop-up

2026-04-01 23:34:13 +02:00 · 2023-11-14 08:59:46 +01:00
146 changed files with 951 additions and 2363 deletions
--- a/addons/userrights/userrightsprofile.class.inc.php
+++ b/addons/userrights/userrightsprofile.class.inc.php
@@ -933,9 +933,8 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	}

 	/**
-	 * @param string $sClass
-	 * @return string|null Find out which attribute is corresponding the dimension 'owner org'
-	 *                   returns null if no such attribute has been found (no filtering should occur)
+	 * Find out which attribute is corresponding the the dimension 'owner org'
+	 * returns null if no such attribute has been found (no filtering should occur)
 	 */
 	public static function GetOwnerOrganizationAttCode($sClass)
 	{
--- a/addons/userrights/userrightsprofile.db.class.inc.php
+++ b/addons/userrights/userrightsprofile.db.class.inc.php
@@ -580,10 +580,10 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	/**
 	 * Read and cache organizations allowed to the given user
 	 *
-	 * @param User $oUser
-	 * @param string $sClass (not used here but can be used in overloads)
+	 * @param $oUser
+	 * @param $sClass (not used here but can be used in overloads)
 	 *
-	 * @return array keys of the User allowed org
+	 * @return array
 	 * @throws \CoreException
 	 * @throws \Exception
 	 */
--- a/application/applicationextension.inc.php
+++ b/application/applicationextension.inc.php
@@ -2015,8 +2015,6 @@ class RestUtils
 	 *
 	 * @return DBObject The object found
 	 * @throws Exception If the input structure is not valid or it could not find exactly one object
-	 *
-	 * @see DBObject::CheckChangedExtKeysValues() generic method to check that we can access the linked object isn't used in that use case because values can be literal, OQL, friendlyname
 	 */
 	public static function FindObjectFromKey($sClass, $key, $bAllowNullValue = false)
 	{
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -4544,7 +4544,7 @@ HTML;
 		return $res;
 	}

-	protected function PostInsertActions(): void
+	public function PostInsertActions(): void
 	{
 		parent::PostInsertActions();

@@ -4568,9 +4568,6 @@ HTML;
 		InlineImage::FinalizeInlineImages($this);
 	}

-	/**
-	 * @deprecated 3.1.1 3.2.0 N°6966 We will have only one DBClone method in the future
-	 */
 	protected function DBCloneTracked_Internal($newKey = null)
 	{
        /** @var cmdbAbstractObject $oNewObj */
@@ -4610,7 +4607,7 @@ HTML;
 		return $res;
 	}

-	protected function PostUpdateActions(array $aChanges): void
+	public function PostUpdateActions(array $aChanges): void
 	{
 		parent::PostUpdateActions($aChanges);

@@ -4659,10 +4656,7 @@ HTML;
 		return $oDeletionPlan;
 	}

-	/**
-	 * @deprecated 3.1.1 3.2.0 N°6967 We will have only one DBDelete method in the future
-	 */
-	protected function DBDeleteTracked_Internal(&$oDeletionPlan = null)
+		protected function DBDeleteTracked_Internal(&$oDeletionPlan = null)
 	{
 		// Invoke extensions before the deletion (the deletion will do some cleanup and we might loose some information
 		/** @var \iApplicationObjectExtension $oExtensionInstance */
@@ -5354,7 +5348,7 @@ EOF
 			$aErrors = $oObj->UpdateObjectFromPostedForm('');
 			$bResult = (count($aErrors) == 0);
 			if ($bResult) {
-				[$bResult, $aErrors] = $oObj->CheckToWrite();
+				list($bResult, $aErrors) = $oObj->CheckToWrite();
 			}
 			if ($bPreview) {
 				$sStatus = $bResult ? Dict::S('UI:BulkModifyStatusOk') : Dict::S('UI:BulkModifyStatusError');
@@ -5371,11 +5365,6 @@ EOF
 				'errors' => '<p>'.($bResult ? '' : implode('</p><p>', $aErrorsToDisplay)).'</p>',
 			);
 			if ($bResult && (!$bPreview)) {
-				// doing the check will load multiple times same objects :/
-				// but it shouldn't cost too much on execution time
-				// user can mitigate by selecting less extkeys/lnk to set and/or less objects to update 🤷‍♂️
-				$oObj->CheckChangedExtKeysValues();
-
 				$oObj->DBUpdate();
 			}
 		}
@@ -5958,56 +5947,42 @@ JS
 	}

 	/**
-	 * Possibility for linked classes to be notified of current class modification
-	 *
+	 * If the passed object is an instance of a link class, then will register each remote object for modification using {@see static::RegisterObjectAwaitingEventDbLinksChanged()}
 	 * If an external key was modified, register also the previous object that was linked previously.
 	 *
-	 * @uses static::RegisterObjectAwaitingEventDbLinksChanged()
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \Exception
 	 *
-	 * @throws ArchivedObjectException
-	 * @throws CoreException
-	 * @throws Exception
-	 *
-	 * @since 3.1.0 N°5906 method creation
-	 * @since 3.1.1 3.2.0 N°6228 now just notify attributes having `with_php_computation`
+	 * @since 3.1.0 N°5906
 	 */
 	final protected function NotifyAttachedObjectsOnLinkClassModification(): void
 	{
+		$sClass = get_class($this);
+		if (false === MetaModel::IsLinkClass($sClass)) {
+			return;
+		}
 		// previous values in case of link change
 		$aPreviousValues = $this->ListPreviousValuesForUpdatedAttributes();
-		$sClass = get_class($this);
-		$aClassExtKeyAttCodes = MetaModel::GetAttributesList($sClass, [AttributeExternalKey::class]);
-		foreach ($aClassExtKeyAttCodes as $sExternalKeyAttCode) {
-			/** @var AttributeExternalKey $oAttDef */
-			$oAttDef = MetaModel::GetAttributeDef($sClass, $sExternalKeyAttCode);

-			if (false === $this->DoesTargetObjectHavePhpComputation($oAttDef)) {
-				continue;
+		$aLnkClassExternalKeys = MetaModel::GetAttributesList($sClass, [AttributeExternalKey::class]);
+		foreach ($aLnkClassExternalKeys as $sExternalKeyAttCode) {
+			/** @var \AttributeExternalKey $oExternalKeyAttDef */
+			$oExternalKeyAttDef = MetaModel::GetAttributeDef($sClass, $sExternalKeyAttCode);
+			$sRemoteClassName = $oExternalKeyAttDef->GetTargetClass();
+
+			$sRemoteObjectId = $this->Get($sExternalKeyAttCode);
+			if ($sRemoteObjectId > 0) {
+				self::RegisterObjectAwaitingEventDbLinksChanged($sRemoteClassName, $sRemoteObjectId);
 			}

-			$sTargetObjectId = $this->Get($sExternalKeyAttCode);
-			if ($sTargetObjectId > 0) {
-				self::RegisterObjectAwaitingEventDbLinksChanged($oAttDef->GetTargetClass(), $sTargetObjectId);
-			}
-
-			$sPreviousTargetObjectId = $aPreviousValues[$sExternalKeyAttCode] ?? 0;
-			if ($sPreviousTargetObjectId > 0) {
-				self::RegisterObjectAwaitingEventDbLinksChanged($oAttDef->GetTargetClass(), $sPreviousTargetObjectId);
+			$sPreviousRemoteObjectId = $aPreviousValues[$sExternalKeyAttCode] ?? 0;
+			if ($sPreviousRemoteObjectId > 0) {
+				self::RegisterObjectAwaitingEventDbLinksChanged($sRemoteClassName, $sPreviousRemoteObjectId);
 			}
 		}
 	}

-	private function DoesTargetObjectHavePhpComputation(AttributeExternalKey $oAttDef): bool
-	{
-		/** @var AttributeLinkedSet $oAttDefMirrorLink */
-		$oAttDefMirrorLink = $oAttDef->GetMirrorLinkAttribute();
-		if (is_null($oAttDefMirrorLink) || false === $oAttDefMirrorLink->HasPHPComputation()){
-			return false;
-		}
-
-		return true;
-	}
-
 	/**
 	 * Register one object for later EVENT_DB_LINKS_CHANGED event.
 	 *
--- a/application/exceptions/InvalidExternalKeyValueException.php
+++ b/application/exceptions/InvalidExternalKeyValueException.php
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * @since 2.7.10 3.0.4 3.1.1 3.2.0 N°6458 object creation
- */
-class InvalidExternalKeyValueException extends CoreUnexpectedValue
-{
-	private const ENUM_PARAMS_OBJECT = 'current_object';
-	private const ENUM_PARAMS_ATTCODE = 'attcode';
-	private const ENUM_PARAMS_ATTVALUE = 'attvalue';
-	private const ENUM_PARAMS_USER = 'current_user';
-
-	public function __construct($oObject, $sAttCode, $aContextData = null, $oPrevious = null)
-	{
-		$aContextData[self::ENUM_PARAMS_OBJECT] = get_class($oObject) . '::' . $oObject->GetKey();
-		$aContextData[self::ENUM_PARAMS_ATTCODE] = $sAttCode;
-		$aContextData[self::ENUM_PARAMS_ATTVALUE] = $oObject->Get($sAttCode);
-
-		$oCurrentUser = UserRights::GetUserObject();
-		if (false === is_null($oCurrentUser)) {
-			$aContextData[self::ENUM_PARAMS_USER] = get_class($oCurrentUser) . '::' . $oCurrentUser->GetKey();
-		}
-
-		parent::__construct('Attribute pointing to an object that is either non existing or not readable by the current user', $aContextData, '', $oPrevious);
-	}
-
-	public function GetAttCode(): string
-	{
-		return $this->getContextData()[self::ENUM_PARAMS_ATTCODE];
-	}
-
-	public function GetAttValue(): string
-	{
-		return $this->getContextData()[self::ENUM_PARAMS_ATTVALUE];
-	}
-}
--- a/application/menunode.class.inc.php
+++ b/application/menunode.class.inc.php
@@ -103,7 +103,7 @@ class ApplicationMenu
 	{
 		self::$sFavoriteSiloQuery = $sOQL;
 	}
-
+	
 	/**
 	 * Get the query used to limit the list of displayed organizations in the drop-down menu
 	 * @return string The OQL query returning a list of Organization objects
@@ -536,7 +536,7 @@ EOF

 		return -1;
 	}
-
+	
 	/**
 	 * Retrieves the currently active menu (if any, otherwise the first menu is the default)
 	 * @return string The Id of the currently active menu
@@ -544,7 +544,7 @@ EOF
 	public static function GetActiveNodeId()
 	{
 		$oAppContext = new ApplicationContext();
-		$sMenuId = $oAppContext->GetCurrentValue('menu', null);
+		$sMenuId = $oAppContext->GetCurrentValue('menu', null);		
 		if ($sMenuId  === null)
 		{
 			$sMenuId = self::GetDefaultMenuId();
@@ -654,7 +654,7 @@ abstract class MenuNode

 	/**
 	 * Stimulus to check: if the user can 'apply' this stimulus, then she/he can see this menu
-	 */
+	 */	
 	protected $m_aEnableStimuli;

 	/**
@@ -814,7 +814,7 @@ abstract class MenuNode
 	{
 		return false;
 	}
-
+	
 	/**
 	 * Add a limiting display condition for the same menu node. The conditions will be combined with a AND
 	 * @param $oMenuNode MenuNode Another definition of the same menu node, with potentially different access restriction
@@ -987,7 +987,7 @@ class TemplateMenuNode extends MenuNode
 	 * @var string
 	 */
 	protected $sTemplateFile;
-
+	
 	/**
 	 * Create a menu item based on a custom template and inserts it into the application's main menu
 	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
@@ -1058,7 +1058,7 @@ class OQLMenuNode extends MenuNode
 	 * @var bool|null
 	 */
 	protected $bSearchFormOpen;
-
+	
 	/**
 	 * Extra parameters to be passed to the display block to fine tune its appearence
 	 */
@@ -1091,7 +1091,7 @@ class OQLMenuNode extends MenuNode
 		// Enhancement: we could set as the "enable" condition that the user has enough rights to "read" the objects
 		// of the class specified by the OQL...
 	}
-
+	
 	/**
 	 * Set some extra parameters to be passed to the display block to fine tune its appearence
 	 * @param array $aParams paramCode => value. See DisplayBlock::GetDisplay for the meaning of the parameters
@@ -1111,7 +1111,7 @@ class OQLMenuNode extends MenuNode
 	 */
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
 	{
-		$oTag = new ContextTag(ContextTag::TAG_OBJECT_SEARCH);
+		ContextTag::AddContext(ContextTag::TAG_OBJECT_SEARCH);
 		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
 		OQLMenuNode::RenderOQLSearch
 		(
@@ -1120,7 +1120,7 @@ class OQLMenuNode extends MenuNode
 			'Menu_'.$this->GetMenuId(),
 			$this->bSearch, // Search pane
 			$this->bSearchFormOpen, // Search open
-			$oPage,
+			$oPage, 
 			array_merge($this->m_aParams, $aExtraParams),
 			true
 		);
@@ -1354,10 +1354,10 @@ class NewObjectMenuNode extends MenuNode
 	{
 		// Enable this menu, only if the current user has enough rights to create such an object, or an object of
 		// any child class
-
+	
 		$aSubClasses = MetaModel::EnumChildClasses($this->sClass, ENUM_CHILD_CLASSES_ALL); // Including the specified class itself
 		$bActionIsAllowed = false;
-
+	
 		foreach($aSubClasses as $sCandidateClass)
 		{
 			if (!MetaModel::IsAbstract($sCandidateClass) && (UserRights::IsActionAllowed($sCandidateClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES))
@@ -1366,7 +1366,7 @@ class NewObjectMenuNode extends MenuNode
 				break; // Enough for now
 			}
 		}
-		return $bActionIsAllowed;
+		return $bActionIsAllowed;		
 	}

 	/**
@@ -1508,7 +1508,7 @@ class DashboardMenuNode extends MenuNode
 			throw new Exception("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
 		}
 	}
-
+	
 }

 /**
@@ -1549,7 +1549,7 @@ class ShortcutContainerMenuNode extends MenuNode
 			$sName = $this->GetMenuId().'_'.$oShortcut->GetKey();
 			new ShortcutMenuNode($sName, $oShortcut, $this->GetIndex(), $fRank++);
 		}
-
+	
 		// Complete the tree
 		//
 		parent::PopulateChildMenus();
--- a/application/utils.inc.php
+++ b/application/utils.inc.php
@@ -2499,17 +2499,15 @@ SQL;
 						$aHeaders = static::ParseHeaders($http_response_header);
 						$sMimeType = array_key_exists('Content-Type', $aHeaders) ? strtolower($aHeaders['Content-Type']) : 'application/x-octet-stream';
 						// Compute the file extension from the MIME Type
-						foreach ($aKnownExtensions as $sExtValue => $sMime) {
-							if ($sMime === $sMimeType) {
+						foreach($aKnownExtensions as $sExtValue => $sMime)
+						{
+							if ($sMime === $sMimeType)
+							{
 								$sExtension = '.'.$sExtValue;
 								break;
 							}
 						}
 					}
-					$sPathName = pathinfo($sPath, PATHINFO_FILENAME);
-					if (utils::IsNotNullOrEmptyString($sPathName)) {
-						$sFileName = $sPathName;
-					}
 					$sFileName .= $sExtension;
 				}
 				$oUploadedDoc = new ormDocument($sData, $sMimeType, $sFileName);
@@ -3031,7 +3029,6 @@ HTML;
 	 *
 	 * @return bool if string null or empty
 	 * @since 3.0.2 N°5302
-	 * @since 2.7.10 N°6458 add method in the 2.7 branch
 	 */
 	public static function IsNullOrEmptyString(?string $sString): bool
 	{
@@ -3047,7 +3044,6 @@ HTML;
 	 *
 	 * @return bool if string is not null and not empty
 	 * @since 3.0.2 N°5302
-	 * @since 2.7.10 N°6458 add method in the 2.7 branch
 	 */
 	public static function IsNotNullOrEmptyString(?string $sString): bool
 	{
--- a/approot.inc.php
+++ b/approot.inc.php
@@ -23,13 +23,11 @@ define('ITOP_DESIGN_LATEST_VERSION', '3.1');
 * @used-by utils::GetItopVersionWikiSyntax()
 * @used-by iTopModulesPhpVersionIntegrationTest
 */
-define('ITOP_CORE_VERSION', '3.1.1');
+define('ITOP_CORE_VERSION', '3.1.0');

 /**
- * @var string
- * @since 3.0.4 3.1.0 3.2.0 N°6274 Allow to test if PHPUnit is currently running. Starting with PHPUnit 9.5 we'll be able to replace it with $GLOBALS['phpunit_version']
- * @since 3.0.4 3.1.1 3.2.0 N°6976 Fix constant name (DeprecatedCallsLog error handler was never set)
+ * @since 3.0.4 N°6274 Allow to test if PHPUnit is currently running. Starting with PHPUnit 9.5 we'll be able to replace it with $GLOBALS['phpunit_version']
 */
-const ITOP_PHPUNIT_RUNNING_CONSTANT_NAME = 'ITOP_PHPUNIT_RUNNING';
+define('ITOP_PHPUNIT_RUNNING_CONSTANT_NAME', 'ITOP_PHPUNIT_RUNNING');

 require_once APPROOT.'bootstrap.inc.php';
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -1739,20 +1739,11 @@ class AttributeLinkedSet extends AttributeDefinition
 	 * @return bool true if Attribute has constraints
 	 * @since 3.1.0 N°6228
 	 */
-	public function HasPHPConstraint(): bool
+	public function GetHasConstraint()
 	{
 		return $this->GetOptional('with_php_constraint', false);
 	}

-	/**
-	 * @return bool true if Attribute has computation (DB_LINKS_CHANGED event propagation, `with_php_computation` attribute xml property), false otherwise
-	 * @since 3.1.1 3.2.0 N°6228
-	 */
-	public function HasPHPComputation(): bool
-	{
-		return $this->GetOptional('with_php_computation', false);
-	}
-	
 	public function GetLinkedClass()
 	{
 		return $this->Get('linked_class');
--- a/core/cmdbobject.class.inc.php
+++ b/core/cmdbobject.class.inc.php
@@ -438,8 +438,7 @@ abstract class CMDBObject extends DBObject
 	}

 	/**
-	 * @deprecated 3.1.0 N°5232 N°6966 simply use {@see DBObject::DBClone()} instead, that will automatically create and persist a CMDBChange object.
-	 *     If you need to persist your own, call {@see CMDBObject::SetCurrentChange()} before.
+	 * @deprecated 3.1.0 N°5232 not used
 	 */
 	public function DBCloneTracked(CMDBChange $oChange, $newKey = null)
 	{
@@ -447,9 +446,6 @@ abstract class CMDBObject extends DBObject
 		$this->DBCloneTracked_Internal($newKey);
 	}

-	/**
-	 * @deprecated 3.1.1 3.2.0 N°6966 We will have only one DBClone method in the future
-	 */
 	protected function DBCloneTracked_Internal($newKey = null)
 	{
 		$newKey = parent::DBClone($newKey);
@@ -474,13 +470,23 @@ abstract class CMDBObject extends DBObject
 	public function DBDelete(&$oDeletionPlan = null)
 	{
 		$this->LogCRUDEnter(__METHOD__);
-		$oDeletionPlan = parent::DBDelete($oDeletionPlan);
+		$oDeletionPlan = $this->DBDeleteTracked_Internal($oDeletionPlan);
 		$this->LogCRUDExit(__METHOD__);
 		return $oDeletionPlan;
 	}

 	/**
-	 * @deprecated 3.1.1 3.2.0 N°6967 We will have only one DBDelete method in the future
+	 * @param null $oDeletionPlan
+	 *
+	 * @return \DeletionPlan|null
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreCannotSaveObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DeleteException
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \OQLException
 	 */
 	protected function DBDeleteTracked_Internal(&$oDeletionPlan = null)
 	{
--- a/core/cmdbsource.class.inc.php
+++ b/core/cmdbsource.class.inc.php
@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify
+//   iTop is free software; you can redistribute it and/or modify	
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -380,7 +380,7 @@ class CMDBSource
 	public static function GetDBVendor()
 	{
 		$sDBVendor = static::ENUM_DB_VENDOR_MYSQL;
-
+		
 		$sVersionComment = static::GetServerVariable('version') .  ' - ' . static::GetServerVariable('version_comment');
 		if(preg_match('/mariadb/i', $sVersionComment) === 1)
 		{
@@ -390,7 +390,7 @@ class CMDBSource
 		{
 			$sDBVendor = static::ENUM_DB_VENDOR_PERCONA;
 		}
-
+		
 		return $sDBVendor;
 	}

@@ -934,7 +934,7 @@ class CMDBSource
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
-
+				
 		while ($aRow = $oResult->fetch_array($iMode))
 		{
 			$aData[] = $aRow;
@@ -1088,7 +1088,7 @@ class CMDBSource
 		if (!array_key_exists($iKey, $aTableInfo["Fields"])) return false;
 		$aFieldData = $aTableInfo["Fields"][$iKey];
 		if (!array_key_exists("Key", $aFieldData)) return false;
-		return ($aFieldData["Key"] == "PRI");
+		return ($aFieldData["Key"] == "PRI"); 
 	}

 	public static function IsAutoIncrement($sTable, $sField)
@@ -1099,7 +1099,7 @@ class CMDBSource
 		$aFieldData = $aTableInfo["Fields"][$sField];
 		if (!array_key_exists("Extra", $aFieldData)) return false;
 		//MyHelpers::debug_breakpoint($aFieldData);
-		return (strstr($aFieldData["Extra"], "auto_increment"));
+		return (strstr($aFieldData["Extra"], "auto_increment")); 
 	}

 	public static function IsField($sTable, $sField)
@@ -1366,13 +1366,13 @@ class CMDBSource
 	public static function GetTableFieldsList($sTable)
 	{
 		assert(!empty($sTable));
-
+		
 		$aTableInfo = self::GetTableInfo($sTable);
 		if (empty($aTableInfo)) return array(); // #@# or an error ?

 		return array_keys($aTableInfo["Fields"]);
 	}
-
+	
 	// Cache the information about existing tables, and their fields
 	private static $m_aTablesInfo = array();
 	private static function _TablesInfoCacheReset($sTableName = null)
@@ -1505,7 +1505,7 @@ class CMDBSource
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
-
+		
 		$aRows = array();
 		while ($aRow = $oResult->fetch_array(MYSQLI_ASSOC))
 		{
@@ -1514,7 +1514,7 @@ class CMDBSource
 		$oResult->free();
 		return $aRows;
 	}
-
+	
 	/**
 	 * Returns the value of the specified server variable
 	 * @param string $sVarName Name of the server variable
@@ -1530,7 +1530,7 @@ class CMDBSource
 	/**
 	 * Returns the privileges of the current user
 	 * @return string privileges in a raw format
-	 */
+	 */	   	
 	public static function GetRawPrivileges()
 	{
 		try
@@ -1556,8 +1556,8 @@ class CMDBSource

 	/**
 	 * Determine the slave status of the server
-	 * @return bool true if the server is slave
-	 */
+	 * @return bool true if the server is slave 
+	 */	   	
 	public static function IsSlaveServer()
 	{
 		try
--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -1193,30 +1193,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
-		'sessions_tracking.enabled' => [
-			'type' => 'bool',
-			'description' => 'Whether or not the whole mechanism to track active sessions is enabled. See PHP session.gc_maxlifetime setting to configure session expiration.',
-			'default' => false,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
-		'sessions_tracking.gc_threshold' => [
-			'type' => 'integer',
-			'description'         => 'fallback in case cron is not active: probability in percent that session files are cleanup during any itop request (100 means always)',
-			'default'             => 1,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
-		'sessions_tracking.gc_duration_in_seconds' => [
-			'type' => 'integer',
-			'description' => 'fallback in case cron is not active: when a cleanup is triggered cleanup duration will not exceed this duration (in seconds).',
-			'default' => 1,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
 		'transaction_storage' => [
 			'type' => 'string',
 			'description' => 'The type of mechanism to use for storing the unique identifiers for transactions (Session|File).',
--- a/core/csvbulkexport.class.inc.php
+++ b/core/csvbulkexport.class.inc.php
@@ -12,7 +12,6 @@ use Combodo\iTop\Application\UI\Base\Component\Input\SelectUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
-use Combodo\iTop\Application\Helper\ExportHelper;

 /**
 * Bulk export: CSV export
@@ -115,7 +114,6 @@ class CSVBulkExport extends TabularBulkExport

 			case 'csv_options':
 				$oPanel = PanelUIBlockFactory::MakeNeutral(Dict::S('Core:BulkExport:CSVOptions'));
-				$oPanel->AddSubBlock(ExportHelper::GetAlertForExcelMaliciousInjection());

 				$oMulticolumn = MultiColumnUIBlockFactory::MakeStandard();
 				$oPanel->AddSubBlock($oMulticolumn);
--- a/core/datamodel.core.xml
+++ b/core/datamodel.core.xml
@@ -502,12 +502,6 @@
          <type>boolean</type>
          <default>false</default>
        </property>
-        <property id="with_php_computation">
-          <php_param>with_php_computation</php_param>
-          <mandatory>false</mandatory>
-          <type>boolean</type>
-          <default>false</default>
-        </property>
        <property id="create_temporary_object">
          <php_param>create_temporary_object</php_param>
          <mandatory>false</mandatory>
--- a/core/dbobject.class.php
+++ b/core/dbobject.class.php
@@ -187,13 +187,12 @@ abstract class DBObject implements iDisplay
 	protected $m_oLinkHostObject = null;

 	/**
-	 * @var array{array{
-	 *      type: string,
-	 *      class: string,
-	 *      id: string,
-	 * }} List all the CRUD stack in progress, with :
-	 *      - type: CRUD operation (INSERT, UPDATE, DELETE)',
-	 *      - class: class of the object in the CRUD process, leaf (object finalclass) if we have a hierarchy
+	 * @var array List all the CRUD stack in progress
+	 *
+	 * The array contains instances of
+	 * ['type' => 'type of CRUD operation (INSERT, UPDATE, DELETE)',
+	 *  'class' => 'class of the object in the CRUD process',
+	 *  'id' => 'id of the object in the CRUD process']
 	 *
 	 * @since 3.1.0 N°5906
 	 */
@@ -2462,130 +2461,6 @@ abstract class DBObject implements iDisplay
 		}
 	}

-	/**
-	 * Trigger onObjectUpdate on the target object when an object pointed by a LinkSet is modified, added or removed
-	 *
-	 * @since 3.1.1 3.2.0 N°6531 method creation
-	 */
-	final protected function ActivateOnObjectUpdateTriggersForTargetObjects(): void
-	{
-		$aPreviousValues = $this->ListPreviousValuesForUpdatedAttributes();
-
-		$aClassExtKeyAttCodes = MetaModel::GetAttributesList(get_class($this), [AttributeExternalKey::class]);
-		foreach ($aClassExtKeyAttCodes as $sExtKeyWithMirrorLinkAttCode) {
-			/** @var AttributeExternalKey $oExtKeyWithMirrorLinkAttDef */
-			$oExtKeyWithMirrorLinkAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyWithMirrorLinkAttCode);
-
-			/** @var AttributeLinkedSet $oAttDefMirrorLink */
-			$oAttDefMirrorLink = $oExtKeyWithMirrorLinkAttDef->GetMirrorLinkAttribute();
-			if (is_null($oAttDefMirrorLink)) {
-				// No LinkSet pointing to me
-				continue;
-			}
-			$sAttCodeMirrorLink = $oAttDefMirrorLink->GetCode();
-			$sTargetObjectClass = $oExtKeyWithMirrorLinkAttDef->GetTargetClass();
-
-			if (array_key_exists($sExtKeyWithMirrorLinkAttCode, $aPreviousValues)) {
-				// need to update old target also
-				$sPreviousTargetObjectKey = $aPreviousValues[$sExtKeyWithMirrorLinkAttCode];
-				$oPreviousTargetObject = static::GetObjectIfNotInCRUDStack($sTargetObjectClass, $sPreviousTargetObjectKey);
-				$this->ActivateOnObjectUpdateTriggers($oPreviousTargetObject, [$sAttCodeMirrorLink]);
-			}
-
-			// we need to update remote with current lnk instance
-			$oTargetObject = static::GetObjectIfNotInCRUDStack($sTargetObjectClass, $this->Get($sExtKeyWithMirrorLinkAttCode));
-			$this->ActivateOnObjectUpdateTriggers($oTargetObject, [$sAttCodeMirrorLink]);
-		}
-	}
-
-	final static protected function GetObjectIfNotInCRUDStack($sClass, $sKey)
-	{
-		if (DBObject::IsObjectCurrentlyInCrud($sClass, $sKey)) {
-			return null;
-		}
-
-		return MetaModel::GetObject($sClass, $sKey, false);
-	}
-
-	/**
-	 * Cascade CheckToWrite to Target Objects With LinkSet Pointing To Me
-	 * @since 3.1.1 3.2.0 N°6228 method creation
-	 */
-	final protected function CheckToWriteForTargetObjects(bool $bIsCheckToDelete = false): void
-	{
-		$aChanges = $this->ListChanges();
-
-		$aClassExtKeyAttCodes = MetaModel::GetAttributesList(get_class($this), [AttributeExternalKey::class]);
-		foreach ($aClassExtKeyAttCodes as $sExtKeyWithMirrorLinkAttCode) {
-			/** @var AttributeExternalKey $oExtKeyWithMirrorLinkAttDef */
-			$oExtKeyWithMirrorLinkAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyWithMirrorLinkAttCode);
-
-			/** @var AttributeLinkedSet $oAttDefMirrorLink */
-			$oAttDefMirrorLink = $oExtKeyWithMirrorLinkAttDef->GetMirrorLinkAttribute();
-			if (is_null($oAttDefMirrorLink) || (false === $oAttDefMirrorLink->HasPHPConstraint())) {
-				continue;
-			}
-			$sAttCodeMirrorLink = $oAttDefMirrorLink->GetCode();
-			$sTargetObjectClass = $oExtKeyWithMirrorLinkAttDef->GetTargetClass();
-
-			$oTargetObject = static::GetObjectIfNotInCRUDStack($sTargetObjectClass, $this->Get($sExtKeyWithMirrorLinkAttCode));
-
-			if ($this->IsNew()) {
-				$this->CheckToWriteForSingleTargetObject_Internal('add', $oTargetObject, $sAttCodeMirrorLink, false);
-			} else if ($bIsCheckToDelete) {
-				$this->CheckToWriteForSingleTargetObject_Internal('remove', $oTargetObject, $sAttCodeMirrorLink, true);
-			} else {
-				if (array_key_exists($sExtKeyWithMirrorLinkAttCode, $aChanges)) {
-					// need to update remote old + new
-					$aPreviousValues = $this->ListPreviousValuesForUpdatedAttributes();
-					$sPreviousTargetObjectKey = $aPreviousValues[$sExtKeyWithMirrorLinkAttCode];
-					$oPreviousTargetObject = static::GetObjectIfNotInCRUDStack($sTargetObjectClass, $sPreviousTargetObjectKey);
-					$this->CheckToWriteForSingleTargetObject_Internal('remove', $oPreviousTargetObject, $sAttCodeMirrorLink, false);
-					$this->CheckToWriteForSingleTargetObject_Internal('add', $oTargetObject, $sAttCodeMirrorLink, false);
-				} else {
-					$this->CheckToWriteForSingleTargetObject_Internal('modify', $oTargetObject, $sAttCodeMirrorLink, false); // we need to update remote with current lnk instance
-				}
-			}
-		}
-	}
-
-	private function CheckToWriteForSingleTargetObject_Internal(string $sAction, ?DBObject $oTargetObject, string $sAttCodeMirrorLink, bool $bIsCheckToDelete): void
-	{
-		if (is_null($oTargetObject)) {
-			return;
-		}
-
-		$this->LogCRUDDebug(__METHOD__, "action: $sAction ".get_class($oTargetObject).'::'.$oTargetObject->GetKey()." ($sAttCodeMirrorLink)");
-
-		/** @var \ormLinkSet $oTargetValue */
-		$oTargetValue = $oTargetObject->Get($sAttCodeMirrorLink);
-		switch ($sAction) {
-			case 'add':
-				$oTargetValue->AddItem($this);
-				break;
-			case 'remove':
-				$oTargetValue->RemoveItem($this->GetKey());
-				break;
-			case 'modify':
-				$oTargetValue->ModifyItem($this);
-				break;
-		}
-		$oTargetObject->Set($sAttCodeMirrorLink, $oTargetValue);
-		[$bCheckStatus, $aCheckIssues, $bSecurityIssue] = $oTargetObject->CheckToWrite();
-		if (false === $bCheckStatus) {
-			if ($bIsCheckToDelete) {
-				$this->m_aDeleteIssues = array_merge($this->m_aDeleteIssues ?? [], $aCheckIssues);
-			} else {
-				$this->m_aCheckIssues = array_merge($this->m_aCheckIssues ?? [], $aCheckIssues);
-			}
-			$this->m_bSecurityIssue = $this->m_bSecurityIssue || $bSecurityIssue;
-		}
-		$aTargetCheckWarnings = $oTargetObject->GetCheckWarnings();
-		if (is_array($aTargetCheckWarnings)) {
-			$this->m_aCheckWarnings = array_merge($this->m_aCheckWarnings ?? [], $aTargetCheckWarnings);
-		}
-	}
-
 	/**
     * @api
     * @api-advanced
@@ -2609,7 +2484,6 @@ abstract class DBObject implements iDisplay
 		{
 			return array(true, array());
 		}
-
 		if (is_null($this->m_bCheckStatus))
 		{
 			$this->m_aCheckIssues = array();
@@ -2626,9 +2500,6 @@ abstract class DBObject implements iDisplay
 			$oKPI = new ExecutionKPI();
 			$this->DoCheckToWrite();
            $oKPI->ComputeStatsForExtension($this, 'DoCheckToWrite');
-
-			$this->CheckToWriteForTargetObjects();
-
 			if (count($this->m_aCheckIssues) == 0)
 			{
 				$this->m_bCheckStatus = true;
@@ -2638,93 +2509,15 @@ abstract class DBObject implements iDisplay
 				$this->m_bCheckStatus = false;
 			}
 		}
-
 		return array($this->m_bCheckStatus, $this->m_aCheckIssues, $this->m_bSecurityIssue);
 	}

-	/**
-	 * Checks for extkey attributes values. This will throw exception on non-existing as well as non-accessible objects (silo, scopes).
-	 * That's why the test is done for all users including Administrators
-	 *
-	 * Note that due to perf issues, this isn't called directly by the ORM, but has to be called by consumers when possible.
-	 *
-	 * @param callable(string, string):bool|null $oIsObjectLoadableCallback Override to check if object is accessible.
-	 *                          Parameters are object class and key
-	 *                          Return value should be false if cannot access object, true otherwise
-	 * @return void
-	 *
-	 * @throws ArchivedObjectException
-	 * @throws CoreException if cannot get object attdef list
-	 * @throws CoreUnexpectedValue
-	 * @throws InvalidExternalKeyValueException
-	 * @throws MySQLException
-	 * @throws SecurityException if one extkey is pointing to an invalid value
-	 *
-	 * @link https://github.com/Combodo/iTop/security/advisories/GHSA-245j-66p9-pwmh
-	 * @since 2.7.10 3.0.4 3.1.1 3.2.0 N°6458
-	 *
-	 * @see \RestUtils::FindObjectFromKey for the same check in the REST endpoint
-	 */
-	final public function CheckChangedExtKeysValues(callable $oIsObjectLoadableCallback = null)
-	{
-		if (is_null($oIsObjectLoadableCallback)) {
-			$oIsObjectLoadableCallback = function ($sClass, $sId) {
-				$oRemoteObject = MetaModel::GetObject($sClass, $sId, false);
-				if (is_null($oRemoteObject)) {
-					return false;
-				}
-				return true;
-			};
-		}
-
-		$aChanges = $this->ListChanges();
-		$aAttCodesChanged = array_keys($aChanges);
-		foreach ($aAttCodesChanged as $sAttDefCode) {
-			$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttDefCode);
-
-			if ($oAttDef instanceof AttributeLinkedSetIndirect) {
-				/** @var ormLinkSet $oOrmSet */
-				$oOrmSet = $this->Get($sAttDefCode);
-				while ($oLnk = $oOrmSet->Fetch()) {
-					$oLnk->CheckChangedExtKeysValues($oIsObjectLoadableCallback);
-				}
-				continue;
-			}
-
-			/** @noinspection PhpConditionCheckedByNextConditionInspection */
-			/** @noinspection NotOptimalIfConditionsInspection */
-			if (($oAttDef instanceof AttributeHierarchicalKey) || ($oAttDef instanceof AttributeExternalKey)) {
-				$sRemoteObjectClass = $oAttDef->GetTargetClass();
-				$sRemoteObjectKey = $this->Get($sAttDefCode);
-			} else if ($oAttDef instanceof AttributeObjectKey) {
-				$sRemoteObjectClassAttCode = $oAttDef->Get('class_attcode');
-				$sRemoteObjectClass = $this->Get($sRemoteObjectClassAttCode);
-				$sRemoteObjectKey = $this->Get($sAttDefCode);
-			} else {
-				continue;
-			}
-
-			/** @noinspection NotOptimalIfConditionsInspection */
-			/** @noinspection TypeUnsafeComparisonInspection */
-			if (utils::IsNullOrEmptyString($sRemoteObjectClass)
-				|| utils::IsNullOrEmptyString($sRemoteObjectKey)
-				|| ($sRemoteObjectKey == 0) // non-strict comparison as we might have bad surprises
-			) {
-				continue;
-			}
-
-			if (false === $oIsObjectLoadableCallback($sRemoteObjectClass, $sRemoteObjectKey)) {
-				throw new InvalidExternalKeyValueException($this, $sAttDefCode);
-			}
-		}
-	}
-
 	/**
 	 * Check if it is allowed to delete the existing object from the database
 	 *
 	 * an array of displayable error is added in {@see DBObject::$m_aDeleteIssues}
 	 *
-     * @internal
+     * @internal 
     *
 	 * @param \DeletionPlan $oDeletionPlan
 	 *
@@ -2789,15 +2582,8 @@ abstract class DBObject implements iDisplay
     */
 	public function CheckToDelete(&$oDeletionPlan)
  	{
-		$this->AddCurrentObjectInCrudStack('DELETE');
-		try {
-			$this->MakeDeletionPlan($oDeletionPlan);
-			$oDeletionPlan->ComputeResults();
-		}
-		finally {
-			$this->RemoveCurrentObjectInCrudStack();
-		}
-
+		$this->MakeDeletionPlan($oDeletionPlan);
+		$oDeletionPlan->ComputeResults();
 		return (!$oDeletionPlan->FoundStopper());
 	}

@@ -2848,7 +2634,7 @@ abstract class DBObject implements iDisplay
 			{
 				// The value is a scalar, the comparison must be 100% strict
 				if($this->m_aOrigValues[$sAtt] !== $proposedValue)
-				{
+				{	
 					//echo "$sAtt:<pre>\n";
 					//var_dump($this->m_aOrigValues[$sAtt]);
 					//var_dump($proposedValue);
@@ -2869,11 +2655,11 @@ abstract class DBObject implements iDisplay
 	 * @api
 	 * @api-advanced
 	 *
-	 * @return array attcode => currentvalue List the attributes that have been changed using {@see DBObject::Set()}.
-	 *         Reset during {@see DBObject::DBUpdate()}
-	 * @throws Exception
 	 * @see  \DBObject::ListPreviousValuesForUpdatedAttributes() to get previous values anywhere in the CRUD stack
 	 * @see https://www.itophub.io/wiki/page?id=latest%3Acustomization%3Asequence_crud iTop CRUD stack documentation
+	 * @return array attname => currentvalue List the attributes that have been changed using {@see DBObject::Set()}.
+	 *         Reset during {@see DBObject::DBUpdate()}
+	 * @throws Exception
 	 * @uses m_aCurrValues
 	 */
 	public function ListChanges()
@@ -2970,7 +2756,7 @@ abstract class DBObject implements iDisplay

 	/**
 	 * Used only by insert, Meant to be overloaded
-     *
+     * 
     * @overwritable-hook You can extend this method in order to provide your own logic.
 	 */
 	protected function OnObjectKeyReady()
@@ -3078,7 +2864,7 @@ abstract class DBObject implements iDisplay
 		// fields in first array, values in the second
 		$aFieldsToWrite = array();
 		$aValuesToWrite = array();
-
+		
 		if (!empty($this->m_iKey) && ($this->m_iKey >= 0))
 		{
 			// Add it to the list of fields to write
@@ -3087,7 +2873,7 @@ abstract class DBObject implements iDisplay
 		}

 		$aHierarchicalKeys = array();
-
+		
 		foreach(MetaModel::ListAttributeDefs($sTableClass) as $sAttCode=>$oAttDef) {
 			// Skip this attribute if not defined in this table
 			if ((!MetaModel::IsAttributeOrigin($sTableClass, $sAttCode) && !$oAttDef->CopyOnAllTables())
@@ -3097,7 +2883,7 @@ abstract class DBObject implements iDisplay
 			$aAttColumns = $oAttDef->GetSQLValues($this->m_aCurrValues[$sAttCode]);
 			foreach($aAttColumns as $sColumn => $sValue)
 			{
-				$aFieldsToWrite[] = "`$sColumn`";
+				$aFieldsToWrite[] = "`$sColumn`"; 
 				$aValuesToWrite[] = CMDBSource::Quote($sValue);
 			}
 			if ($oAttDef->IsHierarchicalKey())
@@ -3121,7 +2907,7 @@ abstract class DBObject implements iDisplay
 					self::$m_aBulkInsertCols[$sClass][$sTable] = implode(', ', $aFieldsToWrite);
 				}
 				self::$m_aBulkInsertItems[$sClass][$sTable][] = '('.implode (', ', $aValuesToWrite).')';
-
+				
 				$iNewKey = 999999; // TODO - compute next id....
 			}
 			else
@@ -3206,7 +2992,7 @@ abstract class DBObject implements iDisplay
 		// fields in first array, values in the second
 		$aFieldsToWrite = array();
 		$aValuesToWrite = array();
-
+		
 		if (!empty($this->m_iKey) && ($this->m_iKey >= 0))
 		{
 			// Add it to the list of fields to write
@@ -3241,7 +3027,7 @@ abstract class DBObject implements iDisplay
 			$aAttColumns = $oAttDef->GetSQLValues($value);
 			foreach($aAttColumns as $sColumn => $sValue)
 			{
-				$aFieldsToWrite[] = "`$sColumn`";
+				$aFieldsToWrite[] = "`$sColumn`"; 
 				$aValuesToWrite[] = CMDBSource::Quote($sValue);
 			}
 			if ($oAttDef->IsHierarchicalKey())
@@ -3312,8 +3098,6 @@ abstract class DBObject implements iDisplay
 	 * @throws \CoreWarning
 	 * @throws \MySQLException
 	 * @throws \OQLException
-	 *
-	 * @see DBWrite
 	 */
 	public function DBInsertNoReload()
 	{
@@ -3351,7 +3135,7 @@ abstract class DBObject implements iDisplay
 				}
 			}

-			[$bRes, $aIssues] = $this->CheckToWrite(false);
+			list($bRes, $aIssues) = $this->CheckToWrite(false);
 			if (!$bRes) {
 				throw new CoreCannotSaveObjectException(array('issues' => $aIssues, 'class' => get_class($this), 'id' => $this->GetKey()));
 			}
@@ -3472,7 +3256,7 @@ abstract class DBObject implements iDisplay
 	 * @throws \MySQLException
 	 * @throws \OQLException
 	 */
-	protected function PostInsertActions(): void
+	public function PostInsertActions(): void
 	{
 		$this->FireEventAfterWrite([], true);
 		$oKPI = new ExecutionKPI();
@@ -3496,9 +3280,6 @@ abstract class DBObject implements iDisplay

 		// - TriggerOnObjectMention
 		$this->ActivateOnMentionTriggers(true);
-
-		// - Trigger for object pointing to the current object
-		$this->ActivateOnObjectUpdateTriggersForTargetObjects();
 	}

    /**
@@ -3526,7 +3307,7 @@ abstract class DBObject implements iDisplay
 		$this->RecordObjCreation();
 		return $ret;
 	}
-
+	
 	/**
 	 * This function is automatically called after cloning an object with the "clone" PHP language construct
 	 * The purpose of this method is to reset the appropriate attributes of the object in
@@ -3545,13 +3326,13 @@ abstract class DBObject implements iDisplay
 	 * Update an object in DB
 	 *
 	 * @api
+	 * @see DBObject::DBWrite()
+	 *
 	 * @return int object key
 	 *
 	 * @throws \CoreException
 	 * @throws \CoreCannotSaveObjectException if CheckToWrite() returns issues
 	 * @throws \Exception
-	 *
-	 * @see DBObject::DBWrite()
 	 */
 	public function DBUpdate()
 	{
@@ -3594,7 +3375,7 @@ abstract class DBObject implements iDisplay
 					return $this->m_iKey;
 				}

-				[$bRes, $aIssues] = $this->CheckToWrite(false);
+				list($bRes, $aIssues) = $this->CheckToWrite(false);
 				if (!$bRes) {
 					throw new CoreCannotSaveObjectException(['issues' => $aIssues, 'class' => $sClass, 'id' => $this->GetKey()]);
 				}
@@ -3791,7 +3572,7 @@ abstract class DBObject implements iDisplay
 	 * @throws \MySQLException
 	 * @throws \OQLException
 	 */
-	protected function PostUpdateActions(array $aChanges): void
+	public function PostUpdateActions(array $aChanges): void
 	{
 		$this->FireEventAfterWrite($aChanges, false);
 		$oKPI = new ExecutionKPI();
@@ -3799,10 +3580,20 @@ abstract class DBObject implements iDisplay
 		$oKPI->ComputeStatsForExtension($this, 'AfterUpdate');

 		// - TriggerOnObjectUpdate
-		$this->ActivateOnObjectUpdateTriggers($this);
-
-		// - Trigger for object pointing to the current object
-		$this->ActivateOnObjectUpdateTriggersForTargetObjects();
+		$aClassList = MetaModel::EnumParentClasses(get_class($this), ENUM_PARENT_CLASSES_ALL);
+		$aParams = array('class_list' => $aClassList);
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnObjectUpdate AS t WHERE t.target_class IN (:class_list)'),
+			array(), $aParams);
+		while ($oTrigger = $oSet->Fetch()) {
+			/** @var \TriggerOnObjectUpdate $oTrigger */
+			try {
+				$oTrigger->DoActivate($this->ToArgs());
+			}
+			catch (Exception $e) {
+				$oTrigger->LogException($e, $this);
+				utils::EnrichRaisedException($oTrigger, $e);
+			}
+		}

 		$sClass = get_class($this);
 		if (MetaModel::HasLifecycle($sClass))
@@ -3848,37 +3639,6 @@ abstract class DBObject implements iDisplay
 		$this->ActivateOnMentionTriggers(false, $aChanges);
 	}

-	/**
-	 * @param \DBObject $oObject
-	 * @param array|null $aAttributes
-	 *
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
-	 * @throws \OQLException
-	 */
-	private function ActivateOnObjectUpdateTriggers(?DBObject $oObject, array $aAttributes = null): void
-	{
-		if (is_null($oObject)) {
-			return;
-		}
-
-		// - TriggerOnObjectUpdate
-		$aClassList = MetaModel::EnumParentClasses(get_class($oObject), ENUM_PARENT_CLASSES_ALL);
-		$aParams = array('class_list' => $aClassList);
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnObjectUpdate AS t WHERE t.target_class IN (:class_list)'),
-			array(), $aParams);
-		while ($oTrigger = $oSet->Fetch()) {
-			/** @var \TriggerOnObjectUpdate $oTrigger */
-			try {
-				$oTrigger->DoActivateForSpecificAttributes($oObject->ToArgs(), $aAttributes);
-			}
-			catch (Exception $e) {
-				$oTrigger->LogException($e, $oObject);
-				utils::EnrichRaisedException($oTrigger, $e);
-			}
-		}
-	}

 	/**
 	 * Increment attribute with specified value.
@@ -4024,18 +3784,13 @@ abstract class DBObject implements iDisplay

 	/**
 	 * Make the current changes persistent - clever wrapper for Insert or Update
-	 *
-	 * @api
+     *
+     * @api
 	 *
 	 * @return int
-	 *
-	 * @throws ArchivedObjectException
-	 * @throws CoreCannotSaveObjectException
-	 * @throws CoreException
-	 * @throws CoreUnexpectedValue
-	 * @throws CoreWarning
-	 * @throws MySQLException
-	 * @throws OQLException
+     *
+	 * @throws \CoreCannotSaveObjectException
+	 * @throws \CoreException
 	 */
 	public function DBWrite()
 	{
@@ -4082,8 +3837,6 @@ abstract class DBObject implements iDisplay
     */
 	protected function DBDeleteSingleObject()
 	{
-		$this->LogCRUDEnter(__METHOD__);
-
 		if (MetaModel::DBIsReadOnly())
 		{
 			$this->LogCRUDExit(__METHOD__, 'DB is read-only');
@@ -4204,11 +3957,8 @@ abstract class DBObject implements iDisplay
 		$this->AfterDelete();
 		$oKPI->ComputeStatsForExtension($this, 'AfterDelete');

-		// - Trigger for object pointing to the current object
-		$this->ActivateOnObjectUpdateTriggersForTargetObjects();

 		$this->m_bIsInDB = false;
-		$this->LogCRUDExit(__METHOD__);
 		// Fix for N°926: do NOT reset m_iKey as it can be used to have it for reporting purposes (see the REST service to delete
 		// objects, reported as bug N°926)
 		// Thought the key is not reset, using DBInsert or DBWrite will create an object having the same characteristics and a new ID. DBUpdate is protected
@@ -4220,7 +3970,7 @@ abstract class DBObject implements iDisplay
     * First, checks if the object can be deleted regarding database integrity.
     * If the answer is yes, it performs any required cleanup (delete other objects or reset external keys) in addition to the object
     * deletion.
-     *
+     * 
     * @api
     *
     * @param \DeletionPlan $oDeletionPlan Do not use: aims at dealing with recursion
@@ -4239,65 +3989,74 @@ abstract class DBObject implements iDisplay
 	public function DBDelete(&$oDeletionPlan = null)
 	{
 		$this->LogCRUDEnter(__METHOD__);
-		try {
-			static $iLoopTimeLimit = null;
-			if ($iLoopTimeLimit == null) {
-				$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
-			}
-			if (is_null($oDeletionPlan)) {
-				$oDeletionPlan = new DeletionPlan();
-			}

-			if (false === $this->CheckToDelete($oDeletionPlan)) {
-				$aIssues = $oDeletionPlan->GetIssues();
-				$this->LogCRUDError(__METHOD__, ' Errors: '.implode(', ', $aIssues));
-				throw new DeleteException('Found issue(s)', array('target_class' => get_class($this), 'target_id' => $this->GetKey(), 'issues' => implode(', ', $aIssues)));
-			}
+		static $iLoopTimeLimit = null;
+		if ($iLoopTimeLimit == null)
+		{
+			$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
+		}
+		if (is_null($oDeletionPlan))
+		{
+			$oDeletionPlan = new DeletionPlan();
+		}
+		$this->MakeDeletionPlan($oDeletionPlan);
+		$oDeletionPlan->ComputeResults();

-
-			// Getting and setting time limit are not symmetric:
-			// www.php.net/manual/fr/function.set-time-limit.php#72305
-			$iPreviousTimeLimit = ini_get('max_execution_time');
-
-			foreach ($oDeletionPlan->ListDeletes() as $sClass => $aToDelete) {
-				foreach ($aToDelete as $iId => $aData) {
-					/** @var \DBObject $oToDelete */
-					$oToDelete = $aData['to_delete'];
-					// The deletion based on a deletion plan should not be done for each object if the deletion plan is common (Trac #457)
-					// because for each object we would try to update all the preceding ones... that are already deleted
-					// A better approach would be to change the API to apply the DBDelete on the deletion plan itself... just once
-					// As a temporary fix: delete only the objects that are still to be deleted...
-					if ($oToDelete->m_bIsInDB) {
-						set_time_limit(intval($iLoopTimeLimit));
-
-						$oToDelete->AddCurrentObjectInCrudStack('DELETE');
-						try {
-							$oToDelete->DBDeleteSingleObject();
-						}
-						finally {
-							$oToDelete->RemoveCurrentObjectInCrudStack();
-						}
-					}
-				}
-			}
-
-			foreach ($oDeletionPlan->ListUpdates() as $sClass => $aToUpdate) {
-				foreach ($aToUpdate as $aData) {
-					$oToUpdate = $aData['to_reset'];
-					/** @var \DBObject $oToUpdate */
-					foreach ($aData['attributes'] as $sRemoteExtKey => $aRemoteAttDef) {
-						$oToUpdate->Set($sRemoteExtKey, $aData['values'][$sRemoteExtKey]);
-						set_time_limit(intval($iLoopTimeLimit));
-						$oToUpdate->DBUpdate();
-					}
-				}
-			}
-
-			set_time_limit(intval($iPreviousTimeLimit));
-		} finally {
-			$this->LogCRUDExit(__METHOD__);
+		if ($oDeletionPlan->FoundStopper())
+		{
+			$aIssues = $oDeletionPlan->GetIssues();
+			$this->LogCRUDError(__METHOD__, ' Errors: '.implode(', ', $aIssues));
+			throw new DeleteException('Found issue(s)', array('target_class' => get_class($this), 'target_id' => $this->GetKey(), 'issues' => implode(', ', $aIssues)));
 		}

+
+		// Getting and setting time limit are not symetric:
+		// www.php.net/manual/fr/function.set-time-limit.php#72305
+		$iPreviousTimeLimit = ini_get('max_execution_time');
+
+		foreach ($oDeletionPlan->ListDeletes() as $sClass => $aToDelete)
+		{
+			foreach ($aToDelete as $iId => $aData)
+			{
+				/** @var \DBObject $oToDelete */
+				$oToDelete = $aData['to_delete'];
+				// The deletion based on a deletion plan should not be done for each object if the deletion plan is common (Trac #457)
+				// because for each object we would try to update all the preceding ones... that are already deleted
+				// A better approach would be to change the API to apply the DBDelete on the deletion plan itself... just once
+				// As a temporary fix: delete only the objects that are still to be deleted...
+				if ($oToDelete->m_bIsInDB)
+				{
+					set_time_limit(intval($iLoopTimeLimit));
+
+					$oToDelete->AddCurrentObjectInCrudStack('DELETE');
+					try {
+						$oToDelete->DBDeleteSingleObject();
+					}
+					finally {
+						$oToDelete->RemoveCurrentObjectInCrudStack();
+					}
+				}
+			}
+		}
+
+		foreach ($oDeletionPlan->ListUpdates() as $sClass => $aToUpdate)
+		{
+			foreach ($aToUpdate as $aData)
+			{
+				$oToUpdate = $aData['to_reset'];
+				/** @var \DBObject $oToUpdate */
+				foreach ($aData['attributes'] as $sRemoteExtKey => $aRemoteAttDef)
+				{
+					$oToUpdate->Set($sRemoteExtKey, $aData['values'][$sRemoteExtKey]);
+					set_time_limit(intval($iLoopTimeLimit));
+					$oToUpdate->DBUpdate();
+				}
+			}
+		}
+
+		set_time_limit(intval($iPreviousTimeLimit));
+
+		$this->LogCRUDExit(__METHOD__);
 		return $oDeletionPlan;
 	}

@@ -4604,7 +4363,7 @@ abstract class DBObject implements iDisplay
     *
     * @api
     *
-	 */
+	 */	 	
 	public function Reset($sAttCode)
 	{
 		$this->Set($sAttCode, $this->GetDefaultValue($sAttCode));
@@ -4616,7 +4375,7 @@ abstract class DBObject implements iDisplay
     * Suitable for use as a lifecycle action
     *
     * @api
-	 */
+	 */	 	
 	public function Copy($sDestAttCode, $sSourceAttCode)
 	{
 		$oTypeValueToCopy = MetaModel::GetAttributeDef(get_class($this), $sSourceAttCode);
@@ -4946,7 +4705,7 @@ abstract class DBObject implements iDisplay
 			{
 				throw new CoreException("Unknown attribute '$sExtKeyAttCode' for the class ".get_class($this));
 			}
-
+			
 			$oKeyAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyAttCode);
 			if (!$oKeyAttDef instanceof AttributeExternalKey)
 			{
@@ -4964,14 +4723,14 @@ abstract class DBObject implements iDisplay
 				$ret  = $oRemoteObj->GetForTemplate($sRemoteAttCode);
 			}
 		}
-		else
+		else 
 		{
 			switch($sPlaceholderAttCode)
 			{
 				case 'id':
 				$ret = $this->GetKey();
 				break;
-
+				
 				case 'name()':
 				$ret = $this->GetName();
 				break;
@@ -5158,7 +4917,7 @@ abstract class DBObject implements iDisplay
 		if ($oOwner)
 		{
 			$sLinkSetOwnerClass = get_class($oOwner);
-
+			
 			$oMyChangeOp = MetaModel::NewObject($sChangeOpClass);
 			$oMyChangeOp->Set("objclass", $sLinkSetOwnerClass);
 			$oMyChangeOp->Set("objkey", $iLinkSetOwnerId);
@@ -5185,7 +4944,7 @@ abstract class DBObject implements iDisplay
 		{
 			/** @var \AttributeLinkedSet $oLinkSet */
 			if (($oLinkSet->GetTrackingLevel() & LINKSET_TRACKING_LIST) == 0) continue;
-
+			
 			$iLinkSetOwnerId  = $this->Get($sExtKeyAttCode);
 			$oMyChangeOp = $this->PrepareChangeOpLinkSet($iLinkSetOwnerId, $oLinkSet, 'CMDBChangeOpSetAttributeLinksAddRemove');
 			if ($oMyChangeOp)
@@ -5403,9 +5162,8 @@ abstract class DBObject implements iDisplay
 		$this->m_aDeleteIssues = array(); // Ok
 		$this->FireEventCheckToDelete($oDeletionPlan);
 		$this->DoCheckToDelete($oDeletionPlan);
-		$this->CheckToWriteForTargetObjects(true);
 		$oDeletionPlan->SetDeletionIssues($this, $this->m_aDeleteIssues, $this->m_bSecurityIssue);
-
+	
 		$aDependentObjects = $this->GetReferencingObjects(true /* allow all data */);

 		// Getting and setting time limit are not symmetric:
@@ -5587,7 +5345,7 @@ abstract class DBObject implements iDisplay
 				$aSynchroClasses[] = $sTarget;
 			}
 		}
-
+		
 		foreach($aSynchroClasses as $sClass)
 		{
 			if ($this instanceof $sClass)
@@ -6394,18 +6152,6 @@ abstract class DBObject implements iDisplay
 		$this->m_aCheckWarnings[] = $sWarning;
 	}

-	/**
-	 *
-	 * @api
-	 *
-	 * @return string[]|null
-	 * @since 3.1.1 3.2.0
-	 */
-	public function GetCheckWarnings(): ?array
-	{
-		return $this->m_aCheckWarnings;
-	}
-
 	/**
 	 * @api
 	 *
@@ -6653,10 +6399,9 @@ abstract class DBObject implements iDisplay
 		// during insert key is reset from -1 to null
 		// so we need to handle null values (will give empty string after conversion)
 		$sConvertedId = (string)$sId;
-		$oRootClass = MetaModel::GetRootClass($sClass);

 		foreach (self::$m_aCrudStack as $aCrudStackEntry) {
-			if (($oRootClass === $aCrudStackEntry['class'])
+			if (($sClass === $aCrudStackEntry['class'])
 				&& ($sConvertedId === $aCrudStackEntry['id'])) {
 				return true;
 			}
@@ -6671,14 +6416,12 @@ abstract class DBObject implements iDisplay
 	 * @param string $sClass
 	 *
 	 * @return bool
-	 * @throws \CoreException
 	 * @since 3.1.0 N°5609
 	 */
 	final public static function IsClassCurrentlyInCrud(string $sClass): bool
 	{
-		$sRootClass = MetaModel::GetRootClass($sClass);
 		foreach (self::$m_aCrudStack as $aCrudStackEntry) {
-			if ($sRootClass === $aCrudStackEntry['class']) {
+			if ($sClass === $aCrudStackEntry['class']) {
 				return true;
 			}
 		}
@@ -6696,11 +6439,9 @@ abstract class DBObject implements iDisplay
 	 */
 	private function AddCurrentObjectInCrudStack(string $sCrudType): void
 	{
-		$this->LogCRUDDebug(__METHOD__);
-		$sRootClass = MetaModel::GetRootClass(get_class($this));
 		self::$m_aCrudStack[] = [
 			'type'  => $sCrudType,
-			'class' => $sRootClass,
+			'class' => get_class($this),
 			'id'    => (string)$this->GetKey(), // GetKey() doesn't have type hinting, so forcing type to avoid getting an int
 		];
 	}
@@ -6714,7 +6455,6 @@ abstract class DBObject implements iDisplay
 	 */
 	private function UpdateCurrentObjectInCrudStack(): void
 	{
-		$this->LogCRUDDebug(__METHOD__);
 		$aCurrentCrudStack = array_pop(self::$m_aCrudStack);
 		$aCurrentCrudStack['id'] = (string)$this->GetKey();
 		self::$m_aCrudStack[] = $aCurrentCrudStack;
@@ -6728,8 +6468,7 @@ abstract class DBObject implements iDisplay
 	 */
 	private function RemoveCurrentObjectInCrudStack(): void
 	{
-		$aRemoved = array_pop(self::$m_aCrudStack);
-		$this->LogCRUDDebug(__METHOD__, $aRemoved['class'].':'.$aRemoved['id']);
+		array_pop(self::$m_aCrudStack);
 	}

 	/**
--- a/core/displayablegraph.class.inc.php
+++ b/core/displayablegraph.class.inc.php
@@ -16,11 +16,8 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 use Combodo\iTop\Application\Helper\WebResourcesHelper;
-use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\MedallionIcon\MedallionIcon;
 use Combodo\iTop\Application\UI\Base\Component\Panel\Panel;
-use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
-use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
 use Combodo\iTop\Renderer\BlockRenderer;

 /**
@@ -1415,8 +1412,6 @@ class DisplayableGraph extends SimpleGraph
 	/**
 	 * Display the graph inside the given page, with the "filter" drawer above it
 	 *
-	 * @deprecated 3.1.1 3.2.0 N°3767 Use \DisplayableGraph::DisplayFilterBox() and \DisplayableGraph::DisplayGraph() instead
-	 *
 	 * @param WebPage $oP
 	 * @param array $aResults
 	 * @param string $sRelation
@@ -1430,35 +1425,10 @@ class DisplayableGraph extends SimpleGraph
 	 *
 	 * @throws \CoreException
 	 * @throws \DictExceptionMissingString
-	 *
 	 */
 	function Display(WebPage $oP, $aResults, $sRelation, ApplicationContext $oAppContext, $aExcludedObjects, $sObjClass, $iObjKey, $sContextKey, $aContextParams = array(), bool $bLazyLoading = false)
 	{
-		$oP->AddSubBlock($this->DisplayFilterBox($oP, $aResults, $bLazyLoading));
-		$this->DisplayGraph($oP, $sRelation, $oAppContext, $aExcludedObjects, $sObjClass, $iObjKey, $sContextKey, $aContextParams, $bLazyLoading);
-	}
-
-	/**
-	 * Display only the graph inside the given page, with the parameters of filter box draw with DisplayFilterBox
-	 *
-	 * @param WebPage $oP
-	 * @param string $sRelation
-	 * @param ApplicationContext $oAppContext
-	 * @param array $aExcludedObjects
-	 * @param string $sObjClass
-	 * @param int $iObjKey
-	 * @param string $sContextKey
-	 * @param array $aContextParams
-	 * @param bool $bLazyLoading
-	 *
-	 * @throws \CoreException
-	 * @throws \DictExceptionMissingString
-	 *
-	 * @since 3.1.1 3.2.0 N°3767
-	 */
-	function DisplayGraph(WebPage $oP, $sRelation, ApplicationContext $oAppContext, $aExcludedObjects, $sObjClass, $iObjKey, $sContextKey, $aContextParams = array(), bool $bLazyLoading = false): void
-	{
-		list($aExcludedByClass, $aAdditionalContexts) = $this->GetFilteringData($sContextKey, $aContextParams, $aExcludedObjects);
+		list($aExcludedByClass, $aAdditionalContexts) = $this->DisplayFiltering($sContextKey, $aContextParams, $aExcludedObjects, $oP, $aResults, $bLazyLoading);

 		$iGroupingThreshold = utils::ReadParam('g', 5);

@@ -1543,10 +1513,12 @@ class DisplayableGraph extends SimpleGraph
 				$oP->add_ready_script(" $('#$sId').simple_graph(".json_encode($aParams).");");
 			} else {
 				$oP->add_script("function Load(){var aExcluded = [];	$('input[name^=excluded]').each( function() {if (!$(this).prop('checked'))	{	aExcluded.push($(this).val());		}} ); var params= $.extend(".json_encode($aParams).",  {excluded_classes: aExcluded}); $('#$sId').simple_graph(params);}");
-				$oP->add_ready_script("$('#graph').html('".utils::TextToHtml(Dict::S('Relation:impacts/NoFilteredData'))."');$('#impacted_objects_lists').html('".utils::TextToHtml(Dict::S('Relation:impacts/NoFilteredData'))."');$('#impacted_groups').html('".utils::TextToHtml(Dict::S('Relation:impacts/NoFilteredData'))."');");
+				$oP->add_ready_script("$('#impacted_objects_lists').html('".utils::TextToHtml(Dict::S('Relation:impacts/NoFilteredData'))."');$('#impacted_groups').html('".utils::TextToHtml(Dict::S('Relation:impacts/NoFilteredData'))."');");
+
 			}
 		}
-		catch (Exception $e) {
+		catch(Exception $e)
+		{
 			$oP->add('<div>'.$e->getMessage().'</div>');
 		}
 		$oP->add_script(
@@ -1591,41 +1563,23 @@ EOF
 	 * @throws \Twig\Error\LoaderError
 	 * @throws \Twig\Error\RuntimeError
 	 * @throws \Twig\Error\SyntaxError
-	 *
-	 * @deprecated 3.1.1 3.2.0 N°3767 Use \DisplayableGraph::DisplayFilterBox() and \DisplayableGraph::GetFilteringData() instead
 	 */
 	public function DisplayFiltering(string $sContextKey, array $aContextParams, array $aExcludedObjects, WebPage $oP, array $aResults, bool $bLazyLoading = false): array
 	{
-		$oP->Add($this->DisplayFilterBox($oP, $aResults, $bLazyLoading));
-
-		return $this->GetFilteringData($sContextKey, $aContextParams, $aExcludedObjects);
-	}
-
-	/**
-	 * @param \WebPage $oP
-	 * @param array $aResults
-	 * @param bool $bLazyLoading
-	 *
-	 * @return UIContentBlock
-	 * @throws \CoreException
-	 * @throws \DictExceptionMissingString
-	 * @throws \ReflectionException
-	 * @throws \Twig\Error\LoaderError
-	 * @throws \Twig\Error\RuntimeError
-	 * @throws \Twig\Error\SyntaxError
-	 *
-	 * @since 3.1.1 3.2.0 N°3767
-	 */
-	public function DisplayFilterBox(WebPage $oP, array $aResults, bool $bLazyLoading = false): UIContentBlock
-	{
+		$aContextDefs = static::GetContextDefinitions($sContextKey, true, $aContextParams);
+		$aExcludedByClass = array();
+		foreach ($aExcludedObjects as $oObj) {
+			if (!array_key_exists(get_class($oObj), $aExcludedByClass)) {
+				$aExcludedByClass[get_class($oObj)] = array();
+			}
+			$aExcludedByClass[get_class($oObj)][] = $oObj->GetKey();
+		}
 		$sSftShort = Dict::S('UI:ElementsDisplayed');
-		$oBlock = UIContentBlockUIBlockFactory::MakeStandard(null, ['not-printable']);
-
+		$oP->add("<div class=\"not-printable\">\n");
 		$oUiSearchBlock = new Panel($sSftShort, [], Panel::ENUM_COLOR_SCHEME_CYAN, 'dh_flash');
-		$oUiSearchBlock->SetCSSClasses(["ibo-search-form-panel", "display_block"])
-			->SetIsCollapsible(true);
-
-		$oUiHtmlBlock = new Html(
+		$oUiSearchBlock->SetCSSClasses(["ibo-search-form-panel", "display_block"]);
+		$oUiSearchBlock->SetIsCollapsible(true);
+		$oUiHtmlBlock = new Combodo\iTop\Application\UI\Base\Component\Html\Html(
 			<<<EOF
 		
    <div id="ds_flash" class="search_box ibo-display-graph--search-box">
@@ -1672,23 +1626,11 @@ EOF
 			$oUiHtmlBlock->AddHtml("<button type=\"button\" id=\"ReloadMovieBtn\" class=\"ibo-button ibo-is-neutral ibo-is-regular\" onClick=\"$sOnCLick\">".Dict::S('UI:Button:Refresh')."</button></div></form>");
 		}
 		$oUiHtmlBlock->AddHtml("</div>\n");
+		$oUiHtmlBlock->AddHtml("</div>\n"); // class="not-printable"

 		$oUiSearchBlock->AddSubBlock($oUiHtmlBlock);
-		$oBlock->AddSubBlock($oUiSearchBlock);
+		$oP->AddUiBlock($oUiSearchBlock);

-		return $oBlock;
-	}
-
-	public function GetFilteringData(string $sContextKey, array $aContextParams, array $aExcludedObjects): array
-	{
-		$aContextDefs = static::GetContextDefinitions($sContextKey, true, $aContextParams);
-		$aExcludedByClass = array();
-		foreach ($aExcludedObjects as $oObj) {
-			if (!array_key_exists(get_class($oObj), $aExcludedByClass)) {
-				$aExcludedByClass[get_class($oObj)] = array();
-			}
-			$aExcludedByClass[get_class($oObj)][] = $oObj->GetKey();
-		}
 		$aAdditionalContexts = array();
 		foreach ($aContextDefs as $sKey => $aDefinition) {
 			$aAdditionalContexts[] = array('key' => $sKey, 'label' => Dict::S($aDefinition['dict']), 'oql' => $aDefinition['oql'], 'default' => (array_key_exists('default', $aDefinition) && ($aDefinition['default'] == 'yes')));
--- a/core/excelbulkexport.class.inc.php
+++ b/core/excelbulkexport.class.inc.php
@@ -10,7 +10,6 @@ use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
-use Combodo\iTop\Application\Helper\ExportHelper;

 require_once(APPROOT.'application/xlsxwriter.class.php');

@@ -83,7 +82,6 @@ class ExcelBulkExport extends TabularBulkExport

 			case 'xlsx_options':
 				$oPanel = PanelUIBlockFactory::MakeNeutral(Dict::S('Core:BulkExport:XLSXOptions'));
-				$oPanel->AddSubBlock(ExportHelper::GetAlertForExcelMaliciousInjection());

 				$oMulticolumn = MultiColumnUIBlockFactory::MakeStandard();
 				$oPanel->AddSubBlock($oMulticolumn);
--- a/core/log.class.inc.php
+++ b/core/log.class.inc.php
@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify
+//   iTop is free software; you can redistribute it and/or modify	
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -576,11 +576,6 @@ class LogChannels
 	public const DATATABLE = 'Datatable';

 	public const DEADLOCK = 'DeadLock';
-	/**
-	 * @var string Everything related to PHP sessions tracking
-	 * @since 3.1.1 3.2.0 N°6901
-	 */
-	public const SESSIONTRACKER = 'SessionTracker';

 	/**
 	 * @var string Everything related to the datamodel CRUD
@@ -1143,13 +1138,9 @@ class DeprecatedCallsLog extends LogAPI
 		parent::Enable($sTargetFile);

 		if (
-			(
-				(false === defined(ITOP_PHPUNIT_RUNNING_CONSTANT_NAME))
-				|| (defined(ITOP_PHPUNIT_RUNNING_CONSTANT_NAME) && (constant(ITOP_PHPUNIT_RUNNING_CONSTANT_NAME) !== true))
-			)
+			(false === defined('ITOP_PHPUNIT_RUNNING_CONSTANT_NAME'))
 			&& static::IsLogLevelEnabledSafe(self::LEVEL_WARNING, self::ENUM_CHANNEL_PHP_LIBMETHOD)
 		) {
-			IssueLog::Trace('Setting '.static::class.' error handler to catch DEPRECATED', static::ENUM_CHANNEL_PHP_LIBMETHOD);
 			set_error_handler([static::class, 'DeprecatedNoticesErrorHandler'], E_DEPRECATED | E_USER_DEPRECATED);
 		}
 	}
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -1445,10 +1445,8 @@ abstract class MetaModel
 	 *
 	 * @return AttributeDefinition[]
 	 * @throws \CoreException
-	 *
-	 * @see GetAttributesList for attcode list
 	 */
-	final public static function ListAttributeDefs($sClass)
+	final static public function ListAttributeDefs($sClass)
 	{
 		self::_check_subclass($sClass);
 		return self::$m_aAttribDefs[$sClass];
@@ -1461,10 +1459,8 @@ abstract class MetaModel
 	 * @param string[] $aDesiredAttTypes Array of AttributeDefinition classes to filter the list on
 	 * @param string|null $sListCode If provided, attributes will be limited to those in this zlist
 	 *
-	 * @return string[] list of attcodes
+	 * @return array
 	 * @throws \CoreException
-	 *
-	 * @see ListAttributeDefs to get AttributeDefinition array instead
 	 */
 	final public static function GetAttributesList(string $sClass, array $aDesiredAttTypes = [], ?string $sListCode = null)
 	{
@@ -5155,7 +5151,7 @@ abstract class MetaModel
 	 */
 	protected static function DBCreateTables($aCallback = null)
 	{
-		[$aErrors, $aSugFix, $aCondensedQueries] = self::DBCheckFormat();
+		list($aErrors, $aSugFix, $aCondensedQueries) = self::DBCheckFormat();

 		//$sSQL = implode('; ', $aCondensedQueries); Does not work - multiple queries not allowed
 		foreach($aCondensedQueries as $sQuery)
@@ -5177,7 +5173,7 @@ abstract class MetaModel
 	 */
 	protected static function DBCreateViews()
 	{
-		[$aErrors, $aSugFix] = self::DBCheckViews();
+		list($aErrors, $aSugFix) = self::DBCheckViews();

 		foreach($aSugFix as $sClass => $aTarget)
 		{
@@ -6926,22 +6922,6 @@ abstract class MetaModel
 		return $iCount === 1;
 	}

-	public static function GetFinalClassName(string $sClass, int $iKey): string
-	{
-		if (MetaModel::IsStandaloneClass($sClass)) {
-			return $sClass;
-		}
-
-		$sRootClass = MetaModel::GetRootClass($sClass);
-		$sTable = MetaModel::DBGetTable($sRootClass);
-		$sKeyCol = MetaModel::DBGetKey($sRootClass);
-		$sEscapedKey = CMDBSource::Quote($iKey);
-		$sFinalClassField = Metamodel::DBGetClassField($sRootClass);
-
-		$sQuery = "SELECT `{$sFinalClassField}` FROM `{$sTable}` WHERE `{$sKeyCol}` = {$sEscapedKey}";
-		return  CMDBSource::QueryToScalar($sQuery);
-	}
-
 	/**
 	 * Search for the specified class and id. If the object is archived it will be returned anyway (this is for pre-2.4
 	 * module compatibility, see N.1108)
--- a/core/trigger.class.inc.php
+++ b/core/trigger.class.inc.php
@@ -256,38 +256,6 @@ abstract class TriggerOnObject extends Trigger
 		}
 	}

-	/**
-	 * Activate trigger based on attribute list given instead of changed attributes
-	 *
-	 * @param array $aContextArgs
-	 * @param array|null $aAttributes if null default to changed attributes
-	 *
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 * @throws \OQLException
-	 * @since 3.1.1 3.2.0 N°6228
-	 */
-	public function DoActivateForSpecificAttributes(array $aContextArgs, ?array $aAttributes)
-	{
-		if (isset($aContextArgs['this->object()']))
-		{
-			/** @var \DBObject $oObject */
-			$oObject = $aContextArgs['this->object()'];
-			if (is_null($aAttributes)) {
-				$aChanges = $oObject->ListPreviousValuesForUpdatedAttributes();
-			} else {
-				$aChanges = array_fill_keys($aAttributes, true);
-			}
-			if (false === $this->IsTargetObject($oObject->GetKey(), $aChanges)) {
-				return;
-			}
-		}
-		parent::DoActivate($aContextArgs);
-	}
-
 	/**
 	 * @param $iObjectId
 	 * @param array $aChanges
--- a/core/userrights.class.inc.php
+++ b/core/userrights.class.inc.php
@@ -1121,7 +1121,9 @@ class UserRights
 	}

 	/**
-	 * @return string connected {@see User} login field value, otherwise empty string
+	 * Return the current user login or an empty string if nobody connected.
+	 *
+	 * @return string
 	 */
 	public static function GetUser()
 	{
@@ -1569,9 +1571,9 @@ class UserRights

 	/**
 	 * @param string $sClass
-	 * @param int $iActionCode see UR_ACTION_* constants
-	 * @param DBObjectSet $oInstanceSet
-	 * @param User $oUser
+	 * @param int $iActionCode
+	 * @param \DBObjectSet $oInstanceSet
+	 * @param \User $oUser
 	 *
 	 * @return int (UR_ALLOWED_YES|UR_ALLOWED_NO|UR_ALLOWED_DEPENDS)
 	 * @throws \CoreException
--- a/datamodels/2.x/authent-cas/module.authent-cas.php
+++ b/datamodels/2.x/authent-cas/module.authent-cas.php
@@ -5,7 +5,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-cas/3.1.1',
+	'authent-cas/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/authent-external/module.authent-external.php
+++ b/datamodels/2.x/authent-external/module.authent-external.php
@@ -27,7 +27,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-external/3.1.1',
+	'authent-external/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/authent-ldap/module.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/module.authent-ldap.php
@@ -9,7 +9,7 @@ if (function_exists('ldap_connect'))

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-ldap/3.1.1',
+	'authent-ldap/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/authent-local/module.authent-local.php
+++ b/datamodels/2.x/authent-local/module.authent-local.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-local/3.1.1',
+	'authent-local/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/module.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/module.combodo-backoffice-darkmoon-theme.php
@@ -5,7 +5,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-backoffice-darkmoon-theme/3.1.1',
+	'combodo-backoffice-darkmoon-theme/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php
@@ -24,7 +24,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-db-tools/3.1.1',
+	'combodo-db-tools/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-attachments/module.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/module.itop-attachments.php
@@ -19,7 +19,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-attachments/3.1.1',
+	'itop-attachments/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-backup/module.itop-backup.php
+++ b/datamodels/2.x/itop-backup/module.itop-backup.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-backup/3.1.1',
+	'itop-backup/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-cmdb-services/module.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/module.itop-bridge-cmdb-services.php
@@ -5,7 +5,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-cmdb-services/3.1.1',
+	'itop-bridge-cmdb-services/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
@@ -5,7 +5,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-cmdb-ticket/3.1.1',
+	'itop-bridge-cmdb-ticket/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-datacenter-mgmt-services/module.itop-bridge-datacenter-mgmt-services.php
+++ b/datamodels/2.x/itop-bridge-datacenter-mgmt-services/module.itop-bridge-datacenter-mgmt-services.php
@@ -5,7 +5,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-datacenter-mgmt-services/3.1.1',
+	'itop-bridge-datacenter-mgmt-services/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-endusers-devices-services/module.itop-bridge-endusers-devices-services.php
+++ b/datamodels/2.x/itop-bridge-endusers-devices-services/module.itop-bridge-endusers-devices-services.php
@@ -5,7 +5,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-endusers-devices-services/3.1.1',
+	'itop-bridge-endusers-devices-services/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-storage-mgmt-services/module.itop-bridge-storage-mgmt-services.php
+++ b/datamodels/2.x/itop-bridge-storage-mgmt-services/module.itop-bridge-storage-mgmt-services.php
@@ -5,7 +5,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-storage-mgmt-services/3.1.1',
+	'itop-bridge-storage-mgmt-services/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-virtualization-mgmt-services/module.itop-bridge-virtualization-mgmt-services.php
+++ b/datamodels/2.x/itop-bridge-virtualization-mgmt-services/module.itop-bridge-virtualization-mgmt-services.php
@@ -5,7 +5,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-virtualization-mgmt-services/3.1.1',
+	'itop-bridge-virtualization-mgmt-services/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
+++ b/datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-virtualization-storage/3.1.1',
+	'itop-bridge-virtualization-storage/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt-itil/3.1.1',
+	'itop-change-mgmt-itil/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt/3.1.1',
+	'itop-change-mgmt/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php
@@ -28,18 +28,17 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Relation:impacts/Description'    => 'Prvky ovlivněné objektem',
-	'Relation:impacts/DownStream'     => 'Dopad na',
-	'Relation:impacts/DownStream+'    => 'Elements impacted by~~',
-	'Relation:impacts/UpStream'       => 'Závislost na',
-	'Relation:impacts/UpStream+'      => 'Elements impacting~~',
+	'Relation:impacts/Description' => 'Prvky ovlivněné objektem',
+	'Relation:impacts/DownStream' => 'Dopad na',
+	'Relation:impacts/DownStream+' => 'Elements impacted by~~',
+	'Relation:impacts/UpStream' => 'Závislost na',
+	'Relation:impacts/UpStream+' => 'Elements impacting~~',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Prvky ovlivňující objekt',
-	'Relation:depends on/DownStream'  => 'Závislost na',
-	'Relation:depends on/UpStream'    => 'Dopad na',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Závislost na',
+	'Relation:depends on/UpStream' => 'Dopad na',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));


--- a/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php
@@ -21,18 +21,17 @@
 * @licence	http://opensource.org/licenses/AGPL-3.0
 */
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Relation:impacts/Description'    => 'Elementer berørt af ...',
-	'Relation:impacts/DownStream'     => 'Påvrikning ...',
-	'Relation:impacts/DownStream+'    => 'Elements impacted by~~',
-	'Relation:impacts/UpStream'       => 'Afhænger af ...',
-	'Relation:impacts/UpStream+'      => 'Elements impacting~~',
+	'Relation:impacts/Description' => 'Elementer berørt af ...',
+	'Relation:impacts/DownStream' => 'Påvrikning ...',
+	'Relation:impacts/DownStream+' => 'Elements impacted by~~',
+	'Relation:impacts/UpStream' => 'Afhænger af ...',
+	'Relation:impacts/UpStream+' => 'Elements impacting~~',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Elementer, som afhænger af dette element',
-	'Relation:depends on/DownStream'  => 'Afhænger af ...',
-	'Relation:depends on/UpStream'    => 'Påvirker ...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Afhænger af ...',
+	'Relation:depends on/UpStream' => 'Påvirker ...',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));


--- a/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php
@@ -23,18 +23,18 @@
 *
 */
 Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Relation:impacts/Description'    => 'Elemente betroffen von',
-	'Relation:impacts/DownStream'     => 'Auswirkung ...',
-	'Relation:impacts/DownStream+'    => 'Elemente betroffen von',
-	'Relation:impacts/UpStream'       => 'Hängt ab von ...',
-	'Relation:impacts/UpStream+'      => 'Betroffene Elemente',
+	'Relation:impacts/Description' => 'Elemente betroffen von',
+	'Relation:impacts/DownStream' => 'Auswirkung ...',
+	'Relation:impacts/DownStream+' => 'Elemente betroffen von',
+	'Relation:impacts/UpStream' => 'Hängt ab von ...',
+	'Relation:impacts/UpStream+' => 'Betroffene Elemente',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Elemente, von denen dieses Element abhängt.',
-	'Relation:depends on/DownStream'  => 'Hängt ab von ...',
-	'Relation:depends on/UpStream'    => 'Wirkt auf ...',
-	'Relation:impacts/LoadData'       => 'Daten laden',
-	'Relation:impacts/FilteredData'   => 'Daten sind über den Tab "Grafische Ansicht" gefiltert',
-	'Relation:impacts/NoFilteredData' => 'Bitte wählen Sie Objekte ~~',
+	'Relation:depends on/DownStream' => 'Hängt ab von ...',
+	'Relation:depends on/UpStream' => 'Wirkt auf ...',
+	'Relation:impacts/LoadData' => 'Daten laden',
+	'Relation:impacts/FilteredData' => 'Daten sind über den Tab "Grafische Ansicht" gefiltert',
+	'Relation:impacts/NoFilteredData' => 'Bitte wählen Sie Objekte im Tab "Grafische Ansicht"',
 ));


--- a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php
@@ -27,18 +27,17 @@
 //

 Dict::Add('EN US', 'English', 'English', array(
-	'Relation:impacts/Description'    => 'Elements impacted by',
-	'Relation:impacts/DownStream'     => 'Impacts...',
-	'Relation:impacts/DownStream+'    => 'Elements impacted by',
-	'Relation:impacts/UpStream'       => 'Depends on......',
-	'Relation:impacts/UpStream+'      => 'Elements impacting',
+	'Relation:impacts/Description' => 'Elements impacted by',
+	'Relation:impacts/DownStream' => 'Impacts...',
+	'Relation:impacts/DownStream+' => 'Elements impacted by',
+	'Relation:impacts/UpStream' => 'Depends on......',
+	'Relation:impacts/UpStream+' => 'Elements impacting',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Elements impacting',
-	'Relation:depends on/DownStream'  => 'Depends on...',
-	'Relation:depends on/UpStream'    => 'Impacts...',
+	'Relation:depends on/DownStream' => 'Depends on...',
+	'Relation:depends on/UpStream' => 'Impacts...',
 	'Relation:impacts/LoadData'       => 'Load data',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data',
-	'Relation:impacts/FilteredData'   => 'Filtered data',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag',
 ));


--- a/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
@@ -27,18 +27,17 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Relation:impacts/Description'    => 'Elementos Impactados por',
-	'Relation:impacts/DownStream'     => 'Impacto...',
-	'Relation:impacts/DownStream+'    => 'Elementos Impactados por',
-	'Relation:impacts/UpStream'       => 'Depende de...',
-	'Relation:impacts/UpStream+'      => 'Elementos de los cuales depende',
+	'Relation:impacts/Description' => 'Elementos Impactados por',
+	'Relation:impacts/DownStream' => 'Impacto...',
+	'Relation:impacts/DownStream+' => 'Elementos Impactados por',
+	'Relation:impacts/UpStream' => 'Depende de...',
+	'Relation:impacts/UpStream+' => 'Elementos de los cuales depende',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Elementos de los cuales depende',
-	'Relation:depends on/DownStream'  => 'Depende de...',
-	'Relation:depends on/UpStream'    => 'Impactos...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Depende de...',
+	'Relation:depends on/UpStream' => 'Impactos...',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));


--- a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php
@@ -23,18 +23,17 @@
 // Class: Organization
 //
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Relation:impacts/Description'    => 'Eléments impactés par',
-	'Relation:impacts/DownStream'     => 'Impacte...',
-	'Relation:impacts/DownStream+'    => 'Eléments impactés par',
-	'Relation:impacts/UpStream'       => 'Dépend de...',
-	'Relation:impacts/UpStream+'      => 'Eléments dont dépend',
+	'Relation:impacts/Description' => 'Eléments impactés par',
+	'Relation:impacts/DownStream' => 'Impacte...',
+	'Relation:impacts/DownStream+' => 'Eléments impactés par',
+	'Relation:impacts/UpStream' => 'Dépend de...',
+	'Relation:impacts/UpStream+' => 'Eléments dont dépend',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Eléments dont dépend',
-	'Relation:depends on/DownStream'  => 'Dépend de...',
-	'Relation:depends on/UpStream'    => 'Impacte...',
-	'Relation:impacts/LoadData'       => 'Charger les données',
-	'Relation:impacts/NoFilteredData' => 'Veuillez sélectionner des objets et lancer le chargement des données',
-	'Relation:impacts/FilteredData'   => 'Données filtrées',
+	'Relation:depends on/DownStream' => 'Dépend de...',
+	'Relation:depends on/UpStream' => 'Impacte...',
+	'Relation:impacts/LoadData' => 'Charger les données',
+	'Relation:impacts/NoFilteredData' => 'Veuillez sélectionner des objets dans l\'onglet Graph',
 ));


--- a/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
@@ -20,18 +20,17 @@
 * @license     http://opensource.org/licenses/AGPL-3.0
 */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Relation:impacts/Description'    => 'Konfigurációs elem működését befolyásolják',
-	'Relation:impacts/DownStream'     => 'Hatás',
-	'Relation:impacts/DownStream+'    => 'Konfigurációs elem működését befolyásolják',
-	'Relation:impacts/UpStream'       => 'Függőségek',
-	'Relation:impacts/UpStream+'      => 'Konfigurációs elemtől függnek',
+	'Relation:impacts/Description' => 'Konfigurációs elem működését befolyásolják',
+	'Relation:impacts/DownStream' => 'Hatás',
+	'Relation:impacts/DownStream+' => 'Konfigurációs elem működését befolyásolják',
+	'Relation:impacts/UpStream' => 'Függőségek',
+	'Relation:impacts/UpStream+' => 'Konfigurációs elemtől függnek',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Konfigurációs elemtől függnek',
-	'Relation:depends on/DownStream'  => 'Függőségek',
-	'Relation:depends on/UpStream'    => 'Hatások',
-	'Relation:impacts/LoadData'       => 'Adat betöltés',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Függőségek',
+	'Relation:depends on/UpStream' => 'Hatások',
+	'Relation:impacts/LoadData' => 'Adat betöltés',
+	'Relation:impacts/NoFilteredData' => 'kérjük, válassza ki az objektumokat a grafikus nézetben',
 ));


--- a/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
@@ -20,18 +20,17 @@
 * @license     http://opensource.org/licenses/AGPL-3.0
 */
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Relation:impacts/Description'    => 'Elementi impattati da...',
-	'Relation:impacts/DownStream'     => 'Impatto...',
-	'Relation:impacts/DownStream+'    => 'Elementi impattati da...',
-	'Relation:impacts/UpStream'       => 'Dipende da...',
-	'Relation:impacts/UpStream+'      => 'Elementi di questo elemento dipende da',
+	'Relation:impacts/Description' => 'Elementi impattati da...',
+	'Relation:impacts/DownStream' => 'Impatto...',
+	'Relation:impacts/DownStream+' => 'Elementi impattati da...',
+	'Relation:impacts/UpStream' => 'Dipende da...',
+	'Relation:impacts/UpStream+' => 'Elementi di questo elemento dipende da',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Elementi di questo elemento dipende da',
-	'Relation:depends on/DownStream'  => 'Dipende da...',
-	'Relation:depends on/UpStream'    => 'Impatto...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Dipende da...',
+	'Relation:depends on/UpStream' => 'Impatto...',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));


--- a/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php
@@ -20,18 +20,17 @@
 * @licence	http://opensource.org/licenses/AGPL-3.0
 */
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Relation:impacts/Description'    => 'インパクトを受ける要素',
-	'Relation:impacts/DownStream'     => 'インパクト...',
-	'Relation:impacts/DownStream+'    => 'インパクトを受ける要素',
-	'Relation:impacts/UpStream'       => '依存...',
-	'Relation:impacts/UpStream+'      => 'この要素が依存している要素',
+	'Relation:impacts/Description' => 'インパクトを受ける要素',
+	'Relation:impacts/DownStream' => 'インパクト...',
+	'Relation:impacts/DownStream+' => 'インパクトを受ける要素',
+	'Relation:impacts/UpStream' => '依存...',
+	'Relation:impacts/UpStream+' => 'この要素が依存している要素',
 	// Legacy entries
 	'Relation:depends on/Description' => 'この要素が依存している要素',
-	'Relation:depends on/DownStream'  => '依存...',
-	'Relation:depends on/UpStream'    => 'インパクト...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => '依存...',
+	'Relation:depends on/UpStream' => 'インパクト...',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));


--- a/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php
@@ -32,18 +32,17 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Relation:impacts/Description'    => 'Elementen met impact van',
-	'Relation:impacts/DownStream'     => 'Impact op...',
-	'Relation:impacts/DownStream+'    => 'Elementen geïmpacteerd door',
-	'Relation:impacts/UpStream'       => 'Is afhankelijk van...',
-	'Relation:impacts/UpStream+'      => 'Elementen met impact op',
+	'Relation:impacts/Description' => 'Elementen met impact van',
+	'Relation:impacts/DownStream' => 'Impact op...',
+	'Relation:impacts/DownStream+' => 'Elementen geïmpacteerd door',
+	'Relation:impacts/UpStream' => 'Is afhankelijk van...',
+	'Relation:impacts/UpStream+' => 'Elementen met impact op',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Elementen afhankelijk van',
-	'Relation:depends on/DownStream'  => 'Is afhankelijk van...',
-	'Relation:depends on/UpStream'    => 'Impact op...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Is afhankelijk van...',
+	'Relation:depends on/UpStream' => 'Impact op...',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));


--- a/datamodels/2.x/itop-config-mgmt/dictionaries/pl.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/pl.dict.itop-config-mgmt.php
@@ -25,18 +25,17 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('PL PL', 'Polish', 'Polski', array(
-	'Relation:impacts/Description'    => 'Elementy, na które ma wpływ',
-	'Relation:impacts/DownStream'     => 'Wpływa na...',
-	'Relation:impacts/DownStream+'    => 'Elementy, na które ma wpływ',
-	'Relation:impacts/UpStream'       => 'Zależy od......',
-	'Relation:impacts/UpStream+'      => 'Elementy wpływające',
+	'Relation:impacts/Description' => 'Elementy, na które ma wpływ',
+	'Relation:impacts/DownStream' => 'Wpływa na...',
+	'Relation:impacts/DownStream+' => 'Elementy, na które ma wpływ',
+	'Relation:impacts/UpStream' => 'Zależy od......',
+	'Relation:impacts/UpStream+' => 'Elementy wpływające',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Elementy wpływające',
-	'Relation:depends on/DownStream'  => 'Zależy od...',
-	'Relation:depends on/UpStream'    => 'Wpływa na...',
-	'Relation:impacts/LoadData'       => 'Załaduj dane',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Zależy od...',
+	'Relation:depends on/UpStream' => 'Wpływa na...',
+	'Relation:impacts/LoadData' => 'Załaduj dane',
+	'Relation:impacts/NoFilteredData' => 'proszę wybrać obiekty w widoku graficznym',
 ));


--- a/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php
@@ -26,18 +26,17 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Relation:impacts/Description'    => 'Elementos impactados por',
-	'Relation:impacts/DownStream'     => 'Impacto...',
-	'Relation:impacts/DownStream+'    => 'Elementos impactados por',
-	'Relation:impacts/UpStream'       => 'Depende de...',
-	'Relation:impacts/UpStream+'      => 'Elementos estes, que dependem deste elemento',
+	'Relation:impacts/Description' => 'Elementos impactados por',
+	'Relation:impacts/DownStream' => 'Impacto...',
+	'Relation:impacts/DownStream+' => 'Elementos impactados por',
+	'Relation:impacts/UpStream' => 'Depende de...',
+	'Relation:impacts/UpStream+' => 'Elementos estes, que dependem deste elemento',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Elementos estes, que dependem deste elemento',
-	'Relation:depends on/DownStream'  => 'Depende de...',
-	'Relation:depends on/UpStream'    => 'Impactos...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Depende de...',
+	'Relation:depends on/UpStream' => 'Impactos...',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));


--- a/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php
@@ -13,18 +13,17 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Relation:impacts/Description'    => 'Элементы, на которые влияет',
-	'Relation:impacts/DownStream'     => 'Влияет на...',
-	'Relation:impacts/DownStream+'    => 'Элементы, на которые влияет',
-	'Relation:impacts/UpStream'       => 'Зависит от...',
-	'Relation:impacts/UpStream+'      => 'Элементы, от которых зависит',
+	'Relation:impacts/Description' => 'Элементы, на которые влияет',
+	'Relation:impacts/DownStream' => 'Влияет на...',
+	'Relation:impacts/DownStream+' => 'Элементы, на которые влияет',
+	'Relation:impacts/UpStream' => 'Зависит от...',
+	'Relation:impacts/UpStream+' => 'Элементы, от которых зависит',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Элементы, от которых зависит',
-	'Relation:depends on/DownStream'  => 'Зависит от...',
-	'Relation:depends on/UpStream'    => 'Влияет на...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Зависит от...',
+	'Relation:depends on/UpStream' => 'Влияет на...',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));


--- a/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php
@@ -25,18 +25,17 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Relation:impacts/Description'    => 'Prvky zasiahnuté',
-	'Relation:impacts/DownStream'     => 'Impacts...~~',
-	'Relation:impacts/DownStream+'    => 'Elements impacted by~~',
-	'Relation:impacts/UpStream'       => 'Depends on......~~',
-	'Relation:impacts/UpStream+'      => 'Elements impacting~~',
+	'Relation:impacts/Description' => 'Prvky zasiahnuté',
+	'Relation:impacts/DownStream' => 'Impacts...~~',
+	'Relation:impacts/DownStream+' => 'Elements impacted by~~',
+	'Relation:impacts/UpStream' => 'Depends on......~~',
+	'Relation:impacts/UpStream+' => 'Elements impacting~~',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Prvky, od ktorých závisí tento prvok',
-	'Relation:depends on/DownStream'  => 'Depends on...~~',
-	'Relation:depends on/UpStream'    => 'Impacts...~~',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Depends on...~~',
+	'Relation:depends on/UpStream' => 'Impacts...~~',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));


--- a/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
@@ -27,18 +27,17 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Relation:impacts/Description'    => 'Etkilenen kalemler',
-	'Relation:impacts/DownStream'     => 'Etkiler...',
-	'Relation:impacts/DownStream+'    => 'Etkilenen kalemler',
-	'Relation:impacts/UpStream'       => 'Bağımlı olanlar...',
-	'Relation:impacts/UpStream+'      => 'Bu kaleme bağımlı olan kalemler',
+	'Relation:impacts/Description' => 'Etkilenen kalemler',
+	'Relation:impacts/DownStream' => 'Etkiler...',
+	'Relation:impacts/DownStream+' => 'Etkilenen kalemler',
+	'Relation:impacts/UpStream' => 'Bağımlı olanlar...',
+	'Relation:impacts/UpStream+' => 'Bu kaleme bağımlı olan kalemler',
 	// Legacy entries
 	'Relation:depends on/Description' => 'Bu kaleme bağımlı olan kalemler',
-	'Relation:depends on/DownStream'  => 'Bağımlı olanlar...',
-	'Relation:depends on/UpStream'    => 'Etkiledikleri...',
-	'Relation:impacts/LoadData'       => 'Load data~~',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => 'Bağımlı olanlar...',
+	'Relation:depends on/UpStream' => 'Etkiledikleri...',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));


--- a/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
@@ -25,18 +25,17 @@
 //////////////////////////////////////////////////////////////////////
 //
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Relation:impacts/Description'    => '被影响的元素',
-	'Relation:impacts/DownStream'     => '影响...',
-	'Relation:impacts/DownStream+'    => '被影响的元素',
-	'Relation:impacts/UpStream'       => '依赖于...',
-	'Relation:impacts/UpStream+'      => '此元素依赖的元素...',
+	'Relation:impacts/Description' => '被影响的元素',
+	'Relation:impacts/DownStream' => '影响...',
+	'Relation:impacts/DownStream+' => '被影响的元素',
+	'Relation:impacts/UpStream' => '依赖于...',
+	'Relation:impacts/UpStream+' => '此元素依赖的元素...',
 	// Legacy entries
 	'Relation:depends on/Description' => '此元素依赖的元素...',
-	'Relation:depends on/DownStream'  => '依赖于...',
-	'Relation:depends on/UpStream'    => '影响...',
-	'Relation:impacts/LoadData'       => '加载数据',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData'   => 'Filtered data~~',
+	'Relation:depends on/DownStream' => '依赖于...',
+	'Relation:depends on/UpStream' => '影响...',
+	'Relation:impacts/LoadData' => '加载数据',
+	'Relation:impacts/NoFilteredData' => 'please select objects in Graphical view tag~~',
 ));


--- a/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-config-mgmt/3.1.1',
+	'itop-config-mgmt/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-config/module.itop-config.php
+++ b/datamodels/2.x/itop-config/module.itop-config.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-config/3.1.1',
+	'itop-config/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-core-update/module.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/module.itop-core-update.php
@@ -24,7 +24,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-core-update/3.1.1',
+	'itop-core-update/3.1.0',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php
+++ b/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php
@@ -18,7 +18,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-datacenter-mgmt/3.1.1',
+	'itop-datacenter-mgmt/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php
+++ b/datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php
@@ -25,7 +25,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-endusers-devices/3.1.1',
+	'itop-endusers-devices/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-faq-light/module.itop-faq-light.php
+++ b/datamodels/2.x/itop-faq-light/module.itop-faq-light.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-faq-light/3.1.1',
+	'itop-faq-light/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-files-information/module.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/module.itop-files-information.php
@@ -24,7 +24,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-files-information/3.1.1',
+	'itop-files-information/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-full-itil/module.itop-full-itil.php
+++ b/datamodels/2.x/itop-full-itil/module.itop-full-itil.php
@@ -6,7 +6,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-full-itil/3.1.1',
+	'itop-full-itil/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
@@ -5,7 +5,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-hub-connector/3.1.1',
+	'itop-hub-connector/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-incident-mgmt-itil/3.1.1',
+	'itop-incident-mgmt-itil/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-knownerror-mgmt/3.1.1',
+	'itop-knownerror-mgmt/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-oauth-client/module.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/module.itop-oauth-client.php
@@ -5,7 +5,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-oauth-client/3.1.1',
+	'itop-oauth-client/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-portal-base/module.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/module.itop-portal-base.php
@@ -20,7 +20,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-portal-base/3.1.1', array(
+	'itop-portal-base/3.1.0', array(
 	// Identification
 	'label' => 'Portal Development Library',
 		'category' => 'Portal',
--- a/datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php
+++ b/datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php
@@ -64,7 +64,7 @@ foreach ($aPortalConf['properties']['themes'] as $sKey => $value)
 {
 	if (!is_array($value))
 	{
-		$aPortalConf['properties']['themes'][$sKey] = utils::GetCSSFromSASS('env-'.utils::GetCurrentEnvironment().'/'.$value,
+		$aPortalConf['properties']['themes'][$sKey] = $_ENV['COMBODO_ABSOLUTE_URL'].utils::GetCSSFromSASS('env-'.utils::GetCurrentEnvironment().'/'.$value,
 				$aImportPaths);
 	}
 	else
@@ -72,7 +72,7 @@ foreach ($aPortalConf['properties']['themes'] as $sKey => $value)
 		$aValues = array();
 		foreach ($value as $sSubValue)
 		{
-			$aValues[] = utils::GetCSSFromSASS('env-'.utils::GetCurrentEnvironment().'/'.$sSubValue,
+			$aValues[] = $_ENV['COMBODO_ABSOLUTE_URL'].utils::GetCSSFromSASS('env-'.utils::GetCurrentEnvironment().'/'.$sSubValue,
 					$aImportPaths);
 		}
 		$aPortalConf['properties']['themes'][$sKey] = $aValues;
--- a/datamodels/2.x/itop-portal-base/portal/public/css/portal.css
+++ b/datamodels/2.x/itop-portal-base/portal/public/css/portal.css
--- a/datamodels/2.x/itop-portal-base/portal/public/css/portal.scss
+++ b/datamodels/2.x/itop-portal-base/portal/public/css/portal.scss
@@ -1808,30 +1808,6 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
 	white-space: pre-line;
 }

-@media print {
-  /* Prevent URLs from being displayed */
-  a[href], img[src] {
-    &::after {
-      content: none !important;
-    }
-  }
-
-  /* Force modals to be displayed one after another instead of stacked */
-  .modal {
-    &.in {
-      position: relative;
-      top: unset;
-      z-index: unset;
-      overflow-y: unset;
-    }
-
-  }
-
-  #drag_overlay {
-    display: none;
-  }
-}
-
 /**********************************************************/
 /* Shameful area (things that should be refactored soon) */
 /**********************************************************/
--- a/datamodels/2.x/itop-portal-base/portal/src/Controller/ManageBrickController.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Controller/ManageBrickController.php
@@ -50,7 +50,6 @@ use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use UnaryExpression;
 use URLButtonItem;
-use utils;

 /**
 * Class ManageBrickController
@@ -261,7 +260,6 @@ class ManageBrickController extends BrickController
 			'oBrick' => $oBrick,
 			'sBrickId' => $sBrickId,
 			'sToken' => $oExporter->SaveState(),
-            'sWikiUrl' => 'https://www.itophub.io/wiki/page?id='.utils::GetItopVersionWikiSyntax().'%3Auser%3Alists#excel_export',
 		);

 		return $this->render(static::EXCEL_EXPORT_TEMPLATE_PATH, $aData);
--- a/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
@@ -43,7 +43,6 @@ use DOMXPath;
 use Exception;
 use ExceptionLog;
 use InlineImage;
-use InvalidExternalKeyValueException;
 use IssueLog;
 use LogChannels;
 use MetaModel;
@@ -51,7 +50,6 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use UserRights;
 use utils;
-use const UR_ACTION_READ;

 /**
 * Description of ObjectFormManager
@@ -806,7 +804,7 @@ class ObjectFormManager extends FormManager
 									if (in_array(get_class($oCustomField), array('Combodo\\iTop\\Form\\Field\\SelectObjectField')))
 									{
 										/** @var \Combodo\iTop\Form\Field\SelectObjectField $oCustomField */
-										if ($this->oFormHandlerHelper->GetUrlGenerator() !== null) {
+										if ($this->oFormHandlerHelper->getUrlGenerator() !== null) {

 											$sSearchEndpoint = $this->oFormHandlerHelper->GetUrlGenerator()->generate('p_object_search_generic',
 												array(
@@ -887,7 +885,7 @@ class ObjectFormManager extends FormManager
 								$iRemoteKey = $oLink->GetKey();
 							}

-							if (!$this->oFormHandlerHelper->GetSecurityHelper()->IsActionAllowed(UR_ACTION_READ, $oField->GetTargetClass(), $iRemoteKey)) {
+							if (!$this->oFormHandlerHelper->getSecurityHelper()->IsActionAllowed(UR_ACTION_READ, $oField->GetTargetClass(), $iRemoteKey)) {
 								$aLimitedAccessItemIDs[] = $iRemoteKey;
 							}
 						}
@@ -912,14 +910,14 @@ class ObjectFormManager extends FormManager
 					if ($this->oFormHandlerHelper !== null) {
 						// Override hardcoded URLs in ormDocument pointing to back office console
 						$oOrmDoc = $this->oObject->Get($sAttCode);
-						$sDisplayUrl = $this->oFormHandlerHelper->GetUrlGenerator()->generate('p_object_document_display', [
+						$sDisplayUrl = $this->oFormHandlerHelper->getUrlGenerator()->generate('p_object_document_display', [
 							'sObjectClass' => get_class($this->oObject),
 							'sObjectId'    => $this->oObject->GetKey(),
 							'sObjectField' => $sAttCode,
 							'cache'        => 86400,
 							's'            => $oOrmDoc->GetSignature(),
 						]);
-						$sDownloadUrl = $this->oFormHandlerHelper->GetUrlGenerator()->generate('p_object_document_download', [
+						$sDownloadUrl = $this->oFormHandlerHelper->getUrlGenerator()->generate('p_object_document_download', [
 							'sObjectClass' => get_class($this->oObject),
 							'sObjectId'    => $this->oObject->GetKey(),
 							'sObjectField' => $sAttCode,
@@ -1011,8 +1009,8 @@ class ObjectFormManager extends FormManager
 				// set id to a unique key - avoid collisions with another attribute that could exist with the name 'attachments'
 				$oField = new FileUploadField('attachments_plugin');
 				$oField->SetLabel(Dict::S('Portal:Attachments'))
-					->SetUploadEndpoint($this->oFormHandlerHelper->GetUrlGenerator()->generate('p_object_attachment_add'))
-					->SetDownloadEndpoint($this->oFormHandlerHelper->GetUrlGenerator()->generate('p_object_attachment_download',
+					->SetUploadEndpoint($this->oFormHandlerHelper->getUrlGenerator()->generate('p_object_attachment_add'))
+					->SetDownloadEndpoint($this->oFormHandlerHelper->getUrlGenerator()->generate('p_object_attachment_download',
 						array('sAttachmentId' => '-sAttachmentId-')))
 					->SetTransactionId($oForm->GetTransactionId())
 					->SetAllowDelete($this->oFormHandlerHelper->getCombodoPortalConf()['properties']['attachments']['allow_delete'])
@@ -1135,10 +1133,8 @@ class ObjectFormManager extends FormManager
 			$bWasModified = $this->oObject->IsModified();
 			$bActivateTriggers = (!$bIsNew && $bWasModified);

-			$oSecurityHelper = $this->oFormHandlerHelper->GetSecurityHelper();
-
 			// Forcing allowed writing on the object if necessary. This is used in some particular cases.
-			$bAllowWrite = $oSecurityHelper->IsActionAllowed($bIsNew ? UR_ACTION_CREATE : UR_ACTION_MODIFY, $sObjectClass, $this->oObject->GetKey());
+			$bAllowWrite = $this->oFormHandlerHelper->getSecurityHelper()->IsActionAllowed($bIsNew ? UR_ACTION_CREATE : UR_ACTION_MODIFY, $sObjectClass, $this->oObject->GetKey());
 			if ($bAllowWrite) {
 				$this->oObject->AllowWrite(true);
 			}
@@ -1146,15 +1142,12 @@ class ObjectFormManager extends FormManager
 			// Writing object to DB
 			try
 			{
-				$this->oObject->CheckChangedExtKeysValues(function ($sClass, $sId) use ($oSecurityHelper): bool {
-					return $oSecurityHelper->IsActionAllowed(UR_ACTION_READ, $sClass, $sId);
-				});
 				$this->oObject->DBWrite();
-			} catch (CoreCannotSaveObjectException $e) {
+			}
+			catch (CoreCannotSaveObjectException $e) {
 				throw new Exception($e->getHtmlMessage());
-			} catch (InvalidExternalKeyValueException $e) {
-				throw new Exception($e->getIssue());
-			} catch (Exception $e) {
+			}
+			catch (Exception $e) {
 				$aContext = [
 					'origin'    => __CLASS__.'::'.__METHOD__,
 					'obj_class' => get_class($this->oObject),
--- a/datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php
@@ -480,7 +480,7 @@ class ObjectFormHandlerHelper
 	 * @since 3.1
 	 *
 	 */
-	public function GetUrlGenerator()
+	public function getUrlGenerator()
 	{
 		return $this->oUrlGenerator;
 	}
@@ -490,7 +490,7 @@ class ObjectFormHandlerHelper
 	 * @since 3.1
 	 *
 	 */
-	public function GetSecurityHelper(): SecurityHelper
+	public function getSecurityHelper(): SecurityHelper
 	{
 		return $this->oSecurityHelper;
 	}
--- a/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/popup-export-excel.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/popup-export-excel.html.twig
@@ -11,7 +11,6 @@
    </div>

    <div id="export-feedback">
-        <p id="export-excel-warning" class="alert alert-warning" role="alert">{{ 'UI:Bulk:Export:MaliciousInjection:Alert:Message'|dict_format(sWikiUrl)|raw }}</p>
        <p class="export-message" style="text-align:center;">{{ 'ExcelExport:PreparingExport'|dict_s }}</p>
        <div class="progress">
            <div class="progress-bar" role="progressbar" style="width: 0%"
--- a/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig
@@ -50,9 +50,9 @@
 		<link href="{{ app['combodo.absolute_url'] ~ 'css/c3.min.css'|add_itop_version }}" rel="stylesheet">
 		<link href="{{ app['combodo.absolute_url'] ~ 'js/ckeditor/plugins/codesnippet/lib/highlight/styles/obsidian.css'|add_itop_version }}" rel="stylesheet">
 		{# - Bootstrap theme #}
-		<link href="{{ app['combodo.absolute_url'] ~ app['combodo.portal.instance.conf'].properties.themes.bootstrap|add_itop_version }}" rel="stylesheet" id="css_bootstrap_theme">
+		<link href="{{ app['combodo.portal.instance.conf'].properties.themes.bootstrap|add_itop_version }}" rel="stylesheet" id="css_bootstrap_theme">
 		{# - Portal adjustments for BS theme #}
-		<link href="{{ app['combodo.absolute_url'] ~ app['combodo.portal.instance.conf'].properties.themes.portal|add_itop_version }}" rel="stylesheet" id="css_portal">
+		<link href="{{ app['combodo.portal.instance.conf'].properties.themes.portal|add_itop_version }}" rel="stylesheet" id="css_portal">
 		{# Tippy for tooltips and Popper for their placement #}
 		<link href="{{ app['combodo.absolute_url'] ~ 'node_modules/tippy.js/dist/tippy.css'|add_itop_version }}" rel="stylesheet">
 		<link href="{{ app['combodo.absolute_url'] ~ 'node_modules/tippy.js/animations/shift-away-subtle.css'|add_itop_version }}" rel="stylesheet">
--- a/datamodels/2.x/itop-portal/module.itop-portal.php
+++ b/datamodels/2.x/itop-portal/module.itop-portal.php
@@ -20,7 +20,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-portal/3.1.1', array(
+	'itop-portal/3.1.0', array(
 	// Identification
 	'label' => 'Enhanced Customer Portal',
 	'category' => 'Portal',
--- a/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-problem-mgmt/3.1.1',
+	'itop-problem-mgmt/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php
+++ b/datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php
@@ -19,7 +19,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-profiles-itil/3.1.1',
+	'itop-profiles-itil/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-request-mgmt-itil/3.1.1',
+	'itop-request-mgmt-itil/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-request-mgmt/3.1.1',
+	'itop-request-mgmt/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-service-mgmt-provider/3.1.1',
+	'itop-service-mgmt-provider/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-service-mgmt/3.1.1',
+	'itop-service-mgmt/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php
@@ -18,7 +18,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-sla-computation/3.1.1',
+	'itop-sla-computation/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php
+++ b/datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php
@@ -25,7 +25,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	 'itop-storage-mgmt/3.1.1',
+	 'itop-storage-mgmt/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-structure/module.itop-structure.php
+++ b/datamodels/2.x/itop-structure/module.itop-structure.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-structure/3.1.1',
+	'itop-structure/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-themes-compat/module.itop-themes-compat.php
+++ b/datamodels/2.x/itop-themes-compat/module.itop-themes-compat.php
@@ -5,7 +5,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-themes-compat/3.1.1',
+	'itop-themes-compat/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
+++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
@@ -202,7 +202,6 @@
          <count_min>0</count_min>
          <count_max>0</count_max>
          <ext_key_to_remote>contact_id</ext_key_to_remote>
-          <with_php_computation>true</with_php_computation>
          <duplicates/>
        </field>
        <field id="functionalcis_list" xsi:type="AttributeLinkedSetIndirect">
@@ -211,7 +210,6 @@
          <count_min>0</count_min>
          <count_max>0</count_max>
          <ext_key_to_remote>functionalci_id</ext_key_to_remote>
-          <with_php_computation>true</with_php_computation>
          <duplicates/>
        </field>
        <field id="workorders_list" xsi:type="AttributeLinkedSet">
--- a/datamodels/2.x/itop-tickets/module.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/module.itop-tickets.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__,
-	'itop-tickets/3.1.1',
+	'itop-tickets/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php
+++ b/datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php
@@ -16,7 +16,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-virtualization-mgmt/3.1.1',
+	'itop-virtualization-mgmt/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php
+++ b/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-welcome-itil/3.1.1',
+	'itop-welcome-itil/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/version.xml
+++ b/datamodels/2.x/version.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <information>
-  <version>3.1.1</version>
+  <version>3.1.0</version>
 </information>
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -182,7 +182,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:User/Error:StatusChangeIsNotAllowed' => 'Changing status is not allowed for your own User',
 	'Class:User/Error:AllowedOrgsMustContainUserOrg' => 'Allowed organizations must contain User organization',
 	'Class:User/Error:CurrentProfilesHaveInsufficientRights' => 'The current list of profiles does not give sufficient access rights (Users are not modifiable anymore)',
-	'Class:User/Error:PortalPowerUserHasInsufficientRights' => 'The Portal power user profile does not give sufficient access rights (another profile must be added)',
 	'Class:User/Error:AtLeastOneOrganizationIsNeeded' => 'At least one organization must be assigned to this user.',
 	'Class:User/Error:OrganizationNotAllowed' => 'Organization not allowed.',
 	'Class:User/Error:UserOrganizationNotAllowed' => 'The user account does not belong to your allowed organizations.',
--- a/dictionaries/fr.dictionary.itop.core.php
+++ b/dictionaries/fr.dictionary.itop.core.php
@@ -984,7 +984,7 @@ Plusieurs champs peuvent ainsi être modifiés lors d\'une "mise à jour" en app
 	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Format par défaut (%1$s), ex. %2$s',
 	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Format spécial: %1$s',
 	'Core:BulkExport:PDF:PageNumber' => 'Page %1$s',
-    'Core:DateTime:Placeholder_d' => 'JJ', // Day of the month: 2 digits (with leading zero)
+	'Core:DateTime:Placeholder_d' => 'JJ', // Day of the month: 2 digits (with leading zero)
 	'Core:DateTime:Placeholder_j' => 'J', // Day of the month: 1 or 2 digits (without leading zero)
 	'Core:DateTime:Placeholder_m' => 'MM', // Month on 2 digits i.e. 01-12
 	'Core:DateTime:Placeholder_n' => 'M', // Month on 1 or 2 digits 1-12
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -166,7 +166,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:User/Error:StatusChangeIsNotAllowed' => 'Impossible de changer l\'état de son propre utilisateur',
 	'Class:User/Error:AllowedOrgsMustContainUserOrg' => 'Les organisations permises doivent contenir l\'organisation de l\'utilisateur',
 	'Class:User/Error:CurrentProfilesHaveInsufficientRights' => 'Les profils existants ne permettent pas de modifier les utilisateurs',
-	'Class:User/Error:PortalPowerUserHasInsufficientRights' => 'Le profil Portal power user ne donne pas suffisamment de droits à l\'utilisateur (un autre profil doit être ajouté)',
 	'Class:User/Error:AtLeastOneOrganizationIsNeeded' => 'L\'utilisateur doit avoir au moins une organisation.',
 	'Class:User/Error:OrganizationNotAllowed' => 'Organisation non autorisée.',
 	'Class:User/Error:UserOrganizationNotAllowed' => 'L\'utilisateur n\'appartient pas à vos organisations.',
--- a/dictionaries/ui/application/bulk/cs.dictionary.itop.bulk.php
+++ b/dictionaries/ui/application/bulk/cs.dictionary.itop.bulk.php
@@ -20,6 +20,5 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(

 	// Bulk modify
 	'UI:Bulk:modify:IncompatibleAttribute' => 'This attribute can\'t be edited in bulk context~~',
-	'UI:Bulk:Export:MaliciousInjection:Alert:Title' => 'Excel security warning~~',
-	'UI:Bulk:Export:MaliciousInjection:Alert:Message' => 'Opening a file with untrusted data in Microsoft Excel may lead to formula injection. Ensure that your Excel settings are configured to handle files safely. <a href="%1$s">Learn more in our documentation.</a>~~',
+
 ));
--- a/dictionaries/ui/application/bulk/da.dictionary.itop.bulk.php
+++ b/dictionaries/ui/application/bulk/da.dictionary.itop.bulk.php
@@ -20,6 +20,5 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(

 	// Bulk modify
 	'UI:Bulk:modify:IncompatibleAttribute' => 'This attribute can\'t be edited in bulk context~~',
-	'UI:Bulk:Export:MaliciousInjection:Alert:Title' => 'Excel security warning~~',
-	'UI:Bulk:Export:MaliciousInjection:Alert:Message' => 'Opening a file with untrusted data in Microsoft Excel may lead to formula injection. Ensure that your Excel settings are configured to handle files safely. <a href="%1$s">Learn more in our documentation.</a>~~',
+
 ));
--- a/dictionaries/ui/application/bulk/de.dictionary.itop.bulk.php
+++ b/dictionaries/ui/application/bulk/de.dictionary.itop.bulk.php
@@ -20,6 +20,5 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(

 	// Bulk modify
 	'UI:Bulk:modify:IncompatibleAttribute' => 'Dieses Attribut kann in einer Massenänderung nicht bearbeitet werden.',
-	'UI:Bulk:Export:MaliciousInjection:Alert:Title' => 'Excel security warning~~',
-	'UI:Bulk:Export:MaliciousInjection:Alert:Message' => 'Opening a file with untrusted data in Microsoft Excel may lead to formula injection. Ensure that your Excel settings are configured to handle files safely. <a href="%1$s">Learn more in our documentation.</a>~~',
+
 ));
--- a/dictionaries/ui/application/bulk/en.dictionary.itop.bulk.php
+++ b/dictionaries/ui/application/bulk/en.dictionary.itop.bulk.php
@@ -21,6 +21,5 @@ Dict::Add('EN US', 'English', 'English', array(

 	// Bulk modify
 	'UI:Bulk:modify:IncompatibleAttribute' => 'This attribute can\'t be edited in bulk context',
-	'UI:Bulk:Export:MaliciousInjection:Alert:Title' => 'Excel security warning',
-	'UI:Bulk:Export:MaliciousInjection:Alert:Message' => 'Opening a file with untrusted data in Microsoft Excel may lead to formula injection. Ensure that your Excel settings are configured to handle files safely. <a href="%1$s">Learn more in our documentation.</a>',
+
 ));
--- a/dictionaries/ui/application/bulk/es_cr.dictionary.itop.bulk.php
+++ b/dictionaries/ui/application/bulk/es_cr.dictionary.itop.bulk.php
@@ -20,6 +20,5 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(

 	// Bulk modify
 	'UI:Bulk:modify:IncompatibleAttribute' => 'This attribute can\'t be edited in bulk context~~',
-	'UI:Bulk:Export:MaliciousInjection:Alert:Title' => 'Excel security warning~~',
-	'UI:Bulk:Export:MaliciousInjection:Alert:Message' => 'Opening a file with untrusted data in Microsoft Excel may lead to formula injection. Ensure that your Excel settings are configured to handle files safely. <a href="%1$s">Learn more in our documentation.</a>~~',
+
 ));
--- a/dictionaries/ui/application/bulk/fr.dictionary.itop.bulk.php
+++ b/dictionaries/ui/application/bulk/fr.dictionary.itop.bulk.php
@@ -20,6 +20,5 @@ Dict::Add('FR FR', 'French', 'Français', array(

 	// Bulk modify
 	'UI:Bulk:modify:IncompatibleAttribute' => 'Cet attribut ne peut être édité dans une modification en masse',
-	'UI:Bulk:Export:MaliciousInjection:Alert:Title' => 'Avertissement sur la sécurité d\'Excel',
-	'UI:Bulk:Export:MaliciousInjection:Alert:Message' => 'L\'ouverture d\'un fichier contenant des données non fiables dans Microsoft Excel peut entraîner l\'injection de formules. Assurez-vous que vos paramètres Excel sont configurés pour traiter les fichiers en toute sécurité. <a href="%1$s">Pour en savoir plus, consultez notre documentation.</a>',
+
 ));
--- a/Show More
+++ b/Show More