svn commit: r1650975 - in /ofbiz/trunk/applications/accounting: script/org/ofbiz/accounting/agreement/AgreementServices.xml servicedef/services_agreement.xml

[nmalin]

Author: nmalin
Date: Sun Jan 11 21:37:26 2015
New Revision: 1650975

URL: http://svn.apache.org/r1650975
Log:
OFBIZ-5955 Convert Agreement entites CRUD service from simple to entity-auto
Convert the CRUD service for entities : Agreement,AgreementItem,AgreementPromoAppl,AgreementProductAppl,AgreementPartyApplic,AgreementGeographicalApplic,AgreementRole,AgreementWorkEffortApplic

Modified:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
    ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml?rev=1650975&r1=1650974&r2=1650975&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml Sun Jan 11 21:37:26 2015
@@ -25,36 +25,6 @@ under the License.
     <!-- Agreement Services -->
     <!-- ================================================================ -->
 
-    <!-- create a new Agreement -->
-    <simple-method method-name="createAgreement" short-description="Create an Agreement">
-        <!-- create new entity and create all the fields -->
-        <make-value value-field="newEntity" entity-name="Agreement"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-
-        <!-- create a non existing ID -->
-        <sequenced-id sequence-name="Agreement" field="agreementId"/>
-        <set from-field="agreementId" field="newEntity.agreementId"/>
-        <field-to-result field="agreementId" result-name="agreementId"/>
-
-        <if-empty field="newEntity.fromDate">
-            <now-timestamp field="nowTimestamp"/>
-            <set from-field="nowTimestamp" field="newEntity.fromDate"/>
-        </if-empty>
-
-        <!-- finally create the record (should not exist already)-->
-        <create-value value-field="newEntity"/>
-        <check-errors/>
-    </simple-method>
-
-    <!-- update an existing Agreement -->
-    <simple-method method-name="updateAgreement" short-description="Update an existing Agreement">
-        <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
-        <check-errors/>
-        <set-nonpk-fields map="parameters" value-field="agreement"/>
-        <store-value value-field="agreement"/>
-        <check-errors/>
-    </simple-method>
-
     <!-- cancel an existing Agreement -->
     <simple-method method-name="cancelAgreement" short-description="Cancel an existing Agreement">
         <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
@@ -120,220 +90,4 @@ under the License.
         <field-to-result field="agreementIdTo" result-name="agreementId"/>
     </simple-method>
 
