svn commit: r915217 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml script/org/ofbiz/accounting/payment/PaymentMapProcs.xml

[erwan]

Author: erwan
Date: Tue Feb 23 07:17:49 2010
New Revision: 915217

URL: http://svn.apache.org/viewvc?rev=915217&view=rev
Log:
Support of UiLabels in PaymentMapProcs.xml OFBIZ-3472 (https://issues.apache.org/jira/browse/OFBIZ-3472)

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=915217&r1=915216&r2=915217&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Feb 23 07:17:49 2010
@@ -100,6 +100,10 @@
         <value xml:lang="th">เลขที่บัญชี</value>
         <value xml:lang="zh">账户号码</value>
     </property>
+    <property key="AccountingAccountNumberMissing">
+        <value xml:lang="de">Kontonummer fehlt</value>
+        <value xml:lang="en">Account Number is missing</value>
+    </property>
     <property key="AccountingAccountTransactionId">
         <value xml:lang="en">Account Transaction Id</value>
         <value xml:lang="hi_IN">लेखा गतिविधि क्रमांक</value>
@@ -121,6 +125,10 @@
         <value xml:lang="th">ประเภทบัญชี</value>
         <value xml:lang="zh">账户类型</value>
     </property>
+    <property key="AccountingAccountTypeMissing">
+        <value xml:lang="de">Kontotyp fehlt</value>
+        <value xml:lang="en">Account Type is missing</value>
+    </property>
     <property key="AccountingAccounting">
         <value xml:lang="en">Accounting</value>
         <value xml:lang="de">Buchhaltung</value>
@@ -1284,6 +1292,10 @@
         <value xml:lang="th">ชื่อธนาคาร</value>
         <value xml:lang="zh">银行名称</value>
     </property>
+    <property key="AccountingBankNameMissing">
+        <value xml:lang="de">Bankname fehlt</value>
+        <value xml:lang="en">Bank Name is missing</value>
+    </property>
     <property key="AccountingBankReconciliation">
         <value xml:lang="en">Bank Reconciliation</value>
         <value xml:lang="hi_IN">बैन्क पुनर्मिलान</value>
@@ -1784,6 +1796,10 @@
         <value xml:lang="th">หมายเลขบัตร</value>
         <value xml:lang="zh">卡号</value>
     </property>
+    <property key="AccountingCardNumberMissing">
+        <value xml:lang="de">Kartennummer fehlt</value>
+        <value xml:lang="en">Card Number is missing</value>
+    </property>
     <property key="AccountingCardSecurityCode">
         <value xml:lang="cs">Bezpečnostní kód karty</value>
         <value xml:lang="de">Sicherheitscode der Karte</value>
@@ -1817,6 +1833,10 @@
         <value xml:lang="th">ประเภทบัตร</value>
         <value xml:lang="zh">卡类型</value>
     </property>
+    <property key="AccountingCardTypeMissing">
+        <value xml:lang="de">Kartentyp fehlt</value>
+        <value xml:lang="en">Card Type is missing</value>
+    </property>
   <property key="AccountingCashBalance">
         <value xml:lang="en">Cash Balance</value>
         <value xml:lang="fr">Solde de trésorerie</value>
@@ -2484,6 +2504,10 @@
         <value xml:lang="th">ข้อมูลบัตรเครดิต</value>
         <value xml:lang="zh">信用卡信息</value>
     </property>
+    <property key="AccountingCreditCardPaymentMethodIdMissing">
+        <value xml:lang="de">Kreditkarten-Zahlungsmethoden-Nummer fehlt</value>
+        <value xml:lang="en">Credit Card Payment Method ID is missing</value>
+    </property>
     <property key="AccountingCreditCardManualAuthFailedError">
         <value xml:lang="de">Kreditkarte wurde nicht erstellt. Kreditkarte nicht überprüft, Authentifizierung fehlgeschlagen.</value>
         <value xml:lang="en">Not creating credit card.  Credit card not verified, authentication failed.</value>
@@ -2850,6 +2874,10 @@
         <value xml:lang="th">ข้อมูลบัญชีธนาคาร</value>
         <value xml:lang="zh">电子资金转账账户信息</value>
     </property>
+    <property key="AccountingEFTAccountPaymentMethodIdMissing">
+        <value xml:lang="de">Lastschrift-Zahlungsmethoden-Nummer fehlt</value>
+        <value xml:lang="en">EFT Account Payment Method ID is missing</value>
+    </property>
     <property key="AccountingEFTNotBelongToYou">
         <value xml:lang="de">Die angegebene Bankverbindung gehört nicht zu Ihnen. Daher dürfen Sie die Infomationen dieser Bankverbindung weder einsehen noch bearbeiten.</value>
         <value xml:lang="en">The EFT Account specified does not belong to you, you may not view or edit it</value>
@@ -3266,6 +3294,18 @@
         <value xml:lang="th">วันหมดอายุ</value>
         <value xml:lang="zh">有效期</value>
     </property>
+    <property key="AccountingExpirationDateIsBeforeToday">
+        <value xml:lang="de">Ablaufdatum liegt in der Vergangenheit</value>
+        <value xml:lang="en">The expiration date is before today</value>
+    </property>
+    <property key="AccountingExpirationMonthMissing">
+        <value xml:lang="de">Ablaufmonat fehlt</value>
+        <value xml:lang="en">Expiration Month is missing</value>
+    </property>
+    <property key="AccountingExpirationYearMissing">
+        <value xml:lang="de">Ablaufjahr fehlt</value>
+        <value xml:lang="en">Expiration Year is missing</value>
+    </property>
     <property key="AccountingExportAsCsv">
         <value xml:lang="en">Export as CSV</value>
         <value xml:lang="hi_IN">सीएसवी के रूप में करे निर्यात</value>
@@ -3478,6 +3518,10 @@
         <value xml:lang="th">ชื่อ (บัตร)</value>
         <value xml:lang="zh">卡上姓名的第一组字母</value>
     </property>
+    <property key="AccountingFirstNameOnCardMissing">
+        <value xml:lang="de">Vorname des Karteninhabers fehlt</value>
+        <value xml:lang="en">First Name on Card is missing</value>
+    </property>
     <property key="AccountingFiscalMonth01">
         <value xml:lang="ar">01-يناير</value>
         <value xml:lang="de">01-Jan</value>
@@ -5511,6 +5555,10 @@
         <value xml:lang="th">นามสกุล (บัตร)</value>
         <value xml:lang="zh">卡上姓名的最后一组字母</value>
     </property>
+    <property key="AccountingLastNameOnCardMissing">
+        <value xml:lang="de">Nachname des Karteninhabers fehlt</value>
+        <value xml:lang="en">Last Name on Card is missing</value>
+    </property>
     <property key="AccountingLeaveEmptyForMaximumAmount">
         <value xml:lang="ar">أترك فارغا من أجل أقصى قيمة</value>
         <value xml:lang="de">Für maximalen Betrag leer lassen</value>
@@ -5859,6 +5907,10 @@
         <value xml:lang="th">ชื่อบนบัญชี</value>
         <value xml:lang="zh">账户名称</value>
     </property>
+    <property key="AccountingNameOnAccountMissing">
+        <value xml:lang="de">Name des Kontoinhabers fehlt</value>
+        <value xml:lang="en">Name on Account is missing</value>
+    </property>
     <property key="AccountingNameOnCard">
         <value xml:lang="cs">Majitel karty</value>
         <value xml:lang="de">Name der Karte</value>
@@ -7452,6 +7504,10 @@
         <value xml:lang="th">รหัสวิธีการชำระเงิน............???</value>
         <value xml:lang="zh">会计支付方法标识........</value>
     </property>
+    <property key="AccountingPaymentMethodIdMissing">
+        <value xml:lang="de">Zahlungsmethode fehlt</value>
+        <value xml:lang="en">Payment Method ID is missing</value>
+     </property>
     <property key="AccountingPaymentMethodIdPaymentMethodTypeIdNullError">
         <value xml:lang="de">Für 'paymentMethodId' und 'paymentMethodTypeId' wurden keine Werte übergeben. Es wird mindestens 'paymentMethodId' benötigt.</value>
         <value xml:lang="en">No values are passed for paymentMethodId or paymentMethodTypeId. At least pass paymentMethodId.</value>
@@ -8408,6 +8464,10 @@
         <value xml:lang="th">หมายเลข Routing</value>
         <value xml:lang="zh">路由号码</value>
     </property>
+    <property key="AccountingRoutingNumberMissing">
+        <value xml:lang="de">Bankleitzahl fehlt</value>
+        <value xml:lang="en">Routing Number is missing</value>
+  </property>
     <property key="AccountingRunningTotal">
         <value xml:lang="de">Laufender Kontostand</value>
         <value xml:lang="en">Running Total</value>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml?rev=915217&r1=915216&r2=915217&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml Tue Feb 23 07:17:49 2010
@@ -21,7 +21,7 @@
 <simple-map-processors xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
   <simple-map-processor name="deletePaymentMethod">
-    <process field="paymentMethodId"><copy/><not-empty><fail-message message="Payment Method ID is missing"/></not-empty></process>
+    <process field="paymentMethodId"><copy/><not-empty><fail-property resource="AccountingUiLabels" property="AccountingPaymentMethodIdMissing"/></not-empty></process>
   </simple-map-processor>
 
   <!-- CreditCard map procs -->
@@ -34,22 +34,22 @@
     <process field="partyId"><copy/></process>
     <process field="companyNameOnCard"><copy/></process>
     <process field="titleOnCard"><copy/></process>
-    <process field="firstNameOnCard"><copy/><not-empty><fail-message message="First Name on Card is missing"/></not-empty></process>
+    <process field="firstNameOnCard"><copy/><not-empty><fail-property resource="AccountingUiLabels" property="AccountingFirstNameOnCardMissing"/></not-empty></process>
     <process field="middleNameOnCard"><copy/></process>
-    <process field="lastNameOnCard"><copy/><not-empty><fail-message message="Last Name on Card is missing"/></not-empty></process>
+    <process field="lastNameOnCard"><copy/><not-empty><fail-property resource="AccountingUiLabels" property="AccountingLastNameOnCardMissing"/></not-empty></process>
     <process field="suffixOnCard"><copy/></process>
-    <process field="cardType"><copy/><not-empty><fail-message message="Card Type is missing"/></not-empty></process>
-    <process field="cardNumber"><copy/><not-empty><fail-message message="Card Number is missing"/></not-empty></process>
+    <process field="cardType"><copy/><not-empty><fail-property resource="AccountingUiLabels" property="AccountingCardTypeMissing"/></not-empty></process>
+    <process field="cardNumber"><copy/><not-empty><fail-property resource="AccountingUiLabels" property="AccountingCardNumberMissing"/></not-empty></process>
     <process field="contactMechId"><copy/></process>
     <process field="description"><copy/></process>
-    <process field="expMonth"><not-empty><fail-message message="Expiration Month is missing"/></not-empty></process>
-    <process field="expYear"><not-empty><fail-message message="Expiration Year is missing"/></not-empty></process>
+    <process field="expMonth"><not-empty><fail-property resource="AccountingUiLabels" property="AccountingExpirationMonthMissing"/></not-empty></process>
+    <process field="expYear"><not-empty><fail-property resource="AccountingUiLabels" property="AccountingExpirationYearMissing"/></not-empty></process>
     <process field="expireDate">
         <copy/>
-        <validate-method method="isDateAfterToday"><fail-message message="The expiration date is before today"/></validate-method></process>
+        <validate-method method="isDateAfterToday"><fail-property resource="AccountingUiLabels" property="AccountingExpirationDateIsBeforeToday"/></validate-method></process>
   </simple-map-processor>
   <simple-map-processor name="updateCreditCard">
-    <process field="paymentMethodId"><copy/><not-empty><fail-message message="Credit Card Payment Method ID is missing"/></not-empty></process>
+    <process field="paymentMethodId"><copy/><not-empty><fail-property resource="AccountingUiLabels" property="AccountingCreditCardPaymentMethodIdMissing"/></not-empty></process>
     <process field="description"><copy/></process>
     <!-- also call createCreditCard after calling updateCreditCard -->
   </simple-map-processor>
@@ -58,16 +58,16 @@
   <simple-map-processor name="createEftAccount">
     <process field="partyId"><copy/></process>
     <process field="description"><copy/></process>
-    <process field="bankName"><copy/><not-empty><fail-message message="Bank Name is missing"/></not-empty></process>
-    <process field="routingNumber"><copy/><not-empty><fail-message message="Routing Number is missing"/></not-empty></process>
-    <process field="accountType"><copy/><not-empty><fail-message message="Account Type is missing"/></not-empty></process>
-    <process field="accountNumber"><copy/><not-empty><fail-message message="Account Number is missing"/></not-empty></process>
-    <process field="nameOnAccount"><copy/><not-empty><fail-message message="Name on Account is missing"/></not-empty></process>
+    <process field="bankName"><copy/><not-empty><fail-property resource="AccountingUiLabels" property="AccountingBankNameMissing"/></not-empty></process>
+    <process field="routingNumber"><copy/><not-empty><fail-property resource="AccountingUiLabels" property="AccountingRoutingNumberMissing"/></not-empty></process>
+    <process field="accountType"><copy/><not-empty><fail-property resource="AccountingUiLabels" property="AccountingAccountTypeMissing"/></not-empty></process>
+    <process field="accountNumber"><copy/><not-empty><fail-property resource="AccountingUiLabels" property="AccountingAccountNumberMissing"/></not-empty></process>
+    <process field="nameOnAccount"><copy/><not-empty><fail-property resource="AccountingUiLabels" property="AccountingNameOnAccountMissing"/></not-empty></process>
     <process field="companyNameOnAccount"><copy/></process>
     <process field="contactMechId"><copy/></process>
   </simple-map-processor>
   <simple-map-processor name="updateEftAccount">
-    <process field="paymentMethodId"><copy/><not-empty><fail-message message="EFT Account Payment Method ID is missing"/></not-empty></process>
+    <process field="paymentMethodId"><copy/><not-empty><fail-property resource="AccountingUiLabels" property="AccountingEFTAccountPaymentMethodIdMissing"/></not-empty></process>
     <process field="description"><copy/></process>
     <!-- also call createEftAccount after calling updateEftAccount -->
   </simple-map-processor>