You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2012/06/21 10:03:12 UTC
svn commit: r1352441 - in /ofbiz/trunk:
applications/accounting/data/AccountingSecurityGroupDemoData.xml
applications/accounting/data/AccountingSecurityPermissionSeedData.xml
framework/security/config/SecurityEntityLabels.xml
Author: hansbak
Date: Thu Jun 21 08:03:11 2012
New Revision: 1352441
URL: http://svn.apache.org/viewvc?rev=1352441&view=rev
Log:
manual payment is used: reverting r1352439
Modified:
ofbiz/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml
ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml
ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml
Modified: ofbiz/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml?rev=1352441&r1=1352440&r2=1352441&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml Thu Jun 21 08:03:11 2012
@@ -44,6 +44,11 @@ under the License.
<SecurityGroupPermission groupId="VIEWADMIN" permissionId="ACCOUNTING_VIEW"/>
<SecurityGroupPermission groupId="BIZADMIN" permissionId="ACCOUNTING_ADMIN"/>
+ <!-- Manual Payment security -->
+ <SecurityGroupPermission groupId="FULLADMIN" permissionId="MANUAL_PAYMENT"/>
+ <SecurityGroupPermission groupId="FLEXADMIN" permissionId="MANUAL_PAYMENT"/>
+ <SecurityGroupPermission groupId="BIZADMIN" permissionId="MANUAL_PAYMENT"/>
+
<!-- ACCOUNTING_COMMs security -->
<SecurityGroupPermission groupId="FULLADMIN" permissionId="ACCOUNTING_COMM_VIEW"/>
<SecurityGroupPermission groupId="FLEXADMIN" permissionId="ACCOUNTING_COMM_VIEW"/>
@@ -88,6 +93,7 @@ under the License.
<SecurityGroupPermission groupId="ACCTG_FUNCTNL_ADMIN" permissionId="ACCTG_PREF_ADMIN"/>
<SecurityGroupPermission groupId="ACCTG_FUNCTNL_ADMIN" permissionId="ACCOUNTING_PRINT_CHECKS"/>
<SecurityGroupPermission groupId="ACCTG_FUNCTNL_ADMIN" permissionId="ACCOUNTING_COMM_VIEW"/>
+ <SecurityGroupPermission groupId="ACCTG_FUNCTNL_ADMIN" permissionId="MANUAL_PAYMENT"/>
<SecurityGroupPermission groupId="ACCTG_FUNCTNL_ADMIN" permissionId="PAY_INFO_ADMIN"/>
<SecurityGroupPermission groupId="ACCTG_FUNCTNL_ADMIN" permissionId="PAYPROC_ADMIN"/>
<SecurityGroupPermission groupId="ACCTG_FUNCTNL_ADMIN" permissionId="ASSETMAINT_VIEW"/>
Modified: ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml?rev=1352441&r1=1352440&r2=1352441&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml Thu Jun 21 08:03:11 2012
@@ -38,6 +38,9 @@ under the License.
<SecurityPermission description="Delete operations in the Accounting Manager." permissionId="ACCOUNTING_DELETE"/>
<SecurityPermission description="ALL operations in the Accounting Manager." permissionId="ACCOUNTING_ADMIN"/>
+ <!-- Manual Payment security -->
+ <SecurityPermission description="Manual Payment Transaction." permissionId="MANUAL_PAYMENT"/>
+
<!-- ACCOUNTING_COMMs security -->
<SecurityPermission description="View commission rates" permissionId="ACCOUNTING_COMM_VIEW"/>
@@ -67,6 +70,7 @@ under the License.
<SecurityGroupPermission groupId="SUPER" permissionId="ACCOUNTING_ADMIN"/>
<SecurityGroupPermission groupId="SUPER" permissionId="PAYPROC_ADMIN"/>
<SecurityGroupPermission groupId="SUPER" permissionId="PAY_INFO_ADMIN"/>
+ <SecurityGroupPermission groupId="SUPER" permissionId="MANUAL_PAYMENT"/>
<SecurityGroupPermission groupId="SUPER" permissionId="ACCOUNTING_COMM_VIEW"/>
<SecurityGroupPermission groupId="SUPER" permissionId="ACCOUNTING_PRINT_CHECKS"/>
<SecurityGroupPermission groupId="SUPER" permissionId="ACCTG_PREF_ADMIN"/>
Modified: ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml?rev=1352441&r1=1352440&r2=1352441&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml (original)
+++ ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml Thu Jun 21 08:03:11 2012
@@ -930,6 +930,16 @@
<value xml:lang="zh">æµè§æ ç¾ä¿¡æ¯é¡µé¢ã</value>
<value xml:lang="zh_TW">ç覽æ¨ç°½è³è¨é é¢ã</value>
</property>
+ <property key="SecurityPermission.description.MANUAL_PAYMENT">
+ <value xml:lang="en">Manual Payment Transaction.</value>
+ <value xml:lang="es">Pago Manual de Transacciones.</value>
+ <value xml:lang="fr">Transaction de paiement manuel.</value>
+ <value xml:lang="it">Transazioni manuali pagamenti.</value>
+ <value xml:lang="ru">Ð ÑÑÐ½Ð°Ñ Ð¿Ñоводка плаÑежа.</value>
+ <value xml:lang="th">รายà¸à¸²à¸£à¸à¸²à¸£à¸à¸³à¸£à¸°à¹à¸à¸´à¸à¸à¹à¸§à¸¢à¸¡à¸·à¸</value>
+ <value xml:lang="zh">æå·¥æ¯ä»äº¤æã</value>
+ <value xml:lang="zh_TW">æå·¥æ¯ä»äº¤æã</value>
+ </property>
<property key="SecurityPermission.description.MANUFACTURING_ADMIN">
<value xml:lang="en">ALL operations in the Manufacturing Manager.</value>
<value xml:lang="es">TODAS las operaciones en el Administrador de Producción.</value>