-    <!-- create a new AgreementItem -->
-    <simple-method method-name="createAgreementItem" short-description="Create an AgreementItem">
-        <!-- create new entity and create all the fields -->
-        <make-value value-field="newEntity" entity-name="AgreementItem"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-
-        <set from-field="parameters.agreementId" field="newEntity.agreementId"/>
-        <!-- create a non existing ID -->
-        <if-empty field="parameters.agreementItemSeqId">
-            <make-next-seq-id value-field="newEntity" seq-field-name="agreementItemSeqId"/>
-            <set from-field="agreementItemSeqId" field="newEntity.agreementItemSeqId"/>
-        <else>
-            <set from-field="parameters.agreementItemSeqId" field="newEntity.agreementItemSeqId"/>
-        </else>
-        </if-empty>
-        <field-to-result field="newEntity.agreementId" result-name="agreementId"/>
-        <field-to-result field="newEntity.agreementItemSeqId" result-name="agreementItemSeqId"/>
-
-        <!-- finally create the record (should not exist already)-->
-        <create-value value-field="newEntity"/>
-        <check-errors/>
-    </simple-method>
-
-    <!-- update an existing AgreementItem -->
-    <simple-method method-name="updateAgreementItem" short-description="Update an existing AgreementItem">
-        <entity-one entity-name="AgreementItem" value-field="agreementItem" auto-field-map="true"/>
-        <check-errors/>
-        <set-nonpk-fields map="parameters" value-field="agreementItem"/>
-        <store-value value-field="agreementItem"/>
-        <check-errors/>
-    </simple-method>
-
-    <!-- remove an AgreementItem -->
-    <simple-method method-name="removeAgreementItem" short-description="Remove an AgreementItem">
-        <entity-one entity-name="AgreementItem" value-field="agreementItem" auto-field-map="true"/>
-        <check-errors/>
-        <remove-value value-field="agreementItem"/>
-    </simple-method>
-
-    <!-- create a new AgreementTerm -->
-    <simple-method method-name="createAgreementTerm" short-description="Create an AgreementTerm">
-        <!-- create new entity and create all the fields -->
-        <make-value value-field="newEntity" entity-name="AgreementTerm"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-
-        <!-- create a non existing ID -->
-        <sequenced-id sequence-name="AgreementTerm" field="agreementTermId"/>
-        <set from-field="parameters.agreementId" field="newEntity.agreementId"/>
-        <set from-field="parameters.agreementItemSeqId" field="newEntity.agreementItemSeqId"/>
-        <set from-field="agreementTermId" field="newEntity.agreementTermId"/>
-        <field-to-result field="agreementTermId" result-name="agreementTermId"/>
-
-        <!-- finally create the record (should not exist already)-->
-        <create-value value-field="newEntity"/>
-        <check-errors/>
-    </simple-method>
-
-    <!-- update an existing AgreementTerm -->
-    <simple-method method-name="updateAgreementTerm" short-description="Update an existing AgreementTerm">
-        <entity-one entity-name="AgreementTerm" value-field="agreementTerm" auto-field-map="true"/>
-        <check-errors/>
-        <set-nonpk-fields map="parameters" value-field="agreementTerm"/>
-        <store-value value-field="agreementTerm"/>
-        <check-errors/>
-    </simple-method>
-
-    <!-- delete an existing AgreementTerm -->
-    <simple-method method-name="deleteAgreementTerm" short-description="Delete an existing AgreementTerm">
-        <entity-one entity-name="AgreementTerm" value-field="agreementTerm" auto-field-map="true"/>
-        <check-errors/>
-        <remove-value value-field="agreementTerm"/>
-        <check-errors/>
-    </simple-method>
-
-    <!-- create a new AgreementPromoAppl -->
-    <simple-method method-name="createAgreementPromoAppl" short-description="Create an AgreementPromoAppl">
-        <make-value value-field="newEntity" entity-name="AgreementPromoAppl"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-        <check-errors/>
-    </simple-method>
-
-    <!-- update an existing AgreementPromoAppl -->
-    <simple-method method-name="updateAgreementPromoAppl" short-description="Update an existing AgreementPromoAppl">
-        <entity-one entity-name="AgreementPromoAppl" value-field="agreementPromoAppl" auto-field-map="true"/>
-        <check-errors/>
-        <set-nonpk-fields map="parameters" value-field="agreementPromoAppl"/>
-        <store-value value-field="agreementPromoAppl"/>
-        <check-errors/>
-    </simple-method>
-
-    <!-- remove an existing AgreementPromoAppl -->
-    <simple-method method-name="removeAgreementPromoAppl" short-description="Remove an existing AgreementPromoAppl">
-        <entity-one entity-name="AgreementPromoAppl" value-field="agreementPromoAppl" auto-field-map="true"/>
-        <check-errors/>
-        <remove-value value-field="agreementPromoAppl"/>
-        <check-errors/>
-    </simple-method>
-
-    <!-- create a new AgreementProductAppl -->
-    <simple-method method-name="createAgreementProductAppl" short-description="Create an AgreementProductAppl">
-        <make-value value-field="newEntity" entity-name="AgreementProductAppl"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-        <check-errors/>
-    </simple-method>
-
-    <!-- update an existing AgreementProductAppl -->
-    <simple-method method-name="updateAgreementProductAppl" short-description="Update an existing AgreementProductAppl">
-        <entity-one entity-name="AgreementProductAppl" value-field="agreementProductAppl" auto-field-map="true"/>
-        <check-errors/>
-        <set-nonpk-fields map="parameters" value-field="agreementProductAppl"/>
-        <store-value value-field="agreementProductAppl"/>
-        <check-errors/>
-    </simple-method>
-
-    <!-- remove an existing AgreementProductAppl -->
-    <simple-method method-name="removeAgreementProductAppl" short-description="Remove an existing AgreementProductAppl">
-        <entity-one entity-name="AgreementProductAppl" value-field="agreementProductAppl" auto-field-map="true"/>
-        <check-errors/>
-        <remove-value value-field="agreementProductAppl"/>
-        <check-errors/>
-    </simple-method>
-
-    <!-- create a new AgreementPartyApplic -->
-    <simple-method method-name="createAgreementPartyApplic" short-description="Create an AgreementPartyApplic">
-        <make-value value-field="newEntity" entity-name="AgreementPartyApplic"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-        <check-errors/>
-    </simple-method>
-
-    <!-- update an existing AgreementPartyApplic -->
-    <simple-method method-name="updateAgreementPartyApplic" short-description="Update an existing AgreementPartyApplic">
-        <entity-one entity-name="AgreementPartyApplic" value-field="agreementPartyApplic" auto-field-map="true"/>
-        <check-errors/>
-        <set-nonpk-fields map="parameters" value-field="agreementPartyApplic"/>
-        <store-value value-field="agreementPartyApplic"/>
-        <check-errors/>
-    </simple-method>
-
-    <!-- remove an existing AgreementPartyApplic -->
-    <simple-method method-name="removeAgreementPartyApplic" short-description="Remove an existing AgreementPartyApplic">
-        <entity-one entity-name="AgreementPartyApplic" value-field="agreementPartyApplic" auto-field-map="true"/>
-        <check-errors/>
-        <remove-value value-field="agreementPartyApplic"/>
-        <check-errors/>
-    </simple-method>
-
-    <!-- create a new AgreementGeographicalApplic -->
-    <simple-method method-name="createAgreementGeographicalApplic" short-description="Create an AgreementGeographicalApplic">
-        <make-value value-field="newEntity" entity-name="AgreementGeographicalApplic"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-        <check-errors/>
-    </simple-method>
-
-    <!-- update an existing AgreementGeographicalApplic -->
-    <simple-method method-name="updateAgreementGeographicalApplic" short-description="Update an existing AgreementGeographicalApplic">
-        <entity-one entity-name="AgreementGeographicalApplic" value-field="agreementGeographicalApplic" auto-field-map="true"/>
-        <check-errors/>
-        <set-nonpk-fields map="parameters" value-field="agreementGeographicalApplic"/>
-        <store-value value-field="agreementGeographicalApplic"/>
-        <check-errors/>
-    </simple-method>
-
-    <!-- remove an existing AgreementGeographicalApplic -->
-    <simple-method method-name="removeAgreementGeographicalApplic" short-description="Remove an existing AgreementGeographicalApplic">
-        <entity-one entity-name="AgreementGeographicalApplic" value-field="agreementGeographicalApplic" auto-field-map="true"/>
-        <check-errors/>
-        <remove-value value-field="agreementGeographicalApplic"/>
-        <check-errors/>
-    </simple-method>
-
-    <!-- Agreement Role -->
-    <simple-method method-name="createAgreementRole" short-description="Create an Agreement Role">
-        <make-value entity-name="AgreementRole" value-field="newEntity"/>
-        <set-pk-fields value-field="newEntity" map="parameters"/>
-        <set-nonpk-fields value-field="newEntity" map="parameters"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-
-    <simple-method method-name="updateAgreementRole" short-description="Update an Agreement Role">
-        <entity-one entity-name="AgreementRole" value-field="lookedUpValue"/>
-        <set-pk-fields value-field="lookedUpValue" map="parameters"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <simple-method method-name="deleteAgreementRole" short-description="Delete an Agreement Role">
-        <entity-one entity-name="AgreementRole" value-field="agreementRole"/>
-        <remove-value value-field="agreementRole"/>
-    </simple-method>
-
-    <!--AgreementWorkEffortApplic-->
-    <simple-method method-name="createAgreementWorkEffortApplic" short-description="Create a link between a WorkEffort and a Agreement Appl">
-        <entity-one entity-name="AgreementWorkEffortApplic" value-field="agreementWorkEffortApplic"/>
-        <if-not-empty field="agreementWorkEffortApplic">
-            <add-error><fail-property resource="AccountingUiLabels" property="AccountingAgreementWorkEffortApplicAlreadyExists"/></add-error>
-            <check-errors/>
-        <else>
-            <make-value value-field="newEntity" entity-name="AgreementWorkEffortApplic"/>
-            <set-pk-fields map="parameters" value-field="newEntity"/>
-            <create-value value-field="newEntity"/>
-        </else>
-        </if-not-empty>
-    </simple-method>
-
-    <simple-method method-name="deleteAgreementWorkEffortApplic" short-description="Remove a link between a WorkEffort and a Agreement Appl">
-        <entity-one entity-name="AgreementWorkEffortApplic" value-field="agreementWorkEffortApplic"/>
-        <remove-value value-field="agreementWorkEffortApplic"/>
-    </simple-method>
-
 </simple-methods>

