Author: adrianc
Date: Wed Aug 6 16:06:17 2008
New Revision: 683440
URL: http://svn.apache.org/viewvc?rev=683440&view=rev
Log:
Small fixup for the Asset Maint component.
The updateFixedAssetMaintAndWorkEffort simple method erased the WorkEffort data
that was just created by the updateFixedAssetMaint service. This only happened
when the maintenance status was changed to Completed, and the issue is related
to the changes in rev 683418.
Modified:
ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml
Modified:
ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml?rev=683440&r1=683439&r2=683440&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml
(original)
+++
ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml
Wed Aug 6 16:06:17 2008
@@ -39,17 +39,18 @@
<simple-method method-name="updateFixedAssetMaintAndWorkEffort"
login-required="true"
short-description="Update FixedAssetMaint and Schedule information in
WorkEffort">
- <check-errors/>
<set-service-fields map-name="parameters"
service-name="updateFixedAssetMaint" to-map-name="updateFixedAssetMaintCtx"/>
<call-service service-name="updateFixedAssetMaint"
in-map-name="updateFixedAssetMaintCtx"/>
<check-errors/>
<if-compare field="parameters.statusId" operator="equals"
value="FAM_CANCELLED">
<set field="updateWorkEffortCtx.currentStatusId"
value="CAL_CANCELLED"/>
</if-compare>
- <set from-field="parameters.scheduleWorkEffortId"
field="updateWorkEffortCtx.workEffortId"/>
<set-service-fields map-name="parameters"
service-name="updateWorkEffort" to-map-name="updateWorkEffortCtx"/>
+ <set from-field="parameters.scheduleWorkEffortId"
field="updateWorkEffortCtx.workEffortId"/>
+ <set from-field="parameters.scheduleWorkEffortId"
field="workEffortId"/>
+ <entity-one value-name="workEffort" entity-name="WorkEffort"/>
+ <set field="updateWorkEffortCtx.actualCompletionDate"
from-field="parameters.actualCompletionDate"
default-value="${workEffort.actualCompletionDate}"/>
<call-service service-name="updateWorkEffort"
in-map-name="updateWorkEffortCtx"/>
- <check-errors/>
</simple-method>
<simple-method method-name="createWorkEffortAndAssoc" login-required="true"
