svn commit: r1088506 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml widget/AccountingMenus.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1088506 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml widget/AccountingMenus.xml

erwan
Author: erwan
Date: Mon Apr  4 08:43:32 2011
New Revision: 1088506

URL: http://svn.apache.org/viewvc?rev=1088506&view=rev
Log:
Adding missing uilabels in menu AccountingAddTax / AccountingConfirmationCancelOrder

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

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1088506&r1=1088505&r2=1088506&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Mon Apr  4 08:43:32 2011
@@ -473,6 +473,10 @@
         <value xml:lang="pt">Adicionar Membro do Grupo de Pagamento</value>
         <value xml:lang="zh_TW">增加支付群組成員</value>
     </property>
+    <property key="AccountingAddTax">
+        <value xml:lang="en">Add Tax</value>
+        <value xml:lang="fr">Ajouter les taxes</value>
+    </property>
     <property key="AccountingAddTaxAuthorityGlAccount">
         <value xml:lang="de">Steuerkonto hinzufügen</value>
         <value xml:lang="en">Add TaxAuthority GL Account</value>
@@ -2520,6 +2524,10 @@
         <value xml:lang="hi_IN">डिवीजनों ${partyNameList} से समेकित डेटा</value>
         <value xml:lang="pt">Os dados consolidados a partir das divisões ${partyNameList}</value>
     </property>
+    <property key="AccountingConfirmationCancelOrder">
+        <value xml:lang="en">Do you want to cancel this invoice number ${invoice.invoiceId}?</value>
+        <value xml:lang="fr">Voulez-vous annuler la facture n° ${invoice.invoiceId} ?</value>
+    </property>
     <property key="AccountingCopyAgreement">
         <value xml:lang="ar">نسخ الإتفاقية</value>
         <value xml:lang="de">Vereinbarung kopieren</value>

Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=1088506&r1=1088505&r2=1088506&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Mon Apr  4 08:43:32 2011
@@ -307,7 +307,7 @@ under the License.
                     </or>
                 </and>
             </condition>
-            <link target="setInvoiceStatus" request-confirmation="true" confirmation-message="You want to cancel this invoice number ${invoice.invoiceId}?">
+            <link target="setInvoiceStatus" request-confirmation="true" confirmation-message="${uiLabelMap.AccountingConfirmationCancelOrder}">
                 <parameter param-name="invoiceId" from-field="invoice.invoiceId"/>
                 <parameter param-name="statusId" value="INVOICE_CANCELLED"/>
             </link>
@@ -327,7 +327,7 @@ under the License.
                 <parameter param-name="invoiceTypeId" from-field="invoice.invoiceTypeId"/>
             </link>
         </menu-item>
-        <menu-item name="addtax" title="Add Tax">
+        <menu-item name="addtax" title="${uiLabelMap.AccountingAddTax}">
             <condition>
                 <and>
                     <not><if-empty field="invoice.invoiceId"/></not>