diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index 363f3cedb..7734f65c2 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -775,8 +775,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Menu:ExportMenu' => 'Exportation',
'Menu:ExportMenu+' => 'Exportation des résultats d\'une requête en HTML, CSV ou XML',
- 'Menu:IncidentManagementMenu' => 'Gestion des Incidents',
- 'Menu:IncidentManagementMenu+' => 'Gestion des Incidents',
'UI:IncidentManagementMenu:Title' => 'Résumé des incidents',
'UI-IncidentManagementMenu-IncidentsByType' => 'Incidents par type',
'UI-IncidentManagementMenu-IncidentsByStatus' => 'Incidents par état',
diff --git a/modules/itop-tickets-1.0.0/data.struct.ta-links.xml b/modules/itop-incident-mgmt-1.0.0/data.struct.ta-links.xml
similarity index 100%
rename from modules/itop-tickets-1.0.0/data.struct.ta-links.xml
rename to modules/itop-incident-mgmt-1.0.0/data.struct.ta-links.xml
diff --git a/modules/itop-tickets-1.0.0/data.struct.ta-triggers.xml b/modules/itop-incident-mgmt-1.0.0/data.struct.ta-triggers.xml
similarity index 100%
rename from modules/itop-tickets-1.0.0/data.struct.ta-triggers.xml
rename to modules/itop-incident-mgmt-1.0.0/data.struct.ta-triggers.xml
diff --git a/modules/itop-incident-mgmt-1.0.0/module.itop-incident-mgmt.php b/modules/itop-incident-mgmt-1.0.0/module.itop-incident-mgmt.php
index 37f7ce662..8ca773ab2 100644
--- a/modules/itop-incident-mgmt-1.0.0/module.itop-incident-mgmt.php
+++ b/modules/itop-incident-mgmt-1.0.0/module.itop-incident-mgmt.php
@@ -31,7 +31,8 @@ SetupWebPage::AddModule(
'es_cr.dict.itop-incident-mgmt.php',
),
'data.struct' => array(
- //'data.struct.itop-incident-mgmt.xml',
+ 'data.struct.ta-triggers.xml',
+ 'data.struct.ta-links.xml',
),
'data.sample' => array(
//'data.sample.itop-incident-mgmt.xml',
diff --git a/modules/itop-request-mgmt-1.0.0/data.struct.ta-links.xml b/modules/itop-request-mgmt-1.0.0/data.struct.ta-links.xml
new file mode 100644
index 000000000..6e980a646
--- /dev/null
+++ b/modules/itop-request-mgmt-1.0.0/data.struct.ta-links.xml
@@ -0,0 +1,23 @@
+
+
+
+2
+50
+1
+
+
+3
+50
+2
+
+
+3
+60
+1
+
+
+1
+20
+1
+
+
diff --git a/modules/itop-request-mgmt-1.0.0/data.struct.ta-triggers.xml b/modules/itop-request-mgmt-1.0.0/data.struct.ta-triggers.xml
new file mode 100644
index 000000000..19377ebe1
--- /dev/null
+++ b/modules/itop-request-mgmt-1.0.0/data.struct.ta-triggers.xml
@@ -0,0 +1,19 @@
+
+
+
+User Request ticket creation
+UserRequest
+
+
+
+User Request ticket assigned to agent
+UserRequest
+assigned
+
+
+
+User Request ticket resolved
+UserRequest
+resolved
+
+
diff --git a/modules/itop-request-mgmt-1.0.0/module.itop-request-mgmt.php b/modules/itop-request-mgmt-1.0.0/module.itop-request-mgmt.php
index 203e14563..59b8a4e6c 100644
--- a/modules/itop-request-mgmt-1.0.0/module.itop-request-mgmt.php
+++ b/modules/itop-request-mgmt-1.0.0/module.itop-request-mgmt.php
@@ -30,7 +30,8 @@ SetupWebPage::AddModule(
'es_cr.dict.itop-request-mgmt.php',
),
'data.struct' => array(
- //'data.struct.itop-request-mgmt.xml',
+ 'data.struct.ta-triggers.xml',
+ 'data.struct.ta-links.xml',
),
'data.sample' => array(
//'data.sample.itop-request-mgmt.xml',
diff --git a/modules/itop-tickets-1.0.0/data.struct.ta-actions.xml b/modules/itop-tickets-1.0.0/data.struct.ta-actions.xml
index 388f80e51..dfab3914f 100644
--- a/modules/itop-tickets-1.0.0/data.struct.ta-actions.xml
+++ b/modules/itop-tickets-1.0.0/data.struct.ta-actions.xml
@@ -1,7 +1,7 @@
-Incident Notification to a Workgroup
+Notification to a Workgroup
This action informs a team that a ticket has been assigned their workgroup
disabled
@@ -13,7 +13,7 @@
The ticket $this->name()$, priority $this->label(priority)$ has been assigned to the workgroup $this->workgroup_name$
<html>
<body>
-<p>The incident ticket $this->name()$ has been assigned to the workgroup $this->workgroup_name$.</p>
+<p>The ticket $this->name()$ has been assigned to the workgroup $this->workgroup_name$.</p>
<p>Description: $this->title$</p>
<p>Title: $this->title$</p>
<hr/>
@@ -23,7 +23,7 @@
normal
-Incident notification to Agent
+Notification to Agent
This action informs an agent that a ticket has been assigned to her/him
disabled
@@ -35,7 +35,7 @@
The ticket $this->name()$, priority $this->label(priority)$ has been assigned to you
<html>
<body>
-<p>The incident ticket $this->name()$ has been assigned to you.</p>
+<p>The ticket $this->name()$ has been assigned to you.</p>
<p>Description: $this->title$</p>
<p>Title: $this->title$</p>
<hr/>
@@ -45,7 +45,7 @@
normal
-Incident Notification to caller
+Notification to caller
This action is used to inform the caller
disabled
@@ -57,7 +57,7 @@
Ticket $this->name()$, priority $this->label(priority)$ - $this->status$
<html>
<body>
-<p>The incident ticket $this->name()$ has changed to status $this->status$</p>
+<p>The ticket $this->name()$ has changed to status $this->status$</p>
<p>Last update: $this->last_update$</p>
<hr/>
<p>for more information on this ticket, click here: $this->hyperlink(portal)$</p>
diff --git a/modules/itop-tickets-1.0.0/module.itop-tickets.php b/modules/itop-tickets-1.0.0/module.itop-tickets.php
index 310cb5adc..3ff3b4622 100644
--- a/modules/itop-tickets-1.0.0/module.itop-tickets.php
+++ b/modules/itop-tickets-1.0.0/module.itop-tickets.php
@@ -29,9 +29,7 @@ SetupWebPage::AddModule(
'es_cr.dict.itop-tickets.php',
),
'data.struct' => array(
- 'data.struct.ta-triggers.xml',
'data.struct.ta-actions.xml',
- 'data.struct.ta-links.xml',
),
'data.sample' => array(
),