From 8008e4d840fd9554044abbac155388304cc1a3db Mon Sep 17 00:00:00 2001
From: vdumas <vincent.dumas@combodo.com>
Date: Mon, 25 Apr 2022 15:04:20 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B04702=20-=20DataModel=20:=20wrong=20attri?=
 =?UTF-8?q?bute=20type=20for=20SLA.customercontracts=5Flist?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datamodel.itop-service-mgmt.xml           | 36 +------------------
 .../dictionaries/en.dict.itop-tickets.php     |  2 +-
 2 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
index ca3473a60b..561feef77e 100755
--- a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
+++ b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
@@ -1580,41 +1580,7 @@ public function PrefillSearchForm(&$aContextParam)
           <edit_mode>none</edit_mode>
         </field>
       </fields>
-			<methods>
-				<method id="DoCheckToWrite">
-					<static>false</static>
-					<access>public</access>
-					<code><![CDATA[
-					public function DoCheckToWrite()
-	{
-		parent::DoCheckToWrite();
-
-		/* This check is now useless as customercontracts_list is no more editable from the SLA side
-		$aCustomerContracts = $this->Get("customercontracts_list");
-		foreach ($aCustomerContracts as $sAttCode => $oCustomerContracts)
-		{
-			// Recurse inside the subdirectories
-			$sOql = "SELECT lnkCustomerContractToService AS ccs WHERE ccs.customercontract_id=:customercontract_id AND ccs.service_id=:service_id";
-			$aQueryParams['customercontract_id'] = $oCustomerContracts->Get("customercontract_id");
-			$aQueryParams['service_id'] = $oCustomerContracts->Get("service_id");
-			if ($this->Get("id") != null)
-			{
-				$sOql = $sOql." AND ccs.sla_id!=:sla_id";
-				$aQueryParams['sla_id'] = $this->Get("id");
-			}
-			$oQuery = DBSearch::FromOQL($sOql, $aQueryParams);
-			$oResultSql = new DBObjectSet($oQuery);
-			$oResultSql->OptimizeColumnLoad(['ccs' => ['customercontract_name','service_name']]);
-			if ($aCurrentRow = $oResultSql->Fetch())
-			{
-				$this->m_aCheckIssues[] = Dict::Format('Class:SLA/Error:UniqueLnkCustomerContractToService',$aCurrentRow->Get('customercontract_name'),$aCurrentRow->Get('service_name'));
-			}
-		}
-		*/
-	}
-			     ]]></code>
-				</method>
-			</methods>
+			<methods/>
 			<presentation>
         <details>
           <items>
diff --git a/datamodels/2.x/itop-tickets/dictionaries/en.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/en.dict.itop-tickets.php
index 8519d7ffb4..4cd243c7a4 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/en.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/en.dict.itop-tickets.php
@@ -224,7 +224,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1'  => 'Target Field',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:1+' => 'The field to set, in the current object',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2'  => 'Modifier',
-	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"',
+	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Textual information to modify the source date, eg. "monday next week"',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3'  => 'Source field',
 	'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:3+' => 'The field used as source to apply the Modifier logic',
 	'Class:cmdbAbstractObject/Method:Reset'                          => 'Reset',