svn commit: r726399 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml src/org/ofbiz/accounting/agreement/AgreementServices.java

Author: jleroux
Date: Sun Dec 14 01:26:48 2008
New Revision: 726399

URL: http://svn.apache.org/viewvc?rev=726399&view=rev
Log:
No needs for a specific label

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=726399&r1=726398&r2=726399&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Sun Dec 14 01:26:48 2008
@@ -1885,18 +1885,6 @@
         <value xml:lang="th">การแลกเปลี่ยนข้อมูล</value>
         <value xml:lang="zh">数据交换</value>
     </property>
-    <property key="AccountingDataSourceError">
-        <value xml:lang="ar">خطأ مصدر معلومات</value>
-        <value xml:lang="en">Data source error</value>
-        <value xml:lang="es">Error de origen de datos</value>
-        <value xml:lang="fr">Erreur - source de données</value>
-        <value xml:lang="it">Errore Sorgente Dati</value>
-        <value xml:lang="nl">Fout databron</value>
-        <value xml:lang="ro">Eroare Resurse Date</value>
-        <value xml:lang="ru">Ошибка источника данных</value>
-        <value xml:lang="th">แหล่งข้อมูลผิดพลาด</value>
-        <value xml:lang="zh">数据源错误</value>
-    </property>
     <property key="AccountingDateAcquiredIsEmpty">
         <value xml:lang="en">Field dateAcquired is empty in FixedAsset data.</value>
         <value xml:lang="fr">Le champ date acquise est vide dans les données d'immobilisation</value>

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java?rev=726399&r1=726398&r2=726399&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java Sun Dec 14 01:26:48 2008
@@ -180,7 +180,7 @@
         } catch (GenericEntityException e) {
             Debug.logWarning(e, module);
             Map messageMap = UtilMisc.toMap("errMessage", e.getMessage());
-            errMsg = UtilProperties.getMessage(resource, "AccountingDataSourceError", messageMap, locale);
+            errMsg = UtilProperties.getMessage("CommonUiLabels", "CommonDatabaseProblem", messageMap, locale);
             return ServiceUtil.returnError(errMsg);
         }
         return UtilMisc.toMap(