svn commit: r662726 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml script/org/ofbiz/accounting/payment/BillingServices.xml script/org/ofbiz/accounting/permissions/PermissionServices.xml servicedef/services_billing.xml

Author: jleroux
Date: Tue Jun  3 03:06:21 2008
New Revision: 662726

URL: http://svn.apache.org/viewvc?rev=662726&view=rev
Log:
A patch from Rashko Rejmer "Move Billing Account permissions to follow new the pattern" (https://issues.apache.org/jira/browse/OFBIZ-1811) - OFBIZ-1811

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml
    ofbiz/trunk/applications/accounting/servicedef/services_billing.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=662726&r1=662725&r2=662726&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Jun  3 03:06:21 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ -1363,20 +1363,6 @@
         <value xml:lang="th">สร้างยอดรวมของบัญชี</value>
         <value xml:lang="zh">新建账单账户</value>
     </property>
-    <property key="AccountingCreateBillingAccountPermissionError">
-        <value xml:lang="ar">Security Error: to run createBillingAccount you must have the ACCOUNTING_CREATE or ACCOUNTING_ADMIN permissionاتصل بمدير التطبيق</value>
-        <value xml:lang="en">Security Error: to run createBillingAccount you must have the ACCOUNTING_CREATE or ACCOUNTING_ADMIN permission </value>
-        <value xml:lang="es">Error de seguridad : Para ejecutar createBillingAccount debe tener el permiso ACCOUNTING_CREATE o ACCOUNTING_ADMIN</value>
-        <value xml:lang="fr">Erreur de sécurité : pour créer un compte de facturation, il faut avoir la permission ACCOUNTING_CREATE ou ACCOUNTING_ADMIN.</value>
-        <value xml:lang="it">Errore Sicurezza : per eseguire createBillingAccount tu devi avere il permesso ACCOUNTING_CREATE o ACCOUNTING_ADMIN</value>
-        <value xml:lang="nl">Toegangsfout: Om een nieuwe rekening aan te maken is ACCOUNTING_CREATE of ACCOUNTING_ADMIN permissie vereist </value>
-        <value xml:lang="pt_BR">Erro de Segurança; para "Criar Nota Fiscal" deverá obter permissões para ACCOUNTING_CREATE ou ACCOUNTING_ADMIN </value>
-        <value xml:lang="pt_PT">Erro de Segurança; para correr "Criar Conta para Pagamento" deverá obter permissões para ACCOUNTING_CREATE ou ACCOUNTING_ADMIN </value>
-        <value xml:lang="ro">Eroare de Securitate: pentru a executa createBillingAccount tu trebuie sa ai permisul ACCOUNTING_CREATE sau ACCOUNTING_ADMIN</value>
-        <value xml:lang="ru">Ошибка безопасности: для запуска createBillingAccount у вас должны быть права ACCOUNTING_CREATE или ACCOUNTING_ADMIN</value>
-        <value xml:lang="th">Security Error: ความผิดพลาด! ในการ createBillingAccount คุณต้องมี ACCOUNTING_CREATE หรือ ACCOUNTING_ADMIN ก่อน </value>
-        <value xml:lang="zh">安全错误：要运行新建账单账户，你必须具有ACCOUNTING_CREATE或ACCOUNTING_ADMIN权限</value>
-    </property>
     <property key="AccountingCreateBillingAccountRole">
         <value xml:lang="ar">استحداث دور حساب فوترة</value>
         <value xml:lang="en">Create Billing Account Role</value>
@@ -1391,19 +1377,6 @@
         <value xml:lang="th">สร้างสถานะยอดรวมของบัญชี</value>
         <value xml:lang="zh">新建账单账户角色</value>
     </property>
-    <property key="AccountingCreateBillingAccountRolePermissionError">
-        <value xml:lang="en">Security Error : to run createBillingAccountRole you must have the ACCOUNTING_CREATE or ACCOUNTING_ADMIN permission</value>
-        <value xml:lang="es">Para ejecutar createBillingAccountRole debe tener el permiso ACCOUNTING_CREATE o ACCOUNTING_ADMIN</value>
-        <value xml:lang="fr">Erreur de sécurité : pour associer un rôle à un compte de facturation, il faut avoir la permission ACCOUNTING_CREATE ou ACCOUNTING_ADMIN</value>
-        <value xml:lang="it">Errore Sicurezza : per eseguire createBillingAccountRole tu devi avere il permesso ACCOUNTING_CREATE o ACCOUNTING_ADMIN</value>
-        <value xml:lang="nl">Toegangsfout: om een nieuwe rol aan te maken is ACCOUNTING_CREATE of ACCOUNTING_ADMIN permissie nodig</value>
-        <value xml:lang="pt_BR">Erro de Segurança: para "Criar Função de Nota Fiscal" deverá obter permissões para ACCOUNTING_CREATE ou ACCOUNTING_ADMIN</value>
-        <value xml:lang="pt_PT">Erro de Segurança: para correr "Criar Função de Conta para Pagamento" deverá obter permissões para ACCOUNTING_CREATE ou ACCOUNTING_ADMIN</value>
-        <value xml:lang="ro">Eroare de Siguranta: pentru a executa  createBillingAccountRole tu trebuie sa ai permisul ACCOUNTING_CREATE sau ACCOUNTING_ADMIN</value>
-        <value xml:lang="ru">Ошибка безопасности: для запуска createBillingAccountRole у вас должны быть права ACCOUNTING_CREATE или ACCOUNTING_ADMIN</value>
-        <value xml:lang="th">Security Error : ความผิดพลาด! ในการ createBillingAccountRole คุณต้องมี ACCOUNTING_CREATE หรือ ACCOUNTING_ADMIN ก่อน</value>
-        <value xml:lang="zh">安全错误：要运行新建账单账户角色，你必须具有ACCOUNTING_CREATE或ACCOUNTING_ADMIN权限</value>
-    </property>
     <property key="AccountingCreateBillingAccountTerm">
         <value xml:lang="ar">استحداث بند لحساب الفوترة</value>
         <value xml:lang="en">Create Billing Account Term</value>
@@ -1418,19 +1391,6 @@
         <value xml:lang="th">สร้างยอดรวมของบัญชีตามที่กำหนด</value>
         <value xml:lang="zh">新建账单账户条件</value>
     </property>
-    <property key="AccountingCreateBillingAccountTermPermissionError">
-        <value xml:lang="en">Security Error : to run createBillingAccountTerm you must have the ACCOUNTING_CREATE or ACCOUNTING_ADMIN permission</value>
-        <value xml:lang="es">Para ejecutar createBillingAccountTerm debe tener el permiso ACCOUNTING_CREATE o ACCOUNTING_ADMIN</value>
-        <value xml:lang="fr">Erreur de sécurité : pour créer un terme sur un compte de facturation, il faut avoir la permission ACCOUNTING_CREATE ou ACCOUNTING_ADMIN</value>
-        <value xml:lang="it">Errore Sicurezza : per eseguire createBillingAccountTerm tu devi avere il permesso ACCOUNTING_CREATE o ACCOUNTING_ADMIN</value>
-        <value xml:lang="nl">Toegangsfout : om een betalingsvoorwaarde an te maken is ACCOUNTING_CREATE of ACCOUNTING_ADMIN permissie nodig</value>
-        <value xml:lang="pt_BR">Erro de Segurança: para  "Criar Termo de Nota Fiscal" deverá obter permissões para ACCOUNTING_CREATE ou ACCOUNTING_ADMIN</value>
-        <value xml:lang="pt_PT">Erro de Segurança: para  correr "Criar Termo de Conta para Pagamento" deverá obter permissões para ACCOUNTING_CREATE ou ACCOUNTING_ADMIN</value>
-        <value xml:lang="ro">Eroare de Siguranta: pentru a executa  createBillingAccountTerm tu trebuie sa ai permisul ACCOUNTING_CREATE o ACCOUNTING_ADMIN</value>
-        <value xml:lang="ru">Ошибка безопасности: для запуска createBillingAccountTerm у вас должны быть права ACCOUNTING_CREATE или ACCOUNTING_ADMIN</value>
-        <value xml:lang="th">Security Error : ความผิดพลาด! ในการ createBillingAccountTerm คุณต้องมี ACCOUNTING_CREATE หรือ ACCOUNTING_ADMIN ก่อน</value>
-        <value xml:lang="zh">安全错误：要运行新建账单账户条件，你必须具有ACCOUNTING_CREATE或ACCOUNTING_ADMIN权限</value>
-    </property>
     <property key="AccountingCreateCostComponentCalc">
         <value xml:lang="en">Create New Cost Component Calc</value>
         <value xml:lang="it">Creare Nuovo Calcolo Costo Componente</value>
@@ -1631,19 +1591,6 @@
         <value xml:lang="th">ผลรวมเดบิตและเครดิตต้องเท่ากับที่แจ้งถึง GL</value>
         <value xml:lang="zh">借方和贷方合计必须等于过帐到总账的金额。</value>
     </property>
-    <property key="AccountingDeleteBillingAccountTermPermissionError">
-        <value xml:lang="en">Security Error : to run removeBillingAccountTerm you must have the ACCOUNTING_DELETE or ACCOUNTING_ADMIN permission</value>
-        <value xml:lang="es">Error de seguridad : Para ejecutar removeBillingAccountTerm debe tener el permiso ACCOUNTING_DELETE o ACCOUNTING_ADMIN</value>
-        <value xml:lang="fr">Erreur de sécurité : pour supprimer un terme de compte de facturation, il faut avoir la permission ACCOUNTING_DELETE ou ACCOUNTING_ADMIN.</value>
-        <value xml:lang="it">Errore Sicurezza  : per eseguire removeBillingAccountTerm tu devi avere il permesso ACCOUNTING_DELETE o ACCOUNTING_ADMIN</value>
-        <value xml:lang="nl">Security Error : to run removeBillingAccountTerm you must have the ACCOUNTING_DELETE or ACCOUNTING_ADMIN permission</value>
-        <value xml:lang="pt_BR">Erro de Segurança: para "Remover Termo de Nota Fiscal" deverá obter permissões para ACCOUNTING_DELETE ou ACCOUNTING_ADMIN</value>
-        <value xml:lang="pt_PT">Erro de Segurança: para correr "Remover Termo de Conta para Pagamento" deverá obter permissões para ACCOUNTING_DELETE ou ACCOUNTING_ADMIN</value>
-        <value xml:lang="ro">Eroare de Siguranta: pentru a executa removeBillingAccountTerm trebuie sa ai permisul ACCOUNTING_DELETE sau ACCOUNTING_ADMIN</value>
-        <value xml:lang="ru">Ошибка безопасности: для запуска removeBillingAccountTerm у вас должны быть права ACCOUNTING_DELETE или ACCOUNTING_ADMIN</value>
-        <value xml:lang="th">Security Error : ความผิดพลาด! ในการ removeBillingAccountTerm คุณต้องมี ACCOUNTING_DELETE หรือ ACCOUNTING_ADMIN ก่อน</value>
-        <value xml:lang="zh">安全错误：要运行删除账单账户条件，你必须具有ACCOUNTING_DELETE或ACCOUNTING_ADMIN权限</value>
-    </property>
     <property key="AccountingDeleteFixedAssetMaintOrderPermissionError">
         <value xml:lang="en">Security Error: to run deleteFixedAssetMaintOrder you must have the ACCOUNTING_DELETE or ACCOUNTING_ADMIN permission, or the limited ACCOUNTING_ROLE_UPDATE permission</value>
         <value xml:lang="fr">Erreur de sécurité: pour exécuter deleteFixedAssetMaintOrdervous devez avoir les permissions ACCOUNTING_DELETE ou ACCOUNTING_ADMIN, ou bien la permission limitée  ACCOUNTING_ROLE_UPDATE</value>
@@ -5946,45 +5893,6 @@
         <value xml:lang="th">แก้ไขยอดรวมของบัญชี</value>
         <value xml:lang="zh">更新账单账户</value>
     </property>
-    <property key="AccountingUpdateBillingAccountPermissionError">
-        <value xml:lang="en">Security Error : to run updateAcctgTrans you must have the ACCOUNTING_UPDATE or ACCOUNTING_ADMIN permission</value>
-        <value xml:lang="es">Error de seguridad : para ejecutar updateAcctgTrans debe tener el permiso ACCOUNTING_UPDATE o ACCOUNTING_ADMIN </value>
-        <value xml:lang="fr">Erreur de sécurité : pour éditer un compte de facturation, il faut avoir la permission ACCOUNTING_UPDATE ou ACCOUNTING_ADMIN.</value>
-        <value xml:lang="it">Errore Sicurezza : per eseguire updateAcctgTrans tu devi avere il permesso ACCOUNTING_UPDATE o ACCOUNTING_ADMIN</value>
-        <value xml:lang="nl">Toegangsfout : om accouttransacties aan te passen is ACCOUNTING_UPDATE or ACCOUNTING_ADMIN permissie vereist</value>
-        <value xml:lang="pt_BR">Erro e Segurança: para "Atualizar Transação em Conta" deverá obter permissões para ACCOUNTING_UPDATE ou ACCOUNTING_ADMIN </value>
-        <value xml:lang="pt_PT">Erro e Segurança: para correr "Actualizar Transacção em Conta" deverá obter permissões para ACCOUNTING_UPDATE ou ACCOUNTING_ADMIN </value>
-        <value xml:lang="ro">Eroare de Siguranta: pentru  executarea updateAcctgTrans trebuie sa ai permisul ACCOUNTING_UPDATE sau ACCOUNTING_ADMIN</value>
-        <value xml:lang="ru">Ошибка безопасности: для запуска updateAcctgTrans у вас должны быть права ACCOUNTING_UPDATE или ACCOUNTING_ADMIN</value>
-        <value xml:lang="th">Security Error : ความปลอดภัยผิดพลาด! ในการดำเนินการ updateAcctgTrans คุณต้องมีการอนุญาต ACCOUNTING_UPDATE หรือ ACCOUNTING_ADMIN </value>
-        <value xml:lang="zh">安全错误：要运行更新账户交易，你必须具有ACCOUNTING_UPDATE或ACCOUNTING_ADMIN权限</value>
-    </property>
-    <property key="AccountingUpdateBillingAccountRolePermissionError">
-        <value xml:lang="en">Security Error : to run updateBillingAccountRole you must have the ACCOUNTING_UPDATE or ACCOUNTING_ADMIN permission</value>
-        <value xml:lang="es">Error de seguridad : para ejecutar updateBillingAccountRole debe tener el permiso ACCOUNTING_UPDATE o ACCOUNTING_ADMIN</value>
-        <value xml:lang="fr">Erreur de sécurité : pour éditer une association d'un rôle à un compte de facturation, il faut avoir la permission ACCOUNTING_UPDATE ou ACCOUNTING_ADMIN.</value>
-        <value xml:lang="it">Errore Sicurezza : per eseguire updateBillingAccountRole tu devi avere il permesso ACCOUNTING_UPDATE o ACCOUNTING_ADMIN</value>
-        <value xml:lang="nl">Toegansfout : om een faktuurrekening rol aan te passen is ACCOUNTING_UPDATE or ACCOUNTING_ADMIN permissie nodig</value>
-        <value xml:lang="pt_BR">Erro de Segurança: para "Atualizar Função de Nota Fiscals" deverá obter permissões para ACCOUNTING_UPDATE ou ACCOUNTING_ADMIN</value>
-        <value xml:lang="pt_PT">Erro de Segurança: para correr "Actualizar Função de Conta para Pagamentos" deverá obter permissões para ACCOUNTING_UPDATE ou ACCOUNTING_ADMIN</value>
-        <value xml:lang="ro">Eroare de Siguranta: pentru a executa updateBillingAccountRole trebuie sa ai permisul ACCOUNTING_UPDATE sau ACCOUNTING_ADMIN</value>
-        <value xml:lang="ru">Ошибка безопасности: для запуска updateBillingAccountRole у вас должны быть права ACCOUNTING_UPDATE или ACCOUNTING_ADMIN</value>
-        <value xml:lang="th">Security Error : ความปลอดภัยผิดพลาด! ในการดำเนินการ updateBillingAccountRole คุณต้องมีการอนุญาต ACCOUNTING_UPDATE หรือ ACCOUNTING_ADMIN </value>
-        <value xml:lang="zh">安全错误：要运行更新账单账户角色，你必须具有ACCOUNTING_UPDATE或ACCOUNTING_ADMIN权限</value>
-    </property>
-    <property key="AccountingUpdateBillingAccountTermPermissionError">
-        <value xml:lang="en">Security Error : to run updateBillingAccountTerm you must have the ACCOUNTING_UPDATE or ACCOUNTING_ADMIN permission</value>
-        <value xml:lang="es">Error de seguridad : para ejecutar updateBillingAccountTerm debe tener el permiso ACCOUNTING_UPDATE or ACCOUNTING_ADMIN</value>
-        <value xml:lang="fr">Erreur de sécurité : pour éditer un terme d'un compte de facturation, il faut avoir la permission ACCOUNTING_UPDATE ou ACCOUNTING_ADMIN.</value>
-        <value xml:lang="it">Errore Sicurezza : per eseguire updateBillingAccountTerm tu devi avere il permesso ACCOUNTING_UPDATE o ACCOUNTING_ADMIN</value>
-        <value xml:lang="nl">Toegansfout :om een faktuurrekening voorwaarde aan te passen is de ACCOUNTING_UPDATE or ACCOUNTING_ADMIN permissie nodig</value>
-        <value xml:lang="pt_BR">Erro de Segurança: para "Atualizar Termo de Nota Fiscal" deverá obter permissões para ACCOUNTING_UPDATE ou ACCOUNTING_ADMIN</value>
-        <value xml:lang="pt_PT">Erro de Segurança: para correr "Actualizar Termo de Conta para Pagamento" deverá obter permissões para ACCOUNTING_UPDATE ou ACCOUNTING_ADMIN</value>
-        <value xml:lang="ro">Eroare de Siguranta: pentru a executa updateBillingAccountTerm trebuie sa ai permisul ACCOUNTING_UPDATE sau ACCOUNTING_ADMIN</value>
-        <value xml:lang="ru">Ошибка безопасности: для запуска updateBillingAccountTerm у вас должны быть права ACCOUNTING_UPDATE или ACCOUNTING_ADMIN</value>
-        <value xml:lang="th">Security Error : ความปลอดภัยผิดพลาด! ในการดำเนินการ updateBillingAccountTerm คุณต้องมีการอนุญาต ACCOUNTING_UPDATE หรือ ACCOUNTING_ADMIN</value>
-        <value xml:lang="zh">安全错误：要运行更新账单账户条件，你必须具有ACCOUNTING_UPDATE或ACCOUNTING_ADMIN权限</value>
-    </property>
     <property key="AccountingUpdateFX">
         <value xml:lang="ar">تحديث  Ù†Ø³Ø¨ الصرف الأجنبي</value>
         <value xml:lang="en">Update Foreign Exchange Rates</value>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml?rev=662726&r1=662725&r2=662726&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml Tue Jun  3 03:06:21 2008
@@ -21,9 +21,6 @@
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
     <simple-method method-name="createBillingAccount" short-description="Create Billing Account">
-        <check-permission permission="ACCOUNTING" action="_CREATE"><fail-property resource="AccountingUiLabels" property="AccountingCreateBillingAccountPermissionError"/></check-permission>
-        <check-errors/>
-        
         <make-value value-name="newEntity" entity-name="BillingAccount"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         
@@ -40,9 +37,6 @@
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateBillingAccount" short-description="Update Billing Account">
-        <check-permission permission="ACCOUNTING" action="_UPDATE"><fail-property resource="AccountingUiLabels" property="AccountingUpdateBillingAccountPermissionError"/></check-permission>
-        <check-errors/>
-        
         <make-value value-name="lookupPKMap" entity-name="BillingAccount"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>        
         <find-by-primary-key entity-name="BillingAccount" map-name="lookupPKMap" value-name="lookedUpValue"/>
@@ -50,9 +44,6 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="createBillingAccountRole" short-description="Create Billing Account Role">
-        <check-permission permission="ACCOUNTING" action="_CREATE"><fail-property resource="AccountingUiLabels" property="AccountingCreateBillingAccountRolePermissionError"/></check-permission>
-        <check-errors/>
-        
         <make-value value-name="newEntity" entity-name="BillingAccountRole"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -63,9 +54,6 @@
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateBillingAccountRole" short-description="Update Billing Account Role">
-        <check-permission permission="ACCOUNTING" action="_UPDATE"><fail-property resource="AccountingUiLabels" property="AccountingUpdateBillingAccountRolePermissionError"/></check-permission>
-        <check-errors/>
-        
         <make-value value-name="lookupPKMap" entity-name="BillingAccountRole"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>        
         <find-by-primary-key entity-name="BillingAccountRole" map-name="lookupPKMap" value-name="lookedUpValue"/>
@@ -73,18 +61,12 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>    
     <simple-method method-name="removeBillingAccountRole" short-description="Remove Billing Account Role">
-        <check-permission permission="ACCOUNTING" action="_UPDATE"><fail-property resource="AccountingUiLabels" property="AccountingRemoveBillingAccountRolePermissionError"/></check-permission>
-        <check-errors/>
-        
         <make-value value-name="lookupPKMap" entity-name="BillingAccountRole"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>        
         <find-by-primary-key entity-name="BillingAccountRole" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="createBillingAccountTerm" short-description="Create Billing Account Term">
-        <check-permission permission="ACCOUNTING" action="_CREATE"><fail-property resource="AccountingUiLabels" property="AccountingCreateBillingAccountTermPermissionError"/></check-permission>
-        <check-errors/>
-        
         <make-value value-name="newEntity" entity-name="BillingAccountTerm"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         
@@ -96,9 +78,6 @@
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateBillingAccountTerm" short-description="Update Billing Account Term">
-        <check-permission permission="ACCOUNTING" action="_UPDATE"><fail-property resource="AccountingUiLabels" property="AccountingUpdateBillingAccountTermPermissionError"/></check-permission>
-        <check-errors/>
-        
         <make-value value-name="lookupPKMap" entity-name="BillingAccountTerm"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="BillingAccountTerm" map-name="lookupPKMap" value-name="lookedUpValue"/>
@@ -106,9 +85,6 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>    
     <simple-method method-name="removeBillingAccountTerm" short-description="Remove Billing Account Term">
-        <check-permission permission="ACCOUNTING" action="_DELETE"><fail-property resource="AccountingUiLabels" property="AccountingDeleteBillingAccountTermPermissionError"/></check-permission>
-        <check-errors/>
-        
         <make-value entity-name="BillingAccountTerm" value-name="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="BillingAccountTerm" map-name="lookupPKMap" value-name="lookedUpValue"/>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml?rev=662726&r1=662725&r2=662726&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml Tue Jun  3 03:06:21 2008
@@ -104,5 +104,9 @@
         <set field="primaryPermission" value="ACCTG_ATX"/>
         <call-simple-method method-name="genericBasePermissionCheck" xml-resource="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml"/>
     </simple-method>
-
+    
+    <!-- Returns hasPermission=true if user has one of the base ACCOUNTING CRUD+ADMIN permissions -->
+    <simple-method method-name="acctgBillingAcctCheck" short-description="Accounting billing account permission logic">
+        <call-simple-method method-name="basePermissionCheck"/>
+    </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/applications/accounting/servicedef/services_billing.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_billing.xml?rev=662726&r1=662725&r2=662726&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_billing.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_billing.xml Tue Jun  3 03:06:21 2008
@@ -28,6 +28,7 @@
     <service name="createBillingAccount" engine="simple"
             location="org/ofbiz/accounting/payment/BillingServices.xml" invoke="createBillingAccount">
         <description>Create a Billing Account</description>
+        <permission-service service-name="acctgBillingAcctCheck" main-action="CREATE"/>
         <attribute name="accountLimit" type="Double" mode="IN" optional="true"/>
         <attribute name="accountCurrencyUomId" type="String" mode="IN" optional="true"/>
         <attribute name="description" type="String" mode="IN" optional="true"/>
@@ -41,6 +42,7 @@
     <service name="updateBillingAccount" engine="simple"
             location="org/ofbiz/accounting/payment/BillingServices.xml" invoke="updateBillingAccount">
         <description>Update a Billing Account</description>
+        <permission-service service-name="acctgBillingAcctCheck" main-action="UPDATE"/>
         <attribute name="billingAccountId" type="String" mode="IN" optional="false"/>
         <attribute name="accountLimit" type="Double" mode="IN" optional="true"/>
         <attribute name="accountCurrencyUomId" type="String" mode="IN" optional="true"/>
@@ -52,6 +54,7 @@
     <service name="createBillingAccountRole" engine="simple"
             location="org/ofbiz/accounting/payment/BillingServices.xml" invoke="createBillingAccountRole">
         <description>Create a Billing Account Role</description>
+        <permission-service service-name="acctgBillingAcctCheck" main-action="CREATE"/>
         <attribute name="billingAccountId" type="String" mode="IN" optional="false"/>
         <attribute name="partyId" type="String" mode="IN" optional="false"/>
         <attribute name="roleTypeId" type="String" mode="IN" optional="false"/>
@@ -61,6 +64,7 @@
     <service name="updateBillingAccountRole" engine="simple"
             location="org/ofbiz/accounting/payment/BillingServices.xml" invoke="updateBillingAccountRole">
         <description>Update a Billing Account Role</description>
+        <permission-service service-name="acctgBillingAcctCheck" main-action="UPDATE"/>
         <attribute name="billingAccountId" type="String" mode="IN" optional="false"/>
         <attribute name="partyId" type="String" mode="IN" optional="false"/>
         <attribute name="roleTypeId" type="String" mode="IN" optional="false"/>
@@ -70,11 +74,13 @@
     <service name="removeBillingAccountRole" engine="simple" default-entity-name="BillingAccountRole"
             location="org/ofbiz/accounting/payment/BillingServices.xml" invoke="removeBillingAccountRole">
         <description>Remove a Billing Account Role</description>
+        <permission-service service-name="acctgBillingAcctCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
     <service name="createBillingAccountTerm" engine="simple"
             location="org/ofbiz/accounting/payment/BillingServices.xml" invoke="createBillingAccountTerm">
         <description>Create a Billing Account Term</description>
+        <permission-service service-name="acctgBillingAcctCheck" main-action="CREATE"/>
         <attribute name="billingAccountId" type="String" mode="IN" optional="false"/>
         <attribute name="termTypeId" type="String" mode="IN" optional="false"/>
         <attribute name="termValue" type="Long" mode="IN" optional="false"/>
@@ -84,6 +90,7 @@
     <service name="updateBillingAccountTerm" engine="simple"
             location="org/ofbiz/accounting/payment/BillingServices.xml" invoke="updateBillingAccountTerm">
         <description>Update a Billing Account Term</description>
+        <permission-service service-name="acctgBillingAcctCheck" main-action="UPDATE"/>
         <attribute name="billingAccountTermId" type="String" mode="IN" optional="false"/>
         <attribute name="billingAccountId" type="String" mode="IN" optional="true"/>
         <attribute name="termTypeId" type="String" mode="IN" optional="true"/>
@@ -93,11 +100,13 @@
     <service name="removeBillingAccountTerm" engine="simple"
             location="org/ofbiz/accounting/payment/BillingServices.xml" invoke="removeBillingAccountTerm">
         <description>Remove a Billing Account Term</description>
+        <permission-service service-name="acctgBillingAcctCheck" main-action="DELETE"/>
         <attribute name="billingAccountTermId" type="String" mode="IN" optional="false"/>
     </service>
     <service name="calcBillingAccountBalance" engine="java"
             location="org.ofbiz.accounting.payment.BillingAccountWorker" invoke="calcBillingAccountBalance">
         <description>Calculate the balance of a Billing Account</description>
+        <permission-service service-name="acctgBillingAcctCheck" main-action="VIEW"/>
         <attribute name="billingAccountId" type="String" mode="IN" optional="false"/>
         <attribute name="accountBalance" type="Double" mode="OUT" optional="false"/>
         <attribute name="netAccountBalance" type="Double" mode="OUT" optional="false"/>
@@ -105,4 +114,9 @@
         <attribute name="availableToCapture" type="Double" mode="OUT" optional="false"/>
         <attribute name="billingAccount" type="GenericValue" mode="OUT" optional="false"/>
     </service>
+    <service name="acctgBillingAcctCheck" engine="simple"
+            location="component://accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml" invoke="acctgBillingAcctCheck">
+        <description>Basic Billing Account Permission Checking Logic</description>
+        <implements service="permissionInterface"/>
+    </service>
 </services>