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

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source
This commit is contained in:
Eric Espie
2022-08-09 17:11:34 +02:00
parent 83b4f2bf34 d2041c0334
commit 8d8cefe948
43 changed files with 623 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -362,7 +362,9 @@ public function PrefillSearchForm(&$aContextParam)
<attribute id="name"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="name"/>
@@ -737,7 +739,9 @@ public function PrefillSearchForm(&$aContextParam)
<attribute id="contact_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="contract_id"/>
@@ -817,7 +821,9 @@ public function PrefillSearchForm(&$aContextParam)
<attribute id="document_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="contract_id"/>
@@ -1207,7 +1213,9 @@ public function PrefillSearchForm(&$aContextParam)
<attribute id="document_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="service_id"/>
@@ -1287,7 +1295,9 @@ public function PrefillSearchForm(&$aContextParam)
<attribute id="contact_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="service_id"/>
@@ -1849,7 +1859,9 @@ public function PrefillSearchForm(&$aContextParam)
<attribute id="slt_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="sla_id"/>
@@ -1969,7 +1981,9 @@ public function PrefillSearchForm(&$aContextParam)
<attribute id="service_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="customercontract_id"/>
@@ -2065,7 +2079,9 @@ public function PrefillSearchForm(&$aContextParam)
<attribute id="providercontract_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="service_id"/>
@@ -2250,7 +2266,9 @@ public function PrefillSearchForm(&$aContextParam)
<attribute id="contact_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="deliverymodel_id"/>