svn commit: r902813 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml src/org/ofbiz/accounting/payment/PaymentMethodServices.java

[erwan]

Author: erwan
Date: Mon Jan 25 14:13:59 2010
New Revision: 902813

URL: http://svn.apache.org/viewvc?rev=902813&view=rev
Log:
Improvement on the OFBIZ-3423 issue, prefixing uilabels with Accounting

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=902813&r1=902812&r2=902813&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Mon Jan 25 14:13:59 2010
@@ -1817,7 +1817,7 @@
         <value xml:lang="th">ประเภทบัตร</value>
         <value xml:lang="zh">卡类型</value>
     </property>
- <property key="AccountingCashBalance">
+  <property key="AccountingCashBalance">
         <value xml:lang="en">Cash Balance</value>
         <value xml:lang="fr">Solde de trésorerie</value>
         <value xml:lang="hi_IN">रोकड़ शेष</value>
@@ -6245,6 +6245,16 @@
         <value xml:lang="th">เวลาที่กำหนดยอดรวมของบัญชีไม่มี</value>
         <value xml:lang="zh">不存在账单账户条件。</value>
     </property>
+    <property key="AccountingNoChangesMadeNotUpdatingCreditCard">
+        <value xml:lang="de">Keine Änderungen, Keditkarteninformationen werden nicht aktualisiert</value>
+        <value xml:lang="en">No changes made, not updating credit card</value>
+        <value xml:lang="fr">Aucun changement effectué, pas de mise à jour de la carte de crédit</value>
+    </property>
+    <property key="AccountingNoChangesMadeNotUpdatingEftAccount">
+        <value xml:lang="de">Keine Änderungen, EFT Account wurde nicht aktualisiert</value>
+        <value xml:lang="en">No changes made, not updating EFT Account</value>
+        <value xml:lang="en">Aucun changement effectué, pas de mise à jour du compte de virement électronique</value>
+    </property>
     <property key="AccountingNoChildPeriodsFound">
         <value xml:lang="de">Keine untergeordneten Zeiträume gefunden</value>
         <value xml:lang="en">No child periods found</value>
@@ -13984,12 +13994,4 @@
         <value xml:lang="en">Could not update credit card (write failure) : </value>
         <value xml:lang="it">Non è possibile aggiornare la carta di credito (fallimento in scrittura) : </value>
     </property>
-    <property key="NoChangesMadeNotUpdatingCreditCard">
-        <value xml:lang="de">Keine Änderungen, Keditkarteninformationen werden nicht aktualisiert</value>
-        <value xml:lang="en">No changes made, not updating credit card</value>
-    </property>
-    <property key="NoChangesMadeNotUpdatingEftAccount">
-        <value xml:lang="de">Keine Änderungen, EFT Account wurde nicht aktualisiert</value>
-        <value xml:lang="en">No changes made, not updating EFT Account</value>
-    </property>
 </resource>
\ No newline at end of file

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java?rev=902813&r1=902812&r2=902813&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java Mon Jan 25 14:13:59 2010
@@ -412,7 +412,7 @@
             result.put("oldPaymentMethodId", paymentMethodId);
             result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
             if (contactMechId == null || !contactMechId.equals("_NEW_")) {
-                result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(resource, "NoChangesMadeNotUpdatingCreditCard", locale));
+                result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(resource, "AccountingNoChangesMadeNotUpdatingCreditCard", locale));
             }
 
             return result;
@@ -628,7 +628,7 @@
             result.put("paymentMethodId", paymentMethodId);
             result.put("oldPaymentMethodId", paymentMethodId);
             result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
-            result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(resource, "NoChangesMadeNotUpdatingEftAccount", locale));
+            result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(resource, "AccountingNoChangesMadeNotUpdatingEftAccount", locale));
 
             return result;
         }
@@ -853,7 +853,7 @@
             result.put("paymentMethodId", paymentMethodId);
             result.put("oldPaymentMethodId", paymentMethodId);
             result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
-            result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(resource, "NoChangesMadeNotUpdatingEftAccount", locale));
+            result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(resource, "AccountingNoChangesMadeNotUpdatingEftAccount", locale));
 
             return result;
         }