Author: adrianc
Date: Wed Jul 30 15:24:28 2008
New Revision: 681227
URL:
http://svn.apache.org/viewvc?rev=681227&view=revLog:
Small improvements to Fixed Asset Maintenance services: return oldStatusId on update, create workeffort description on create.
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml?rev=681227&r1=681226&r2=681227&view=diff==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml Wed Jul 30 15:24:28 2008
@@ -227,6 +227,8 @@
<set value="CAL_TENTATIVE" field="maintWorkEffortMap.currentStatusId"/>
<set from-field="userLogin.partyId" field="maintWorkEffortMap.quickAssignPartyId"/>
<set from-field="newEntity.fixedAssetId" field="maintWorkEffortMap.fixedAssetId"/>
+ <get-related-one to-value-name="productMaintType" relation-name="ProductMaintType" value-name="newEntity"/>
+ <set field="maintWorkEffortMap.description" from-field="productMaintType.description"/>
<!-- Optional dates supplied by Fixed Asset Calendar -->
<set from-field="parameters.estimatedStartDate" field="maintWorkEffortMap.estimatedStartDate"/>
<set from-field="parameters.estimatedCompletionDate" field="maintWorkEffortMap.estimatedCompletionDate"/>
@@ -239,6 +241,7 @@
</simple-method>
<simple-method method-name="updateFixedAssetMaint" short-description="Update an existing FixedAsset Maintenance">
<entity-one entity-name="FixedAssetMaint" value-name="lookedUpValue"/>
+ <field-to-result field-name="lookedUpValue.statusId" result-name="oldStatusId"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<if-not-empty field="parameters.productMaintSeqId">
<entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
Modified: ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml?rev=681227&r1=681226&r2=681227&view=diff==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml Wed Jul 30 15:24:28 2008
@@ -160,6 +160,7 @@
<permission-service service-name="fixedAssetPermissionCheck" main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <attribute name="oldStatusId" type="String" mode="OUT" optional="false"/>
</service>
<service name="deleteFixedAssetMaint" default-entity-name="FixedAssetMaint" engine="simple"
location="org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="deleteFixedAssetMaint" auth="true">