OFBiz › OFBiz - Commits

svn commit: r933890 - in /ofbiz/trunk: applications/accounting/config/ applications/accounting/webapp/accounting/finaccounttrans/ applications/accounting/webapp/accounting/ledger/ applications/accounting/webapp/accounting/payment/ applications/accounti...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

erwan

svn commit: r933890 - in /ofbiz/trunk: applications/accounting/config/ applications/accounting/webapp/accounting/finaccounttrans/ applications/accounting/webapp/accounting/ledger/ applications/accounting/webapp/accounting/payment/ applications/accounti...

Author: erwan
Date: Wed Apr 14 09:19:52 2010
New Revision: 933890

URL: http://svn.apache.org/viewvc?rev=933890&view=rev
Log:
Applying OFBIZ-3694 "Pass Accounting label to Common Label". The AccountingNoRecordFound is now CommonNoRecordFound

Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl
ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl
ofbiz/trunk/applications/accounting/webapp/accounting/reports/ChartOfAccount.fo.ftl
ofbiz/trunk/applications/accounting/webapp/accounting/reports/CostCentersReport.fo.ftl
ofbiz/trunk/applications/accounting/webapp/accounting/reports/CostCentersReport.ftl
ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl
ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl
ofbiz/trunk/applications/accounting/webapp/ap/reports/CommissionReport.fo.ftl
ofbiz/trunk/applications/accounting/webapp/ar/payment/batchPayments.ftl
ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
ofbiz/trunk/framework/common/config/CommonUiLabels.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=933890&r1=933889&r2=933890&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Wed Apr 14 09:19:52 2010
@@ -6508,22 +6508,10 @@
<value xml:lang="en">Either no selected invoices in ready state or selected invoices outstanding amount equals to zero.</value>
<value xml:lang="hi_IN">à¤¯à¤¾ à¤¤à¥ à¤à¥à¤¨à¥ à¤à¤ à¤à¤¾à¤²à¤¾à¤¨ à¤¤à¥à¤¯à¤¾à¤° à¤à¥ à¤¸à¥à¤¥à¤¿à¤¤à¤¿ à¤®à¥à¤ à¤¨à¤¹à¥à¤ à¤¹à¥ à¤¯à¤¾ à¤à¤¯à¤¨à¤¿à¤¤ à¤à¤¾à¤²à¤¾à¤¨ à¤¬à¤à¤¾à¤¯à¤¾ à¤°à¤¾à¤¶à¤¿ à¤¶à¥à¤¨à¥à¤¯ à¤à¥ à¤¬à¤°à¤¾à¤¬à¤° à¤¹à¥</value>
</property>
- <property key="AccountingNoRecordFound">
- <value xml:lang="de">Kein Datensatz gefunden</value>
- <value xml:lang="en">No Record Found.</value>
- <value xml:lang="fr">Aucun rÃ©sultat trouvÃ©</value>
- <value xml:lang="hi_IN">à¤à¥à¤ à¤°à¤¿à¤à¥à¤°à¥à¤¡ à¤¨à¤¹à¥à¤ à¤®à¤¿à¤²à¤¾</value>
- </property>
<property key="AccountingNotAdjustmentFinAccountTrans">
<value xml:lang="en">Not a adjustment financial account transaction.</value>
<value xml:lang="hi_IN">à¤¸à¤®à¤¾à¤¯à¥à¤à¤¨ à¤µà¤¿à¤¤à¥à¤¤à¥à¤¯ à¤à¤¤à¤¿à¤µà¤¿à¤§à¤¿ à¤à¤¾à¤¤à¤¾ à¤¨à¤¹à¥à¤ à¤¹à¥</value>
</property>
- <property key="AccountingNotAssigned">
- <value xml:lang="de">Nicht zugewiesen</value>
- <value xml:lang="en">Not Assigned</value>
- <value xml:lang="fr">Non attribuÃ©</value>
- <value xml:lang="hi_IN">à¤¨à¤¿à¤°à¥à¤¦à¤¿à¤·à¥à¤ à¤¨à¤¹à¥à¤ </value>
- </property>
<property key="AccountingNotDepositFinAccountTrans">
<value xml:lang="en">Not a deposit financial account transaction.</value>
<value xml:lang="hi_IN">à¤à¤®à¤¾ à¤µà¤¿à¤¤à¥à¤¤à¥à¤¯ à¤à¤¾à¤¤à¤¾ à¤à¤¤à¤¿à¤µà¤¿à¤§à¤¿ à¤¨à¤¹à¥à¤ à¤¹à¥</value>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl?rev=933890&r1=933889&r2=933890&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl Wed Apr 14 09:19:52 2010
@@ -326,6 +326,6 @@ function getFinAccountTransRunningTotalA
</table>
</#if>
<#else>
- <h2>${uiLabelMap.AccountingNoRecordFound}</h2>
+ <h2>${uiLabelMap.CommonNoRecordFound}</h2>
</#if>
</div>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl?rev=933890&r1=933889&r2=933890&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl Wed Apr 14 09:19:52 2010
@@ -56,5 +56,5 @@ under the License.
<div align="right"><input type="button" id="costCentersSubmit" value="${uiLabelMap.CommonSubmit}"/></div>
</form>
<#else>
- <label>${uiLabelMap.AccountingNoRecordFound}</label>
+ <label>${uiLabelMap.CommonNoRecordFound}</label>
</#if>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl?rev=933890&r1=933889&r2=933890&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl Wed Apr 14 09:19:52 2010
@@ -115,7 +115,7 @@ function getPaymentRunningTotal() {
</div>
</table>
<#else>
- <span class="label">${uiLabelMap.AccountingNoRecordFound}</span>
+ <span class="label">${uiLabelMap.CommonNoRecordFound}</span>
</#if>
</form>
</div>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/ChartOfAccount.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/ChartOfAccount.fo.ftl?rev=933890&r1=933889&r2=933890&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/reports/ChartOfAccount.fo.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/ChartOfAccount.fo.ftl Wed Apr 14 09:19:52 2010
@@ -148,7 +148,7 @@ under the License.
</fo:table>
</fo:block>
<#else>
- <fo:block text-align="center">${uiLabelMap.AccountingNoRecordFound}</fo:block>
+ <fo:block text-align="center">${uiLabelMap.CommonNoRecordFound}</fo:block>
</#if>
</fo:flow>
</fo:page-sequence>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/CostCentersReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/CostCentersReport.fo.ftl?rev=933890&r1=933889&r2=933890&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/reports/CostCentersReport.fo.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/CostCentersReport.fo.ftl Wed Apr 14 09:19:52 2010
@@ -65,6 +65,6 @@ under the License.
</fo:table-body>
</fo:table>
<#else>
- <fo:block text-align="center">${uiLabelMap.AccountingNoRecordFound}</fo:block>
+ <fo:block text-align="center">${uiLabelMap.CommonNoRecordFound}</fo:block>
</#if>
</#escape>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/CostCentersReport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/CostCentersReport.ftl?rev=933890&r1=933889&r2=933890&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/reports/CostCentersReport.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/CostCentersReport.ftl Wed Apr 14 09:19:52 2010
@@ -43,5 +43,5 @@ under the License.
</#list>
</table>
<#else>
- <h2>${uiLabelMap.AccountingNoRecordFound}</h2>
+ <h2>${uiLabelMap.CommonNoRecordFound}</h2>
</#if>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl?rev=933890&r1=933889&r2=933890&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl Wed Apr 14 09:19:52 2010
@@ -124,7 +124,7 @@ under the License.
<fo:table-row>
<fo:table-cell number-columns-spanned="2"/>
<fo:table-cell padding="2pt">
- <fo:block>${uiLabelMap.AccountingNoRecordFound}</fo:block>
+ <fo:block>${uiLabelMap.CommonNoRecordFound}</fo:block>
</fo:table-cell>
<fo:table-cell number-columns-spanned="2"/>
</fo:table-row>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl?rev=933890&r1=933889&r2=933890&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl Wed Apr 14 09:19:52 2010
@@ -132,6 +132,6 @@ under the License.
</fo:table-body>
</fo:table>
<#else>
- ${uiLabelMap.AccountingNoRecordFound}
+ ${uiLabelMap.CommonNoRecordFound}
</#if>
</#escape>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl?rev=933890&r1=933889&r2=933890&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl Wed Apr 14 09:19:52 2010
@@ -87,6 +87,6 @@ under the License.
</form>
</div>
<#else>
- ${uiLabelMap.AccountingNoRecordFound}
+ ${uiLabelMap.CommonNoRecordFound}
</#if>
</div>

Modified: ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl?rev=933890&r1=933889&r2=933890&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl Wed Apr 14 09:19:52 2010
@@ -74,5 +74,5 @@ under the License.
</ul>
</div>
<#else>
- <td colspan='4'><h3>${uiLabelMap.AccountingNoRecordFound}</h3></td>
+ <td colspan='4'><h3>${uiLabelMap.CommonNoRecordFound}</h3></td>
</#if>

Modified: ofbiz/trunk/applications/accounting/webapp/ap/reports/CommissionReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/reports/CommissionReport.fo.ftl?rev=933890&r1=933889&r2=933890&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ap/reports/CommissionReport.fo.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/ap/reports/CommissionReport.fo.ftl Wed Apr 14 09:19:52 2010
@@ -84,7 +84,7 @@ under the License.
<fo:table-row height="14px">
<fo:table-cell number-columns-spanned="5">
<fo:block space-after="10pt"/>
- <fo:block text-align="center">${uiLabelMap.AccountingNoRecordFound}</fo:block>
+ <fo:block text-align="center">${uiLabelMap.CommonNoRecordFound}</fo:block>
</fo:table-cell>
</fo:table-row>
</#if>

Modified: ofbiz/trunk/applications/accounting/webapp/ar/payment/batchPayments.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ar/payment/batchPayments.ftl?rev=933890&r1=933889&r2=933890&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ar/payment/batchPayments.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/ar/payment/batchPayments.ftl Wed Apr 14 09:19:52 2010
@@ -190,7 +190,7 @@ function setServiceName(selection) {
</tbody>
</table>
<#else>
- <h3>${uiLabelMap.AccountingNoRecordFound}</h3>
+ <h3>${uiLabelMap.CommonNoRecordFound}</h3>
</#if>
</form>
</div>

Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=933890&r1=933889&r2=933890&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Wed Apr 14 09:19:52 2010
@@ -334,7 +334,7 @@ under the License.
</field>
<field name="glReconciliationId" position="2">
<drop-down allow-empty="true">
- <option key="_NA_" description="${uiLabelMap.AccountingNotAssigned}"/>
+ <option key="_NA_" description="${uiLabelMap.CommonNotAssigned}"/>
<list-options list-name="glReconciliations" key-name="glReconciliationId"
description="${glReconciliationName}[[${glReconciliationId}] [${reconciledDate}] [${reconciledBalance}]]"/>
</drop-down>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=933890&r1=933889&r2=933890&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Wed Apr 14 09:19:52 2010
@@ -4626,6 +4626,12 @@
<value xml:lang="zh">æ </value>
<value xml:lang="zh_CN">æ </value>
</property>
+ <property key="CommonNoRecordFound">
+ <value xml:lang="de">Kein Datensatz gefunden</value>
+ <value xml:lang="en">No Record Found.</value>
+ <value xml:lang="fr">Aucun rÃ©sultat trouvÃ©</value>
+ <value xml:lang="hi_IN">à¤à¥à¤ à¤°à¤¿à¤à¥à¤°à¥à¤¡ à¤¨à¤¹à¥à¤ à¤®à¤¿à¤²à¤¾</value>
+ </property>
<property key="CommonNormal">
<value xml:lang="en">Normal</value>
<value xml:lang="fr">Normal</value>
@@ -4651,6 +4657,12 @@
<value xml:lang="zh">ä¸æ¯</value>
<value xml:lang="zh_CN">ä¸æ¯</value>
</property>
+ <property key="CommonNotAssigned">
+ <value xml:lang="de">Nicht zugewiesen</value>
+ <value xml:lang="en">Not Assigned</value>
+ <value xml:lang="fr">Non attribuÃ©</value>
+ <value xml:lang="hi_IN">à¤¨à¤¿à¤°à¥à¤¦à¤¿à¤·à¥à¤ à¤¨à¤¹à¥à¤ </value>
+ </property>
<property key="CommonNotModifRecreat">
<value xml:lang="de">kann nur mit Neuanlage geÃ¤ndert werden</value>
<value xml:lang="en">cannot change without re-creating</value>