You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/03/02 14:59:32 UTC
svn commit: r1296209 - in /ofbiz/trunk/specialpurpose/projectmgr:
entitydef/entitymodel.xml script/org/ofbiz/project/ProjectServices.xml
Author: erwan
Date: Fri Mar 2 13:59:31 2012
New Revision: 1296209
URL: http://svn.apache.org/viewvc?rev=1296209&view=rev
Log:
OFBIZ-4686 - Correction on actualCompletionDate calculation for a task (phase or project) in a project - A patch from Olivier Heintz
Modified:
ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml?rev=1296209&r1=1296208&r2=1296209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml Fri Mar 2 13:59:31 2012
@@ -338,7 +338,6 @@ under the License.
<alias entity-alias="WET" field="workEffortId" name="taskId" group-by="true"/>
<alias entity-alias="TE" field="fromDate" name="actualEntryStartDate" function="min"/>
- <alias entity-alias="TE" field="thruDate" name="actualEntryCompletionDate" function="max"/>
<view-link entity-alias="WEP" rel-entity-alias="WEPH">
<key-map field-name="workEffortId" rel-field-name="workEffortParentId"/>
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=1296209&r1=1296208&r2=1296209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Fri Mar 2 13:59:31 2012
@@ -1063,7 +1063,6 @@
<condition-expr field-name="taskId" from-field="highInfo.taskId" ignore-if-empty="true"/>
</condition-list>
<select-field field-name="actualEntryStartDate"/>
- <select-field field-name="actualEntryCompletionDate"/>
</entity-condition>
<first-from-list entry="timeEntriesInfo" list="summaryEntriesInfos"/>
<if-not-empty field="timeEntriesInfo">
@@ -1080,21 +1079,6 @@
</then>
</if>
</if-not-empty>
- <!-- update actual completion date by the max date form sub tasks associated TimeEntries
- (if after actualCompletionDate field) -->
- <if-not-empty field="timeEntriesInfo.actualEntryCompletionDate">
- <if>
- <condition>
- <or>
- <if-empty field="highInfo.actualCompletionDate"/>
- <if-compare-field field="highInfo.actualCompletionDate" operator="less" type="Timestamp" to-field="timeEntriesInfo.actualEntryCompletionDate"/>
- </or>
- </condition>
- <then>
- <set field="highInfo.actualCompletionDate" from-field="timeEntriesInfo.actualEntryCompletionDate"/>
- </then>
- </if>
- </if-not-empty>
</if-not-empty>
</simple-method>