svn commit: r699194 - /ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml

[hansbak-2]

Author: hansbak
Date: Thu Sep 25 23:49:03 2008
New Revision: 699194

URL: http://svn.apache.org/viewvc?rev=699194&view=rev
Log:
make sure that not a single cancelled task set the project status to cancelled

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=699194&r1=699193&r2=699194&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Thu Sep 25 23:49:03 2008
@@ -468,13 +468,14 @@
         <first-from-list entry-name="status" list-name="statusses"/>
         <set field="highInfo.currentStatusId" from-field="status.statusId"/>
         
+        <!-- make sure these statusvalues do not influence the total status if there are other active ones -->
         <if>
             <condition>
                 <and>
                     <or>
                         <if-compare field="highInfo.currentStatusId" value="PTS_COMPLETED" operator="equals"/>
                         <if-compare field="highInfo.currentStatusId" value="PTS_ON_HOLD" operator="equals"/>
-                    </or>
+                        <if-compare field="highInfo.currentStatusId" value="PTS_CANCELLED" operator="equals"/>                    </or>
                     <not>
                         <if-empty field="allTaskStatus"/>
                     </not>