composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-20 07:42:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

#1314 (N°585,586,591) allow to use finalclass (sub-class name) as reconciliation key when loading by CSV import, relationship defined on an abstract class.

Browse Source 
#1387 (N°577) fixing old issue with CSV import of relationship with Documents

SVN:trunk[4576]
This commit is contained in:
Vincent Dumas
2017-03-13 16:56:03 +00:00
parent b3a0c6119e
commit 5f82c78dc7
23 changed files with 103 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
View File

@@ -65,6 +65,11 @@
<reconciliation>
<attributes>
<attribute id="name"/>
<attribute id="org_id"/>
<attribute id="organization_name"/>
<attribute id="provider_id"/>
<attribute id="provider_name"/>
<attribute id="finalclass"/>
</attributes>
</reconciliation>
</properties>
@@ -354,6 +359,10 @@
<reconciliation>
<attributes>
<attribute id="name"/>
<attribute id="org_id"/>
<attribute id="organization_name"/>
<attribute id="provider_id"/>
<attribute id="provider_name"/>
</attributes>
</reconciliation>
</properties>
@@ -498,6 +507,10 @@
<reconciliation>
<attributes>
<attribute id="name"/>
<attribute id="org_id"/>
<attribute id="organization_name"/>
<attribute id="provider_id"/>
<attribute id="provider_name"/>
</attributes>
</reconciliation>
</properties>

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

@@ -141,8 +141,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete',
'Class:Contract/Attribute:status/Value:production' => 'production',
'Class:Contract/Attribute:status/Value:production+' => 'production',
'Class:Contract/Attribute:finalclass' => 'Type',
'Class:Contract/Attribute:finalclass+' => '',
'Class:Contract/Attribute:finalclass' => 'Contract sub-class',
'Class:Contract/Attribute:finalclass+' => 'Name of the final class',
));
//
// Class: CustomerContract

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

@@ -92,8 +92,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolète',
'Class:Contract/Attribute:status/Value:production' => 'production',
'Class:Contract/Attribute:status/Value:production+' => 'production',
'Class:Contract/Attribute:finalclass' => 'Type',
'Class:Contract/Attribute:finalclass+' => '',
'Class:Contract/Attribute:finalclass' => 'Sous-classe de Contrat',
'Class:Contract/Attribute:finalclass+' => 'Nom de la classe instanciable',
));
//
@@ -122,7 +122,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:ProviderContract/Attribute:coverage+' => '',
'Class:ProviderContract/Attribute:contracttype_id' => 'Type de contrat',
'Class:ProviderContract/Attribute:contracttype_id+' => '',
'Class:ProviderContract/Attribute:contracttype_name' => 'Nom type de contrat',
'Class:ProviderContract/Attribute:contracttype_name' => 'Nom Type de contrat',
'Class:ProviderContract/Attribute:contracttype_name+' => '',
));
@@ -442,7 +442,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:DeliveryModel/Attribute:org_id' => 'Organisation',
'Class:DeliveryModel/Attribute:org_id+' => '',
'Class:DeliveryModel/Attribute:organization_name' => 'Nom organisation',
'Class:DeliveryModel/Attribute:organization_name+' => 'Common name',
'Class:DeliveryModel/Attribute:organization_name+' => '',
'Class:DeliveryModel/Attribute:description' => 'Description',
'Class:DeliveryModel/Attribute:description+' => '',
'Class:DeliveryModel/Attribute:contacts_list' => 'Contacts',