diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.organizations.xml b/datamodels/2.x/itop-config-mgmt/data.sample.organizations.xml
index c7712a9b7..214e51795 100755
--- a/datamodels/2.x/itop-config-mgmt/data.sample.organizations.xml
+++ b/datamodels/2.x/itop-config-mgmt/data.sample.organizations.xml
@@ -7,16 +7,11 @@
0
-
-Standard support
-
-3
-
Demo
active
0
-2
+
diff --git a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
index 0c49c7e9c..c2aeaee13 100755
--- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
+++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
@@ -61,16 +61,6 @@
parent_id
name
-
- deliverymodel_id
- DeliveryModel
- true
- DEL_MANUAL
-
-
- deliverymodel_id
- name
-
@@ -88,9 +78,6 @@
-
40
- -
- 50
-
diff --git a/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php
index bf600c134..3e40b2af7 100755
--- a/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php
@@ -39,8 +39,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'Class:Organization/Attribute:status/Value:inactive+' => 'Inaktiv',
'Class:Organization/Attribute:parent_id' => 'Mutterfirma',
'Class:Organization/Attribute:parent_id+' => 'Dachorganisation',
- 'Class:Organization/Attribute:deliverymodel_id' => 'Delivery-Modell',
- 'Class:Organization/Attribute:deliverymodel_id+' => '',
'Class:Location' => 'Standort',
'Class:Location+' => 'Jeder Typ von Standort: Region, Land, Stadt, Seite, Gebäude, Flur, Raum, Rack,...',
'Class:Location/Attribute:name' => 'Name',
@@ -433,8 +431,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'Relation:depends on/VerbDown' => 'Wirkt auf ...',
'Class:Organization/Attribute:parent_name' => 'Name der Mutterfirma',
'Class:Organization/Attribute:parent_name+' => 'Name der Mutterfirma',
- 'Class:Organization/Attribute:deliverymodel_name' => 'Delivery-Modell-Name',
- 'Class:Organization/Attribute:deliverymodel_name+' => '',
'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent',
'Class:Organization/Attribute:parent_id_friendlyname+' => '',
'Class:Location/Attribute:org_name' => 'Name der Organisation',
@@ -1100,4 +1096,4 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'Menu:ConfigManagement:Typology' => 'Typologie-Konfiguration',
'Class:Document:PreviewTab' => 'Vorschau',
));
-?>
\ No newline at end of file
+?>
diff --git a/datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php
index 39bb26fd1..fedbcad1d 100755
--- a/datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php
@@ -94,10 +94,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
'Class:Organization/Attribute:parent_id+' => 'Organización Padre',
'Class:Organization/Attribute:parent_name' => 'Organización Padre',
'Class:Organization/Attribute:parent_name+' => 'Nombre de la Organización Padre',
- 'Class:Organization/Attribute:deliverymodel_id' => 'Modelo de Entrega',
- 'Class:Organization/Attribute:deliverymodel_id+' => 'Modelo de Entrega',
- 'Class:Organization/Attribute:deliverymodel_name' => 'Nombre del Modelo de Entrega',
- 'Class:Organization/Attribute:deliverymodel_name+' => 'Nombre del Modelo de Entrega',
'Class:Organization/Attribute:parent_id_friendlyname' => 'Organización Padre',
'Class:Organization/Attribute:parent_id_friendlyname+' => 'Organización Padre',
));
diff --git a/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php
index 4b98dc45e..9b0924da6 100755
--- a/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php
@@ -45,10 +45,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Organization/Attribute:parent_id+' => 'Organisation parent',
'Class:Organization/Attribute:parent_name' => 'Nom du parent',
'Class:Organization/Attribute:parent_name+' => 'Nom de l\'organisation parente',
- 'Class:Organization/Attribute:deliverymodel_id' => 'Modèle de support',
- 'Class:Organization/Attribute:deliverymodel_id+' => '',
- 'Class:Organization/Attribute:deliverymodel_name' => 'Nom modèle de support',
- 'Class:Organization/Attribute:deliverymodel_name+' => '',
'Class:Organization/Attribute:parent_id_friendlyname' => 'Nom commun',
'Class:Organization/Attribute:parent_id_friendlyname+' => '',
));
diff --git a/datamodels/2.x/itop-service-mgmt-provider/data.sample.organizations.xml b/datamodels/2.x/itop-service-mgmt-provider/data.sample.organizations.xml
new file mode 100755
index 000000000..c7712a9b7
--- /dev/null
+++ b/datamodels/2.x/itop-service-mgmt-provider/data.sample.organizations.xml
@@ -0,0 +1,22 @@
+
+
+
+IT Department
+IT
+active
+0
+
+
+
+Standard support
+
+3
+
+
+Demo
+
+active
+0
+2
+
+
diff --git a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
index 52c5936c3..b58469e8d 100755
--- a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
+++ b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
@@ -1,6 +1,30 @@
+
+
+
+ deliverymodel_id
+ DeliveryModel
+ true
+ DEL_MANUAL
+
+
+ deliverymodel_id
+ name
+
+
+
+
+
+
+ -
+ 50
+
+
+
+
+
cmdbAbstractObject
diff --git a/datamodels/2.x/itop-service-mgmt-provider/de.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/de.dict.itop-service-mgmt-provider.php
index 5847d253b..9ee5e2aca 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/de.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/de.dict.itop-service-mgmt-provider.php
@@ -23,6 +23,10 @@
*/
Dict::Add('DE DE', 'German', 'Deutsch', array(
+ 'Class:Organization/Attribute:deliverymodel_id' => 'Delivery-Modell',
+ 'Class:Organization/Attribute:deliverymodel_id+' => '',
+ 'Class:Organization/Attribute:deliverymodel_name' => 'Delivery-Modell-Name',
+ 'Class:Organization/Attribute:deliverymodel_name+' => '',
'Class:ContractType' => 'Vertrags-Typ',
'Class:ContractType+' => '',
'Class:CustomerContract' => 'Kundenvertrag',
diff --git a/datamodels/2.x/itop-service-mgmt-provider/en.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/en.dict.itop-service-mgmt-provider.php
index fad6e5f34..6d6895bd6 100755
--- a/datamodels/2.x/itop-service-mgmt-provider/en.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/en.dict.itop-service-mgmt-provider.php
@@ -75,6 +75,18 @@ Dict::Add('EN US', 'English', 'English', array(
'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
*/
+//
+// Class: Organization
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+ 'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model',
+ 'Class:Organization/Attribute:deliverymodel_id+' => '',
+ 'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name',
+ 'Class:Organization/Attribute:deliverymodel_name+' => '',
+));
+
+
//
// Class: ContractType
diff --git a/datamodels/2.x/itop-service-mgmt-provider/es_cr.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/es_cr.dict.itop-service-mgmt-provider.php
index e829bd13a..bcda195a4 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/es_cr.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/es_cr.dict.itop-service-mgmt-provider.php
@@ -76,6 +76,17 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
*/
+//
+// Class: Organization
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+ 'Class:Organization/Attribute:deliverymodel_id' => 'Modelo de Entrega',
+ 'Class:Organization/Attribute:deliverymodel_id+' => 'Modelo de Entrega',
+ 'Class:Organization/Attribute:deliverymodel_name' => 'Nombre del Modelo de Entrega',
+ 'Class:Organization/Attribute:deliverymodel_name+' => 'Nombre del Modelo de Entrega',
+));
+
//
// Class: ContractType
//
diff --git a/datamodels/2.x/itop-service-mgmt-provider/fr.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/fr.dict.itop-service-mgmt-provider.php
index a445e7840..7c04efff9 100755
--- a/datamodels/2.x/itop-service-mgmt-provider/fr.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/fr.dict.itop-service-mgmt-provider.php
@@ -30,6 +30,18 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:ContractType+' => '',
));
+//
+// Class: Organization
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+ 'Class:Organization/Attribute:deliverymodel_id' => 'Modèle de support',
+ 'Class:Organization/Attribute:deliverymodel_id+' => '',
+ 'Class:Organization/Attribute:deliverymodel_name' => 'Nom modèle de support',
+ 'Class:Organization/Attribute:deliverymodel_name+' => '',
+));
+
+
//
// Class: Contract
//
diff --git a/datamodels/2.x/itop-service-mgmt-provider/ja.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/ja.dict.itop-service-mgmt-provider.php
index 58c4f51cb..5e1cac0c7 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/ja.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/ja.dict.itop-service-mgmt-provider.php
@@ -22,6 +22,10 @@
*/
Dict::Add('JA JP', 'Japanese', '日本語', array(
+ 'Class:Organization/Attribute:deliverymodel_id' => '提供モデル',
+ 'Class:Organization/Attribute:deliverymodel_id+' => '',
+ 'Class:Organization/Attribute:deliverymodel_name' => '提供モデル名',
+ 'Class:Organization/Attribute:deliverymodel_name+' => '',
'Class:ContractType' => '契約タイプ',
'Class:ContractType+' => '',
'Class:CustomerContract' => '顧客契約',
@@ -340,4 +344,4 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:lnkDeliveryModelToContact/Attribute:role_name' => '役割名',
'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
));
-?>
\ No newline at end of file
+?>
diff --git a/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
index f0b20f966..a514bef5d 100755
--- a/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
@@ -28,6 +28,7 @@ SetupWebPage::AddModule(
//'data.struct.itop-service-mgmt.xml',
),
'data.sample' => array(
+ 'data.sample.organizations.xml',
'data.sample.contracts.xml',
'data.sample.services.xml',
'data.sample.serviceelements.xml',
diff --git a/datamodels/2.x/itop-service-mgmt/data.sample.organizations.xml b/datamodels/2.x/itop-service-mgmt/data.sample.organizations.xml
new file mode 100755
index 000000000..c7712a9b7
--- /dev/null
+++ b/datamodels/2.x/itop-service-mgmt/data.sample.organizations.xml
@@ -0,0 +1,22 @@
+
+
+
+IT Department
+IT
+active
+0
+
+
+
+Standard support
+
+3
+
+
+Demo
+
+active
+0
+2
+
+
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 f13a12d5a..3626a738e 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
@@ -1,6 +1,32 @@
+
+
+
+ deliverymodel_id
+ DeliveryModel
+ true
+ DEL_MANUAL
+
+
+ deliverymodel_id
+ name
+
+
+
+
+
+
+ -
+ 50
+
+
+
+
+
+
+
cmdbAbstractObject
diff --git a/datamodels/2.x/itop-service-mgmt/de.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/de.dict.itop-service-mgmt.php
index a231799fe..b5ca81076 100755
--- a/datamodels/2.x/itop-service-mgmt/de.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/de.dict.itop-service-mgmt.php
@@ -24,6 +24,10 @@
*/
Dict::Add('DE DE', 'German', 'Deutsch', array(
+ 'Class:Organization/Attribute:deliverymodel_id' => 'Delivery-Modell',
+ 'Class:Organization/Attribute:deliverymodel_id+' => '',
+ 'Class:Organization/Attribute:deliverymodel_name' => 'Delivery-Modell-Name',
+ 'Class:Organization/Attribute:deliverymodel_name+' => '',
'Class:ContractType' => 'Vertrags-Typ',
'Class:ContractType+' => '',
'Class:CustomerContract' => 'Kundenvertrag',
diff --git a/datamodels/2.x/itop-service-mgmt/en.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/en.dict.itop-service-mgmt.php
index 92ffeb985..466cc5099 100755
--- a/datamodels/2.x/itop-service-mgmt/en.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/en.dict.itop-service-mgmt.php
@@ -69,6 +69,17 @@ Dict::Add('EN US', 'English', 'English', array(
+));
+
+//
+// Class: Organization
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+ 'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model',
+ 'Class:Organization/Attribute:deliverymodel_id+' => '',
+ 'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name',
+
));
diff --git a/datamodels/2.x/itop-service-mgmt/es_cr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/es_cr.dict.itop-service-mgmt.php
index f67a242a3..73adbf017 100755
--- a/datamodels/2.x/itop-service-mgmt/es_cr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/es_cr.dict.itop-service-mgmt.php
@@ -74,6 +74,17 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
));
+//
+// Class: Organization
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+ 'Class:Organization/Attribute:deliverymodel_id' => 'Modelo de Entrega',
+ 'Class:Organization/Attribute:deliverymodel_id+' => 'Modelo de Entrega',
+ 'Class:Organization/Attribute:deliverymodel_name' => 'Nombre del Modelo de Entrega',
+ 'Class:Organization/Attribute:deliverymodel_name+' => 'Nombre del Modelo de Entrega',
+));
+
//
// Class: ContractType
//
diff --git a/datamodels/2.x/itop-service-mgmt/fr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/fr.dict.itop-service-mgmt.php
index aba33f8da..d827bdcdb 100755
--- a/datamodels/2.x/itop-service-mgmt/fr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/fr.dict.itop-service-mgmt.php
@@ -30,6 +30,17 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:ContractType+' => '',
));
+//
+// Class: Organization
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+ 'Class:Organization/Attribute:deliverymodel_id' => 'Modèle de support',
+ 'Class:Organization/Attribute:deliverymodel_id+' => '',
+ 'Class:Organization/Attribute:deliverymodel_name' => 'Nom modèle de support',
+ 'Class:Organization/Attribute:deliverymodel_name+' => '',
+));
+
//
// Class: Contract
//
diff --git a/datamodels/2.x/itop-service-mgmt/ja.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/ja.dict.itop-service-mgmt.php
index 3fda6c00a..6a15a53b9 100755
--- a/datamodels/2.x/itop-service-mgmt/ja.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/ja.dict.itop-service-mgmt.php
@@ -22,6 +22,10 @@
*/
Dict::Add('JA JP', 'Japanese', '日本語', array(
+ 'Class:Organization/Attribute:deliverymodel_id' => '提供モデル',
+ 'Class:Organization/Attribute:deliverymodel_id+' => '',
+ 'Class:Organization/Attribute:deliverymodel_name' => '提供モデル名',
+ 'Class:Organization/Attribute:deliverymodel_name+' => '',
'Class:ContractType' => '契約タイプ',
'Class:ContractType+' => '',
'Class:CustomerContract' => '顧客契約',
@@ -352,4 +356,4 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:lnkDeliveryModelToContact/Attribute:role_name' => '役割名',
'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
));
-?>
\ No newline at end of file
+?>
diff --git a/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
index eeecfb945..61c98d1f7 100755
--- a/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
@@ -28,6 +28,7 @@ SetupWebPage::AddModule(
//'data.struct.itop-service-mgmt.xml',
),
'data.sample' => array(
+ 'data.sample.organizations.xml',
'data.sample.contracts.xml',
'data.sample.services.xml',
'data.sample.serviceelements.xml',
diff --git a/datamodels/2.x/itop-service-mgmt/ru.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/ru.dict.itop-service-mgmt.php
index ad367bb29..7b5590efe 100755
--- a/datamodels/2.x/itop-service-mgmt/ru.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/ru.dict.itop-service-mgmt.php
@@ -24,6 +24,10 @@
*/
Dict::Add('RU RU', 'Russian', 'Русский', array(
+ 'Class:Organization/Attribute:deliverymodel_id' => 'Модель доставки~~',
+ 'Class:Organization/Attribute:deliverymodel_id+' => '',
+ 'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
+ 'Class:Organization/Attribute:deliverymodel_name+' => '',
'Class:ContractType' => 'Contract Type~~',
'Class:ContractType+' => '',
'Class:CustomerContract' => 'Договора с клиентами',