svn commit: r1230460 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml widget/FixedAssetScreens.xml

[er...@apache.org]

Author: erwan
Date: Thu Jan 12 09:58:32 2012
New Revision: 1230460

URL: http://svn.apache.org/viewvc?rev=1230460&view=rev
Log:
Adding missing uiLabels in FixedAssetScreens.xml

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1230460&r1=1230459&r2=1230460&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Thu Jan 12 09:58:32 2012
@@ -5750,6 +5750,9 @@
         <value xml:lang="pt">Reconciliação de contabilidade para: ${finAccount.finAccountName} [${finAccountId}]</value>
         <value xml:lang="zh">总账对账：${finAccount.finAccountName} [${finAccountId}]</value>
     </property>
+    <property key="AccountingGlMappings">
+        <value xml:lang="en">GL Mappings</value>
+    </property>
     <property key="AccountingGlobalGLSettings">
         <value xml:lang="de">Hauptbuch-Einstellungen, global</value>
         <value xml:lang="en">Global GL Settings</value>
@@ -14706,6 +14709,9 @@
         <value xml:lang="pt">Nova categoria de Conta Razão</value>
         <value xml:lang="zh">新建总账账户分类</value>
     </property>
+    <property key="FormFieldTitle_NextDepreciationAmount">
+        <value xml:lang="en">Next depreciation amount</value>
+    </property>
     <property key="FormFieldTitle_notApplied">
         <value xml:lang="en">Not Applied</value>
         <value xml:lang="fr">Non alloué</value>
@@ -16423,6 +16429,9 @@
         <value xml:lang="pt">Pagamentos de Depósito e Criar lote</value>
         <value xml:lang="zh">存款支付并创建批量处理</value>
     </property>
+    <property key="PageTitleFixedAssetDepreciationHistory">
+        <value xml:lang="en">Deprecation history</value>
+    </property>
     <property key="PageTitleEditAgreement">
         <value xml:lang="de">Vereinbarung ändern</value>
         <value xml:lang="en">Edit Agreement</value>

Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=1230460&r1=1230459&r2=1230460&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Thu Jan 12 09:58:32 2012
@@ -529,12 +529,12 @@ under the License.
                         <section>
                             <widgets>
                                 <screenlet title="${uiLabelMap.PageTitleFixedAssetDepreciationHistory}">
-                                    <label style="h3">${uiLabelMap.FixedAssetPurchaseCost}: ${fixedAsset.purchaseCost}</label>
-                                    <label style="h3">${uiLabelMap.FixedAssetDepreciation}: ${depreciation}</label>
-                                    <label style="h3">${uiLabelMap.FixedAssetSalvageValue}: ${fixedAsset.salvageValue}</label>
-                                    <label style="h3">${uiLabelMap.FixedAssetDateAcquired}: ${fixedAsset.dateAcquired}</label>
-                                    <label style="h3">${uiLabelMap.FixedAssetExpectedEndOfLife}: ${fixedAsset.expectedEndOfLife}</label>
-                                    <label style="h3">${uiLabelMap.FixedAssetNextDepreciationAmount}: ${assetDepreciationResultMap.nextDepreciationAmount}</label>
+                                    <label style="h3">${uiLabelMap.FormFieldTitle_purchaseCost}: ${fixedAsset.purchaseCost}</label>
+                                    <label style="h3">${uiLabelMap.FormFieldTitle_depreciation}: ${depreciation}</label>
+                                    <label style="h3">${uiLabelMap.FormFieldTitle_salvageValue}: ${fixedAsset.salvageValue}</label>
+                                    <label style="h3">${uiLabelMap.FormFieldTitle_dateAcquired}: ${fixedAsset.dateAcquired}</label>
+                                    <label style="h3">${uiLabelMap.FormFieldTitle_expectedEndOfLife}: ${fixedAsset.expectedEndOfLife}</label>
+                                    <label style="h3">${uiLabelMap.FormFieldTitle_NextDepreciationAmount}: ${assetDepreciationResultMap.nextDepreciationAmount}</label>
                                     <section>
                                         <condition>
                                             <and>
@@ -577,7 +577,7 @@ under the License.
                                     <include-form name="AddFixedAssetDepMethod" location="component://accounting/widget/FixedAssetForms.xml"/>
                                     <include-form name="ListFixedAssetDepMethods" location="component://accounting/widget/FixedAssetForms.xml"/>
                                 </screenlet>
-                                <screenlet title="GL Mappings">
+                                <screenlet title="${uiLabelMap.AccountingGlMappings}">
                                     <include-form name="AddFixedAssetTypeGlAccount" location="component://accounting/widget/FixedAssetForms.xml"/>
                                     <label style="h3">${uiLabelMap.PageTitleFixedAssetMappings}</label>
                                     <include-form name="FixedAssetTypeGlAccounts" location="component://accounting/widget/FixedAssetForms.xml"/>