Author: adrianc
Date: Sat Aug 2 07:56:49 2008
New Revision: 681992
URL: http://svn.apache.org/viewvc?rev=681992&view=rev
Log:
Simplified the code that was moved in rev 681711 - changed SECA to a direct
call.
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
ofbiz/trunk/applications/accounting/servicedef/secas.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=681992&r1=681991&r2=681992&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
Sat Aug 2 07:56:49 2008
@@ -237,7 +237,10 @@
</call-service>
</else>
</if-not-empty>
- <create-value value-name="newEntity"/>
+ <create-value value-name="newEntity"/>
+ <check-errors/>
+ <set field="workEffortId" from-field="newEntity.scheduleWorkEffortId"/>
+ <call-simple-method
method-name="autoAssignFixedAssetPartiesToMaintenance"/>
</simple-method>
<simple-method method-name="updateFixedAssetMaint"
short-description="Update an existing FixedAsset Maintenance">
<entity-one entity-name="FixedAssetMaint" value-name="lookedUpValue"/>
Modified: ofbiz/trunk/applications/accounting/servicedef/secas.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/secas.xml?rev=681992&r1=681991&r2=681992&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/secas.xml Sat Aug 2
07:56:49 2008
@@ -162,8 +162,4 @@
<action service="createAcctgTransAndEntriesForPaymentApplication"
mode="sync"/>
</eca>
- <eca service="createFixedAssetMaint" event="commit" run-on-failure="false">
- <action service="autoAssignFixedAssetPartiesToMaintenance"
mode="sync"/>
- </eca>
-
</service-eca>
Modified: ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml?rev=681992&r1=681991&r2=681992&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml
(original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml Sat
Aug 2 07:56:49 2008
@@ -234,14 +234,6 @@
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
- <service name="autoAssignFixedAssetPartiesToMaintenance" engine="simple"
-
location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml"
invoke="autoAssignFixedAssetPartiesToMaintenance" auth="true">
- <description>Auto-assign Fixed Asset Parties to a Fixed Asset
Maintenance</description>
- <permission-service service-name="fixedAssetPermissionCheck"
main-action="UPDATE"/>
- <attribute name="fixedAssetId" mode="IN" type="String"
optional="false"/>
- <attribute name="maintHistSeqId" mode="IN" type="String"
optional="false"/>
- </service>
-
<!-- Fixed Asset Permission Services -->
<service name="fixedAssetPermissionCheck" engine="simple"
location="component://accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml"
invoke="basePermissionCheck">
