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 2016/01/22 22:57:49 UTC

svn commit: r1726327 - in /ofbiz/trunk/applications/accounting: script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml servicedef/services_tax.xml

Author: nmalin
Date: Fri Jan 22 21:57:48 2016
New Revision: 1726327

URL: http://svn.apache.org/viewvc?rev=1726327&view=rev
Log:
I converted simple crud service to entity-auto for following entites  :
 * TaxAuthority
 * TaxAuthorityAssoc
 * TaxAuthorityCategory (not remove)
 * TaxAuthorityGlAccount
 * TaxAuthorityRateProduct

I also move the permission check to the service definition.
related issue OFBIZ-6851

Modified:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml
    ofbiz/trunk/applications/accounting/servicedef/services_tax.xml

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml?rev=1726327&r1=1726326&r2=1726327&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml Fri Jan 22 21:57:48 2016
@@ -21,108 +21,8 @@ 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">
 
-    <!-- TaxAuthority methods -->
-    <simple-method method-name="createTaxAuthority" short-description="create a TaxAuthority">
-        <set value="_CREATE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}">
-            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="TaxAuthority" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateTaxAuthority" short-description="update a TaxAuthority">
-        <set value="_UPDATE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}">
-            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <entity-one entity-name="TaxAuthority" value-field="lookedUpValue"/>
-        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteTaxAuthority" short-description="delete a TaxAuthority">
-        <set value="_DELETE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}">
-            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <entity-one entity-name="TaxAuthority" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- TaxAuthorityAssoc methods -->
-    <simple-method method-name="createTaxAuthorityAssoc" short-description="create a TaxAuthorityAssoc">
-        <set value="_CREATE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}">
-            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="TaxAuthorityAssoc" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateTaxAuthorityAssoc" short-description="update a TaxAuthorityAssoc">
-        <set value="_UPDATE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}">
-            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <entity-one entity-name="TaxAuthorityAssoc" value-field="lookedUpValue"/>
-        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteTaxAuthorityAssoc" short-description="delete a TaxAuthorityAssoc">
-        <set value="_DELETE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}">
-            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <entity-one entity-name="TaxAuthorityAssoc" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
     <!-- TaxAuthorityCategory methods -->
-    <simple-method method-name="createTaxAuthorityCategory" short-description="create a TaxAuthorityCategory">
-        <set value="_CREATE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}">
-            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="TaxAuthorityCategory" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateTaxAuthorityCategory" short-description="update a TaxAuthorityCategory">
-        <set value="_UPDATE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}">
-            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <entity-one entity-name="TaxAuthorityCategory" value-field="lookedUpValue"/>
-        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
     <simple-method method-name="deleteTaxAuthorityCategory" short-description="delete a TaxAuthorityCategory">
-        <set value="_DELETE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}">
-            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
         <set field="taxAuthorityRateProductMap.taxAuthGeoId" from-field="parameters.taxAuthGeoId"/>
         <set field="taxAuthorityRateProductMap.taxAuthPartyId" from-field="parameters.taxAuthPartyId"/>
         <set field="taxAuthorityRateProductMap.productCategoryId" from-field="parameters.productCategoryId"/>
@@ -139,89 +39,8 @@ under the License.
         <check-errors/>
     </simple-method>
 
-    <!-- TaxAuthorityGlAccount methods -->
-    <simple-method method-name="createTaxAuthorityGlAccount" short-description="create a TaxAuthorityGlAccount">
-        <set value="_CREATE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}">
-            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="TaxAuthorityGlAccount" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateTaxAuthorityGlAccount" short-description="update a TaxAuthorityGlAccount">
-        <set value="_UPDATE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}">
-            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <entity-one entity-name="TaxAuthorityGlAccount" value-field="lookedUpValue"/>
-        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteTaxAuthorityGlAccount" short-description="delete a TaxAuthorityGlAccount">
-        <set value="_DELETE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}">
-            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <entity-one entity-name="TaxAuthorityGlAccount" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- TaxAuthorityRateProduct methods -->
-    <simple-method method-name="createTaxAuthorityRateProduct" short-description="create a TaxAuthorityRateProduct">
-        <set value="_CREATE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}">
-            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value entity-name="TaxAuthorityRateProduct" value-field="newEntity"/>
-        <sequenced-id sequence-name="TaxAuthorityRateProduct" field="newEntity.taxAuthorityRateSeqId"/>
-        <field-to-result field="newEntity.taxAuthorityRateSeqId" result-name="taxAuthorityRateSeqId"/>
-
-        <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>
-    <simple-method method-name="updateTaxAuthorityRateProduct" short-description="update a TaxAuthorityRateProduct">
-        <set value="_UPDATE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}">
-            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <entity-one entity-name="TaxAuthorityRateProduct" value-field="lookedUpValue"/>
-        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteTaxAuthorityRateProduct" short-description="delete a TaxAuthorityRateProduct">
-        <set value="_DELETE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}">
-            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <entity-one entity-name="TaxAuthorityRateProduct" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-
     <!-- PartyTaxAuthInfo methods -->
     <simple-method method-name="createPartyTaxAuthInfo" short-description="create a PartyTaxAuthInfo">
