diff --git a/datamodels/2.x/itop-incident-mgmt-itil/en.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/en.dict.itop-incident-mgmt-itil.php
index c79ae59f8..e38b36c70 100755
--- a/datamodels/2.x/itop-incident-mgmt-itil/en.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/en.dict.itop-incident-mgmt-itil.php
@@ -1,5 +1,5 @@
'Re-open',
'Class:Incident/Stimulus:ev_reopen+' => '',
'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Cannot assign the Parent incident to the incident itself',
+
+ 'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets',
+ 'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info',
));
-
-
-?>
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/fr.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/fr.dict.itop-incident-mgmt-itil.php
index abf2b74a4..9529a516b 100755
--- a/datamodels/2.x/itop-incident-mgmt-itil/fr.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/fr.dict.itop-incident-mgmt-itil.php
@@ -1,5 +1,5 @@
'Incidents ouverts par statut',
'UI-IncidentManagementOverview-OpenIncidentByAgent' => 'Incidents ouverts par agent',
'UI-IncidentManagementOverview-OpenIncidentByCustomer' => 'Incidents ouverts par client',
+
+ 'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets (résoudre les tickets fils)',
+ 'Class:Incident/Method:ResolveChildTickets+' => 'Cascader l\'action de résolution du ticket (ev_autoresolve) vers les requêtes et incidents fils, et aligner les caractéristiques suivantes : service, équipe, agent, information de résolution',
));
-?>
diff --git a/datamodels/2.x/itop-request-mgmt-itil/en.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/en.dict.itop-request-mgmt-itil.php
index cd0059387..575548924 100755
--- a/datamodels/2.x/itop-request-mgmt-itil/en.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/en.dict.itop-request-mgmt-itil.php
@@ -1,5 +1,5 @@
'Wait for approval',
'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Cannot assign the Parent request to the request itself',
+
+ 'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
+ 'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info',
));
-
-
-
-?>
diff --git a/datamodels/2.x/itop-request-mgmt-itil/fr.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/fr.dict.itop-request-mgmt-itil.php
index 4870cc98f..42ab0e78a 100755
--- a/datamodels/2.x/itop-request-mgmt-itil/fr.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/fr.dict.itop-request-mgmt-itil.php
@@ -1,5 +1,5 @@
'Informations complémentaires',
'Portal:Details-Service-Element' => 'Eléments de service',
'Portal:NoClosedTicket' => 'Pas de requête fermée',
- 'Portal:NoService' => ''
+ 'Portal:NoService' => '',
+
+ 'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets (résoudre les tickets fils)',
+ 'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascader l\'action de résolution de la demande (ev_autoresolve), et aligner les caractéristiques suivantes : service, équipe, agent, information de résolution',
));
-?>
diff --git a/datamodels/2.x/itop-request-mgmt/en.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/en.dict.itop-request-mgmt.php
index ae0b1a175..3e6db35f4 100755
--- a/datamodels/2.x/itop-request-mgmt/en.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/en.dict.itop-request-mgmt.php
@@ -1,5 +1,5 @@
"Change you language",
'Portal:LanguageChangedTo_Lang' => 'Language changed to',
'Portal:ChooseYourFavoriteLanguage' => 'Choose your favorite language',
-));
-?>
+ 'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
+ 'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info',
+));
diff --git a/datamodels/2.x/itop-request-mgmt/fr.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/fr.dict.itop-request-mgmt.php
index 046663c84..5e3592f9d 100755
--- a/datamodels/2.x/itop-request-mgmt/fr.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/fr.dict.itop-request-mgmt.php
@@ -1,5 +1,5 @@
"Changer ma langue",
'Portal:LanguageChangedTo_Lang' => 'Langue changée en',
'Portal:ChooseYourFavoriteLanguage' => 'Choisissez votre langue',
+
+ 'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets (résoudre les tickets fils)',
+ 'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascader l\'action de résolution de la demande (ev_autoresolve), et aligner les caractéristiques suivantes : service, équipe, agent, information de résolution',
));
-?>
diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
index c295949ba..e07d8f93f 100755
--- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
+++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
@@ -744,89 +744,64 @@
-
attcodetrue
- The field to set, in the current object
-
stringtrue
- The value to set
-
attcodetrue
- The field, in the current object, to set to
- the current date
-
attcodetrue
- The field, in the current object, to set to
- the current logged in user
-
attcodetrue
- The field, in the current object, to set to
- the time elapsed since the date given by the reference field
-
attcodetrue
- The reference date or date/time
-
stringfalse
- Leave empty to rely on the standard working hours scheme, or set to "DefaultWorkingTimeComputer" to force a 24x7 scheme
-
attcodetrue
- The field, in the current object, to reset
- to its default value
-
attcodetrue
- The field, in the current object, to set
-
attcodetrue
- The field, in the current object, to get
- the value from
@@ -834,18 +809,14 @@
-
-
-
+
-
-
-
+
-
+
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
index 06dd1863d..92928d6de 100755
--- a/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
@@ -179,5 +179,42 @@ Dict::Add('EN US', 'English', 'English', array(
'Ticket:SLA' => 'SLA report',
'WorkOrder:Details' => 'Details',
'WorkOrder:Moreinfo' => 'More information',
- 'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s'
+ 'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s',
+
+ 'Class:cmdbAbstractObject/Method:Set' => 'Set',
+ 'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value',
+ 'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field',
+ 'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'The field to set, in the current object',
+ 'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Value',
+ 'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'The value to set',
+ 'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate',
+ 'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Set a field with the current date and time',
+ 'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Target Field',
+ 'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'The field to set, in the current object',
+ 'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser',
+ 'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Set a field with the currently logged in user',
+ 'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field',
+ 'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Set a field with the time (seconds) elapsed since a date given by another field',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Target Field',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to "DefaultWorkingTimeComputer" to force a 24x7 scheme',
+ 'Class:cmdbAbstractObject/Method:Reset' => 'Reset',
+ 'Class:cmdbAbstractObject/Method:Reset+' => 'Reset a field to its default value',
+ 'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Target Field',
+ 'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'The field to reset, in the current object',
+ 'Class:cmdbAbstractObject/Method:Copy' => 'Copy',
+ 'Class:cmdbAbstractObject/Method:Copy+' => 'Copy the value of a field to another field',
+ 'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Target Field',
+ 'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'The field to set, in the current object',
+ 'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Source Field',
+ 'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'The field to get the value from, in the current object',
+ 'Class:ResponseTicketTT0/Interface:iMetricComputer' => 'Time To Own',
+ 'Class:ResponseTicketTT0/Interface:iMetricComputer+' => 'Time To Own',
+ 'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
+ 'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Time To Resolve',
));
diff --git a/datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php
index 367e8147f..bfc1eda3e 100755
--- a/datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php
@@ -1,5 +1,5 @@
'Rapport SLA',
'WorkOrder:Details' => 'Détails',
'WorkOrder:Moreinfo' => 'Informations complémentaires',
- 'Tickets:ResolvedFrom' => 'Résolu via %1$s'
+ 'Tickets:ResolvedFrom' => 'Résolu via %1$s',
+
+ 'Class:cmdbAbstractObject/Method:Set' => 'Set (initialiser)',
+ 'Class:cmdbAbstractObject/Method:Set+' => 'Initialiser un champ avec une valeur statique',
+ 'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Champ Cible',
+ 'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'Le champ à initialiser, dans l\'objet courant',
+ 'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Valeur',
+ 'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'La valeur statique',
+ 'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate (initialiser à la date courante)',
+ 'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Initialiser un champ avec la date et l\'heure courants',
+ 'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Champ Cible',
+ 'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'Le champ à initialiser, dans l\'objet courant',
+ 'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser (initialiser à l\'utilisateur courant)',
+ 'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Initialiser un champ avec l\'utilisateur qui est en train d\'effectuer une action sur l\'objet',
+ 'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Champ Cible',
+ 'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'Le champ à initialiser, dans l\'objet courant',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime (initialiser avec le temps passé)',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Initialiser un champ avec le temps passé (en secondes) depuis une date donnée par un autre champ',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Champ Cible',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'Le champ à initialiser, dans l\'objet courant',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Champ de Référence',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'Le champ qui doit contenir la date de début',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Jours et Heures Ouvrés',
+ 'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Laisser ce champ vide pour bénéficier de la gestion des fenêtres de couverture, ou saisir "DefaultWorkingTimeComputer" pour passer en mode 24h/24 7j/7',
+ 'Class:cmdbAbstractObject/Method:Reset' => 'Reset (réinitialiser)',
+ 'Class:cmdbAbstractObject/Method:Reset+' => 'Réinitialiser un champ à sa valeur par défaut',
+ 'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Champ Cible',
+ 'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'Le champ à réinitialiser, dans l\'objet courant',
+ 'Class:cmdbAbstractObject/Method:Copy' => 'Copy (copier)',
+ 'Class:cmdbAbstractObject/Method:Copy+' => 'Copier la valeur depuis un champ vers un autre champ',
+ 'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Champ Cible',
+ 'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'Le champ à initialiser, dans l\'objet courant',
+ 'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Champ Source',
+ 'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'Le champ dans lequel on va lire la valeur, dans l\'objet courant',
+ 'Class:ResponseTicketTT0/Interface:iMetricComputer' => 'Time To Own',
+ 'Class:ResponseTicketTT0/Interface:iMetricComputer+' => 'Time To Own',
+ 'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
+ 'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Time To Resolve',
));