[ofbiz-framework] branch trunk updated: Improved: Converted cancelFixedAssetStdCost service from simple to entity-auto. (#80)

[surajk]

This is an automated email from the ASF dual-hosted git repository.

surajk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new f527bf4  Improved: Converted cancelFixedAssetStdCost service from simple to entity-auto. (#80)
f527bf4 is described below

commit f527bf4dc08c2f17cb93cdad7a63622f922fa03d
Author: Suraj Khurana <[hidden email]>
AuthorDate: Wed Apr 29 18:47:34 2020 +0530

    Improved: Converted cancelFixedAssetStdCost service from simple to entity-auto. (#80)
   
    * Improved: Converted cancelFixedAssetStdCost service from simple to entity-auto.
    (OFBIZ-11612)
---
 applications/accounting/minilang/fixedasset/FixedAssetServices.xml | 7 -------
 applications/accounting/servicedef/services_fixedasset.xml         | 6 +++---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/applications/accounting/minilang/fixedasset/FixedAssetServices.xml b/applications/accounting/minilang/fixedasset/FixedAssetServices.xml
index 10af8a2..35d805a 100644
--- a/applications/accounting/minilang/fixedasset/FixedAssetServices.xml
+++ b/applications/accounting/minilang/fixedasset/FixedAssetServices.xml
@@ -21,13 +21,6 @@ under the License.
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
 
-    <!-- cancel an existing Agreement -->
-    <simple-method method-name="cancelFixedAssetStdCost" short-description="Cancel an existing FixedAssetStdCost">
-        <entity-one entity-name="FixedAssetStdCost" value-field="fixedAssetStdCost"/>
-        <now-timestamp field="fixedAssetStdCost.thruDate"/>
-        <store-value value-field="fixedAssetStdCost"/>
-    </simple-method>
-
     <!--  create/update/delete FixedAssetMaint -->
     <simple-method method-name="createFixedAssetMaint" short-description="create a FixedAssetMaint">
         <make-value entity-name="FixedAssetMaint" value-field="newEntity"/>
diff --git a/applications/accounting/servicedef/services_fixedasset.xml b/applications/accounting/servicedef/services_fixedasset.xml
index 47bdf2a..9fbb432 100644
--- a/applications/accounting/servicedef/services_fixedasset.xml
+++ b/applications/accounting/servicedef/services_fixedasset.xml
@@ -74,9 +74,9 @@ under the License.
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="cancelFixedAssetStdCost" default-entity-name="FixedAssetStdCost" engine="simple"
-                location="component://accounting/minilang/fixedasset/FixedAssetServices.xml" invoke="cancelFixedAssetStdCost" auth="true">
-        <description>Cancel a Fixed Asset Standard Cost</description>
+    <!-- TODO: It should be named with expire prefix -->
+    <service name="cancelFixedAssetStdCost" default-entity-name="FixedAssetStdCost" engine="entity-auto" invoke="expire" auth="true">
+        <description>Expire a Fixed Asset Standard Cost</description>
         <permission-service service-name="fixedAssetPermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>