You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2010/12/21 19:48:55 UTC
svn commit: r1051608 [2/2] - in /ofbiz/trunk/applications/accounting:
config/ script/org/ofbiz/accounting/finaccount/
script/org/ofbiz/accounting/fixedasset/
script/org/ofbiz/accounting/invoice/ script/org/ofbiz/accounting/ledger/
script/org/ofbiz/acco...
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=1051608&r1=1051607&r2=1051608&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 Tue Dec 21 18:48:54 2010
@@ -24,7 +24,9 @@ under the License.
<!-- 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-permission permission="ACCOUNTING" action="${securityAction}">
+ <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="TaxAuthority" value-field="newEntity"/>
@@ -34,7 +36,9 @@ under the License.
</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-permission permission="ACCOUNTING" action="${securityAction}">
+ <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+ </check-permission>
<check-errors/>
<entity-one entity-name="TaxAuthority" value-field="lookedUpValue"/>
@@ -43,7 +47,9 @@ under the License.
</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-permission permission="ACCOUNTING" action="${securityAction}">
+ <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+ </check-permission>
<check-errors/>
<entity-one entity-name="TaxAuthority" value-field="lookedUpValue"/>
@@ -53,7 +59,9 @@ under the License.
<!-- 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-permission permission="ACCOUNTING" action="${securityAction}">
+ <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="TaxAuthorityAssoc" value-field="newEntity"/>
@@ -64,7 +72,9 @@ under the License.
</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-permission permission="ACCOUNTING" action="${securityAction}">
+ <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+ </check-permission>
<check-errors/>
<entity-one entity-name="TaxAuthorityAssoc" value-field="lookedUpValue"/>
@@ -73,7 +83,9 @@ under the License.
</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-permission permission="ACCOUNTING" action="${securityAction}">
+ <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+ </check-permission>
<check-errors/>
<entity-one entity-name="TaxAuthorityAssoc" value-field="lookedUpValue"/>
@@ -83,7 +95,9 @@ under the License.
<!-- 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-permission permission="ACCOUNTING" action="${securityAction}">
+ <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="TaxAuthorityCategory" value-field="newEntity"/>
@@ -93,7 +107,9 @@ under the License.
</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-permission permission="ACCOUNTING" action="${securityAction}">
+ <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+ </check-permission>
<check-errors/>
<entity-one entity-name="TaxAuthorityCategory" value-field="lookedUpValue"/>
@@ -102,7 +118,9 @@ under the License.
</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-permission permission="ACCOUNTING" action="${securityAction}">
+ <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+ </check-permission>
<check-errors/>
<set field="taxAuthorityRateProductMap.taxAuthGeoId" from-field="parameters.taxAuthGeoId"/>
@@ -124,7 +142,9 @@ under the License.
<!-- 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-permission permission="ACCOUNTING" action="${securityAction}">
+ <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="TaxAuthorityGlAccount" value-field="newEntity"/>
@@ -134,7 +154,9 @@ under the License.
</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-permission permission="ACCOUNTING" action="${securityAction}">
+ <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+ </check-permission>
<check-errors/>
<entity-one entity-name="TaxAuthorityGlAccount" value-field="lookedUpValue"/>
@@ -143,7 +165,9 @@ under the License.
</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-permission permission="ACCOUNTING" action="${securityAction}">
+ <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+ </check-permission>
<check-errors/>
<entity-one entity-name="TaxAuthorityGlAccount" value-field="lookedUpValue"/>
@@ -153,7 +177,9 @@ under the License.
<!-- 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-permission permission="ACCOUNTING" action="${securityAction}">
+ <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="TaxAuthorityRateProduct" value-field="newEntity"/>
@@ -168,7 +194,9 @@ under the License.
</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-permission permission="ACCOUNTING" action="${securityAction}">
+ <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+ </check-permission>
<check-errors/>
<entity-one entity-name="TaxAuthorityRateProduct" value-field="lookedUpValue"/>
@@ -177,7 +205,9 @@ under the License.
</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-permission permission="ACCOUNTING" action="${securityAction}">
+ <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+ </check-permission>
<check-errors/>
<entity-one entity-name="TaxAuthorityRateProduct" value-field="lookedUpValue"/>
@@ -188,7 +218,10 @@ under the License.
<!-- PartyTaxAuthInfo methods -->
<simple-method method-name="createPartyTaxAuthInfo" short-description="create a PartyTaxAuthInfo">
<set value="_CREATE" field="securityAction"/>
- <check-permission permission="ACCOUNTING" action="${securityAction}"><accept-userlogin-party/><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
+ <check-permission permission="ACCOUNTING" action="${securityAction}">
+ <accept-userlogin-party/>
+ <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+ </check-permission>
<call-simple-method method-name="validatePartyTaxIdInline"/>
@@ -204,7 +237,10 @@ under the License.
</simple-method>
<simple-method method-name="updatePartyTaxAuthInfo" short-description="update a PartyTaxAuthInfo">
<set value="_UPDATE" field="securityAction"/>
- <check-permission permission="ACCOUNTING" action="${securityAction}"><accept-userlogin-party/><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
+ <check-permission permission="ACCOUNTING" action="${securityAction}">
+ <accept-userlogin-party/>
+ <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+ </check-permission>
<call-simple-method method-name="validatePartyTaxIdInline"/>
@@ -228,14 +264,19 @@ under the License.
</and>
</condition>
<then>
- <add-error><fail-message message="The tax ID [${parameters.partyTaxId}] was not in a valid format for the selected tax authority [${taxAuthority.taxIdFormatPattern}]"/></add-error>
+ <add-error>
+ <fail-property resource="AccountingErrorUiLabels" property="AccountingTaxIdInvalidFormat"/>
+ </add-error>
</then>
</if>
</simple-method>
<simple-method method-name="deletePartyTaxAuthInfo" short-description="delete a PartyTaxAuthInfo">
<set value="_DELETE" field="securityAction"/>
- <check-permission permission="ACCOUNTING" action="${securityAction}"><accept-userlogin-party/><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
+ <check-permission permission="ACCOUNTING" action="${securityAction}">
+ <accept-userlogin-party/>
+ <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+ </check-permission>
<check-errors/>
<entity-one entity-name="PartyTaxAuthInfo" value-field="lookedUpValue"/>