Modified: ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml?rev=1650975&r1=1650974&r2=1650975&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml Sun Jan 11 21:37:26 2015
@@ -24,16 +24,14 @@ under the License.
     <version>1.0</version>
 
     <!-- Agreement  -->
-    <service name="createAgreement" default-entity-name="Agreement" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="createAgreement" auth="true">
+    <service name="createAgreement" default-entity-name="Agreement" engine="entity-auto" invoke="create" auth="true">
         <description>Create an Agreement</description>
         <permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <auto-attributes include="pk" mode="OUT" optional="true"/>
         <override name="textData" allow-html="any"/>
     </service>
-    <service name="updateAgreement" default-entity-name="Agreement" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="updateAgreement" auth="true">
+    <service name="updateAgreement" default-entity-name="Agreement" engine="entity-auto" invoke="update" auth="true">
         <description>Update an Agreement</description>
         <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
@@ -59,97 +57,85 @@ under the License.
     </service>
 
     <!-- AgreementItem  -->
-    <service name="createAgreementItem" default-entity-name="AgreementItem" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="createAgreementItem" auth="true">
+    <service name="createAgreementItem" default-entity-name="AgreementItem" engine="entity-auto" invoke="create" auth="true">
         <description>Create an AgreementItem</description>
         <permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/>
         <auto-attributes include="pk" mode="INOUT" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="agreementText" allow-html="any"/>
     </service>
