You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by nm...@apache.org on 2015/01/17 14:47:01 UTC
svn commit: r1652608 - in /ofbiz/trunk/applications/accounting:
script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
servicedef/services_fixedasset.xml
Author: nmalin
Date: Sat Jan 17 13:47:00 2015
New Revision: 1652608
URL: http://svn.apache.org/r1652608
Log:
(OFBIZ-5992) Convert following entities CRUD service from simple to entity-auto :
FixedAsset
FixedAssetProduct
FixedAssetStdCost
FixedAssetIdent
FixedAssetRegistration
FixedAssetMaint
FixedAssetMaintOrder
PartyFixedAssetAssignment
FixedAssetTypeGlAccount
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=1652608&r1=1652607&r2=1652608&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 Jan 17 13:47:00 2015
@@ -21,131 +21,6 @@ under the License.
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd">
- <!-- ================================================================ -->
- <!-- FixedAsset Services -->
- <!-- ================================================================ -->
-
- <!-- create a new Fixed Asset header record -->
- <simple-method method-name="createFixedAsset" short-description="Create an FixedAsset">
- <!-- create new entity and create all the fields -->
- <make-value value-field="newEntity" entity-name="FixedAsset"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
-
- <!-- create a non existing ID if not supplied -->
- <if-empty field="parameters.fixedAssetId">
- <sequenced-id sequence-name="FixedAsset" field="newEntity.fixedAssetId"/>
- <else>
- <!-- check the Duplicate ID> -->
- <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
- <if-not-empty field="fixedAsset">
- <add-error>
- <fail-property resource="AccountingUiLabels" property="AccountingFixedAssetIdAlreadyExists"/>
- </add-error>
- <log level="info" message="${AccountingUiLabels.AccountingFixedAssetIdAlreadyExists}"/>
- <else>
- <check-id field="parameters.fixedAssetId"/>
- </else>
- </if-not-empty>
- <check-errors/>
- <set from-field="parameters.fixedAssetId" field="newEntity.fixedAssetId"/>
- </else>
- </if-empty>
- <field-to-result field="newEntity.fixedAssetId" result-name="fixedAssetId"/>
-
- <!-- finally create the record (should not exist already)-->
- <create-value value-field="newEntity"/>
- </simple-method>
-
- <!-- update an existing Fixed Asset header Record -->
- <simple-method method-name="updateFixedAsset" short-description="Update an existing FixedAsset">
- <entity-one entity-name="FixedAsset" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- ================================================================ -->
- <!-- FixedAssetMember Services -->
- <!-- ================================================================ -->
-
- <!-- add a product to a fixed Asset -->
- <simple-method method-name="addFixedAssetProduct" short-description="Add Product to FixedAsset">
- <make-value value-field="newEntity" entity-name="FixedAssetProduct"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
-
- <if-empty field="newEntity.fromDate">
- <now-timestamp field="newEntity.fromDate"/>
- </if-empty>
-
- <create-value value-field="newEntity"/>
- </simple-method>
-
- <!-- update the product to fixed Asset link -->
- <simple-method method-name="updateFixedAssetProduct" short-description="Update Products of a FixedAsset">
- <entity-one entity-name="FixedAssetProduct" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- remove the productlink from the Fixed Asset -->
- <simple-method method-name="removeFixedAssetProduct" short-description="Remove Product From FixedAsset">
- <entity-one entity-name="FixedAssetProduct" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- ================================================================ -->
- <!-- FixedAssetCalendar Services -->
- <!-- ================================================================ -->
- <!-- update the calendar of the fixed Asset -->
-<!-- <simple-method method-name="updateFixedAssetCalendar" short-description="Update the calendar of the FixedAsset">
- <check-permission permission="ACCOUNTING" action="_UPDATE">
- <alt-permission permission="ACCOUNTING_ROLE" action="_UPDATE"/>
- <fail-property resource="AccountingUiLabels" property="AccountingUpdatePermissionError"/>
- </check-permission>
- <check-errors/>
-
- <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
-
- <make-value value-field="excDayPKMap" entity-name="TechDataCalendarExcDay"/>
- <set-pk-fields field-name= "calendarId" map="fixedAsset" value-field="excDayPKMap"/>
- <set-pk-fields fieldName= "exceptionDateStartTime" map="parameters" value-field="excDayPKMap"/>
- <find-by entity-name="TechDataCalendarExcDay" map-name="excDayPKMap" value-name="lookedUpValue"/>
- <set-nonpk-fields field-name="capacity" map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
-
-
- -->
-
-
- <!-- create a new FixedAssetStdCost -->
- <simple-method method-name="createFixedAssetStdCost" short-description="Create a FixedAssetStdCost">
- <!-- TODO: we should cancel the existing costs of the same type -->
- <!-- create new entity and create all the fields -->
-
- <!-- Check, should not exist already -->
- <entity-one entity-name="FixedAssetStdCost" value-field="fixedAssetStdCost"/>
- <if-not-empty field="fixedAssetStdCost">
- <add-error>
- <fail-property resource="AccountingUiLabels" property="AccountingFixedAssetStdCostAlreadyExists"/>
- </add-error>
- </if-not-empty>
- <check-errors/>
-
- <make-value value-field="newEntity" entity-name="FixedAssetStdCost"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
-
- <!-- finally create the record (should not exist already)-->
- <create-value value-field="newEntity"/>
- <check-errors/>
- </simple-method>
- <!-- update an existing FixedAssetStdCost -->
- <simple-method method-name="updateFixedAssetStdCost" short-description="Update an existing FixedAssetStdCost">
- <entity-one entity-name="FixedAssetStdCost" value-field="fixedAssetStdCost"/>
- <set-nonpk-fields map="parameters" value-field="fixedAssetStdCost"/>
- <store-value value-field="fixedAssetStdCost"/>
- </simple-method>
<!-- cancel an existing Agreement -->
<simple-method method-name="cancelFixedAssetStdCost" short-description="Cancel an existing FixedAssetStdCost">
<entity-one entity-name="FixedAssetStdCost" value-field="fixedAssetStdCost"/>
@@ -153,43 +28,6 @@ under the License.
<store-value value-field="fixedAssetStdCost"/>
</simple-method>
- <!-- Fixed Asset Identification "FIXED_ASSET_IDENT"-->
- <simple-method method-name="createFixedAssetIdent" short-description="Create an FixedAssetIdent">
- <make-value value-field="newEntity" entity-name="FixedAssetIdent"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateFixedAssetIdent" short-description="Update an existing FixedAssetIdent">
- <entity-one entity-name="FixedAssetIdent" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="removeFixedAssetIdent" short-description="Remove Fixed Assets Idents FixedAssetIdent">
- <entity-one entity-name="FixedAssetIdent" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- FixedAsset Registration Create/Update/Delete"-->
- <simple-method method-name="createFixedAssetRegistration" short-description="Create FixedAsset Registration">
- <make-value value-field="newEntity" entity-name="FixedAssetRegistration"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <if-empty field="newEntity.fromDate">
- <now-timestamp field="newEntity.fromDate"/>
- </if-empty>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateFixedAssetRegistration" short-description="Update an existing FixedAsset Registration">
- <entity-one entity-name="FixedAssetRegistration" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="deleteFixedAssetRegistration" short-description="Delete FixedAsset Registration">
- <entity-one entity-name="FixedAssetRegistration" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
<!-- create/update/delete FixedAssetMaint -->
<simple-method method-name="createFixedAssetMaint" short-description="create a FixedAssetMaint">
<make-value entity-name="FixedAssetMaint" value-field="newEntity"/>
@@ -305,10 +143,6 @@ under the License.
</then>
</if>
</simple-method>
- <simple-method method-name="deleteFixedAssetMaint" short-description="Delete FixedAsset Maintenance">
- <entity-one entity-name="FixedAssetMaint" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
<!-- create/update/delete FixedAssetMeter -->
<simple-method method-name="createFixedAssetMeter" short-description="Create a Fixed Asset Meter Reading">
@@ -328,10 +162,6 @@ under the License.
<set field="meterValue" from-field="lookedUpValue"/>
<call-simple-method method-name="createMaintsFromMeterReading"/>
</simple-method>
- <simple-method method-name="deleteFixedAssetMeter" short-description="Delete a Fixed Asset Meter Reading">
- <entity-one entity-name="FixedAssetMeter" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
<simple-method method-name="createMaintsFromMeterReading" short-description="Create Fixed Asset Maintenances From A Meter Reading">
<if-not-empty field="meterValue.maintHistSeqId">
<return/>
@@ -507,33 +337,6 @@ under the License.
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
- <simple-method method-name="deleteFixedAssetMaintOrder" short-description="Delete FixedAsset Maintenance Order">
- <entity-one entity-name="FixedAssetMaintOrder" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- ==============Party Fixed Asset Assignment============= -->
- <simple-method method-name="createPartyFixedAssetAssignment" short-description="Associate Party to Fixed Asset">
- <make-value entity-name="PartyFixedAssetAssignment" value-field="newEntity"/>
- <set-pk-fields value-field="newEntity" map="parameters"/>
- <set-nonpk-fields value-field="newEntity" map="parameters"/>
- <if-empty field="newEntity.fromDate">
- <now-timestamp field="nowTimestamp"/>
- <set field="newEntity.fromDate" from-field="nowTimestamp"/>
- </if-empty>
- <create-value value-field="newEntity"/>
- </simple-method>
-
- <simple-method method-name="updatePartyFixedAssetAssignment" short-description="Update Party to Fixed Asset">
- <entity-one entity-name="PartyFixedAssetAssignment" value-field="newEntity"/>
- <set-nonpk-fields value-field="newEntity" map="parameters"/>
- <store-value value-field="newEntity"/>
- </simple-method>
-
- <simple-method method-name="deletePartyFixedAssetAssignment" short-description="Delete Party to Fixed Asset">
- <entity-one entity-name="PartyFixedAssetAssignment" value-field="newEntity"/>
- <remove-value value-field="newEntity"/>
- </simple-method>
<simple-method method-name="autoAssignFixedAssetPartiesToMaintenance" login-required="true"
short-description="Auto-assign Fixed Asset Parties to a Fixed Asset Maintenance">
Modified: ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml?rev=1652608&r1=1652607&r2=1652608&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml Sat Jan 17 13:47:00 2015
@@ -25,16 +25,14 @@ under the License.
<version>1.0</version>
<!-- Fixed Asset -->
- <service name="createFixedAsset" default-entity-name="FixedAsset" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="createFixedAsset" auth="true">
+ <service name="createFixedAsset" default-entity-name="FixedAsset" engine="entity-auto" invoke="create" auth="true">
<description>Create a Fixed Asset</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
<auto-attributes include="pk" mode="INOUT" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<override name="fixedAssetTypeId" optional="false"/>
</service>
- <service name="updateFixedAsset" default-entity-name="FixedAsset" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="updateFixedAsset" auth="true">
+ <service name="updateFixedAsset" default-entity-name="FixedAsset" engine="entity-auto" invoke="update" auth="true">
<description>Update a Fixed Asset</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -43,51 +41,34 @@ under the License.
</service>
<!-- Product to Fixed Asset maintenance -->
- <service name="addFixedAssetProduct" default-entity-name="FixedAssetProduct" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="addFixedAssetProduct" auth="true">
+ <service name="addFixedAssetProduct" default-entity-name="FixedAssetProduct" engine="entity-auto" invoke="create" auth="true">
<description>Add Product To Fixed Asset</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<override name="fromDate" optional="true"/>
</service>
-
- <service name="updateFixedAssetProduct" default-entity-name="FixedAssetProduct" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="updateFixedAssetProduct" auth="true">
+ <service name="updateFixedAssetProduct" default-entity-name="FixedAssetProduct" engine="entity-auto" invoke="update" auth="true">
<description>Update the Product to Fixed Asset information</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"/>
</service>
-
- <service name="removeFixedAssetProduct" default-entity-name="FixedAssetProduct" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="removeFixedAssetProduct" auth="true">
+ <service name="removeFixedAssetProduct" default-entity-name="FixedAssetProduct" engine="entity-auto" invoke="delete" auth="true">
<description>Remove Product From Fixed Asset</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
- <!-- TO BE REMOVED : Fixed Asset calendar
- <service name="updateFixedAssetCalendar" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="updateFixedAssetCalendar" auth="true">
- <description>Update the Capacity available of Calendar of a Fixed Asset information</description>
- <attribute name="fixedAssetId" type="Id" mode="IN" optional="false"/>
- <attribute name="exceptionDateStartTime" type="Timestamp" mode="IN" optional="false"/>
- <attribute name="exceptionCapacity" type="Timestamp" mode="IN" optional="false"/>
- <attribute name="capacity" type="BigDecimal" mode="IN" optional="true"/>
- </service>
- -->
-
<!-- FixedAssetStdCost -->
- <service name="createFixedAssetStdCost" default-entity-name="FixedAssetStdCost" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="createFixedAssetStdCost" auth="true">
+ <!-- TODO: we should cancel the existing costs of the same type with seca -->
+ <service name="createFixedAssetStdCost" default-entity-name="FixedAssetStdCost" engine="entity-auto" invoke="create" auth="true">
<description>Create a Fixed Asset Standard Cost</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="updateFixedAssetStdCost" default-entity-name="FixedAssetStdCost" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="updateFixedAssetStdCost" auth="true">
+ <service name="updateFixedAssetStdCost" default-entity-name="FixedAssetStdCost" engine="entity-auto" invoke="update" auth="true">
<description>Update a Fixed Asset Standard Cost</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -102,44 +83,38 @@ under the License.
</service>
<!-- FixedAssetIdent -->
- <service name="createFixedAssetIdent" default-entity-name="FixedAssetIdent" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="createFixedAssetIdent" auth="true">
+ <service name="createFixedAssetIdent" default-entity-name="FixedAssetIdent" engine="entity-auto" invoke="create" auth="true">
<description>Create a Fixed Asset Identification</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="updateFixedAssetIdent" default-entity-name="FixedAssetIdent" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="updateFixedAssetIdent" auth="true">
+ <service name="updateFixedAssetIdent" default-entity-name="FixedAssetIdent" engine="entity-auto" invoke="update" auth="true">
<description>Update a Fixed Asset Identification</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"/>
</service>
- <service name="removeFixedAssetIdent" default-entity-name="FixedAssetIdent" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="removeFixedAssetIdent" auth="true">
+ <service name="removeFixedAssetIdent" default-entity-name="FixedAssetIdent" engine="entity-auto" invoke="delete" auth="true">
<description>Remove a Fixed Asset Identification</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
<!-- Equipment Registration Create/Update/Delete-->
- <service name="createFixedAssetRegistration" default-entity-name="FixedAssetRegistration" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="createFixedAssetRegistration" auth="true">
+ <service name="createFixedAssetRegistration" default-entity-name="FixedAssetRegistration" engine="entity-auto" invoke="create" auth="true">
<description>Create a Fixed Asset Registration</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<override name="fromDate" optional="true"/>
</service>
- <service name="updateFixedAssetRegistration" default-entity-name="FixedAssetRegistration" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="updateFixedAssetRegistration" auth="true">
+ <service name="updateFixedAssetRegistration" default-entity-name="FixedAssetRegistration" engine="entity-auto" invoke="update" auth="true">
<description>Update a Fixed Asset Registration</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"/>
</service>
- <service name="deleteFixedAssetRegistration" default-entity-name="FixedAssetRegistration" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="deleteFixedAssetRegistration" auth="true">
+ <service name="deleteFixedAssetRegistration" default-entity-name="FixedAssetRegistration" engine="entity-auto" invoke="delete" auth="true">
<description>Delete a Fixed Asset Registration</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -164,8 +139,7 @@ under the License.
<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="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="deleteFixedAssetMaint" auth="true">
+ <service name="deleteFixedAssetMaint" default-entity-name="FixedAssetMaint" engine="entity-auto" invoke="delete" auth="true">
<description>Remove a Fixed Asset Maintenance</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -192,8 +166,7 @@ under the License.
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="deleteFixedAssetMeter" default-entity-name="FixedAssetMeter" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="deleteFixedAssetMeter" auth="true">
+ <service name="deleteFixedAssetMeter" default-entity-name="FixedAssetMeter" engine="entity-auto" invoke="delete" auth="true">
<description>Remove a Fixed Asset Maintenance Meter</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -209,33 +182,27 @@ under the License.
<attribute name="orderItemSeqId" type="String" mode="IN" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="deleteFixedAssetMaintOrder" default-entity-name="FixedAssetMaintOrder" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="deleteFixedAssetMaintOrder" auth="true">
+ <service name="deleteFixedAssetMaintOrder" default-entity-name="FixedAssetMaintOrder" engine="entity-auto" invoke="delete" auth="true">
<description>Remove a Fixed Asset Maintenance Order</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
<!-- =========Party Fixed Asset Assignment Services========= -->
- <service name="createPartyFixedAssetAssignment" engine="simple" default-entity-name="PartyFixedAssetAssignment"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="createPartyFixedAssetAssignment" auth="true">
+ <service name="createPartyFixedAssetAssignment" default-entity-name="PartyFixedAssetAssignment" engine="entity-auto" invoke="create" auth="true">
<description>Add Party to a Fixed Asset</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<override name="fromDate" optional="true"/>
</service>
-
- <service name="updatePartyFixedAssetAssignment" engine="simple" default-entity-name="PartyFixedAssetAssignment"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="updatePartyFixedAssetAssignment" auth="true">
+ <service name="updatePartyFixedAssetAssignment" default-entity-name="PartyFixedAssetAssignment" engine="entity-auto" invoke="update" auth="true">
<description>Update Party to Fixed Asset</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"/>
</service>
-
- <service name="deletePartyFixedAssetAssignment" engine="simple" default-entity-name="PartyFixedAssetAssignment"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="deletePartyFixedAssetAssignment" auth="true">
+ <service name="deletePartyFixedAssetAssignment" default-entity-name="PartyFixedAssetAssignment" engine="entity-auto" invoke="delete" auth="true">
<description>Delete Party to Fixed Asset</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -248,17 +215,17 @@ under the License.
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="deleteFixedAssetDepMethod" default-entity-name="FixedAssetDepMethod" engine="entity-auto" invoke="delete" auth="true">
- <description>Delete a Fixed Asset Depreciation Method</description>
- <permission-service service-name="fixedAssetPermissionCheck" main-action="DELETE"/>
- <auto-attributes include="pk" mode="IN" optional="false"/>
- </service>
<service name="updateFixedAssetDepMethod" default-entity-name="FixedAssetDepMethod" engine="entity-auto" invoke="update" auth="true">
<description>Create a Fixed Asset Depreciation Method</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"/>
</service>
+ <service name="deleteFixedAssetDepMethod" default-entity-name="FixedAssetDepMethod" engine="entity-auto" invoke="delete" auth="true">
+ <description>Delete a Fixed Asset Depreciation Method</description>
+ <permission-service service-name="fixedAssetPermissionCheck" main-action="DELETE"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
<service name="checkUpdateFixedAssetDepreciation" default-entity-name="AcctgTrans" engine="simple"
location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="checkUpdateFixedAssetDepreciation" auth="true">
<description>If the accounting transaction is a depreciation transaction for a fixed asset, update the depreciation amount in the FixedAsset entity.</description>
@@ -300,13 +267,13 @@ under the License.
<attribute name="nextDepreciationAmount" type="BigDecimal" mode="OUT" optional="true"/>
<attribute name="plannedPastDepreciationTotal" type="BigDecimal" mode="OUT" optional="true"/>
</service>
- <service name="createFixedAssetTypeGlAccount" engine="simple" default-entity-name="FixedAssetTypeGlAccount"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="createFixedAssetTypeGlAccount" auth="true">
+
+ <service name="createFixedAssetTypeGlAccount" default-entity-name="FixedAssetTypeGlAccount" engine="entity-auto" invoke="create" auth="true">
<description>Create a Fixed Asset Type Gl Account Mapping</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
- <attribute name="fixedAssetTypeId" type="String" mode="IN" optional="true"/>
- <attribute name="fixedAssetId" type="String" mode="IN" optional="true"/>
+ <attribute name="fixedAssetTypeId" type="String" mode="IN" optional="true" default-value="_NA_"/>
+ <attribute name="fixedAssetId" type="String" mode="IN" optional="true" default-value="_NA_"/>
<attribute name="organizationPartyId" type="String" mode="IN" optional="false"/>
</service>
<service name="deleteFixedAssetTypeGlAccount" default-entity-name="FixedAssetTypeGlAccount" engine="entity-auto" invoke="delete" auth="true">