-        <set value="_CREATE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}">
-            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
-        </check-permission>
-
         <call-simple-method method-name="validatePartyTaxIdInline"/>
 
         <!-- done checking preliminary constraints, see if there are any errors -->
@@ -235,11 +54,6 @@ under the License.
         <create-value value-field="newEntity"/>
     </simple-method>
     <simple-method method-name="updatePartyTaxAuthInfo" short-description="update a PartyTaxAuthInfo">
-        <set value="_UPDATE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}">
-            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
-        </check-permission>
-
         <call-simple-method method-name="validatePartyTaxIdInline"/>
 
         <!-- done checking preliminary constraints, see if there are any errors -->
@@ -269,17 +83,6 @@ under the License.
         </if>
     </simple-method>
 
-    <simple-method method-name="deletePartyTaxAuthInfo" short-description="delete a PartyTaxAuthInfo">
-        <set value="_DELETE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}">
-            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <entity-one entity-name="PartyTaxAuthInfo" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
     <simple-method method-name="createCustomerTaxAuthInfo" short-description="Create a Customer PartyTaxAuthInfo">
         <call-bsh><![CDATA[
             taxAuthPartyGeoIds = parameters.get("taxAuthPartyGeoIds");

Modified: ofbiz/trunk/applications/accounting/servicedef/services_tax.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_tax.xml?rev=1726327&r1=1726326&r2=1726327&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_tax.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_tax.xml Fri Jan 22 21:57:48 2016
@@ -68,110 +68,107 @@ under the License.
     </service>
 
     <!-- TaxAuthority -->
-    <service name="createTaxAuthority" default-entity-name="TaxAuthority" engine="simple" auth="true"
-        location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="createTaxAuthority">
+    <service name="createTaxAuthority" default-entity-name="TaxAuthority" engine="entity-auto" invoke="create" auth="true">
         <description>Create TaxAuthority</description>
+        <permission-service service-name="acctgBasePermissionCheck" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateTaxAuthority" default-entity-name="TaxAuthority" engine="simple" auth="true"
-        location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="updateTaxAuthority">
+    <service name="updateTaxAuthority" default-entity-name="TaxAuthority" engine="entity-auto" invoke="update" auth="true">
         <description>Update TaxAuthority</description>
+        <permission-service service-name="acctgBasePermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteTaxAuthority" default-entity-name="TaxAuthority" engine="simple" auth="true"
-        location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="deleteTaxAuthority">
+    <service name="deleteTaxAuthority" default-entity-name="TaxAuthority" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete TaxAuthority</description>
+        <permission-service service-name="acctgBasePermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <!-- TaxAuthorityAssoc -->
-    <service name="createTaxAuthorityAssoc" default-entity-name="TaxAuthorityAssoc" engine="simple" auth="true"
-        location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="createTaxAuthorityAssoc">
+    <service name="createTaxAuthorityAssoc" default-entity-name="TaxAuthorityAssoc" engine="entity-auto" invoke="create" auth="true">
         <description>Create TaxAuthorityAssoc</description>
+        <permission-service service-name="acctgBasePermissionCheck" 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="updateTaxAuthorityAssoc" default-entity-name="TaxAuthorityAssoc" engine="simple" auth="true"
-        location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="updateTaxAuthorityAssoc">
+    <service name="updateTaxAuthorityAssoc" default-entity-name="TaxAuthorityAssoc" engine="entity-auto" invoke="update" auth="true">
         <description>Update TaxAuthorityAssoc</description>
+        <permission-service service-name="acctgBasePermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteTaxAuthorityAssoc" default-entity-name="TaxAuthorityAssoc" engine="simple" auth="true"
-        location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="deleteTaxAuthorityAssoc">
+    <service name="deleteTaxAuthorityAssoc" default-entity-name="TaxAuthorityAssoc" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete TaxAuthorityAssoc</description>
+        <permission-service service-name="acctgBasePermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <!-- TaxAuthorityCategory -->
-    <service name="createTaxAuthorityCategory" default-entity-name="TaxAuthorityCategory" engine="simple" auth="true"
-        location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="createTaxAuthorityCategory">
+    <service name="createTaxAuthorityCategory" default-entity-name="TaxAuthorityCategory" engine="entity-auto" invoke="create" auth="true">
         <description>Create TaxAuthorityCategory</description>
+        <permission-service service-name="acctgBasePermissionCheck" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateTaxAuthorityCategory" default-entity-name="TaxAuthorityCategory" engine="simple" auth="true"
-        location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="updateTaxAuthorityCategory">
+    <service name="updateTaxAuthorityCategory" default-entity-name="TaxAuthorityCategory" engine="entity-auto" invoke="update" auth="true">
         <description>Update TaxAuthorityCategory</description>
+        <permission-service service-name="acctgBasePermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="deleteTaxAuthorityCategory" default-entity-name="TaxAuthorityCategory" engine="simple" auth="true"
         location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="deleteTaxAuthorityCategory">
         <description>Delete TaxAuthorityCategory</description>
+        <permission-service service-name="acctgBasePermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <!-- TaxAuthorityGlAccount -->
-    <service name="createTaxAuthorityGlAccount" default-entity-name="TaxAuthorityGlAccount" engine="simple" auth="true"
-        location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="createTaxAuthorityGlAccount">
+    <service name="createTaxAuthorityGlAccount" default-entity-name="TaxAuthorityGlAccount" engine="entity-auto" invoke="create" auth="true">
         <description>Create TaxAuthorityGlAccount</description>
+        <permission-service service-name="acctgBasePermissionCheck" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateTaxAuthorityGlAccount" default-entity-name="TaxAuthorityGlAccount" engine="simple" auth="true"
-        location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="updateTaxAuthorityGlAccount">
+    <service name="updateTaxAuthorityGlAccount" default-entity-name="TaxAuthorityGlAccount" engine="entity-auto" invoke="update" auth="true">
         <description>Update TaxAuthorityGlAccount</description>
+        <permission-service service-name="acctgBasePermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteTaxAuthorityGlAccount" default-entity-name="TaxAuthorityGlAccount" engine="simple" auth="true"
-        location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="deleteTaxAuthorityGlAccount">
+    <service name="deleteTaxAuthorityGlAccount" default-entity-name="TaxAuthorityGlAccount" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete TaxAuthorityGlAccount</description>
+        <permission-service service-name="acctgBasePermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <!-- TaxAuthorityRateProduct -->
-    <service name="createTaxAuthorityRateProduct" default-entity-name="TaxAuthorityRateProduct" engine="simple" auth="true"
-        location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="createTaxAuthorityRateProduct">
+    <service name="createTaxAuthorityRateProduct" default-entity-name="TaxAuthorityRateProduct" engine="entity-auto" invoke="create" auth="true">
         <description>Create TaxAuthorityRateProduct</description>
+        <permission-service service-name="acctgBasePermissionCheck" main-action="CREATE"/>
         <auto-attributes include="pk" mode="OUT" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateTaxAuthorityRateProduct" default-entity-name="TaxAuthorityRateProduct" engine="simple" auth="true"
-        location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="updateTaxAuthorityRateProduct">
+    <service name="updateTaxAuthorityRateProduct" default-entity-name="TaxAuthorityRateProduct" engine="entity-auto" invoke="update" auth="true">
         <description>Update TaxAuthorityRateProduct</description>
+        <permission-service service-name="acctgBasePermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteTaxAuthorityRateProduct" default-entity-name="TaxAuthorityRateProduct" engine="simple" auth="true"
-        location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="deleteTaxAuthorityRateProduct">
+    <service name="deleteTaxAuthorityRateProduct" default-entity-name="TaxAuthorityRateProduct" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete TaxAuthorityRateProduct</description>
+        <permission-service service-name="acctgBasePermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <!-- PartyTaxAuthInfo -->
     <service name="createPartyTaxAuthInfo" default-entity-name="PartyTaxAuthInfo" engine="simple" auth="true"
         location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="createPartyTaxAuthInfo">
         <description>Create PartyTaxAuthInfo</description>
+        <permission-service service-name="acctgBasePermissionCheck" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="fromDate" optional="true"/>
@@ -179,14 +176,14 @@ under the License.
     <service name="updatePartyTaxAuthInfo" default-entity-name="PartyTaxAuthInfo" engine="simple" auth="true"
         location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="updatePartyTaxAuthInfo">
         <description>Update PartyTaxAuthInfo</description>
+        <permission-service service-name="acctgBasePermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deletePartyTaxAuthInfo" default-entity-name="PartyTaxAuthInfo" engine="simple" auth="true"
-        location="component://accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml" invoke="deletePartyTaxAuthInfo">
+    <service name="deletePartyTaxAuthInfo" default-entity-name="PartyTaxAuthInfo" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete PartyTaxAuthInfo</description>
+        <permission-service service-name="acctgBasePermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <service name="createCustomerTaxAuthInfo" default-entity-name="PartyTaxAuthInfo" engine="simple" auth="true"