Move definition of the delivery model of an organization from itop-config-mgmt to itop-service-mgmt module.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@2885 a333f486-631f-4898-b8df-5754b55c2be0

datamodels/2.x/itop-config-mgmt/data.sample.organizations.xml

@@ -7,16 +7,11 @@
 <parent_id>0</parent_id>
 <deliverymodel_id></deliverymodel_id>
 </Organization>
-<DeliveryModel alias="DeliveryModel" id="2">
-<name>Standard support</name>
-<description></description>
-<org_id>3</org_id>
-</DeliveryModel>
 <Organization alias="Organization" id="2">
 <name>Demo</name>
 <code></code>
 <status>active</status>
 <parent_id>0</parent_id>
-<deliverymodel_id>2</deliverymodel_id>
+<deliverymodel_id></deliverymodel_id>
 </Organization>
 </Set>

datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml

@@ -61,16 +61,6 @@
           <extkey_attcode>parent_id</extkey_attcode>
           <target_attcode>name</target_attcode>
         </field>
-        <field id="deliverymodel_id" xsi:type="AttributeExternalKey">
-          <sql>deliverymodel_id</sql>
-          <target_class>DeliveryModel</target_class>
-          <is_null_allowed>true</is_null_allowed>
-          <on_target_delete>DEL_MANUAL</on_target_delete>
-        </field>
-        <field id="deliverymodel_name" xsi:type="AttributeExternalField">
-          <extkey_attcode>deliverymodel_id</extkey_attcode>
-          <target_attcode>name</target_attcode>
-        </field>
       </fields>
       <methods/>
       <presentation>
@@ -88,9 +78,6 @@
             <item id="parent_id">
               <rank>40</rank>
             </item>
-            <item id="deliverymodel_id">
-              <rank>50</rank>
-            </item>
           </items>
         </details>
         <search>

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',
 ));
-?>
+?>

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',
 ));

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+' => '',
 ));

datamodels/2.x/itop-service-mgmt-provider/data.sample.organizations.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<Organization alias="Organization" id="3">
+<name>IT Department</name>
+<code>IT</code>
+<status>active</status>
+<parent_id>0</parent_id>
+<deliverymodel_id></deliverymodel_id>
+</Organization>
+<DeliveryModel alias="DeliveryModel" id="2">
+<name>Standard support</name>
+<description></description>
+<org_id>3</org_id>
+</DeliveryModel>
+<Organization alias="Organization" id="2">
+<name>Demo</name>
+<code></code>
+<status>active</status>
+<parent_id>0</parent_id>
+<deliverymodel_id>2</deliverymodel_id>
+</Organization>
+</Set>

datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml

@@ -1,6 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
   <classes>
+    <class id="Organization">
+      <fields>
+        <field id="deliverymodel_id" xsi:type="AttributeExternalKey" _delta="define">
+          <sql>deliverymodel_id</sql>
+          <target_class>DeliveryModel</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="deliverymodel_name" xsi:type="AttributeExternalField" _delta="define">
+          <extkey_attcode>deliverymodel_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="deliverymodel_id"  _delta="define">
+              <rank>50</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
     <class id="Contract" _delta="define">
       <parent>cmdbAbstractObject</parent>
       <properties>

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',

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

datamodels/2.x/itop-service-mgmt-provider/es_cr.dict.itop-service-mgmt-provider.php

@@ -77,6 +77,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
 //
 

datamodels/2.x/itop-service-mgmt-provider/fr.dict.itop-service-mgmt-provider.php

@@ -31,6 +31,18 @@ Dict::Add('FR FR', 'French', 'Français', array(
 ));
 
 //
+// 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
 //
 

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+' => '',
 ));
-?>
+?>

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',

datamodels/2.x/itop-service-mgmt/data.sample.organizations.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<Organization alias="Organization" id="3">
+<name>IT Department</name>
+<code>IT</code>
+<status>active</status>
+<parent_id>0</parent_id>
+<deliverymodel_id></deliverymodel_id>
+</Organization>
+<DeliveryModel alias="DeliveryModel" id="2">
+<name>Standard support</name>
+<description></description>
+<org_id>3</org_id>
+</DeliveryModel>
+<Organization alias="Organization" id="2">
+<name>Demo</name>
+<code></code>
+<status>active</status>
+<parent_id>0</parent_id>
+<deliverymodel_id>2</deliverymodel_id>
+</Organization>
+</Set>

datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml

@@ -1,6 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
   <classes>
+    <class id="Organization">
+      <fields>
+        <field id="deliverymodel_id" xsi:type="AttributeExternalKey" _delta="define">
+          <sql>deliverymodel_id</sql>
+          <target_class>DeliveryModel</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="deliverymodel_name" xsi:type="AttributeExternalField" _delta="define">
+          <extkey_attcode>deliverymodel_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="deliverymodel_id"  _delta="define">
+              <rank>50</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+
+
     <class id="Contract" _delta="define">
       <parent>cmdbAbstractObject</parent>
       <properties>

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',

datamodels/2.x/itop-service-mgmt/en.dict.itop-service-mgmt.php

@@ -71,6 +71,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',
+
+));
+
 
 //
 // Class: ContractType

datamodels/2.x/itop-service-mgmt/es_cr.dict.itop-service-mgmt.php

@@ -75,6 +75,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
 //
 

datamodels/2.x/itop-service-mgmt/fr.dict.itop-service-mgmt.php

@@ -31,6 +31,17 @@ Dict::Add('FR FR', 'French', 'Français', array(
 ));
 
 //
+// 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
 //
 

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+' => '',
 ));
-?>
+?>

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',

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' => 'Договора с клиентами',