-    <service name="updateAgreementItem" default-entity-name="AgreementItem" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="updateAgreementItem" auth="true">
+    <service name="updateAgreementItem" default-entity-name="AgreementItem" engine="entity-auto" invoke="update" auth="true">
         <description>Update an AgreementItem</description>
         <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="agreementText" allow-html="any"/>
     </service>
-    <service name="removeAgreementItem" default-entity-name="AgreementItem" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="removeAgreementItem" auth="true">
+    <service name="removeAgreementItem" default-entity-name="AgreementItem" engine="entity-auto" invoke="delete" auth="true">
         <description>Remove an AgreementItem</description>
-        <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
+        <permission-service service-name="acctgAgreementPermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="INOUT" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <!-- AgreementTerm  -->
-    <service name="createAgreementTerm" default-entity-name="AgreementTerm" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="createAgreementTerm" auth="true">
+    <service name="createAgreementTerm" default-entity-name="AgreementTerm" engine="entity-auto" invoke="create" auth="true">
         <description>Create an AgreementTerm</description>
         <permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/>
         <auto-attributes include="pk" mode="INOUT" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="textValue" allow-html="any"/>
     </service>
-    <service name="updateAgreementTerm" default-entity-name="AgreementTerm" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="updateAgreementTerm" auth="true">
+    <service name="updateAgreementTerm" default-entity-name="AgreementTerm" engine="entity-auto" invoke="update" auth="true">
         <description>Update an AgreementTerm</description>
         <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="textValue" allow-html="any"/>
     </service>
