You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2009/07/30 07:50:44 UTC
svn commit: r799175 - in /ofbiz/trunk/applications/accounting:
config/AccountingUiLabels.xml
script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
widget/FinAccountScreens.xml
Author: apatel
Date: Thu Jul 30 05:50:44 2009
New Revision: 799175
URL: http://svn.apache.org/viewvc?rev=799175&view=rev
Log:
Improved UiLabels. Thanks Amit for patch. OFBIZ-2771.
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=799175&r1=799174&r2=799175&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Thu Jul 30 05:50:44 2009
@@ -2013,6 +2013,9 @@
<value xml:lang="th">สรà¹à¸²à¸à¸à¸±à¸à¸à¸µà¸à¸à¸²à¸à¸²à¸£à¹à¸«à¸¡à¹</value>
<value xml:lang="zh">å建æ°çµåèµé转账</value>
</property>
+ <property key="AccountingCreateNewFinAccount">
+ <value xml:lang="en">Create New Financial Account</value>
+ </property>
<property key="AccountingCreateNewGiftCard">
<value xml:lang="de">Neuen Gutschein erstellen</value>
<value xml:lang="en">Create New Gift Card</value>
@@ -2525,6 +2528,15 @@
<value xml:lang="th">สรà¹à¸²à¸/à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¸à¸à¸à¸³à¹à¸£à¸ªà¸°à¸ªà¸¡à¹à¸¥à¸°à¸à¸à¹à¸ªà¸à¸à¸à¸²à¸£à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¸à¸²à¸à¸°à¸à¸²à¸£à¹à¸à¸´à¸</value>
<value xml:lang="zh">å建/æ´æ°éèè´¦æ·</value>
</property>
+ <property key="AccountingEditFinAccountAuthorityFor">
+ <value xml:lang="en">Edit Financial Account Authority For ${finAccount.finAccountName} [${finAccountId}]</value>
+ </property>
+ <property key="AccountingEditFinAccountRoleFor">
+ <value xml:lang="en">Edit Financial Account Role For ${finAccount.finAccountName} [${finAccountId}]</value>
+ </property>
+ <property key="AccountingEditFinAccountTransactionFor">
+ <value xml:lang="en">Edit Financial Account Transaction For ${finAccount.finAccountName} [${finAccountId}]</value>
+ </property>
<property key="AccountingEditGiftCard">
<value xml:lang="cs">ZmÄnit dárkový poukaz</value>
<value xml:lang="de">Gutschein bearbeiten</value>
@@ -2556,9 +2568,15 @@
<property key="AccountingEditPaymentGroup">
<value xml:lang="en">Edit Payment Group</value>
</property>
+ <property key="AccountingEditPaymentGroupFor">
+ <value xml:lang="en">Edit Payment Group For ${finAccount.finAccountName} [${finAccountId}]</value>
+ </property>
<property key="AccountingEditPaymentGroupMember">
<value xml:lang="en">Edit Payment Group Member</value>
</property>
+ <property key="AccountingEditPaymentGroupMemberFor">
+ <value xml:lang="en">Edit Payment Group Member For ${finAccount.finAccountName} [${finAccountId}]</value>
+ </property>
<property key="AccountingEditTaxAuthorityGlAccounts">
<value xml:lang="de">Steuerkonten bearbeiten</value>
<value xml:lang="en">Edit TaxAuthority GL Accounts</value>
@@ -5575,8 +5593,8 @@
<value xml:lang="th">à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¢à¸à¸£à¸²à¸¨à¸à¸²à¸à¸à¸²à¸£à¸ªà¸£à¹à¸²à¸à¸à¸±à¸à¸à¸µà¹à¸¢à¸à¸à¸£à¸°à¹à¸ à¸à¸à¸±à¹à¸§à¹à¸à¸à¸µà¸à¸à¸£à¸±à¹à¸.</value>
<value xml:lang="zh">åªæéæ°æ°å»ºæ»è´¦è´¦æ·æè½æ¹åè¿ä¸ªæ°æ®é¡¹ã</value>
</property>
- <property key="AccountingNotWithdrawlFinAccountTrans">
- <value xml:lang="en">Not a withdrawl financial account transaction.</value>
+ <property key="AccountingNotWithdrawalFinAccountTrans">
+ <value xml:lang="en">Not a withdrawal financial account transaction.</value>
</property>
<property key="AccountingNumber">
<value xml:lang="cs">ÄÃslo</value>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=799175&r1=799174&r2=799175&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Thu Jul 30 05:50:44 2009
@@ -759,7 +759,7 @@
<call-service service-name="createAcctgTransAndEntries" in-map-name="createAcctgTransAndEntriesMap"/>
</iterate>
<else>
- <property-to-field property="AccountingNotWithdrawlFinAccountTrans" resource="AccountingUiLabels" field="errorMessage"/>
+ <property-to-field property="AccountingNotWithdrawalFinAccountTrans" resource="AccountingUiLabels" field="errorMessage"/>
<field-to-result field="errorMessage" result-name="errorMessage"/>
</else>
</if-compare>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=799175&r1=799174&r2=799175&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Thu Jul 30 05:50:44 2009
@@ -128,7 +128,7 @@
<condition><not><if-empty field="finAccountId"/></not></condition>
<widgets>
<container style="button-bar">
- <link target="EditFinAccount" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingFinAccount}" style="buttontext"/>
+ <link target="EditFinAccount" text="${uiLabelMap.AccountingCreateNewFinAccount}" style="buttontext"/>
</container>
</widgets>
</section>
@@ -157,7 +157,7 @@
<widgets>
<decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="FinAccountRolePanel" title="${uiLabelMap.PageTitleEditFinAccountRole} ${uiLabelMap.CommonFor} ${finAccount.finAccountName} [${finAccountId}]" collapsible="true">
+ <screenlet id="FinAccountRolePanel" title="${uiLabelMap.AccountingEditFinAccountRoleFor}" collapsible="true">
<include-form name="AddFinAccountRole" location="component://accounting/widget/FinAccountForms.xml"/>
</screenlet>
<include-form name="ListFinAccountRoles" location="component://accounting/widget/FinAccountForms.xml"/>
@@ -179,7 +179,7 @@
<widgets>
<decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="FinAccountTransPanel" title="${uiLabelMap.PageTitleEditFinAccountTrans} ${uiLabelMap.CommonFor} ${finAccount.finAccountName} [${finAccountId}]" collapsible="true">
+ <screenlet id="FinAccountTransPanel" title="${uiLabelMap.AccountingEditFinAccountTransactionFor}" collapsible="true">
<include-form name="AddFinAccountTrans" location="component://accounting/widget/FinAccountForms.xml"/>
</screenlet>
</decorator-section>
@@ -201,7 +201,7 @@
<widgets>
<decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="FinAccountAuthsPanel" title="${uiLabelMap.PageTitleEditFinAccountAuths} ${uiLabelMap.CommonFor} ${finAccount.finAccountName} [${finAccountId}]" collapsible="true">
+ <screenlet id="FinAccountAuthsPanel" title="${uiLabelMap.AccountingEditFinAccountAuthorityFor}]" collapsible="true">
<include-form name="AddFinAccountAuth" location="component://accounting/widget/FinAccountForms.xml"/>
</screenlet>
<include-form name="ListFinAccountAuths" location="component://accounting/widget/FinAccountForms.xml"/>
@@ -335,10 +335,10 @@
<decorator-section name="body">
<section>
<widgets>
- <screenlet title="${uiLabelMap.AccountingEditPaymentGroup} ${uiLabelMap.CommonFor} ${finAccount.finAccountName} [${finAccountId}]">
+ <screenlet title="${uiLabelMap.AccountingEditPaymentGroupFor}">
<include-form name="EditDepositSlip" location="component://accounting/widget/FinAccountForms.xml"/>
</screenlet>
- <screenlet title="${uiLabelMap.AccountingEditPaymentGroupMember} ${uiLabelMap.CommonFor} ${finAccount.finAccountName} [${finAccountId}]">
+ <screenlet title="${uiLabelMap.AccountingEditPaymentGroupMemberFor}">
<include-form name="AddDepositSlipMember" location="component://accounting/widget/FinAccountForms.xml"/>
<include-form name="ListDepositSlipMember" location="component://accounting/widget/FinAccountForms.xml"/>
</screenlet>