|
@@ -125,7 +125,7 @@
|
|
|
<is_null_allowed>true</is_null_allowed>
|
|
|
</field>
|
|
|
<field id="service_id" xsi:type="AttributeExternalKey">
|
|
|
- <filter><![CDATA[SELECT Service AS s JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :this->org_id]]></filter>
|
|
|
+ <filter><![CDATA[SELECT Service AS s JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :this->org_id AND s.status != 'obsolete']]></filter>
|
|
|
<dependencies>
|
|
|
<attribute id="org_id"/>
|
|
|
</dependencies>
|
|
@@ -141,7 +141,7 @@
|
|
|
<is_null_allowed>true</is_null_allowed>
|
|
|
</field>
|
|
|
<field id="servicesubcategory_id" xsi:type="AttributeExternalKey">
|
|
|
- <filter><![CDATA[SELECT ServiceSubcategory WHERE service_id = :this->service_id AND request_type = :this->request_type]]></filter>
|
|
|
+ <filter><![CDATA[SELECT ServiceSubcategory WHERE service_id = :this->service_id AND request_type = :this->request_type AND status != 'obsolete']]></filter>
|
|
|
<dependencies>
|
|
|
<attribute id="service_id"/>
|
|
|
<attribute id="request_type"/>
|