-    <service name="deleteAgreementTerm" default-entity-name="AgreementTerm" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="deleteAgreementTerm" auth="true">
+    <service name="deleteAgreementTerm" default-entity-name="AgreementTerm" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete an AgreementTerm</description>
-        <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
+        <permission-service service-name="acctgAgreementPermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <!-- AgreementPromoAppl  -->
-    <service name="createAgreementPromoAppl" default-entity-name="AgreementPromoAppl" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="createAgreementPromoAppl" auth="true">
+    <service name="createAgreementPromoAppl" default-entity-name="AgreementPromoAppl" engine="entity-auto" invoke="create" auth="true">
         <description>Create an AgreementPromoAppl</description>
         <permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateAgreementPromoAppl" default-entity-name="AgreementPromoAppl" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="updateAgreementPromoAppl" auth="true">
+    <service name="updateAgreementPromoAppl" default-entity-name="AgreementPromoAppl" engine="entity-auto" invoke="update" auth="true">
         <description>Update an AgreementPromoAppl</description>
         <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeAgreementPromoAppl" default-entity-name="AgreementPromoAppl" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="removeAgreementPromoAppl" auth="true">
+    <service name="removeAgreementPromoAppl" default-entity-name="AgreementPromoAppl" engine="entity-auto" invoke="delete" auth="true">
         <description>Remove an AgreementPromoAppl</description>
-        <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
+        <permission-service service-name="acctgAgreementPermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <!-- AgreementProductAppl  -->
-    <service name="createAgreementProductAppl" default-entity-name="AgreementProductAppl" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="createAgreementProductAppl" auth="true">
+    <service name="createAgreementProductAppl" default-entity-name="AgreementProductAppl" engine="entity-auto" invoke="create" auth="true">
         <description>Create an AgreementProductAppl</description>
         <permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateAgreementProductAppl" default-entity-name="AgreementProductAppl" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="updateAgreementProductAppl" auth="true">
+    <service name="updateAgreementProductAppl" default-entity-name="AgreementProductAppl" engine="entity-auto" invoke="update" auth="true">
         <description>Update an AgreementProductAppl</description>
         <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeAgreementProductAppl" default-entity-name="AgreementProductAppl" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="removeAgreementProductAppl" auth="true">
+    <service name="removeAgreementProductAppl" default-entity-name="AgreementProductAppl" engine="entity-auto" invoke="delete" auth="true">
         <description>Remove an AgreementProductAppl</description>
-        <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
+        <permission-service service-name="acctgAgreementPermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
@@ -169,72 +155,63 @@ under the License.
     </service>
     <service name="removeAgreementFacilityAppl" default-entity-name="AgreementFacilityAppl" engine="entity-auto" invoke="delete" auth="true">
         <description>Remove an AgreementFacilityAppl</description>
-        <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
+        <permission-service service-name="acctgAgreementPermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <!-- AgreementPartyApplic  -->
-    <service name="createAgreementPartyApplic" default-entity-name="AgreementPartyApplic" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="createAgreementPartyApplic" auth="true">
+    <service name="createAgreementPartyApplic" default-entity-name="AgreementPartyApplic" engine="entity-auto" invoke="create" auth="true">
         <description>Create an AgreementPartyApplic</description>
         <permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateAgreementPartyApplic" default-entity-name="AgreementPartyApplic" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="updateAgreementPartyApplic" auth="true">
