N°6716 - ✅ High memory Consomption and performance issue

2026-03-21 08:54:12 +01:00 · 2023-09-14 15:16:11 +02:00 · 2023-09-14 14:38:17 +02:00
228 changed files with 1768 additions and 2253 deletions
--- a/.doc/contributing-guide/2023.contributing-stickers-side-by-side.png
+++ b/.doc/contributing-guide/2023.contributing-stickers-side-by-side.png
--- a/.doc/itop-version-history.md
+++ b/.doc/itop-version-history.md
@@ -68,8 +68,6 @@ gitGraph
    branch support/3.1 order: 840
    checkout support/3.1
    commit id: "2023-08-09" tag: "3.1.0-2"
-    checkout support/2.7
-    commit id: "2023-08-10" tag: "2.7.9"
 ```

 To learn more, check the [iTop community versions history on the official wiki](https://www.itophub.io/wiki/page?id=latest:release:start).
--- a/.gitignore
+++ b/.gitignore
@@ -37,9 +37,7 @@ tests/*/vendor/*

 # iTop extensions
 /extensions/**
-!/extensions/.htaccess
 !/extensions/readme.txt
-!/extensions/web.config

 # all logs but listing prevention
 /log/**
@@ -47,10 +45,8 @@ tests/*/vendor/*
 !/log/index.php
 !/log/web.config

-# PHPUnit: Cache file, local XML working copies
+# PHPUnit cache file
 /tests/php-unit-tests/.phpunit.result.cache
-/tests/php-unit-tests/phpunit.xml
-/tests/php-unit-tests/postbuild_integration.xml


 # Jetbrains
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -140,7 +140,7 @@ When your code is working, please:
 * Pull request description: mind to add all the information useful to understand why you're suggesting this modification and anything necessary to dive into your work. Especially:
  - Bugfixes: exact steps to reproduce the bug (given/when/then), description of the bug cause and what solution is implemented 
  - Enhancements: use cases, implementation details if needed
-* Mind to check the "[Allow edits from maintainers](https://docs.github.com/en/github-ae@latest/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)" option ! (note that if you are working with an org fork, this option [won't be available](https://github.com/orgs/community/discussions/5634))
+* Mind to check the "[Allow edits from maintainers](https://docs.github.com/en/github-ae@latest/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)" option !


 ## 🙏 We are thankful
@@ -161,4 +161,4 @@ We have one sticker per contribution type. You might get multiple stickers with

 Here is the design of each stickers for year 2022:

-![iTop stickers 2023](.doc/contributing-guide/2023.contributing-stickers-side-by-side.png)
+![iTop stickers 2022](.doc/contributing-guide/2022.contributing-stickers-side-by-side.png)
--- a/README.md
+++ b/README.md
@@ -90,7 +90,6 @@ We would like to give a special thank you 🤗 to the people from the community
 - Dvořák, Lukáš
 - Goethals, Stefan
 - Gumble, David
- Ji, Leeb (冀利斌) (a.k.a [@chileeb](https://github.com/chileeb))
 - Kaltefleiter, Lars (a.k.a [@larhip](https://www.github.com/larhip))
 - Khamit, Shamil
 - Kincel, Martin
@@ -108,7 +107,6 @@ We would like to give a special thank you 🤗 to the people from the community
 - Rudner, Björn (a.k.a [@rudnerbjoern](https://github.com/rudnerbjoern))
 - Seki, Shoji
 - Shilov, Vladimir
- Stetina, Pavel (a.k.a [@Stetinac](https://github.com/Stetinac))
 - Stukalov, Ilya (a.k.a [@ilya](https://www.github.com/ilya)-stukalov)
 - Tulio, Marco
 - Turrubiates, Miguel
--- a/addons/userrights/userrightsprofile.class.inc.php
+++ b/addons/userrights/userrightsprofile.class.inc.php
@@ -502,7 +502,6 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	}

 	protected $m_aUserOrgs = array(); // userid -> array of orgid
-	protected $m_aAdministrators = null; // [user id]

 	// Built on demand, could be optimized if necessary (doing a query for each attribute that needs to be read)
 	protected $m_aObjectActionGrants = array();
@@ -559,7 +558,6 @@ class UserRightsProfile extends UserRightsAddOnAPI

 		// Cache
 		$this->m_aObjectActionGrants = array();
-		$this->m_aAdministrators = null;
 	}

 	public function LoadCache()
@@ -702,10 +700,12 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	 */
 	private function GetAdministrators()
 	{
-		if ($this->m_aAdministrators === null)
+		static $aAdministrators = null;
+
+		if ($aAdministrators === null)
 		{
 			// Find all administrators
-			$this->m_aAdministrators = array();
+			$aAdministrators = array();
 			$oAdministratorsFilter = new DBObjectSearch('User');
 			$oLnkFilter = new DBObjectSearch('URP_UserProfile');
 			$oExpression = new FieldExpression('profileid', 'URP_UserProfile');
@@ -718,10 +718,10 @@ class UserRightsProfile extends UserRightsAddOnAPI
 			$oSet->OptimizeColumnLoad(array('User' => array('login')));
 			while($oUser = $oSet->Fetch())
 			{
-				$this->m_aAdministrators[] = $oUser->GetKey();
+				$aAdministrators[] = $oUser->GetKey();
 			}
 		}
-		return $this->m_aAdministrators;
+		return $aAdministrators;
 	}

 	/**
--- a/application/ajaxwebpage.class.inc.php
+++ b/application/ajaxwebpage.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @deprecated  3.0.0 will be removed in 3.1.0 - moved to sources/Application/WebPage/AjaxPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/AjaxPage.php, now loadable using autoloader
 * @license     http://opensource.org/licenses/AGPL-3.0
 * @copyright   Copyright (C) 2010-2023 Combodo SARL
 */
--- a/application/capturewebpage.class.inc.php
+++ b/application/capturewebpage.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @deprecated  3.0.0 will be removed in 3.1.0 - moved to sources/Application/WebPage/CaptureWebPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/CaptureWebPage.php, now loadable using autoloader
 * @license     http://opensource.org/licenses/AGPL-3.0
 * @copyright   Copyright (C) 2010-2023 Combodo SARL
 */
--- a/application/clipage.class.inc.php
+++ b/application/clipage.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @deprecated  3.0.0 will be removed in 3.1.0 - moved to sources/Application/WebPage/CLIPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/CLIPage.php, now loadable using autoloader
 * @license     http://opensource.org/licenses/AGPL-3.0
 * @copyright   Copyright (C) 2010-2023 Combodo SARL
 */
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -744,11 +744,7 @@ HTML
 			$oPage->SetCurrentTab($sTabCode, $oAttDef->GetLabel().$sCount, $sTabDescription);

 			$aArgs = array('this' => $this);
-			
-			$sEditWhen = $oAttDef->GetEditWhen();
-			$bIsEditableBasedOnEditWhen = ($sEditWhen === LINKSET_EDITWHEN_ALWAYS || $sEditWhen === LINKSET_EDITWHEN_ON_HOST_EDITION);
-
-			$bReadOnly = ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE)) || !$bIsEditableBasedOnEditWhen;
+			$bReadOnly = ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE));
 			if ($bEditMode && (!$bReadOnly)) {
 				$sInputId = $this->m_iFormId.'_'.$sAttCode;
 				$sDisplayValue = ''; // not used
--- a/application/csvpage.class.inc.php
+++ b/application/csvpage.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @deprecated  3.0.0 will be removed in 3.1.0 - moved to sources/Application/WebPage/CSVPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/CSVPage.php, now loadable using autoloader
 * @license     http://opensource.org/licenses/AGPL-3.0
 * @copyright   Copyright (C) 2010-2023 Combodo SARL
 */
--- a/application/dashboard.class.inc.php
+++ b/application/dashboard.class.inc.php
@@ -918,7 +918,7 @@ class RuntimeDashboard extends Dashboard
 	{
 		$bCustomized = false;

-		$sDashboardFileSanitized = utils::RealPath(APPROOT.$sDashboardFile, APPROOT);
+		$sDashboardFileSanitized = utils::RealPath($sDashboardFile, APPROOT);
 		if (false === $sDashboardFileSanitized) {
 			throw new SecurityException('Invalid dashboard file !');
 		}
@@ -1141,7 +1141,7 @@ JS
 		$oToolbar->AddSubBlock($oActionButton);

 		$aActions = array();
-		$sFile = addslashes(utils::LocalPath($this->sDefinitionFile));
+		$sFile = addslashes($this->sDefinitionFile);
 		$sJSExtraParams = json_encode($aExtraParams);
 		if ($this->HasCustomDashboard()) {
 			$oEdit = new JSPopupMenuItem('UI:Dashboard:Edit', Dict::S('UI:Dashboard:EditCustom'), "return EditDashboard('{$this->sId}', '$sFile', $sJSExtraParams)");
@@ -1264,12 +1264,12 @@ EOF
 		$sOkButtonLabel = Dict::S('UI:Button:Save');
 		$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
 		
-		$sId = utils::HtmlEntities($this->sId);
-		$sLayoutClass = utils::HtmlEntities($this->sLayoutClass);
+		$sId = addslashes($this->sId);
+		$sLayoutClass = addslashes($this->sLayoutClass);
 		$sAutoReload = $this->bAutoReload ? 'true' : 'false';
 		$sAutoReloadSec = (string) $this->iAutoReloadSec;
-		$sTitle = utils::HtmlEntities($this->sTitle);
-		$sFile = utils::HtmlEntities($this->GetDefinitionFile());
+		$sTitle = addslashes($this->sTitle);
+		$sFile = addslashes($this->GetDefinitionFile());
 		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php';
 		$sReloadURL = $this->GetReloadURL();

--- a/application/datamodel.application.xml
+++ b/application/datamodel.application.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <classes>
    <class id="AbstractResource" _delta="define">
      <parent>cmdbAbstractObject</parent>
@@ -514,18 +514,10 @@
          <description>The object containing the document</description>
          <type>DBObject</type>
        </event_datum>
-        <event_datum id="att_code">
-          <description>The optional object attribute code hosting the document</description>
-          <type>string</type>
-        </event_datum>
        <event_datum id="document">
          <description>The document downloaded</description>
          <type>ormDocument</type>
        </event_datum>
-        <event_datum id="content_disposition">
-          <description>The content disposition of the document ("inline" or "attachment")</description>
-          <type>string</type>
-        </event_datum>
        <event_datum id="debug_info">
          <description>Debug string</description>
          <type>string</type>
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -2042,7 +2042,7 @@ class MenuBlock extends DisplayBlock
 			}

 			//----------------------------------------------------
-			// Any style but NOT \DisplayBlock::ENUM_STYLE_LIST_IN_OBJECT (linksets) actions
+			// Any style but NOT "listInObject" (linksets) actions
 			//----------------------------------------------------
 			if ($this->m_sStyle !== static::ENUM_STYLE_LIST_IN_OBJECT) {
 				switch ($iSetCount) {
--- a/application/errorpage.class.inc.php
+++ b/application/errorpage.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @deprecated  3.0.0 will be removed in 3.1.0 - moved to sources/Application/WebPage/ErrorPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/ErrorPage.php, now loadable using autoloader
 * @license     http://opensource.org/licenses/AGPL-3.0
 * @copyright   Copyright (C) 2010-2023 Combodo SARL
 */
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @deprecated  3.0.0 will be removed in 3.1.0 - moved to sources/Application/WebPage/iTopWebPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/iTopWebPage.php, now loadable using autoloader
 * @license     http://opensource.org/licenses/AGPL-3.0
 * @copyright   Copyright (C) 2010-2023 Combodo SARL
 */
--- a/application/itopwizardwebpage.class.inc.php
+++ b/application/itopwizardwebpage.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @deprecated  3.0.0 will be removed in 3.1.0 - moved to sources/Application/WebPage/iTopWizardWebPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/iTopWizardWebPage.php, now loadable using autoloader
 * @license     http://opensource.org/licenses/AGPL-3.0
 * @copyright   Copyright (C) 2010-2023 Combodo SARL
 */
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @deprecated  3.0.0 will be removed in 3.1.0 - moved to sources/Application/WebPage/NiceWebPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/NiceWebPage.php, now loadable using autoloader
 * @license     http://opensource.org/licenses/AGPL-3.0
 * @copyright   Copyright (C) 2010-2023 Combodo SARL
 */
--- a/application/pdfpage.class.inc.php
+++ b/application/pdfpage.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @deprecated  3.0.0 will be removed in 3.1.0 - moved to sources/Application/WebPage/PDFPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/PDFPage.php, now loadable using autoloader
 * @license     http://opensource.org/licenses/AGPL-3.0
 * @copyright   Copyright (C) 2010-2023 Combodo SARL
 */
--- a/application/ui.extkeywidget.class.inc.php
+++ b/application/ui.extkeywidget.class.inc.php
@@ -163,7 +163,7 @@ class UIExtKeyWidget
 		$oPage->add_linked_script('../js/extkeywidget.js');
 		$oPage->add_linked_script('../js/forms-json-utils.js');

-		$bCreate = (!$this->bSearchMode) && (UserRights::IsActionAllowed($this->sTargetClass, UR_ACTION_MODIFY) && $bAllowTargetCreation);
+		$bCreate = (!$this->bSearchMode) && (UserRights::IsActionAllowed($this->sTargetClass, UR_ACTION_BULK_MODIFY) && $bAllowTargetCreation);
 		$bExtensions = true;
 		$sMessage = Dict::S('UI:Message:EmptyList:UseSearchForm');
 		$sAttrFieldPrefix = ($this->bSearchMode) ? '' : 'attr_';
@@ -975,10 +975,6 @@ HTML
 		// Remove blob edition from creation form @see N°5863 to allow blob edition in modal context
 		FormHelper::DisableAttributeBlobInputs($this->sTargetClass, $aFormExtraParams);

-		if(FormHelper::HasMandatoryAttributeBlobInputs($oNewObj)){
-			$oPage->AddUiBlock(FormHelper::GetAlertForMandatoryAttributeBlobInputsInModal());
-		}
-		
 		cmdbAbstractObject::DisplayCreationForm($oPage, $this->sTargetClass, $oNewObj, array(), $aFormExtraParams);
 		$oPage->add(<<<HTML
 	</div>
--- a/application/ui.linksdirectwidget.class.inc.php
+++ b/application/ui.linksdirectwidget.class.inc.php
@@ -143,10 +143,6 @@ JS

 			// Remove blob edition from creation form @see N°5863 to allow blob edition in modal context
 			FormHelper::DisableAttributeBlobInputs($sRealClass, $aFormExtraParams);
-			
-			if(FormHelper::HasMandatoryAttributeBlobInputs($oObj)){
-				$oPage->AddUiBlock(FormHelper::GetAlertForMandatoryAttributeBlobInputsInModal());
-			}

 			cmdbAbstractObject::DisplayCreationForm($oPage, $sRealClass, $oObj, array(), $aFormExtraParams);
 		}
--- a/application/utils.inc.php
+++ b/application/utils.inc.php
@@ -52,31 +52,22 @@ class utils
 {
 	/**
 	 * @var string
-	 * @since 2.7.10 3.0.0
+	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_INTEGER = 'integer';
 	/**
-	 * Datamodel class
 	 * @var string
-	 * @since 2.7.10 3.0.0
-	 * @since 2.7.10 3.0.4 3.1.1 3.2.0 N°6606 update PHPDoc
-	 * @uses MetaModel::IsValidClass()
+	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_CLASS = 'class';
 	/**
 	 * @var string
-	 * @since 2.7.10 3.0.4 3.1.1 3.2.0 N°6606
-	 * @uses class_exists()
-	 */
-	public const ENUM_SANITIZATION_FILTER_PHP_CLASS = 'php_class';
-	/**
-	 * @var string
-	 * @since 2.7.10 3.0.0
+	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_STRING = 'string';
 	/**
 	 * @var string
-	 * @since 2.7.10 3.0.0
+	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_CONTEXT_PARAM = 'context_param';
 	/**
@@ -91,22 +82,22 @@ class utils
 	public const ENUM_SANITIZATION_FILTER_OPERATION = 'operation';
 	/**
 	 * @var string
-	 * @since 2.7.10 3.0.0
+	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_PARAMETER = 'parameter';
 	/**
 	 * @var string
-	 * @since 2.7.10 3.0.0
+	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_FIELD_NAME = 'field_name';
 	/**
 	 * @var string
-	 * @since 2.7.10 3.0.0
+	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_TRANSACTION_ID = 'transaction_id';
 	/**
 	 * @var string For XML / HTML node identifiers
-	 * @since 2.7.10 3.0.0
+	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER = 'element_identifier';
 	/**
@@ -116,13 +107,12 @@ class utils
 	public const ENUM_SANITIZATION_FILTER_VARIABLE_NAME = 'variable_name';
 	/**
 	 * @var string
-	 * @since 2.7.10 3.0.0
+	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_RAW_DATA = 'raw_data';
 	/**
 	 * @var string
-	 * @since 3.0.2 3.1.0 N°4899
-	 * @since 2.7.10 N°6606
+	 * @since 3.0.2, 3.1.0 N°4899
 	 */
 	public const ENUM_SANITIZATION_FILTER_URL = 'url';

@@ -165,8 +155,6 @@ class utils

 	private static $iNextId = 0;

-	private static $m_sAppRootUrl = null;
-
 	protected static function LoadParamFile($sParamFile)
 	{
 		if (!file_exists($sParamFile)) {
@@ -408,10 +396,6 @@ class utils
 	 * @since 2.7.0 new 'element_identifier' filter
 	 * @since 3.0.0 new utils::ENUM_SANITIZATION_* const
 	 * @since 2.7.7, 3.0.2, 3.1.0 N°4899 - new 'url' filter
-	 * @since 2.7.10 N°6606 use the utils::ENUM_SANITIZATION_* const
-	 * @since 2.7.10 N°6606 new case for ENUM_SANITIZATION_FILTER_PHP_CLASS
-	 *
-	 * @link https://www.php.net/manual/en/filter.filters.sanitize.php PHP sanitization filters
 	 */
 	protected static function Sanitize_Internal($value, $sSanitizationFilter)
 	{
@@ -432,13 +416,6 @@ class utils
 				$retValue = filter_var($value, FILTER_SANITIZE_SPECIAL_CHARS);
 				break;

-			case static::ENUM_SANITIZATION_FILTER_PHP_CLASS:
-				$retValue = $value;
-				if (!class_exists($value)) {
-					$retValue = false;
-				}
-				break;
-
 			case static::ENUM_SANITIZATION_FILTER_CONTEXT_PARAM:
 			case static::ENUM_SANITIZATION_FILTER_ROUTE:
 			case static::ENUM_SANITIZATION_FILTER_OPERATION:
@@ -504,7 +481,6 @@ class utils

 			// For URL
 			case static::ENUM_SANITIZATION_FILTER_URL:
-                // N°6350 - returns only valid URLs
 				$retValue = filter_var($value, FILTER_VALIDATE_URL);
 				break;

@@ -1048,7 +1024,7 @@ class utils
     */
 	public static function GetAbsoluteUrlAppRoot($bForceTrustProxy = false)
 	{
-		$sUrl = static::$m_sAppRootUrl;
+		static $sUrl = null;
 		if ($sUrl === null || $bForceTrustProxy)
 		{
 			$sUrl = self::GetConfig()->Get('app_root_url');
@@ -1069,9 +1045,8 @@ class utils
 				}
 				$sUrl = str_replace(SERVER_NAME_PLACEHOLDER, $sServerName, $sUrl);
 			}
-			static::$m_sAppRootUrl = $sUrl;
 		}
-		return static::$m_sAppRootUrl;
+		return $sUrl;
 	}

 	/**
--- a/application/webpage.class.inc.php
+++ b/application/webpage.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @deprecated  3.0.0 will be removed in 3.1.0 - moved to sources/Application/WebPage/WebPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/WebPage.php, now loadable using autoloader
 * @license     http://opensource.org/licenses/AGPL-3.0
 * @copyright   Copyright (C) 2010-2023 Combodo SARL
 */
--- a/application/wizardhelper.class.inc.php
+++ b/application/wizardhelper.class.inc.php
@@ -351,7 +351,6 @@ class WizardHelper
 	/**
 	 * @return string JS code to be executed for fields update
 	 * @since 3.0.0 N°3198
-	 * @deprecated 3.0.3-2 3.0.4 3.1.1 3.2.0 Use {@see \WizardHelper::AddJsForUpdateFields()} instead
 	 */
 	public function GetJsForUpdateFields()
 	{
@@ -364,32 +363,6 @@ class WizardHelper
 JS;
 	}

-	/**
-	 * Add necessary JS snippets (to the page) to be executed for fields update
-	 *
-	 * @param \WebPage $oPage
-	 * @return void
-	 * @since 3.0.3-2 3.0.4 3.1.1 3.2.0 N°6766
-	 */
-	public function AddJsForUpdateFields(WebPage $oPage)
-	{
-		$sWizardHelperJsVar = (!is_null($this->m_aData['m_sWizHelperJsVarName'])) ? utils::Sanitize($this->m_aData['m_sWizHelperJsVarName'], '', utils::ENUM_SANITIZATION_FILTER_PARAMETER) : 'oWizardHelper'.$this->GetFormPrefix();
-		$sWizardHelperJson = $this->ToJSON();
-
-		$oPage->add_script(<<<JS
-{$sWizardHelperJsVar}.m_oData = {$sWizardHelperJson};
-{$sWizardHelperJsVar}.UpdateFields();
-JS
-		);
-		$oPage->add_ready_script(<<<JS
-if ({$sWizardHelperJsVar}.m_oDependenciesUpdatedPromiseResolve !== null){
-    {$sWizardHelperJsVar}.m_oDependenciesUpdatedPromiseResolve();
-}
-JS
-		);
-
-	}
-
 	/*
 	 * Function with an old pattern of code
 	 * @deprecated 3.1.0
@@ -398,9 +371,11 @@ JS
 	{
 		$aSet = json_decode($sJsonSet, true); // true means hash array instead of object
 		$oSet = CMDBObjectSet::FromScratch($sLinkClass);
-		foreach ($aSet as $aLinkObj) {
+		foreach ($aSet as $aLinkObj)
+		{
 			$oLink = MetaModel::NewObject($sLinkClass);
-			foreach ($aLinkObj as $sAttCode => $value) {
+			foreach ($aLinkObj as $sAttCode => $value)
+			{
 				$oAttDef = MetaModel::GetAttributeDef($sLinkClass, $sAttCode);
 				if (($oAttDef->IsExternalKey()) && ($value != '') && ($value > 0))
 				{
--- a/application/xmlpage.class.inc.php
+++ b/application/xmlpage.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @deprecated  3.0.0 will be removed in 3.1.0 - moved to sources/Application/WebPage/XMLPage.php, now loadable using autoloader
+ * @deprecated  will be removed in 3.1.0 - moved to sources/Application/WebPage/XMLPage.php, now loadable using autoloader
 * @license     http://opensource.org/licenses/AGPL-3.0
 * @copyright   Copyright (C) 2010-2023 Combodo SARL
 */
--- a/approot.inc.php
+++ b/approot.inc.php
@@ -11,7 +11,7 @@ define('APPCONF', APPROOT.'conf/');
 *
 * @see ITOP_CORE_VERSION to get full iTop core version
 */
-define('ITOP_DESIGN_LATEST_VERSION', '3.2');
+define('ITOP_DESIGN_LATEST_VERSION', '3.1');

 /**
 * Constant containing the iTop core version, whatever application was built
@@ -23,7 +23,7 @@ define('ITOP_DESIGN_LATEST_VERSION', '3.2');
 * @used-by utils::GetItopVersionWikiSyntax()
 * @used-by iTopModulesPhpVersionIntegrationTest
 */
-define('ITOP_CORE_VERSION', '3.2.0');
+define('ITOP_CORE_VERSION', '3.1.0');

 /**
 * @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']
--- a/core/DbConnectionWrapper.php
+++ b/core/DbConnectionWrapper.php
@@ -60,7 +60,6 @@ class DbConnectionWrapper
 	 *
 	 * @param \mysqli|null $oMysqli
 	 * @since 3.0.4 3.1.1 3.2.0 Param $oMysqli becomes nullable
-	 * @since 3.1.0-4 N°6848 backport of restoring cnx on null parameter value
 	 */
 	public static function SetDbConnectionMockForQuery(?mysqli $oMysqli = null): void
 	{
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -91,12 +91,6 @@ define('LINKSET_EDITMODE_ACTIONS', 2); // Show the usual 'Actions' popup menu
 define('LINKSET_EDITMODE_INPLACE', 3); // The "linked" objects can be created/modified/deleted in place
 define('LINKSET_EDITMODE_ADDREMOVE', 4); // The "linked" objects can be added/removed in place

-define('LINKSET_EDITWHEN_NEVER', 0); // The linkset cannot be edited at all from inside this object
-define('LINKSET_EDITWHEN_ON_HOST_EDITION', 1); // The only possible action is to open a new window to create a new object
-define('LINKSET_EDITWHEN_ON_HOST_DISPLAY', 2); // Show the usual 'Actions' popup menu
-define('LINKSET_EDITWHEN_ALWAYS', 3); // Show the usual 'Actions' popup menu
-
-
 define('LINKSET_DISPLAY_STYLE_PROPERTY', 'property');
 define('LINKSET_DISPLAY_STYLE_TAB', 'tab');

@@ -797,7 +791,7 @@ abstract class AttributeDefinition
 	public function HasAValue($proposedValue): bool
 	{
 		// Default implementation, we don't really know what type $proposedValue will be
-		return !(is_null($proposedValue));
+		return is_null($proposedValue);
 	}

 	/**
@@ -1709,15 +1703,6 @@ class AttributeLinkedSet extends AttributeDefinition
 	public function GetEditMode()
 	{
 		return $this->GetOptional('edit_mode', LINKSET_EDITMODE_ACTIONS);
-	}	
-	
-	/**
-	 * @return int see LINKSET_EDITWHEN_* constants
-	 * @since 3.1.1 3.2.0 N°6385
-	 */
-	public function GetEditWhen(): int
-	{
-		return $this->GetOptional('edit_when', LINKSET_EDITWHEN_ALWAYS);
 	}

 	/**
@@ -13211,10 +13196,8 @@ class AttributeCustomFields extends AttributeDefinition
 				// In that case we need additional keys : see \TemplateFieldsHandler::DoBuildForm
 				$aRequestTemplateValues = $proposedValue->GetValues();
 				if (false === array_key_exists('current_template_id', $aRequestTemplateValues)) {
-					$oCurrentValue = $oHostObject->Get($this->GetCode());
-					if(is_object($oCurrentValue)){
-						$aRequestTemplateValues = array_merge($oCurrentValue->GetValues(), $aRequestTemplateValues);
-					}
+					$aRequestTemplateValues['current_template_id'] = $aRequestTemplateValues['template_id'];
+					$aRequestTemplateValues['current_template_data'] = $aRequestTemplateValues['template_data'];
 					$proposedValue = new ormCustomFieldsValue($oHostObject, $this->GetCode(), $aRequestTemplateValues);
 				}
 			}
--- a/core/bulkexport.class.inc.php
+++ b/core/bulkexport.class.inc.php
@@ -149,9 +149,7 @@ abstract class BulkExport
 		$this->oSearch = null;
 		$this->iChunkSize = 0;
 		$this->sFormatCode = null;
-		$this->aStatusInfo = [
-			'show_obsolete_data' => utils::ShowObsoleteData(),
-		];
+		$this->aStatusInfo = array();
 		$this->oBulkExportResult = null;
 		$this->sTmpFile = '';
 		$this->bLocalizeOutput = false;
@@ -205,17 +203,15 @@ abstract class BulkExport
 		if ($oInfo && ($oInfo->Get('user_id') == UserRights::GetUserId()))
 		{
 			$sFormatCode = $oInfo->Get('format');
-			$aStatusInfo = json_decode($oInfo->Get('status_info'),true);
-
 			$oSearch = DBObjectSearch::unserialize($oInfo->Get('search'));
-			$oSearch->SetShowObsoleteData($aStatusInfo['show_obsolete_data']);
+
 			$oBulkExporter = self::FindExporter($sFormatCode, $oSearch);
 			if ($oBulkExporter)
 			{
 				$oBulkExporter->SetFormat($sFormatCode);
 				$oBulkExporter->SetObjectList($oSearch);
 				$oBulkExporter->SetChunkSize($oInfo->Get('chunk_size'));
-				$oBulkExporter->SetStatusInfo($aStatusInfo);
+				$oBulkExporter->SetStatusInfo(json_decode($oInfo->Get('status_info'), true));

                $oBulkExporter->SetLocalizeOutput($oInfo->Get('localize_output'));

@@ -293,7 +289,6 @@ abstract class BulkExport
 	 */
 	public function SetObjectList(DBSearch $oSearch)
 	{
-		$oSearch->SetShowObsoleteData($this->aStatusInfo['show_obsolete_data']);
 		$this->oSearch = $oSearch;
 	}
 	
--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -29,7 +29,7 @@ define('ITOP_APPLICATION_SHORT', 'iTop');
 *
 * @see ITOP_CORE_VERSION to get iTop core version
 */
-define('ITOP_VERSION', '3.2.0-dev');
+define('ITOP_VERSION', '3.1.1-dev');

 define('ITOP_VERSION_NAME', 'Fullmoon');
 define('ITOP_REVISION', 'svn');
--- a/core/datamodel.core.xml
+++ b/core/datamodel.core.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <user_rights>
    <profiles>
      <profile id="1024" _delta="define">
@@ -282,13 +282,8 @@
          <field id="obj_attcode" xsi:type="AttributeString"/>
        </fields>
      </class>
-      <class id="DefaultWorkingTimeComputer" _delta="define">
-        <interfaces>
-          <interface id="iWorkingTimeComputer"/>
-        </interfaces>
-      </class>
    </classes>
-    <attribute_properties_definition _delta="define">
+    <attribute_properties_definition  _delta="define">
      <properties>
        <property id="sql">
          <php_param>sql</php_param>
--- a/core/dbobject.class.php
+++ b/core/dbobject.class.php
@@ -3582,8 +3582,7 @@ abstract class DBObject implements iDisplay
 		$oKPI->ComputeStatsForExtension($this, 'AfterUpdate');

 		// - TriggerOnObjectUpdate
-		$aClassList = MetaModel::EnumParentClasses(get_class($this), ENUM_PARENT_CLASSES_ALL);
-		$aParams = array('class_list' => $aClassList);
+		$aParams = array('class_list' => MetaModel::EnumParentClasses(get_class($this), ENUM_PARENT_CLASSES_ALL));
 		$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnObjectUpdate AS t WHERE t.target_class IN (:class_list)'),
 			array(), $aParams);
 		while ($oTrigger = $oSet->Fetch()) {
@@ -3597,44 +3596,6 @@ abstract class DBObject implements iDisplay
 			}
 		}

-		$sClass = get_class($this);
-		if (MetaModel::HasLifecycle($sClass))
-		{
-			$sStateAttCode = MetaModel::GetStateAttributeCode($sClass);
-			if (isset($this->m_aPreviousValuesForUpdatedAttributes[$sStateAttCode])) {
-				$sPreviousState = $this->m_aPreviousValuesForUpdatedAttributes[$sStateAttCode];
-				// Change state triggers...
-				$aParams = array(
-					'class_list'     => MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL),
-					'previous_state' => $sPreviousState,
-					'new_state'      => $this->Get($sStateAttCode),
-				);
-				$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnStateLeave AS t WHERE t.target_class IN (:class_list) AND t.state=:previous_state'), array(), $aParams);
-				while ($oTrigger = $oSet->Fetch()) {
-					/** @var \TriggerOnStateLeave $oTrigger */
-					try {
-						$oTrigger->DoActivate($this->ToArgs('this'));
-					}
-					catch (Exception $e) {
-						$oTrigger->LogException($e, $this);
-						utils::EnrichRaisedException($oTrigger, $e);
-					}
-				}
-
-				$oSet = new DBObjectSet(DBObjectSearch::FromOQL('SELECT TriggerOnStateEnter AS t WHERE t.target_class IN (:class_list) AND t.state=:new_state'), array(), $aParams);
-				while ($oTrigger = $oSet->Fetch()) {
-					/** @var \TriggerOnStateEnter $oTrigger */
-					try {
-						$oTrigger->DoActivate($this->ToArgs('this'));
-					}
-					catch (Exception $e) {
-						$oTrigger->LogException($e, $this);
-						utils::EnrichRaisedException($oTrigger, $e);
-					}
-				}
-			}
-		}
-
 		// Activate any existing trigger
 		// - TriggerOnObjectMention
 		// Forgotten by the fix of N°3245
@@ -4330,6 +4291,36 @@ abstract class DBObject implements iDisplay
 				$this->DBWrite();
 			}

+			// Change state triggers...
+			$aParams = array(
+				'class_list' => MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL),
+				'previous_state' => $sPreviousState,
+				'new_state' => $sNewState,
+			);
+			$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnStateLeave AS t WHERE t.target_class IN (:class_list) AND t.state=:previous_state"), array(), $aParams);
+			while ($oTrigger = $oSet->Fetch()) {
+				/** @var \TriggerOnStateLeave $oTrigger */
+				try {
+					$oTrigger->DoActivate($this->ToArgs('this'));
+				}
+				catch (Exception $e) {
+					$oTrigger->LogException($e, $this);
+					utils::EnrichRaisedException($oTrigger, $e);
+				}
+			}
+
+			$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnStateEnter AS t WHERE t.target_class IN (:class_list) AND t.state=:new_state"), array(), $aParams);
+			while ($oTrigger = $oSet->Fetch()) {
+				/** @var \TriggerOnStateEnter $oTrigger */
+				try {
+					$oTrigger->DoActivate($this->ToArgs('this'));
+				}
+				catch (Exception $e) {
+					$oTrigger->LogException($e, $this);
+					utils::EnrichRaisedException($oTrigger, $e);
+				}
+			}
+
 			$this->FireEvent(EVENT_DB_AFTER_APPLY_STIMULUS, $aEventData);
 		}
 		else
--- a/core/log.class.inc.php
+++ b/core/log.class.inc.php
@@ -1671,8 +1671,6 @@ class ExceptionLog extends LogAPI
 	 */
 	private static function GetLastEventIssue()
 	{
-		$oRet = self::$oLastEventIssue;
-		self::$oLastEventIssue = null;
-		return $oRet;
+		return self::$oLastEventIssue;
 	}
 }
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -6737,13 +6737,7 @@ abstract class MetaModel

 		if ($bMustBeFound && empty($aRow))
 		{
-			$sNotFoundErrorMessage = "No result for the single row query";
-			IssueLog::Info($sNotFoundErrorMessage, LogChannels::CMDB_SOURCE, [
-				'class' => $sClass,
-				'key' => $iKey,
-				'sql_query' => $sSQL,
-				]);
-			throw new CoreException($sNotFoundErrorMessage);
+			throw new CoreException("No result for the single row query: '$sSQL'");
 		}

 		return $aRow;
--- a/core/pdfbulkexport.class.inc.php
+++ b/core/pdfbulkexport.class.inc.php
@@ -68,6 +68,8 @@ class PDFBulkExport extends HTMLBulkExport

 				//page format
 				$oSelectFormat = SelectUIBlockFactory::MakeForSelectWithLabel("page_size", Dict::S('Core:BulkExport:PDFPageSize'));
+				$oSelectFormat->SetIsLabelBefore(false);
+				//$oSelectFormat->AddCSSClass('ibo-input-checkbox');
 				$oFieldSetFormat->AddSubBlock($oSelectFormat);

 				$aPossibleFormat = ['A3', 'A4', 'Letter'];
@@ -77,7 +79,10 @@ class PDFBulkExport extends HTMLBulkExport
 				}
 				$oFieldSetFormat->AddSubBlock(new Html('</br>'));

-				$oSelectOrientation = SelectUIBlockFactory::MakeForSelectWithLabel("page_orientation", Dict::S('Core:BulkExport:PDFPageOrientation'));
+				$oSelectOrientation = SelectUIBlockFactory::MakeForSelectWithLabel("page_orientation",
+					Dict::S('Core:BulkExport:PDFPageOrientation'));
+				$oSelectOrientation->SetIsLabelBefore(false);
+				//$oSelectOrientation->AddCSSClass('ibo-input-checkbox');
 				$oFieldSetFormat->AddSubBlock($oSelectOrientation);

 				$aPossibleOrientation = ['P', 'L'];
--- a/css/backoffice/vendors/_bulma-variables-overload.scss
+++ b/css/backoffice/vendors/_bulma-variables-overload.scss
@@ -13,9 +13,6 @@ $body-overflow-x: hidden !default;
 $body-overflow-y: auto !default;


-/*N°5786 - Avoid strong text to always be grey (default Bulma color for this var.) so strong text can keep its color. This  is mostly for text within the .ibo-is-html-content. */
-$text-strong: inherit !default;
-
 /**
 * customize Bulma content variables
 * See https://bulma.io/documentation/elements/content/
--- a/datamodels/2.x/authent-cas/datamodel.authent-cas.xml
+++ b/datamodels/2.x/authent-cas/datamodel.authent-cas.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <constants>
  </constants>
  <classes>
--- 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.2.0',
+	'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.2.0',
+	'authent-external/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/authent-ldap/datamodel.authent-ldap.xml
+++ b/datamodels/2.x/authent-ldap/datamodel.authent-ldap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <classes>
    <class id="UserLDAP" _delta="define">
      <parent>cmdbAbstractObject</parent>
@@ -355,26 +355,4 @@
      </presentation>
    </class>
  </classes>
-  <meta>
-    <classes>
-      <class id="UserInternal" _delta="define_if_not_exists">
-        <fields>
-          <field id="contactid" xsi:type="AttributeExternalKey">
-            <target_class>Contact</target_class>
-          </field>
-          <field id="first_name" xsi:type="AttributeExternalField"/>
-          <field id="last_name" xsi:type="AttributeExternalField"/>
-          <field id="status" xsi:type="AttributeEnum"/>
-          <field id="org_id" xsi:type="AttributeExternalField"/>
-          <field id="email" xsi:type="AttributeExternalField"/>
-          <field id="login" xsi:type="AttributeString"/>
-          <field id="language" xsi:type="AttributeApplicationLanguage"/>
-          <field id="status" xsi:type="AttributeEnum"/>
-          <field id="allowed_org_list" xsi:type="AttributeLinkedSetIndirect"/>
-          <field id="profile_list" xsi:type="AttributeLinkedSetIndirect"/>
-          <field id="log" xsi:type="AttributeCaseLog"/>
-        </fields>
-      </class>
-    </classes>
-  </meta>
 </itop_design>
--- 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.2.0',
+	'authent-ldap/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/authent-local/datamodel.authent-local.xml
+++ b/datamodels/2.x/authent-local/datamodel.authent-local.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <module_parameters>
    <parameters id="authent-local" _delta="define">
      <password_validation.pattern>^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{8,}$</password_validation.pattern>
--- 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.2.0',
+	'authent-local/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/datamodel.combodo-backoffice-darkmoon-theme.xml
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/datamodel.combodo-backoffice-darkmoon-theme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <branding>
    <themes>
      <theme id="darkmoon" _delta="define">
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/cs.dict.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/cs.dict.combodo-backoffice-darkmoon-theme.php
@@ -21,5 +21,5 @@
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'theme:darkmoon' => 'Dark moon',
-));
+	'theme:darkmoon' => 'Dark moon~~',
+));
--- 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.2.0',
+	'combodo-backoffice-darkmoon-theme/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/combodo-db-tools/datamodel.combodo-db-tools.xml
+++ b/datamodels/2.x/combodo-db-tools/datamodel.combodo-db-tools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <menus>
    <menu id="DBToolsMenu" xsi:type="WebPageMenuNode" _delta="define">
      <rank>30</rank>
--- 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.2.0',
+	'combodo-db-tools/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
+++ b/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <classes>
    <class id="Attachment" _delta="define">
      <parent>DBObject</parent>
--- 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.2.0',
+	'itop-attachments/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-backup/datamodel.itop-backup.xml
+++ b/datamodels/2.x/itop-backup/datamodel.itop-backup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <menus>
    <menu id="BackupStatus" xsi:type="WebPageMenuNode" _delta="define">
      <rank>50</rank>
--- 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.2.0',
+	'itop-backup/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-cmdb-services/datamodel.itop-bridge-cmdb-services.xml
+++ b/datamodels/2.x/itop-bridge-cmdb-services/datamodel.itop-bridge-cmdb-services.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <constants/>
  <classes>
    <class id="lnkFunctionalCIToProviderContract" _delta="define">
--- 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.2.0',
+	'itop-bridge-cmdb-services/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <constants/>
  <classes>
    <class id="lnkFunctionalCIToTicket" _delta="define">
--- 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.2.0',
+	'itop-bridge-cmdb-ticket/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-datacenter-mgmt-services/datamodel.itop-bridge-datacenter-mgmt-services.xml
+++ b/datamodels/2.x/itop-bridge-datacenter-mgmt-services/datamodel.itop-bridge-datacenter-mgmt-services.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <constants/>
  <classes>
    <class id="Rack" _delta="must_exist">
--- 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.2.0',
+	'itop-bridge-datacenter-mgmt-services/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-endusers-devices-services/datamodel.itop-bridge-endusers-devices-services.xml
+++ b/datamodels/2.x/itop-bridge-endusers-devices-services/datamodel.itop-bridge-endusers-devices-services.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <constants/>
  <classes>
    <class id="Phone" _delta="must_exist">
--- 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.2.0',
+	'itop-bridge-endusers-devices-services/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-storage-mgmt-services/datamodel.itop-bridge-storage-mgmt-services.xml
+++ b/datamodels/2.x/itop-bridge-storage-mgmt-services/datamodel.itop-bridge-storage-mgmt-services.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <constants/>
  <classes>
    <class id="SANSwitch" _delta="must_exist">
--- 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.2.0',
+	'itop-bridge-storage-mgmt-services/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-virtualization-mgmt-services/datamodel.itop-bridge-virtualization-mgmt-services.xml
+++ b/datamodels/2.x/itop-bridge-virtualization-mgmt-services/datamodel.itop-bridge-virtualization-mgmt-services.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <constants/>
  <classes>
    <class id="Hypervisor" _delta="must_exist">
--- 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.2.0',
+	'itop-bridge-virtualization-mgmt-services/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml
+++ b/datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <classes>
    <class id="lnkVirtualDeviceToVolume" _delta="define">
      <parent>cmdbAbstractObject</parent>
--- 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.2.0',
+	'itop-bridge-virtualization-storage/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
+++ b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <classes>
    <class id="Change" _delta="define">
      <parent>Ticket</parent>
@@ -21,7 +21,7 @@
            <attribute id="ref"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="title"/>
+            <attribute id="title"></attribute>
          </complementary_attributes>
        </naming>
        <fields_semantic>
@@ -49,12 +49,20 @@
            <value id="approved">approved
              <code>approved</code>
              <rank>60</rank>
-              <style><main_color>$ibo-lifecycle-success-state-primary-color</main_color><complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color><decoration_classes>fas fa-user-check</decoration_classes></style>
+              <style>
+                <main_color>$ibo-lifecycle-success-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
+                <decoration_classes>fas fa-user-check</decoration_classes>
+              </style>
            </value>
            <value id="assigned">assigned
              <code>assigned</code>
              <rank>40</rank>
-              <style><main_color>$ibo-lifecycle-neutral-state-primary-color</main_color><complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color><decoration_classes/></style>
+              <style>
+                <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
            </value>
            <value id="closed">
              <code>closed</code>
@@ -1288,7 +1296,7 @@
            <attribute id="ref"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="title"/>
+            <attribute id="title"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -2089,7 +2097,7 @@
            <attribute id="ref"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="title"/>
+            <attribute id="title"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -3095,7 +3103,7 @@
            <attribute id="ref"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="title"/>
+            <attribute id="title"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -3793,7 +3801,7 @@
            <attribute id="ref"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="title"/>
+            <attribute id="title"></attribute>
          </complementary_attributes>
        </naming>
        <style>
--- 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.2.0',
+	'itop-change-mgmt-itil/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
+++ b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <classes>
    <class id="Change" _delta="define">
      <parent>Ticket</parent>
@@ -21,7 +21,7 @@
            <attribute id="ref"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="title"/>
+            <attribute id="title"></attribute>
          </complementary_attributes>
        </naming>
        <fields_semantic>
--- 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.2.0',
+	'itop-change-mgmt/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
+++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <classes>
    <class id="FunctionalCI" _delta="define">
      <parent>cmdbAbstractObject</parent>
@@ -15,7 +15,7 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -272,7 +272,7 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
            <attribute id="location_name"/>
          </complementary_attributes>
        </naming>
@@ -530,8 +530,8 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
-            <attribute id="location_name"/>
+            <attribute id="organization_name"></attribute>
+            <attribute id="location_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -702,8 +702,8 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
-            <attribute id="location_name"/>
+            <attribute id="organization_name"></attribute>
+            <attribute id="location_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -992,8 +992,8 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
-            <attribute id="networkdevicetype_name"/>
+            <attribute id="organization_name"></attribute>
+            <attribute id="networkdevicetype_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -1293,8 +1293,8 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
-            <attribute id="location_name"/>
+            <attribute id="organization_name"></attribute>
+            <attribute id="location_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -1621,7 +1621,7 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
          </complementary_attributes>
        </naming>
        <fields_semantic>
@@ -1797,7 +1797,7 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
          </complementary_attributes>
        </naming>
        <fields_semantic>
@@ -1943,7 +1943,7 @@
            <attribute id="system_name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
          </complementary_attributes>
        </naming>
        <fields_semantic>
@@ -2145,7 +2145,7 @@
            <attribute id="system_name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -2299,7 +2299,7 @@
            <attribute id="system_name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -2453,7 +2453,7 @@
            <attribute id="system_name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -2607,7 +2607,7 @@
            <attribute id="system_name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -2740,7 +2740,7 @@
            <attribute id="system_name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -2872,8 +2872,8 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
-            <attribute id="middleware_name"/>
+            <attribute id="organization_name"></attribute>
+            <attribute id="middleware_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -3011,8 +3011,8 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
-            <attribute id="dbserver_name"/>
+            <attribute id="organization_name"></attribute>
+            <attribute id="dbserver_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -3148,8 +3148,8 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
-            <attribute id="webserver_name"/>
+            <attribute id="organization_name"></attribute>
+            <attribute id="webserver_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -3304,8 +3304,8 @@
            <attribute id="version"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="vendor"/>
-            <attribute id="type"/>
+            <attribute id="vendor"></attribute>
+            <attribute id="type"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -3782,7 +3782,7 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -4260,6 +4260,7 @@
              <rank>70</rank>
            </item>
          </items>
+
        </summary>
      </presentation>
    </class>
@@ -4371,7 +4372,7 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="osfamily_name"/>
+            <attribute id="osfamily_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -4560,8 +4561,8 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="brand_name"/>
-            <attribute id="type"/>
+            <attribute id="brand_name"></attribute>
+            <attribute id="type"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -5424,8 +5425,8 @@
            <attribute id="ip_mask"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="org_name"/>
-            <attribute id="subnet_name"/>
+            <attribute id="org_name"></attribute>
+            <attribute id="subnet_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -5648,7 +5649,7 @@
            <attribute id="vlan_tag"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="org_name"/>
+            <attribute id="org_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -5941,7 +5942,7 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="ipaddress"/>
+            <attribute id="ipaddress"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -6353,7 +6354,17 @@
            <attribute id="connectableci_id"/>
          </attributes>
        </reconciliation>
-        <uniqueness_rules/>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="networkdevice_id"/>
+              <attribute id="connectableci_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
      </properties>
      <fields>
        <field id="networkdevice_id" xsi:type="AttributeExternalKey">
@@ -6830,8 +6841,8 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="owner_name"/>
-            <attribute id="type"/>
+            <attribute id="owner_name"></attribute>
+            <attribute id="type"></attribute>
          </complementary_attributes>
        </naming>
        <fields_semantic>
--- 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.2.0',
+	'itop-config-mgmt/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-config/datamodel.itop-config.xml
+++ b/datamodels/2.x/itop-config/datamodel.itop-config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <menus>
    <menu id="ConfigEditor" xsi:type="WebPageMenuNode" _delta="define">
      <rank>10</rank>
--- 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.2.0',
+	'itop-config/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml
+++ b/datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <menus>
    <menu id="iTopUpdate" xsi:type="WebPageMenuNode" _delta="define">
      <rank>60</rank>
--- a/datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
@@ -68,47 +68,47 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Fájlrendszer ellenőrzése sikertelen',
 	'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Az alkalmazás frissíthető',
 	'iTopUpdate:UI:CanCoreUpdate:No' => 'Az alkalmazás nem frissíthető: %1$s',
-	'iTopUpdate:UI:CanCoreUpdate:Warning'          => 'Figyelem: alkalmazás frissítés sikertelen lehet: %1$s',
-	'iTopUpdate:UI:CannotUpdateUseSetup'           => '<b>SNéhány módosított fájlt észleltünk</b>, a részleges frissítés nem hajtható végre.</br>Kövesse a <a target="_blank" href="%2$s"> eljárást</a> az iTop manuális frissítéséhez. Az alkalmazás frissítéséhez a <a href="%1$s">setup</a> parancsot kell használnia.',
-	'iTopUpdate:UI:CheckInProgress'                => 'Kérjük, várjon az integritás ellenőrzés alatt',
-	'iTopUpdate:UI:SetupLaunch'                    => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
-	'iTopUpdate:UI:SetupLaunchConfirm'             => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',
+	'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Figyelem: alkalmazás frissítés sikertelen lehet: %1$s',
+	'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>SNéhány módosított fájlt észleltünk</b>, a részleges frissítés nem hajtható végre.</br>Kövesse a <a target="_blank" href="%2$s"> eljárást</a> az iTop manuális frissítéséhez. Az alkalmazás frissítéséhez a <a href="%1$s">setup</a> parancsot kell használnia.',
+	'iTopUpdate:UI:CheckInProgress' => 'Kérjük, várjon az integritás ellenőrzés alatt',
+	'iTopUpdate:UI:SetupLaunch' => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
+	'iTopUpdate:UI:SetupLaunchConfirm' => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',

 	// Setup Messages
-	'iTopUpdate:UI:SetupMessage:Ready'             => 'Készen állunk',
-	'iTopUpdate:UI:SetupMessage:EnterMaintenance'  => 'Karbantartási módba lépés',
-	'iTopUpdate:UI:SetupMessage:Backup'            => 'Adatbázis biztonsági mentése',
-	'iTopUpdate:UI:SetupMessage:FilesArchive'      => 'Alkalmazás fájlok archiválása',
-	'iTopUpdate:UI:SetupMessage:CopyFiles'         => 'Új fájlverziók másolása',
-	'iTopUpdate:UI:SetupMessage:CheckCompile'      => 'Alkalmazásfrissítés ellenőrzése',
-	'iTopUpdate:UI:SetupMessage:Compile'           => 'Az alkalmazás és az adatbázis frissítése',
-	'iTopUpdate:UI:SetupMessage:UpdateDatabase'    => 'Adatbázis frissítés',
-	'iTopUpdate:UI:SetupMessage:ExitMaintenance'   => 'Kilépés a karbantartási módból',
-	'iTopUpdate:UI:SetupMessage:UpdateDone'        => 'A frissítés befejeződött',
+	'iTopUpdate:UI:SetupMessage:Ready' => 'Készen állunk',
+	'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Karbantartási módba lépés',
+	'iTopUpdate:UI:SetupMessage:Backup' => 'Adatbázis biztonsági mentése',
+	'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Alkalmazás fájlok archiválása',
+	'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Új fájlverziók másolása',
+	'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Alkalmazásfrissítés ellenőrzése',
+	'iTopUpdate:UI:SetupMessage:Compile' => 'Az alkalmazás és az adatbázis frissítése',
+	'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Adatbázis frissítés',
+	'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Kilépés a karbantartási módból',
+	'iTopUpdate:UI:SetupMessage:UpdateDone' => 'A frissítés befejeződött',

 	// Errors
-	'iTopUpdate:Error:MissingFunction'             => 'Lehetetlen elindítani a frissítést, hiányzó funkció',
-	'iTopUpdate:Error:MissingFile'                 => 'Hiányzó fájl: %1$s',
-	'iTopUpdate:Error:CorruptedFile'               => 'A %1$s fájl sérült',
-	'iTopUpdate:Error:BadFileFormat'               => 'A frissítési fájl nem zip fájl',
-	'iTopUpdate:Error:BadFileContent'              => 'A frissítési fájl nem alkalmazás archívum',
-	'iTopUpdate:Error:BadItopProduct'              => 'A frissítési fájl nem kompatibilis az alkalmazással',
-	'iTopUpdate:Error:Copy'                        => 'Hiba: \'%1$s\' nem másolható \'%2$s\' -ba',
-	'iTopUpdate:Error:FileNotFound'                => 'Nincs meg a fájl',
-	'iTopUpdate:Error:NoFile'                      => 'Nincs fájl megadva',
-	'iTopUpdate:Error:InvalidToken'                => 'Érvénytelen token',
-	'iTopUpdate:Error:UpdateFailed'                => 'Frissítés sikertelen',
-	'iTopUpdate:Error:FileUploadMaxSizeTooSmall'   => 'A feltöltés maximális mérete túl kicsinek tűnik a frissítéshez. Kérjük, módosítsa a PHP konfigurációt.',
-	'iTopUpdate:UI:RestoreArchive'                 => 'Visszaállíthatja az alkalmazást a \'%1$s\' archívumból',
-	'iTopUpdate:UI:RestoreBackup'                  => 'Visszaállíthatja az adatbázist a \'%1$s\' archívumból',
-	'iTopUpdate:UI:UpdateDone'                     => 'Frissítés sikeres',
-	'Menu:iTopUpdate'                              => 'Alkalmazás frissítés',
-	'Menu:iTopUpdate+'                             => 'Alkalmazás frissítés',
+	'iTopUpdate:Error:MissingFunction' => 'Lehetetlen elindítani a frissítést, hiányzó funkció',
+	'iTopUpdate:Error:MissingFile' => 'Hiányzó fájl: %1$',
+	'iTopUpdate:Error:CorruptedFile' => 'A %1$s fájl sérült',
+	'iTopUpdate:Error:BadFileFormat' => 'A frissítési fájl nem zip fájl',
+	'iTopUpdate:Error:BadFileContent' => 'A frissítési fájl nem alkalmazás archívum',
+	'iTopUpdate:Error:BadItopProduct' => 'A frissítési fájl nem kompatibilis az alkalmazással',
+	'iTopUpdate:Error:Copy' => 'Hiba: \'%1$s\' nem másolható \'%2$s\' -ba',
+	'iTopUpdate:Error:FileNotFound' => 'Nincs meg a fájl',
+	'iTopUpdate:Error:NoFile' => 'Nincs fájl megadva',
+	'iTopUpdate:Error:InvalidToken' => 'Érvénytelen token',
+	'iTopUpdate:Error:UpdateFailed' => 'Frissítés sikertelen',
+	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'A feltöltés maximális mérete túl kicsinek tűnik a frissítéshez. Kérjük, módosítsa a PHP konfigurációt.',
+	'iTopUpdate:UI:RestoreArchive' => 'Visszaállíthatja az alkalmazást a \'%1$s\' archívumból',
+	'iTopUpdate:UI:RestoreBackup' => 'Visszaállíthatja az adatbázist a \'%1$s\' archívumból',
+	'iTopUpdate:UI:UpdateDone' => 'Frissítés sikeres',
+	'Menu:iTopUpdate' => 'Alkalmazás frissítés',
+	'Menu:iTopUpdate+' => 'Alkalmazás frissítés',

-	// Missing itop entries
+    // Missing itop entries
 	'Class:ModuleInstallation/Attribute:installed' => 'Telepítve ',
-	'Class:ModuleInstallation/Attribute:name'      => 'Név',
-	'Class:ModuleInstallation/Attribute:version'   => 'Verzió',
+	'Class:ModuleInstallation/Attribute:name' => 'Név',
+	'Class:ModuleInstallation/Attribute:version' => 'Verzió',
 	'Class:ModuleInstallation/Attribute:comment' => 'Megjegyzés',
 ));

--- 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.2.0',
+	'itop-core-update/3.1.0',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
+++ b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <classes>
    <class id="Rack" _delta="define">
      <parent>PhysicalDevice</parent>
@@ -15,7 +15,7 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
            <attribute id="location_name"/>
          </complementary_attributes>
        </naming>
@@ -213,7 +213,7 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
            <attribute id="location_name"/>
            <attribute id="rack_name"/>
          </complementary_attributes>
@@ -419,7 +419,7 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
            <attribute id="location_name"/>
          </complementary_attributes>
        </naming>
@@ -585,7 +585,7 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
            <attribute id="location_name"/>
          </complementary_attributes>
        </naming>
@@ -754,7 +754,7 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
            <attribute id="location_name"/>
            <attribute id="rack_name"/>
            <attribute id="powerstart_name"/>
--- 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.2.0',
+	'itop-datacenter-mgmt/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml
+++ b/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <classes>
    <class id="TelephonyCI" _delta="define">
      <parent>PhysicalDevice</parent>
@@ -15,7 +15,7 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
            <attribute id="phonenumber"/>
          </complementary_attributes>
        </naming>
@@ -173,7 +173,7 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
            <attribute id="phonenumber"/>
          </complementary_attributes>
        </naming>
@@ -343,7 +343,7 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
            <attribute id="phonenumber"/>
          </complementary_attributes>
        </naming>
@@ -533,7 +533,7 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
            <attribute id="phonenumber"/>
          </complementary_attributes>
        </naming>
@@ -703,7 +703,7 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
+            <attribute id="organization_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -869,8 +869,8 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
-            <attribute id="location_name"/>
+            <attribute id="organization_name"></attribute>
+            <attribute id="location_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -1139,8 +1139,8 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
-            <attribute id="location_name"/>
+            <attribute id="organization_name"></attribute>
+            <attribute id="location_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
@@ -1339,8 +1339,8 @@
            <attribute id="name"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="organization_name"/>
-            <attribute id="location_name"/>
+            <attribute id="organization_name"></attribute>
+            <attribute id="location_name"></attribute>
          </complementary_attributes>
        </naming>
        <style>
--- 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.2.0',
+	'itop-endusers-devices/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml
+++ b/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <classes>
    <class id="FAQ" _delta="define">
      <parent>cmdbAbstractObject</parent>
--- 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.2.0',
+	'itop-faq-light/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-files-information/datamodel.itop-files-information.xml
+++ b/datamodels/2.x/itop-files-information/datamodel.itop-files-information.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
 </itop_design>
--- 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.2.0',
+	'itop-files-information/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml
+++ b/datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <classes>
    <class id="Ticket">
      <methods>
--- 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.2.0',
+	'itop-full-itil/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-hub-connector/datamodel.itop-hub-connector.xml
+++ b/datamodels/2.x/itop-hub-connector/datamodel.itop-hub-connector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <constants>
  </constants>
  <classes>
--- 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.2.0',
+	'itop-hub-connector/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
+++ b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <classes>
    <class id="Incident" _delta="define">
      <parent>Ticket</parent>
@@ -21,7 +21,7 @@
            <attribute id="ref"/>
          </attributes>
          <complementary_attributes>
-            <attribute id="title"/>
+            <attribute id="title"></attribute>
          </complementary_attributes>
        </naming>
        <fields_semantic>
--- 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.2.0',
+	'itop-incident-mgmt-itil/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
+++ b/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <classes>
    <class id="KnownError" _delta="define">
      <parent>cmdbAbstractObject</parent>
--- 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.2.0',
+	'itop-knownerror-mgmt/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml
+++ b/datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
  <constants/>
  <classes>
    <class id="OAuthClient" _delta="define">
--- 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.2.0',
+	'itop-oauth-client/3.1.0',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-portal-base/datamodel.itop-portal-base.xml
+++ b/datamodels/2.x/itop-portal-base/datamodel.itop-portal-base.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design version="3.2">
+<itop_design version="3.1">
  <events>
    <event id="EVENT_DISPLAY_OBJECT_DETAILS" _delta="define">
      <description>An object details is about to be displayed to a user</description>
--- a/datamodels/2.x/itop-portal-base/dictionaries/cs.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/cs.dict.itop-portal-base.php
@@ -23,9 +23,9 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Page:Home' => 'Domů',
 	'Page:GoPortalHome' => 'Domů',
 	'Page:GoPreviousPage' => 'Předchozí stránka',
-	'Page:ReloadPage' => 'Reload stránky',
+	'Page:ReloadPage' => 'Reload page~~',
 	'Portal:Button:Submit' => 'Odeslat',
-	'Portal:Button:Apply' => 'Aktualizovat',
+	'Portal:Button:Apply' => 'Update~~',
 	'Portal:Button:Cancel' => 'Zrušit',
 	'Portal:Button:Close' => 'Zavřít',
 	'Portal:Button:Add' => 'Přidat',
@@ -87,7 +87,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(

 // AggregatePageBrick
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Brick:Portal:AggregatePage:DefaultTitle' => 'Dashboard',
+	'Brick:Portal:AggregatePage:DefaultTitle' => 'Dashboard~~',
 ));

 // BrowseBrick brick
@@ -95,7 +95,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Brick:Portal:Browse:Name' => 'Procházet položky',
 	'Brick:Portal:Browse:Mode:List' => 'Seznam',
 	'Brick:Portal:Browse:Mode:Tree' => 'Strom',
-	'Brick:Portal:Browse:Mode:Mosaic' => 'Mozaika',
+	'Brick:Portal:Browse:Mode:Mosaic' => 'Mosaic~~',
 	'Brick:Portal:Browse:Action:Drilldown' => 'Rozpad',
 	'Brick:Portal:Browse:Action:View' => 'Podrobnosti',
 	'Brick:Portal:Browse:Action:Edit' => 'Upravit',
@@ -112,16 +112,16 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Brick:Portal:Manage:Table:NoData' => 'Žádná položka',
 	'Brick:Portal:Manage:Table:ItemActions' => 'Actions~~',
 	'Brick:Portal:Manage:DisplayMode:list' => 'List~~',
-	'Brick:Portal:Manage:DisplayMode:pie-chart' => 'Koláčový graf',
-	'Brick:Portal:Manage:DisplayMode:bar-chart' => 'Sloupcový graf',
-	'Brick:Portal:Manage:Others' => 'Ostatní',
-	'Brick:Portal:Manage:All' => 'Vše',
-	'Brick:Portal:Manage:Group' => 'Skupina',
-	'Brick:Portal:Manage:fct:count' => 'Celkem',
-	'Brick:Portal:Manage:fct:sum' => 'Suma',
-	'Brick:Portal:Manage:fct:avg' => 'Průměr',
-	'Brick:Portal:Manage:fct:min' => 'Min',
-	'Brick:Portal:Manage:fct:max' => 'Max',
+	'Brick:Portal:Manage:DisplayMode:pie-chart' => 'Pie Chart~~',
+	'Brick:Portal:Manage:DisplayMode:bar-chart' => 'Bar Chart',
+	'Brick:Portal:Manage:Others' => 'Others~~',
+	'Brick:Portal:Manage:All' => 'All~~',
+	'Brick:Portal:Manage:Group' => 'Group~~',
+	'Brick:Portal:Manage:fct:count' => 'Total~~',
+	'Brick:Portal:Manage:fct:sum' => 'Sum~~',
+	'Brick:Portal:Manage:fct:avg' => 'Average~~',
+	'Brick:Portal:Manage:fct:min' => 'Min~~',
+	'Brick:Portal:Manage:fct:max' => 'Max~~',
 ));

 // ObjectBrick brick
@@ -132,23 +132,23 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s',
 	'Brick:Portal:Object:Form:Stimulus:Title' => 'Vyplňte prosím následující informace:',
 	'Brick:Portal:Object:Form:Message:Saved' => 'Uloženo',
-	'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s uloženo',
+	'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s uloženo~~',
 	'Brick:Portal:Object:Search:Regular:Title' => 'Vybrat %1$s (%2$s)',
 	'Brick:Portal:Object:Search:Hierarchy:Title' => 'Vybrat %1$s (%2$s)',
-	'Brick:Portal:Object:Copy:TextToCopy' => '%1$s: %2$s',
-	'Brick:Portal:Object:Copy:Tooltip' => 'Zkopíruj odkaz na objekt',
-	'Brick:Portal:Object:Copy:CopiedTooltip' => 'Zkopírováno'
+	'Brick:Portal:Object:Copy:TextToCopy' => '%1$s: %2$s~~',
+	'Brick:Portal:Object:Copy:Tooltip' => 'Copy object link~~',
+	'Brick:Portal:Object:Copy:CopiedTooltip' => 'Copied~~'
 ));

 // CreateBrick brick
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Brick:Portal:Create:Name' => 'Rychlé vytvoření',
-	'Brick:Portal:Create:ChooseType' => 'Vyberte typ',
+	'Brick:Portal:Create:ChooseType' => 'Please, choose a type~~',
 ));

 // Filter brick
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Brick:Portal:Filter:Name' => 'Prefilter a brick~~',
 	'Brick:Portal:Filter:SearchInput:Placeholder' => 'eg. connect wifi~~',
-	'Brick:Portal:Filter:SearchInput:Submit' => 'Vyhledat',
+	'Brick:Portal:Filter:SearchInput:Submit' => 'Search~~',
 ));
--- 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.2.0', array(
+	'itop-portal-base/3.1.0', array(
 	// Identification
 	'label' => 'Portal Development Library',
 		'category' => 'Portal',
--- 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
@@ -1803,11 +1803,6 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
 	text-decoration: line-through;
 }

-/* Tippy: Handle multi-line content */
-.tippy-content {
-	white-space: pre-line;
-}
-
 /**********************************************************/
 /* Shameful area (things that should be refactored soon) */
 /**********************************************************/
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Eric Espie	8bd72409f1	N°6716 - ✅ High memory Consomption and performance issue	2023-09-14 15:16:11 +02:00
Eric Espie	3eb06f8ada	N°6716 - ✅ High memory Consomption and performance issue	2023-09-14 14:38:17 +02:00