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 561feef77e..ca3473a60b 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,7 +1580,41 @@ public function PrefillSearchForm(&$aContextParam)
none
-
+
+
+ false
+ public
+ 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'));
+ }
+ }
+ */
+ }
+ ]]>
+
+
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 4cd243c7a4..8519d7ffb4 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. "monday next week"',
+ 'Class:cmdbAbstractObject/Method:SetComputedDateIfNull/Param:2+' => 'Textual information to modify the source date, eg. "+3 days"',
'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',