+    <service name="updateAgreementPartyApplic" default-entity-name="AgreementPartyApplic" engine="entity-auto" invoke="update" auth="true">
         <description>Update an AgreementPartyApplic</description>
         <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeAgreementPartyApplic" default-entity-name="AgreementPartyApplic" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="removeAgreementPartyApplic" auth="true">
+    <service name="removeAgreementPartyApplic" default-entity-name="AgreementPartyApplic" engine="entity-auto" invoke="delete" auth="true">
         <description>Remove an AgreementPartyApplic</description>
-        <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
+        <permission-service service-name="acctgAgreementPermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <!-- AgreementGeographicalApplic  -->
-    <service name="createAgreementGeographicalApplic" default-entity-name="AgreementGeographicalApplic" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="createAgreementGeographicalApplic" auth="true">
+    <service name="createAgreementGeographicalApplic" default-entity-name="AgreementGeographicalApplic" engine="entity-auto" invoke="create" auth="true">
         <description>Create an AgreementGeographicalApplic</description>
         <permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateAgreementGeographicalApplic" default-entity-name="AgreementGeographicalApplic" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="updateAgreementGeographicalApplic" auth="true">
+    <service name="updateAgreementGeographicalApplic" default-entity-name="AgreementGeographicalApplic" engine="entity-auto" invoke="update" auth="true">
         <description>Update an AgreementGeographicalApplic</description>
         <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeAgreementGeographicalApplic" default-entity-name="AgreementGeographicalApplic" engine="simple"
-                location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="removeAgreementGeographicalApplic" auth="true">
+    <service name="removeAgreementGeographicalApplic" default-entity-name="AgreementGeographicalApplic" engine="entity-auto" invoke="delete" auth="true">
         <description>Remove an AgreementGeographicalApplic</description>
-        <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
+        <permission-service service-name="acctgAgreementPermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <!-- AgreementRole -->
-   <service name="createAgreementRole" default-entity-name="AgreementRole" engine="simple"
-            location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="createAgreementRole" auth="true">
+   <service name="createAgreementRole" default-entity-name="AgreementRole" engine="entity-auto" invoke="create" auth="true">
         <description>Create an Agreement Role</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
     </service>
-    <service name="updateAgreementRole" default-entity-name="AgreementRole" engine="simple"
-            location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="updateAgreementRole" auth="true">
+    <service name="updateAgreementRole" default-entity-name="AgreementRole" engine="entity-auto" invoke="update" auth="true">
         <description>Update an Agreement Role</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
     </service>
-    <service name="deleteAgreementRole" default-entity-name="AgreementRole" engine="simple"
-            location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="deleteAgreementRole" auth="true">
+    <service name="deleteAgreementRole" default-entity-name="AgreementRole" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete an Agreement Role</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>
@@ -263,14 +240,12 @@ under the License.
     </service>
 
     <!--AgrementWorkEffortApplic-->
-    <service name="createAgreementWorkEffortApplic" engine="simple" default-entity-name="AgreementWorkEffortApplic"
-            location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="createAgreementWorkEffortApplic">
+    <service name="createAgreementWorkEffortApplic" default-entity-name="AgreementWorkEffortApplic" engine="entity-auto" invoke="create" auth="true">
         <description> Create AgreementWorkEffortApplic </description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
-        <override name="agreementItemSeqId" default-value="_NA_"></override>
+        <override name="agreementItemSeqId" default-value="_NA_"/>
     </service>
-    <service name="deleteAgreementWorkEffortApplic" engine="simple" default-entity-name="AgreementWorkEffortApplic"
-            location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="deleteAgreementWorkEffortApplic">
+    <service name="deleteAgreementWorkEffortApplic" default-entity-name="AgreementWorkEffortApplic" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete AgreementWorkEffortApplic</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>