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

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

40
datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.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"/>
@@ -765,7 +767,9 @@ public function PrefillSearchForm(&$aContextParam)
<attribute id="contact_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="contract_id"/>
@@ -845,7 +849,9 @@ public function PrefillSearchForm(&$aContextParam)
<attribute id="document_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="contract_id"/>
@@ -1213,7 +1219,9 @@ public function PrefillSearchForm(&$aContextParam)
<attribute id="document_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="service_id"/>
@@ -1293,7 +1301,9 @@ public function PrefillSearchForm(&$aContextParam)
<attribute id="contact_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="service_id"/>
@@ -1848,7 +1858,9 @@ public function PrefillSearchForm(&$aContextParam)
<attribute id="slt_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="sla_id"/>
@@ -1968,7 +1980,9 @@ public function PrefillSearchForm(&$aContextParam)
<attribute id="service_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="customercontract_id"/>
@@ -2064,7 +2078,9 @@ public function PrefillSearchForm(&$aContextParam)
<attribute id="providercontract_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="customercontract_id"/>
@@ -2144,7 +2160,9 @@ public function PrefillSearchForm(&$aContextParam)
<attribute id="functionalci_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="customercontract_id"/>
@@ -2330,7 +2348,9 @@ public function PrefillSearchForm(&$aContextParam)
<attribute id="contact_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="deliverymodel_id"/>