From ae8ff6b6755dc3cf2e760447517ff0bb175e2d8a Mon Sep 17 00:00:00 2001
From: Erwan Taloc <erwan.taloc@combodo.com>
Date: Mon, 21 Oct 2013 13:06:10 +0000
Subject: [PATCH] Fix Trac #796 Prevent Support agent to create ticket for
 obsolete Services and Service sub categories

SVN:trunk[2944]
---
 .../datamodel.itop-incident-mgmt-itil.xml                     | 4 ++--
 .../datamodel.itop-request-mgmt-itil.xml                      | 4 ++--
 .../2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
index 1daa88d0d..bf7b81704 100755
--- a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
+++ b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
@@ -98,7 +98,7 @@
           <display_style>list</display_style>
         </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>
@@ -112,7 +112,7 @@
           <target_attcode>name</target_attcode>
         </field>
         <field id="servicesubcategory_id" xsi:type="AttributeExternalKey">
-          <filter><![CDATA[SELECT ServiceSubcategory WHERE service_id = :this->service_id AND request_type = 'incident']]></filter>
+          <filter><![CDATA[SELECT ServiceSubcategory WHERE service_id = :this->service_id AND request_type = 'incident' AND status != 'obsolete']]></filter>
           <dependencies>
             <attribute id="service_id"/>
           </dependencies>
diff --git a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
index b31292f2f..0d8298955 100755
--- a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
+++ b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
@@ -121,7 +121,7 @@
           <target_attcode>email</target_attcode>
         </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>
@@ -135,7 +135,7 @@
           <target_attcode>name</target_attcode>
         </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"/>
diff --git a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
index 39531ba0c..cbab1c8c7 100755
--- a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
+++ b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
@@ -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"/>