svn commit: r1051608 [1/2] - in /ofbiz/trunk/applications/accounting: config/ script/org/ofbiz/accounting/finaccount/ script/org/ofbiz/accounting/fixedasset/ script/org/ofbiz/accounting/invoice/ script/org/ofbiz/accounting/ledger/ script/org/ofbiz/acco...

[mrisaliti]

Author: mrisaliti
Date: Tue Dec 21 18:48:54 2010
New Revision: 1051608

URL: http://svn.apache.org/viewvc?rev=1051608&view=rev
Log:
Replace some fail-message to fail-property tag in accounting component (OFBIZ-1874)

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingErrorUiLabels.xml
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingErrorUiLabels.xml?rev=1051608&r1=1051607&r2=1051608&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingErrorUiLabels.xml Tue Dec 21 18:48:54 2010
@@ -19,6 +19,14 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <property key="AccountingDeleteRateAmount">
+        <value xml:lang="en">Could not find RateAmount record to be deleted</value>
+        <value xml:lang="it">Non è possibile trovare un record di RateAmount che deve essere cancellato</value>
+    </property>
+    <property key="AccountingFinAccountCannotPost">
+        <value xml:lang="en">Cannot post FinAccountTrans with ID ${parameters.finAccountTransId} to GL, could not find ${creditDebit} ${requiredField}</value>
+        <value xml:lang="it">Non post FinAccountTrans con ID ${parameters.finAccountTransId} in GL, could not find ${creditDebit} ${requiredField}</value>
+    </property>
     <property key="AccountingFinAccountInactiveStatusError">
         <value xml:lang="en">FinAccount must be in active status</value>
         <value xml:lang="fr">Le compte financier doit être dans un état actif</value>
@@ -42,6 +50,10 @@
         <value xml:lang="hi_IN">शॉपिंग कार्ट खाली है, एक्सप्रेस चेकआउट के साथ आगे नहीं बढ़ सकते</value>
         <value xml:lang="it">Il carrello è vuoto, non posso procedere con il checkout Express</value>
     </property>
+    <property key="AccountingTaxIdInvalidFormat">
+        <value xml:lang="en">The tax ID ${parameters.partyTaxId} was not in a valid format for the selected tax authority ${taxAuthority.taxIdFormatPattern}</value>
+        <value xml:lang="it">Id tasse ${parameters.partyTaxId} non è nel formato valido per l'autorità tasse selezionata ${taxAuthority.taxIdFormatPattern}</value>
+    </property>
     <property key="payPalEvents.failedToExecuteServiceCreatePaymentFromPreference">
         <value xml:lang="en">Failed to execute service createPaymentFromPreference</value>
         <value xml:lang="fr">Echec à l'exécution du service createPaymentFromPreference</value>

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1051608&r1=1051607&r2=1051608&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Dec 21 18:48:54 2010
@@ -4867,6 +4867,14 @@
         <value xml:lang="zh">总账账户</value>
         <value xml:lang="zh_TW">總帳科目</value>
     </property>
+    <property key="AccountingGlAccountNotSetForAccountType">
+        <value xml:lang="en">Gl account id is not set for ${acctgTransEntry.acctgTransEntrySeqId} or mapping not found for account type ${acctgTransEntry.glAccountTypeId}</value>
+        <value xml:lang="it">Conto contabilità generale non è impostato per ${acctgTransEntry.acctgTransEntrySeqId} o mappatura non trovata per il tipo conto ${acctgTransEntry.glAccountTypeId}</value>
+    </property>
+    <property key="AccountingGlAccountAmountNotSet">
+        <value xml:lang="en">Amount not set for ${acctgTransEntry.acctgTransEntrySeqId} or failed to convert the original amount ${acctgTransEntry.origAmount} with currency ${acctgTransEntry.origCurrencyUomId}</value>
+        <value xml:lang="it">Importo non impostato per ${acctgTransEntry.acctgTransEntrySeqId} o fallimento durante la conversion dell'importo originale ${acctgTransEntry.origAmount} con valuta ${acctgTransEntry.origCurrencyUomId}</value>
+    </property>
     <property key="AccountingGlAccountAssignments">
         <value xml:lang="ar">تعيينات الحساب المحاسبي</value>
         <value xml:lang="de">HB Kontenzuordnungen</value>
@@ -5179,6 +5187,10 @@
         <value xml:lang="zh">发票</value>
         <value xml:lang="zh_TW">發票</value>
     </property>
+    <property key="AccountingInvoiceAmountIsMandatory">
+        <value xml:lang="en">The amount value is mandatory</value>
+        <value xml:lang="it">L'importo fattura è obbligatorio</value>
+    </property>
     <property key="AccountingInvoiceCancelledCannotApplyTo">
         <value xml:lang="ar">الفاتورة  [${invoiceId}] قد ألغيت, لا يمكن تطبيقها على</value>
         <value xml:lang="de">Rechnung [${invoiceId}] ist storniert und kann nicht zugewiesen werden...</value>
@@ -5194,6 +5206,10 @@
         <value xml:lang="zh">发票[${invoiceId}]已取消，无法应用...</value>
         <value xml:lang="zh_TW">發票[${invoiceId}]已取消，無法應用...</value>
     </property>
+    <property key="AccountingInvoiceCannotChangeStatusToPaid">
+        <value xml:lang="en">Cannot change status to 'paid', invoice ${invoice.invoiceId} has an unapplied balance of ${notApplied}</value>
+        <value xml:lang="it">Non è possibile cambiare lo stato a 'pagato', fattura ${invoice.invoiceId} ha un bilancio non applicato di ${notApplied}</value>
+    </property>
     <property key="AccountingInvoiceCapitals">
         <value xml:lang="ar">فاتورة</value>
         <value xml:lang="de">RECHNUNG</value>
@@ -5376,6 +5392,10 @@
         <value xml:lang="zh">开票日期</value>
         <value xml:lang="zh_TW">開票日期</value>
     </property>
+    <property key="AccountingInvoiceDoesNotExists">
+        <value xml:lang="en">Invoice with id ${parameters.invoiceId} doesn't exist.</value>
+        <value xml:lang="it">Fattura con id ${parameters.invoiceId} non esiste.</value>
+    </property>
     <property key="AccountingInvoiceHeader">
         <value xml:lang="ar">الرأسية</value>
         <value xml:lang="de">Kopfzeile</value>
@@ -5455,6 +5475,10 @@
         <value xml:lang="zh">新建发票明细</value>
         <value xml:lang="zh_TW">新建發票明細</value>
     </property>
+    <property key="AccountingInvoiceItemDoesNotExists">
+        <value xml:lang="en">The Invoice Item with id ${parameters.invoiceItemSeqId} doesn't exist.</value>
+        <value xml:lang="it">Riga fattura con id ${parameters.invoiceItemSeqId} non esiste.</value>
+    </property>
     <property key="AccountingInvoiceItemLessRequested">
         <value xml:lang="en">Invoice [${invoiceId} Item [${invoiceItemSeqId} has ${invoiceItemApplyAvailable?currency(${isoCode})} to apply but  ${amountApplied?currency(${isoCode})} is requested</value>
         <value xml:lang="es">Factura [${invoiceId} Elemento [${invoiceItemSeqId} tiene ${invoiceItemApplyAvailable?currency(${isoCode})} para aplicar pero   ${amountApplied?currency(${isoCode})} es requerio</value>
@@ -5733,6 +5757,10 @@
         <value xml:lang="zh">销售发票</value>
         <value xml:lang="zh_TW">銷售發票</value>
     </property>
+    <property key="AccountingInvoiceUpdateOnlyWithInProcessStatus">
+        <value xml:lang="en">Can only update Invoice, when status is in-process...current status: ${lookedUpValue.statusId}</value>
+        <value xml:lang="it">La fattura può essere aggiornata solo quando lo stato è in-corso...stato attuale: ${lookedUpValue.statusId}</value>
+    </property>
     <property key="AccountingInvoicesDueSoon">
         <value xml:lang="en">Invoices Due Soon</value>
     </property>
@@ -6835,6 +6863,22 @@
         <value xml:lang="zh">没有选择当前的定制时间段；下面的"子集"没有上级时间段。</value>
         <value xml:lang="zh_TW">沒有選擇當前的定制時間段；下面的"子集"沒有上級時間段。</value>
     </property>
+    <property key="AccountingNoCustomTimePeriodClosed">
+        <value xml:lang="en">CustomTimePeriod (fiscal period) ${customTimePeriod.customTimePeriodId} is CLOSED, cannot post to it (is for the Transaction Date ${acctgTrans.transactionDate} and Organization Party with ID ${acctgTransEntry.organizationPartyId})</value>
+        <value xml:lang="it">CustomTimePeriod (periodo fiscale) ${customTimePeriod.customTimePeriodId} è CHIUSO, non è possibile contabilizzare (è la data transazione ${acctgTrans.transactionDate} e organizzazione con ID ${acctgTransEntry.organizationPartyId})</value>
+    </property>
+    <property key="AccountingNoCustomTimePeriodClosedChild">
+        <value xml:lang="en">Cannot close time period ${customTimePeriod.customTimePeriodId} because the child time period ${openChildTimePeriod.periodName} ${openChildTimePeriod.customTimePeriodId} is not closed.</value>
+        <value xml:lang="it">Non è possibile chiudere il periodo ${customTimePeriod.customTimePeriodId} perchè il periodo filgio ${openChildTimePeriod.periodName} ${openChildTimePeriod.customTimePeriodId} non è chiuso.</value>
+    </property>
+    <property key="AccountingNoCustomTimePeriodClosedForClosedDate">
+        <value xml:lang="en">Unable to find a last closed date for time period ${customTimePeriod.customTimePeriodId} of type ${customTimePeriod.customTimePeriodId} for organization ${customTimePeriod.organizationPartyId}</value>
+        <value xml:lang="it">Non è possibil trovate una data ultima chiusura per il periodo di tempo ${customTimePeriod.customTimePeriodId} del tipo ${customTimePeriod.customTimePeriodId} per l'organizzazione ${customTimePeriod.organizationPartyId}</value>
+    </property>
+    <property key="AccountingNoCustomTimePeriodFoundForTransactionDate">
+        <value xml:lang="en">Could not find a CustomTimePeriod (fiscal period) for the Transaction Date ${acctgTrans.transactionDate} (is for Organization Party with ID ${acctgTransEntry.organizationPartyId})</value>
+        <value xml:lang="it">Non è possibile trova un CustomTimePeriod (periodo fiscale) per la data transazione ${acctgTrans.transactionDate} (è una organizzazione con ID ${acctgTransEntry.organizationPartyId})</value>
+    </property>
     <property key="AccountingNoGenBilAddressFound">
         <value xml:lang="ar">لا عنوان عام/فوترة موجود للطرف</value>
         <value xml:lang="de">Keine Allgemeine-/Rechnungsadresse für Akteur gefunden:</value>
@@ -7053,6 +7097,38 @@
         <value xml:lang="zh">只有重新新建总账账户才能改变这个数据项。</value>
         <value xml:lang="zh_TW">只有重新新建總帳科目才能改變這個資料項。</value>
     </property>
+    <property key="AccountingNotPostingGlAccountTransactionAlreadyPosted">
+        <value xml:lang="en">AcctgTrans ${parameters.acctgTransId} has already been posted. Not posting again</value>
+        <value xml:lang="it">AcctgTrans ${parameters.acctgTransId} è già stata contabilizzata. Non contabilizzabile nuovamente</value>
+    </property>
+    <property key="AccountingNotPostingGlAccountTransactionBadDebitCreditFlag">
+        <value xml:lang="en">Bad debitCreditFlag ${acctgTransEntry.debitCreditFlag} (was not D or C) in Accounting Transaction Entry with acctgTransId=${acctgTransEntry.acctgTransId} and acctgTransEntrySeqId=${acctgTransEntry.acctgTransEntrySeqId}</value>
+        <value xml:lang="it">Flag debito/credito errato ${acctgTransEntry.debitCreditFlag} (non è D o C) in Accounting Transaction Entry con acctgTransId=${acctgTransEntry.acctgTransId} e acctgTransEntrySeqId=${acctgTransEntry.acctgTransEntrySeqId}</value>
+    </property>
+    <property key="AccountingNotPostingGlAccountTransactionCreditZero">
+        <value xml:lang="en">Not posting GL Accounting Transaction with ID ${parameters.acctgTransId} because credit total is zero: Debit Total=${trialBalanceResultMap.debitTotal} Credit Total=${trialBalanceResultMap.creditTotal} Debit/Credit Difference=${trialBalanceResultMap.debitCreditDifference}</value>
+        <value xml:lang="it">Non è possibile contabilizzare la GL Accounting Transaction con ID ${parameters.acctgTransId} perchè il credito totale è zero: Debito Totale=${trialBalanceResultMap.debitTotal} Credito Totale=${trialBalanceResultMap.creditTotal} Debito/Credito Differenza=${trialBalanceResultMap.debitCreditDifference}</value>
+    </property>
+    <property key="AccountingNotPostingGlAccountTransactionDebitZero">
+        <value xml:lang="en">Not posting GL Accounting Transaction with ID ${parameters.acctgTransId} because debit total is zero: Debit Total=${trialBalanceResultMap.debitTotal} Credit Total=${trialBalanceResultMap.creditTotal} Debit/Credit Difference=${trialBalanceResultMap.debitCreditDifference}</value>
+        <value xml:lang="it">Non è possibile contabilizzare la GL Accounting Transaction con ID ${parameters.acctgTransId} perchè il debito totale è zero: Debito Totale=${trialBalanceResultMap.debitTotal} Credito Totale=${trialBalanceResultMap.creditTotal} Debito/Credito Differenza=${trialBalanceResultMap.debitCreditDifference}</value>
+    </property>
+    <property key="AccountingNotPostingGlAccountTransactionTrialBalanceFailed">
+        <value xml:lang="en">Not posting GL Accounting Transaction with ID ${parameters.acctgTransId} because the trial balance failed: Debit Total=${trialBalanceResultMap.debitTotal} Credit Total=${trialBalanceResultMap.creditTotal} Debit/Credit Difference=${trialBalanceResultMap.debitCreditDifference}</value>
+        <value xml:lang="it">Non è possibile contabilizzare la GL Accounting Transaction con ID ${parameters.acctgTransId} perchè il bilancio di prova è fallito: Debito Totale=${trialBalanceResultMap.debitTotal} Credito Totale=${trialBalanceResultMap.creditTotal} Debito/Credito Differenza=${trialBalanceResultMap.debitCreditDifference}</value>
+    </property>
+    <property key="AccountingNotPostingGlAccountTransactionNotScheduledToBePosted">
+        <value xml:lang="en">Not posting GL Accounting Transaction with ID ${parameters.acctgTransId} because it's not scheduled to be posted yet. The scheduled posting date is ${acctgTrans.scheduledPostingDate}</value>
+        <value xml:lang="it">Non è possibile contabilizzare la GL Accounting Transaction con ID ${parameters.acctgTransId} perchè non è schedulato di essere ancora contabilizzato. La data di schedulazione contabilizzazione è ${acctgTrans.scheduledPostingDate}</value>
+    </property>
+    <property key="AccountingNotPostingGlJournalTrialBalanceFailed">
+        <value xml:lang="en">Not posting GL Journal with ID ${parameters.glJournalId} because the trial balance failed: Debit Total=${trialBalanceResultMap.debitTotal} Credit Total=${trialBalanceResultMap.creditTotal} Debit/Credit Difference=${trialBalanceResultMap.debitCreditDifference}</value>
+        <value xml:lang="it">Non è possibile contabilizzare il giornale con ID ${parameters.glJournalId} perchè il bilancio di prova è fallito: Debito Totale=${trialBalanceResultMap.debitTotal} Credito Totale=${trialBalanceResultMap.creditTotal} Debito/Credito Differenza=${trialBalanceResultMap.debitCreditDifference}</value>
+    </property>
+    <property key="AccountingNotReconcilingTransEntryAlreadyReconciled">
+        <value xml:lang="en">The accounting transaction entry ${acctgTransEntry.acctgTransId}/${acctgTransEntry.acctgTransEntrySeqId} is already reconciled: cannot reconcile.</value>
+        <value xml:lang="it">La voce transazione ${acctgTransEntry.acctgTransId}/${acctgTransEntry.acctgTransEntrySeqId} è già riconcialita: non può essere riconciliata.</value>
+    </property>
     <property key="AccountingNotWithdrawalFinAccountTrans">
         <value xml:lang="en">Not a withdrawal financial account transaction.</value>
         <value xml:lang="hi_IN">वापसी वित्तीय खाता गतिविधि नहीं है</value>
@@ -7716,6 +7792,10 @@
         <value xml:lang="zh">税务机关辖区 [${paymentApplication.taxAuthGeoId}]</value>
         <value xml:lang="zh_TW">稅務機關轄區 [${paymentApplication.taxAuthGeoId}]</value>
     </property>
+    <property key="AccountingPaymentApplicationCannotRemovedWithConfirmedStatus">
+        <value xml:lang="en">PaymentID ${payment.paymentId} has status 'confirmed', cannot remove application.</value>
+        <value xml:lang="it">ID pagamento ${payment.paymentId} ha lo stato 'confermato', non è possibile rimuovere l'applicazione pagamento.</value>
+    </property>
     <property key="AccountingPaymentApplicationNotFound">
         <value xml:lang="de">Zahlungs-Zuweisungs-Datensatz [${paymentApplicationId}] nicht gefunden</value>
         <value xml:lang="en">PaymentApplication record [${paymentApplicationId}] not found</value>
@@ -9626,6 +9706,14 @@
         <value xml:lang="zh">至少有一个产品税率使用了这个分类</value>
         <value xml:lang="zh_TW">至少有一個產品稅率使用了這個分類</value>
     </property>
+    <property key="AccountingTaxCannotCalculate">
+        <value xml:lang="en">Cannot calculate tax, no shipping or.......</value>
+        <value xml:lang="it">Non è possibile calcolare le tasse, nessuna spedizione o.......</value>
+    </property>
+    <property key="AccountingTaxProductIdCannotCalculate">
+        <value xml:lang="en">productId don't have value, cannot call calcTax service.</value>
+        <value xml:lang="it">Codice prodotto non ha nessun valore, non è possibile eseguire il servizio calcTax.</value>
+    </property>
     <property key="AccountingTaxSummary">
         <value xml:lang="ar">تقرير ملخص الضريبة</value>
         <value xml:lang="de">Zusammenfasssung Steuer-Bericht</value>
@@ -10187,6 +10275,10 @@
         <value xml:lang="zh">安全错误：要更新支付，你必须是支付方或接收方会员，或者具有PAY_INFO_UPDATE或PAY_INFO_ADMIN权限。</value>
         <value xml:lang="zh_TW">安全錯誤：要更新支付，你必須是支付方或接收方成員，或者具有PAY_INFO_UPDATE或PAY_INFO_ADMIN權限。</value>
     </property>
+    <property key="AccountingUpdatePermissionError">
+        <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the ACCOUNTING_UPDATE or ACCOUNTING_ADMIN permission, or the limited ACCOUNTING_ROLE_UPDATE permission</value>
+        <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} tu devi avere il permesso ACCOUNTING_UPDATE o ACCOUNTING_ADMIN, o il permesso limitato ACCOUNTING_ROLE_UPDATE</value>
+    </property>
     <property key="AccountingUpdateRateAmount">
         <value xml:lang="en">Update Rate amount</value>
         <value xml:lang="fr">Mise à jour d'une valeur de taux</value>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml?rev=1051608&r1=1051607&r2=1051608&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml Tue Dec 21 18:48:54 2010
@@ -104,13 +104,25 @@ under the License.
 
         <!-- Make sure we have the glAccountId, glAccountIdOffset, organizationPartyId -->
         <if-empty field="quickCreateAcctgTransAndEntries.debitGlAccountId">
-            <add-error><fail-message message="Cannot post FinAccountTrans with ID [${parameters.finAccountTransId}] to GL, could not find Debit glAccountId"/></add-error>
+            <add-error>
+                <set field="creditDebit" value="Debit"/>
+                <set field="requiredField" value="glAccountId"/>
+                <fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountCannotPost"/>
+            </add-error>
         </if-empty>
         <if-empty field="quickCreateAcctgTransAndEntries.creditGlAccountId">
-            <add-error><fail-message message="Cannot post FinAccountTrans with ID [${parameters.finAccountTransId}] to GL, could not find credit glAccountId"/></add-error>
+            <add-error>
+                <set field="creditDebit" value="credit"/>
+                <set field="requiredField" value="glAccountId"/>
+                <fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountCannotPost"/>
+            </add-error>
         </if-empty>
         <if-empty field="organizationPartyId">
-            <add-error><fail-message message="Cannot post FinAccountTrans with ID [${parameters.finAccountTransId}] to GL, could not find organizationPartyId"/></add-error>
+            <add-error>
+                <set field="creditDebit" value=""/>
+                <set field="requiredField" value="organizationPartyId"/>
+                <fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountCannotPost"/>
+            </add-error>
         </if-empty>
         <check-errors/>
         <call-service service-name="quickCreateAcctgTransAndEntries" in-map-name="quickCreateAcctgTransAndEntries" include-user-login="true"/>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=1051608&r1=1051607&r2=1051608&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Tue Dec 21 18:48:54 2010
@@ -109,7 +109,9 @@ under the License.
                     </entity-one>
                     <if-empty field="statusValidChange">
                         <!-- no valid change record found? return an error... -->
-                        <add-error><fail-property resource="CommonUiLabels" property="CommonErrorNoStatusValidChange"/></add-error>
+                        <add-error>
+                            <fail-property resource="CommonUiLabels" property="CommonErrorNoStatusValidChange"/>
+                        </add-error>
                         <check-errors/>
                     </if-empty>
                 </if-not-empty>
@@ -120,10 +122,14 @@ under the License.
             </then>
             <else>
                 <if-compare field="lookedUpValue.statusId" operator="equals" value="FNACT_MANFROZEN">
-                    <add-error><fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountInactiveStatusError"/></add-error>
+                    <add-error>
+                        <fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountInactiveStatusError"/>
+                    </add-error>
                 </if-compare>
                 <if-compare field="lookedUpValue.statusId" operator="equals" value="FNACT_CANCELLED">
-                    <add-error><fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountStatusNotValidError"/></add-error>
+                    <add-error>
+                        <fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountStatusNotValidError"/>
+                    </add-error>
                 </if-compare>
                 <check-errors/>
             </else>
@@ -171,10 +177,14 @@ under the License.
     <simple-method method-name="createFinAccountTrans" short-description="Create a Financial Account Transaction">
         <entity-one entity-name="FinAccount" value-field="finAccount"/>
         <if-compare field="finAccount.statusId" operator="equals" value="FNACT_MANFROZEN">
-            <add-error><fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountInactiveStatusError"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountInactiveStatusError"/>
+            </add-error>
         </if-compare>
         <if-compare field="finAccount.statusId" operator="equals" value="FNACT_CANCELLED">
-            <add-error><fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountStatusNotValidError"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountStatusNotValidError"/>
+            </add-error>
         </if-compare>
         <check-errors/>
         <call-simple-method method-name="getArithmeticSettingsInline"/>
@@ -212,10 +222,14 @@ under the License.
     <simple-method method-name="createFinAccountRole" short-description="Create a Financial Account Role">
         <entity-one entity-name="FinAccount" value-field="finAccount"/>
         <if-compare field="finAccount.statusId" operator="equals" value="FNACT_MANFROZEN">
-            <add-error><fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountInactiveStatusError"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountInactiveStatusError"/>
+            </add-error>
         </if-compare>
         <if-compare field="finAccount.statusId" operator="equals" value="FNACT_CANCELLED">
-            <add-error><fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountStatusNotValidError"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountStatusNotValidError"/>
+            </add-error>
         </if-compare>
         <check-errors/>
         <make-value value-field="newEntity" entity-name="FinAccountRole"/>
@@ -409,7 +423,9 @@ under the License.
                </or>
            </condition>
            <then>
-               <add-error><fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountInactiveStatusError"/></add-error>
+               <add-error>
+                   <fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountInactiveStatusError"/>
+               </add-error>
            </then>
         </if>
         <check-errors/>
@@ -420,12 +436,16 @@ under the License.
         <iterate list="payments" entry="payment">
             <set field="paymentRunningTotal" value="${paymentRunningTotal + payment.amount}" type="BigDecimal"/>
             <if-not-empty field="payment.finAccountTransId">
-                <add-error><fail-property resource="AccountingUiLabels" property="AccountingPaymentAlreadyAssociatedToFinAccountError"/></add-error>
+                <add-error>
+                    <fail-property resource="AccountingUiLabels" property="AccountingPaymentAlreadyAssociatedToFinAccountError"/>
+                </add-error>
             </if-not-empty>
             <check-errors/>
             <set field="isValidStatus" value="${payment.statusId == 'PMNT_SENT' @or payment.statusId == 'PMNT_RECEIVED'}" type="Boolean"/>
             <if-compare field="isValidStatus" operator="equals" value="false">
-                <add-error><fail-property resource="AccountingUiLabels" property="AccountingPaymentStatusIsNotReceivedOrSentError"/></add-error>
+                <add-error>
+                    <fail-property resource="AccountingUiLabels" property="AccountingPaymentStatusIsNotReceivedOrSentError"/>
+                </add-error>
             </if-compare>
             <check-errors/>
         </iterate>
@@ -442,7 +462,9 @@ under the License.
             <iterate list="payments" entry="payment">
                 <set field="isReceipt" value="${groovy:org.ofbiz.accounting.util.UtilAccounting.isReceipt(payment)}" type="Boolean"/>
                 <if-compare field="isReceipt" operator="equals" value="false" type="Boolean">
-                    <add-error><fail-property resource="AccountingUiLabels" property="AccountingCannotIncludeApPaymentError"/></add-error>
+                    <add-error>
+                        <fail-property resource="AccountingUiLabels" property="AccountingCannotIncludeApPaymentError"/>
+                    </add-error>
                 </if-compare>
                 <check-errors/>
                 <set field="updatePaymentCtx.paymentId" from-field="payment.paymentId"/>
@@ -493,7 +515,9 @@ under the License.
                 <field-map field-name="statusIdTo" from-field="parameters.statusId"/>
             </entity-one>
             <if-empty field="statusChange">
-                <add-error><fail-message message="${uiLabelMap.AccountingPSInvalidStatusChange}"/></add-error>
+                <add-error>
+                    <fail-property resource="AccountingUiLabels" property="AccountingPSInvalidStatusChange"/>
+                </add-error>
                 <log level="error" message="Cannot change from ${finAccountTrans.statusId} to ${parameters.statusId}"/>
                 <check-errors/>
             <else>
@@ -726,7 +750,9 @@ under the License.
             </if-compare>
             <call-service service-name="updateGlReconciliation" in-map-name="updateGlReconciliationMap"/>
         <else>
-            <add-error><fail-property resource="AccountingUiLabels" property="AccountingReconciliationError"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingReconciliationError"/>
+            </add-error>
             <check-errors/>
         </else>
         </if-not-empty>
@@ -941,10 +967,14 @@ under the License.
                 <field-map field-name="finAccountId" from-field="paymentMethod.finAccountId"/>
             </entity-one>
             <if-compare field="finAccount.statusId" operator="equals" value="FNACT_MANFROZEN">
-                <add-error><fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountInactiveStatusError"/></add-error>
+                <add-error>
+                    <fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountInactiveStatusError"/>
+                </add-error>
             </if-compare>
             <if-compare field="finAccount.statusId" operator="equals" value="FNACT_CANCELLED">
-                <add-error><fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountStatusNotValidError"/></add-error>
+                <add-error>
+                    <fail-property resource="AccountingErrorUiLabels" property="AccountingFinAccountStatusNotValidError"/>
+                </add-error>
             </if-compare>
             <check-errors/>
             <if-compare field="parameters.isDepositWithDrawPayment" operator="equals" value="Y">
@@ -992,7 +1022,9 @@ under the License.
         <entity-one entity-name="GlReconciliation" value-field="glReconciliation"/>
         <if-compare field="glReconciliation.statusId" operator="equals" value="GLREC_CREATED">
             <if-compare field="finAccountTrans.statusId" operator="not-equals" value="FINACT_TRNS_CREATED">
-                <add-error><fail-property resource="AccountingUiLabels" property="AccountingInvalidGlReconciliationAssignment"/></add-error>
+                <add-error>
+                    <fail-property resource="AccountingUiLabels" property="AccountingInvalidGlReconciliationAssignment"/>
+                </add-error>
                 <check-errors/>
             <else>
                 <set field="finAccountTrans.glReconciliationId" from-field="glReconciliationId"/>
@@ -1012,12 +1044,16 @@ under the License.
             </if-empty>
             <iterate list="payments" entry="payment">
                 <if-compare field="${payment.statusId == 'PMNT_SENT' @or payment.statusId == 'PMNT_RECEIVED' @or payment.statusId == 'PMNT_CONFIRMED'}" operator="equals" value="false">
-                    <add-error><fail-property resource="AccountingUiLabels" property="AccountingPaymentsAssociateWithFinAccountHasInvalidStatusError"/></add-error>
+                    <add-error>
+                        <fail-property resource="AccountingUiLabels" property="AccountingPaymentsAssociateWithFinAccountHasInvalidStatusError"/>
+                    </add-error>
                     <check-errors/>
                 </if-compare>
             </iterate>
         <else>
-            <add-error><fail-property resource="AccountingUiLabels" property="AccountingInvalidGlReconciliation"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingInvalidGlReconciliation"/>
+            </add-error>
             <check-errors/>
         </else>
         </if-compare>
@@ -1029,7 +1065,9 @@ under the License.
             <clear-field field="finAccountTrans.glReconciliationId"/>
             <store-value value-field="finAccountTrans"/>
         <else>
-            <add-error><fail-property resource="AccountingUiLabels" property="AccountingFinAccountTransInvalidStatusError"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingFinAccountTransInvalidStatusError"/>
+            </add-error>
             <check-errors/>
         </else>
         </if-compare>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml?rev=1051608&r1=1051607&r2=1051608&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml Tue Dec 21 18:48:54 2010
@@ -38,7 +38,9 @@ under the License.
             <!-- check the Duplicate ID> -->
             <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
             <if-not-empty field="fixedAsset">
-                <add-error><fail-property resource="AccountingUiLabels" property="AccountingFixedAssetIdAlreadyExists"/></add-error>
+                <add-error>
+                    <fail-property resource="AccountingUiLabels" property="AccountingFixedAssetIdAlreadyExists"/>
+                </add-error>
                 <log level="info" message="${AccountingUiLabels.AccountingFixedAssetIdAlreadyExists}"/>
                 <else>
                     <check-id field="parameters.fixedAssetId"/>
@@ -98,7 +100,7 @@ under the License.
 <!--     <simple-method method-name="updateFixedAssetCalendar" short-description="Update the calendar of the FixedAsset">
         <check-permission permission="ACCOUNTING" action="_UPDATE">
             <alt-permission permission="ACCOUNTING_ROLE" action="_UPDATE"/>
-            <fail-message message="Security Error: to run updateFixedAssetCalendar you must have the ACCOUNTING_UPDATE or ACCOUNTING_ADMIN permission, or the limited ACCOUNTING_ROLE_UPDATE permission"/>
+            <fail-property resource="AccountingUiLabels" property="AccountingUpdatePermissionError"/>
         </check-permission>
         <check-errors/>
 
@@ -124,7 +126,9 @@ under the License.
         <!-- Check, should not exist already -->
         <entity-one entity-name="FixedAssetStdCost" value-field="fixedAssetStdCost"/>
         <if-not-empty field="fixedAssetStdCost">
-            <add-error><fail-property resource="AccountingUiLabels" property="AccountingFixedAssetStdCostAlreadyExists"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingFixedAssetStdCostAlreadyExists"/>
+            </add-error>
         </if-not-empty>
         <check-errors/>
 
@@ -467,7 +471,9 @@ under the License.
         <entity-one entity-name="OrderHeader" value-field="lookedUpValue"/>
         <if-empty field="lookedUpValue">
             <set field="orderId" from-field="parameters.orderId"/>
-            <add-error><fail-property resource="AccountingUiLabels" property="AccountingOrderWithIdNotFound"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingOrderWithIdNotFound"/>
+            </add-error>
         </if-empty>
         <check-errors/>
 
@@ -488,7 +494,9 @@ under the License.
                <entity-one entity-name="OrderItem" value-field="lookedUpValue"/>
                <if-empty field="lookedUpValue">
                   <set field="orderItemSeqId" from-field="parameters.orderItemSeqId"/>
-                  <add-error><fail-property resource="AccountingUiLabels" property="AccountingOrderItemWithIdNotFound"/></add-error>
+                  <add-error>
+                      <fail-property resource="AccountingUiLabels" property="AccountingOrderItemWithIdNotFound"/>
+                  </add-error>
                </if-empty>
             </else>
         </if-empty>
@@ -800,7 +808,9 @@ under the License.
     <simple-method method-name="calculateFixedAssetDepreciation" short-description="Service to calculate the yearly depreciation from dateAcquired year to current financial year">
         <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
         <if-empty field="fixedAsset">
-            <add-error><fail-property resource="ManufacturingUiLabels" property="ManufacturingFixedAssetNotExist"/></add-error>
+            <add-error>
+                <fail-property resource="ManufacturingUiLabels" property="ManufacturingFixedAssetNotExist"/>
+            </add-error>
             <check-errors/>
         </if-empty>
         <set field="startIndex" value="0" type="Integer"/>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=1051608&r1=1051607&r2=1051608&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Tue Dec 21 18:48:54 2010
@@ -237,7 +237,9 @@ under the License.
                 <store-value value-field="lookedUpValue"/> <!-- update all non status and key fields -->
             </if-compare-field>
             <else>
-                <add-error><fail-message message="Can only update Invoice, when status is in-process...current status: ${lookedUpValue.statusId}"/></add-error>
+                <add-error>
+                    <fail-property resource="AccountingUiLabels" property="AccountingInvoiceUpdateOnlyWithInProcessStatus"/>
+                </add-error>
                 <log level="error" message="Can only update Invoice, when status is in-process...current Status: ${lookedUpValue.statusId}"/>
                 <check-errors/>
             </else>
@@ -293,7 +295,7 @@ under the License.
         </if-not-empty>
         <if-empty field="newEntity.amount">
             <add-error>
-                <fail-message message="The amount value is mandatory"/>
+                <fail-property resource="AccountingUiLabels" property="AccountingInvoiceAmountIsMandatory"/>
             </add-error>
         </if-empty>
         <create-value value-field="newEntity"/>
@@ -324,7 +326,7 @@ under the License.
         </if-not-empty>
         <if-empty field="newEntity.amount">
             <add-error>
-                <fail-message message="The amount value is mandatory"/>
+                <fail-property resource="AccountingUiLabels" property="AccountingInvoiceAmountIsMandatory"/>
             </add-error>
         </if-empty>
         <if-compare-field field="lookedUpValue" to-field="savedValue" operator="not-equals" type="Object">
@@ -356,7 +358,7 @@ under the License.
         </entity-one>
         <if-empty field="paymentApplication">
             <add-error>
-                <fail-message message="Cannot find payment application record [${parameters.paymentApplicationId}]"/>
+                <fail-property resource="AccountingUiLabels" property="AccountingPaymentApplicationNotFound"/>
             </add-error>
             <check-errors/>
         </if-empty>
@@ -368,7 +370,9 @@ under the License.
             </entity-one>
             <if-not-empty field="payment">
                 <if-compare field="payment.statusId" operator="equals" value="PMNT_CONFIRMED">
-                    <add-error><fail-message message="PaymentID [${payment.paymentId}] has status 'confirmed', cannot remove application."/></add-error>
+                    <add-error>
+                        <fail-property resource="AccountingUiLabels" property="AccountingPaymentApplicationCannotRemovedWithConfirmedStatus"/>
+                    </add-error>
                 </if-compare>
                 <check-errors/>
             </if-not-empty>
@@ -381,7 +385,9 @@ under the License.
                 <field-map field-name="invoiceId" value="${paymentApplication.invoiceId}"/>
             </entity-one>
             <if-empty field="invoice">
-                <add-error><fail-message message="Invoice not found, invoice Id: ${paymentApplication.invoiceId}"/></add-error>
+                <add-error>
+                    <fail-property resource="AccountingUiLabels" property="AccountingInvoiceNotFound"/>
+                </add-error>
                 <log level="info" message="Invoice not found, invoice Id: ${invoiceId}"/>
                 <check-errors/>
             </if-empty>
@@ -410,7 +416,9 @@ under the License.
             </entity-one>
             <if-not-empty field="toPayment">
                 <if-compare field="toPayment.statusId" operator="equals" value="PMNT_CONFIRMED">
-                    <add-error><fail-message message="Related payment [${toPayment.paymentId}] has status 'confirmed', cannot remove application."/></add-error>
+                    <add-error>
+                        <fail-property resource="AccountingUiLabels" property="AccountingPaymentApplicationCannotRemovedWithConfirmedStatus"/>
+                    </add-error>
                 </if-compare>
                 <check-errors/>
             </if-not-empty>
@@ -462,7 +470,9 @@ under the License.
                 <field-map field-name="statusIdTo" from-field="parameters.statusId"/>
             </entity-one>
             <if-empty field="statusChange">
-                <add-error><fail-message message="Status is not a valid change"/></add-error>
+                <add-error>
+                    <fail-property resource="AccountingUiLabels" property="AccountingPSInvalidStatusChange"/>
+                </add-error>
                 <log level="error" message="Cannot change from ${invoice.statusId} to ${parameters.statusId}"/>
                 <check-errors/>
             <else>
@@ -470,7 +480,9 @@ under the License.
                 <if-compare field="parameters.statusId" operator="equals" value="INVOICE_PAID">
                     <set field="notApplied" type="BigDecimal" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}"/>
                     <if-compare field="notApplied" operator="not-equals" value="0.00" type="BigDecimal">
-                        <add-error><fail-message message="Cannot change status to 'paid', invoice ${invoice.invoiceId} has an unapplied balance of [${notApplied}]"/></add-error>
+                        <add-error>
+                            <fail-property resource="AccountingUiLabels" property="AccountingInvoiceCannotChangeStatusToPaid"/>
+                        </add-error>
                         <check-errors/>
                     </if-compare>
 
@@ -570,13 +582,17 @@ under the License.
         <!-- find the current header record -->
         <entity-one entity-name="Invoice" value-field="headerValue"/>
         <if-empty field="headerValue">
-            <add-error><fail-message message="Invoice not found, invoice Id: ${invoiceId}"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingInvoiceNotFound"/>
+            </add-error>
             <log level="info" message="Invoice not found, invoice Id: ${invoiceId}"/>
             <check-errors/>
         </if-empty>
         <!-- check if the status is in progress... -->
         <if-compare field="headerValue.statusId" operator="not-equals" value="INVOICE_IN_PROCESS">
-            <add-error><fail-message message="Can only update Invoice, when status is in-process...is now: ${headerValue.statusId}"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingInvoiceUpdateOnlyWithInProcessStatus"/>
+            </add-error>
             <log level="info" message="Can only update Invoice, when status is in-process...is now: ${headerValue.statusId}"/>
         </if-compare>
         <check-errors/>
@@ -622,7 +638,9 @@ under the License.
     <simple-method method-name="cancelInvoice" short-description="Service to cancel the Invoices">
         <entity-one entity-name="Invoice" value-field="invoice"/>
         <if-empty field="invoice">
-            <add-error><fail-message message="${uiLabelMap.AccountingInvoiceNotFound}"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingInvoiceNotFound"/>
+            </add-error>
             <check-errors/>
         </if-empty>
         <get-related relation-name="PaymentApplication" value-field="invoice" list="paymentApplications"/>
@@ -727,7 +745,9 @@ under the License.
             </entity-and>
         </if-empty>
         <if-empty field="contacts">
-            <add-error><fail-message message="cannot calculate tax, no shipping or......."/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingTaxCannotCalculate"/>
+            </add-error>
         </if-empty>
         <first-from-list entry="contactMech" list="contacts"/>
         <entity-one entity-name="PostalAddress" value-field="postalAddress">
@@ -854,7 +874,7 @@ under the License.
             </then>
             <else>
                 <add-error>
-                    <fail-message message="productId don't have value, cannot call calcTax service."/>
+                    <fail-property resource="AccountingUiLabels" property="AccountingTaxProductIdCannotCalculate"/>
                 </add-error>
                 <log level="error" message="Cannot call calcTax service, when don't have productId"/>
                 <check-errors/>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml?rev=1051608&r1=1051607&r2=1051608&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml Tue Dec 21 18:48:54 2010
@@ -181,7 +181,9 @@ under the License.
                     </calculate>
                 <else>
                     <!-- uh-oh, bad debitCreditFlag... -->
-                      <add-error><fail-message message="Bad debitCreditFlag [${acctgTransEntry.debitCreditFlag}] (was not D or C) in Accounting Transaction Entry with acctgTransId=[${acctgTransEntry.acctgTransId}] and acctgTransEntrySeqId=[${acctgTransEntry.acctgTransEntrySeqId}]"/></add-error>
+                      <add-error>
+                          <fail-property resource="AccountingUiLabels" property="AccountingNotPostingGlAccountTransactionBadDebitCreditFlag"/>
+                      </add-error>
                 </else>
                 </if-compare>
             </else>
@@ -207,7 +209,9 @@ under the License.
         <!-- make sure the AcctgTrans has not already been posted -->
         <entity-one entity-name="AcctgTrans" value-field="acctgTrans" auto-field-map="true"/>
         <if-compare field="acctgTrans.isPosted" operator="equals" value="Y">
-            <add-error><fail-message message="AcctgTrans [${parameters.acctgTransId}] has already been posted. Not posting again"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingNotPostingGlAccountTransactionAlreadyPosted"/>
+            </add-error>
         </if-compare>
         <check-errors/>
 
@@ -217,16 +221,24 @@ under the License.
             <results-to-map map-name="trialBalanceResultMap"/>
         </call-service>
         <if-compare field="trialBalanceResultMap.debitCreditDifference" operator="greater-equals" value="0.01" type="BigDecimal">
-            <add-error><fail-message message="Not posting GL Accounting Transaction with ID [${parameters.acctgTransId}] because the trial balance failed: Debit Total=${trialBalanceResultMap.debitTotal} Credit Total=${trialBalanceResultMap.creditTotal} Debit/Credit Difference=${trialBalanceResultMap.debitCreditDifference}"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingNotPostingGlAccountTransactionTrialBalanceFailed"/>
+            </add-error>
         </if-compare>
         <if-compare field="trialBalanceResultMap.debitCreditDifference" operator="less-equals" value="-0.01" type="BigDecimal">
-            <add-error><fail-message message="Not posting GL Accounting Transaction with ID [${parameters.acctgTransId}] because the trial balance failed: Debit Total=${trialBalanceResultMap.debitTotal} Credit Total=${trialBalanceResultMap.creditTotal} Debit/Credit Difference=${trialBalanceResultMap.debitCreditDifference}"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingNotPostingGlAccountTransactionTrialBalanceFailed"/>
+            </add-error>
         </if-compare>
         <if-compare field="trialBalanceResultMap.debitTotal" operator="equals" value="0.00" type="BigDecimal">
-            <add-error><fail-message message="Not posting GL Accounting Transaction with ID [${parameters.acctgTransId}] because debit total is zero: Debit Total=${trialBalanceResultMap.debitTotal} Credit Total=${trialBalanceResultMap.creditTotal} Debit/Credit Difference=${trialBalanceResultMap.debitCreditDifference}"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingNotPostingGlAccountTransactionDebitZero"/>
+            </add-error>
         </if-compare>
         <if-compare field="trialBalanceResultMap.creditTotal" operator="equals" value="0.00" type="BigDecimal">
-            <add-error><fail-message message="Not posting GL Accounting Transaction with ID [${parameters.acctgTransId}] because credit total is zero: Debit Total=${trialBalanceResultMap.debitTotal} Credit Total=${trialBalanceResultMap.creditTotal} Debit/Credit Difference=${trialBalanceResultMap.debitCreditDifference}"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingNotPostingGlAccountTransactionCreditZero"/>
+            </add-error>
         </if-compare>
 
         <entity-condition entity-name="AcctgTransEntry" list="acctgTransEntryList">
@@ -239,7 +251,9 @@ under the License.
             <set field="scheduledPostingDate" from-field="acctgTrans.scheduledPostingDate"/>
             <set field="beforeScheduled" value="${groovy: org.ofbiz.base.util.UtilDateTime.nowTimestamp().before(scheduledPostingDate)}"/>
             <if-compare field="beforeScheduled" operator="equals" value="true" type="Boolean">
-                <add-error><fail-message message="Not posting GL Accounting Transaction with ID [${parameters.acctgTransId}] because it's not scheduled to be posted yet.  The scheduled posting date is [${acctgTrans.scheduledPostingDate}]"/></add-error>
+                <add-error>
+                    <fail-property resource="AccountingUiLabels" property="AccountingNotPostingGlAccountTransactionNotScheduledToBePosted"/>
+                </add-error>
             </if-compare>
         </if-not-empty>
 
@@ -268,12 +282,16 @@ under the License.
                 </call-service>
 
                 <if-empty field="customTimePeriodList">
-                    <add-error><fail-message message="Could not find a CustomTimePeriod (fiscal period) for the Transaction Date [${acctgTrans.transactionDate}] (is for Organization Party with ID [${acctgTransEntry.organizationPartyId}])"/></add-error>
+                    <add-error>
+                        <fail-property resource="AccountingUiLabels" property="AccountingNoCustomTimePeriodFoundForTransactionDate"/>
+                    </add-error>
                 </if-empty>
                 <!-- now do the actual isClose check -->
                 <iterate entry="customTimePeriod" list="customTimePeriodList">
                     <if-compare field="customTimePeriod.isClosed" operator="equals" value="Y">
-                        <add-error><fail-message message="CustomTimePeriod (fiscal period) [${customTimePeriod.customTimePeriodId}] is CLOSED, cannot post to it (is for the Transaction Date [${acctgTrans.transactionDate}] and Organization Party with ID [${acctgTransEntry.organizationPartyId}])"/></add-error>
+                        <add-error>
+                            <fail-property resource="AccountingUiLabels" property="AccountingNoCustomTimePeriodClosed"/>
+                        </add-error>
                     </if-compare>
                 </iterate>
 
@@ -281,14 +299,20 @@ under the License.
                 <set from-field="customTimePeriodList" field="customTimePeriodListByOrganizationPartyIdMap[acctgTransEntry.organizationPartyId]"/>
             </if-empty>
             <if-empty field="acctgTransEntry.glAccountId">
-                <add-error><fail-message message="Gl account id is not set for [${acctgTransEntry.acctgTransEntrySeqId}] or mapping not found for account type ${acctgTransEntry.glAccountTypeId}"/></add-error>
+                <add-error>
+                    <fail-property resource="AccountingUiLabels" property="AccountingGlAccountNotSetForAccountType"/>
+                </add-error>
             </if-empty>
             <if-empty field="acctgTransEntry.amount">
-                <add-error><fail-message message="Amount not set for [${acctgTransEntry.acctgTransEntrySeqId}] or failed to convert the original amount ${acctgTransEntry.origAmount} with currency ${acctgTransEntry.origCurrencyUomId}"/></add-error>
+                <add-error>
+                    <fail-property resource="AccountingUiLabels" property="AccountingGlAccountAmountNotSet"/>
+                </add-error>
             </if-empty>
             <!--
             <if-empty field="acctgTransEntry.currencyUomId">
-                <add-error><fail-message message="Currency is not set for [${acctgTransEntry.acctgTransEntrySeqId}]"/></add-error>
+                <add-error>
+                    
+                </add-error>
             </if-empty>
             -->
         </iterate>
@@ -428,7 +452,9 @@ under the License.
                                 </calcop>
                             </calculate>
                             <else>
-                                <add-error><fail-message message="Bad debitCreditFlag [${acctgTransEntry.debitCreditFlag}] (was not D or C) in Accounting Transaction Entry with acctgTransId=[${acctgTransEntry.acctgTransId}] and acctgTransEntrySeqId=[${acctgTransEntry.acctgTransEntrySeqId}]"/></add-error>
+                                <add-error>
+                                    <fail-property resource="AccountingUiLabels" property="AccountingNotPostingGlAccountTransactionBadDebitCreditFlag"/>                                    
+                                </add-error>
                             </else>
                         </if-compare>
                     </else>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=1051608&r1=1051607&r2=1051608&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Tue Dec 21 18:48:54 2010
@@ -172,7 +172,9 @@ under the License.
         </call-service>
 
         <if-compare field="trialBalanceResultMap.debitCreditDifference" operator="not-equals" value="0" type="BigDecimal">
-            <add-error><fail-message message="Not posting GL Journal with ID [${parameters.glJournalId}] because the trial balance failed: Debit Total=${trialBalanceResultMap.debitTotal} Credit Total=${trialBalanceResultMap.creditTotal} Debit/Credit Difference=${trialBalanceResultMap.debitCreditDifference}"/></add-error>
+            <add-error>
+    <fail-property resource="AccountingUiLabels" property="AccountingNotPostingGlJournalTrialBalanceFailed"/>
+ </add-error>
             <check-errors/>
         </if-compare>
 
@@ -233,7 +235,9 @@ under the License.
         <!-- first of all, make sure that the AcctgTransEntry is not already reconciled -->
         <entity-one entity-name="AcctgTransEntry" value-field="acctgTransEntry"/>
         <if-compare field="acctgTransEntry.reconcileStatusId" operator="equals" value="AES_RECONCILED">
-            <add-error><fail-message message="The accounting transaction entry ${acctgTransEntry.acctgTransId}/${acctgTransEntry.acctgTransEntrySeqId} is already reconciled: cannot reconcile."/></add-error>
+            <add-error>
+    <fail-property resource="AccountingUiLabels" property="AccountingNotReconcilingTransEntryAlreadyReconciled"/>
+ </add-error>
             <check-errors/>
         </if-compare>
         <make-value entity-name="GlReconciliationEntry" value-field="newEntity"/>
@@ -652,7 +656,9 @@ under the License.
         <set field="openTimePeriodCondition.isClosed" value="N"/>
         <get-related value-field="customTimePeriod" relation-name="ChildCustomTimePeriod" list="openChildTimePeriods" map="openTimePeriodCondition"/>
         <iterate list="openChildTimePeriods" entry="openChildTimePeriod">
-            <add-error><fail-message message="Cannot close time period [${customTimePeriod.customTimePeriodId}] because the child time period ${openChildTimePeriod.periodName} [${openChildTimePeriod.customTimePeriodId}] is not closed."/></add-error>
+            <add-error>
+    <fail-property resource="AccountingUiLabels" property="AccountingNoCustomTimePeriodClosedChild"/>
+ </add-error>
         </iterate>
         <check-errors/>
         <!-- retrieve the last closed date for the same type of time period -->
@@ -663,7 +669,9 @@ under the License.
             <result-to-field result-name="lastClosedTimePeriod"/>
         </call-service>
         <if-empty field="lastClosedDate">
-            <add-error><fail-message message="Unable to find a last closed date for time period [${customTimePeriod.customTimePeriodId}] of type [${customTimePeriod.customTimePeriodId}] for organization [${customTimePeriod.organizationPartyId}]"/></add-error>
+            <add-error>
+    <fail-property resource="AccountingUiLabels" property="AccountingNoCustomTimePeriodClosedForClosedDate"/>
+ </add-error>
         </if-empty>
         <check-errors/>
         <entity-one entity-name="GlAccountClass" value-field="expenseGlAccountClass">

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml?rev=1051608&r1=1051607&r2=1051608&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml Tue Dec 21 18:48:54 2010
@@ -24,7 +24,9 @@ under the License.
     <simple-method method-name="loadSalesInvoiceFact" short-description="">
         <entity-one entity-name="Invoice" value-field="invoice"/>
         <if-empty field="invoice">
-            <add-error><fail-message message="Invoice with id [${parameters.invoiceId}] doesn't exist."/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingInvoiceDoesNotExists"/>
+            </add-error>
         </if-empty>
         <check-errors/>
         <if-compare field="invoice.invoiceTypeId" operator="equals" value="SALES_INVOICE">
@@ -48,10 +50,14 @@ under the License.
             <entity-one entity-name="InvoiceItem" value-field="invoiceItem"/>
         </if-empty>
         <if-empty field="invoice">
-            <add-error><fail-message message="Invoice with id [${parameters.invoiceId}] doesn't exist."/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingInvoiceDoesNotExists"/>
+            </add-error>
         </if-empty>
         <if-empty field="invoiceItem">
-            <add-error><fail-message message="The Invoice Item with id [${parameters.invoiceItemSeqId}] doesn't exist."/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingInvoiceItemDoesNotExists"/>
+            </add-error>
         </if-empty>
         <check-errors/>
 

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=1051608&r1=1051607&r2=1051608&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Tue Dec 21 18:48:54 2010
@@ -30,7 +30,9 @@ under the License.
                 </and>
             </condition>
             <then>
-                <add-error><fail-property resource="AccountingUiLabels" property="AccountingCreatePaymentPermissionError"/></add-error>
+                <add-error>
+                    <fail-property resource="AccountingUiLabels" property="AccountingCreatePaymentPermissionError"/>
+                </add-error>
             </then>
         </if>
         <check-errors/>
@@ -90,7 +92,9 @@ under the License.
                 </and>
             </condition>
             <then>
-                <add-error><fail-property resource="AccountingUiLabels" property="AccountingUpdatePaymentPermissionError"/></add-error>
+                <add-error>
+                    <fail-property resource="AccountingUiLabels" property="AccountingUpdatePaymentPermissionError"/>
+                </add-error>
             </then>
         </if>
         <check-errors/>
@@ -146,7 +150,9 @@ under the License.
             <if-empty field="parameters.billingAccountId">
                 <if-empty field="parameters.taxAuthGeoId">
                     <if-empty field="parameters.overrideGlAccountId">
-                      <add-error><fail-property resource="AccountingUiLabels" property="AccountingPaymentApplicationParameterMissing"/></add-error>
+                      <add-error>
+                          <fail-property resource="AccountingUiLabels" property="AccountingPaymentApplicationParameterMissing"/>
+                      </add-error>
                       <check-errors/>
                     </if-empty>
                 </if-empty>
@@ -198,7 +204,9 @@ under the License.
                 <field-map field-name="statusIdTo" from-field="parameters.statusId"/>
             </entity-one>
             <if-empty field="statusChange">
-                <add-error><fail-property resource="AccountingUiLabels" property="AccountingPSInvalidStatusChange"/></add-error>
+                <add-error>
+                    <fail-property resource="AccountingUiLabels" property="AccountingPSInvalidStatusChange"/>
+                </add-error>
                 <log level="error" message="Cannot change from ${payment.statusId} to ${parameters.statusId}"/>
                 <check-errors/>
                 <else>
@@ -207,7 +215,9 @@ under the License.
                     <if-compare field="parameters.statusId" operator="equals" value="PMNT_CONFIRMED">
                         <set field="notYetApplied" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment)}"/>
                         <if-compare field="notYetApplied" operator="greater" value="0.00" type="BigDecimal">
-                            <add-error><fail-property resource="AccountingUiLabels" property="AccountingPSNotConfirmedNotFullyApplied"/></add-error>
+                            <add-error>
+                                <fail-property resource="AccountingUiLabels" property="AccountingPSNotConfirmedNotFullyApplied"/>
+                            </add-error>
                             <log level="error" message="Cannot change from ${payment.statusId} to ${parameters.statusId}, payment not fully applied: ${notYetapplied}"/>
                             <check-errors/>
                         </if-compare>
@@ -417,7 +427,9 @@ under the License.
         <set field="transStatusId" value="FINACT_TRNS_CANCELED"/>
         <field-to-result field="transStatusId" result-name="statusId"/>
         <if-empty field="payment">
-            <add-error><fail-message message="${uiLabelMap.AccountingNoPaymentsfound}"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingNoPaymentsfound"/>
+            </add-error>
             <check-errors/>
         </if-empty>
         <set field="paymentId" from-field="parameters.paymentId"/>
@@ -510,10 +522,14 @@ under the License.
             <field-map field-name="finAccountId" from-field="paymentMethod.finAccountId"/>
         </entity-one>
         <if-compare field="finAccount.statusId" operator="equals" value="FNACT_MANFROZEN">
-            <add-error><fail-property resource="AccountingErrorUiLabels.xml" property="AccountingFinAccountInactiveStatusError"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingErrorUiLabels.xml" property="AccountingFinAccountInactiveStatusError"/>
+            </add-error>
         </if-compare>
         <if-compare field="finAccount.statusId" operator="equals" value="FNACT_CANCELLED">
-            <add-error><fail-property resource="AccountingErrorUiLabels.xml" property="AccountingFinAccountStatusNotValidError"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingErrorUiLabels.xml" property="AccountingFinAccountStatusNotValidError"/>
+            </add-error>
         </if-compare>
         <check-errors/>
         <set field="invoices" type="List"/>
@@ -565,7 +581,9 @@ under the License.
                 <first-from-list list="invoicePaymentInfoList" entry="invoicePaymentInfo"/>
                 <set field="paymentAmount" value="${paymentAmount + invoicePaymentInfo.outstandingAmount}"/>
             <else>
-                <add-error><fail-property resource="AccountingUiLabels" property="AccountingInvoicesRequiredInReadyStatus"/></add-error>
+                <add-error>
+                    <fail-property resource="AccountingUiLabels" property="AccountingInvoicesRequiredInReadyStatus"/>
+                </add-error>
                 <check-errors/>
             </else>
             </if-compare>
@@ -722,7 +740,9 @@ under the License.
             </if-compare>
         </iterate>
         <if-not-empty field="disbursementPaymentIds">
-            <add-error><fail-property resource="AccountingUiLabels" property="AccountingCannotIncludeApPaymentError"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingCannotIncludeApPaymentError"/>
+            </add-error>
             <check-errors/>
         </if-not-empty>
         <entity-condition entity-name="PaymentGroupMember" list="paymentGroupMembers" filter-by-date="true">
@@ -730,7 +750,9 @@ under the License.
         </entity-condition>
         <if-not-empty field="paymentGroupMembers">
             <set field="batchPaymentIds" value="${groovy:org.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(paymentGroupMembers, 'paymentId', true);}" type="List"/>
-            <add-error><fail-property resource="AccountingUiLabels" property="AccountingPaymentsAreAlreadyBatchedError"/></add-error>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingPaymentsAreAlreadyBatchedError"/>
+            </add-error>
             <check-errors/>
         <else>
             <set-service-fields service-name="createPaymentGroupAndMember" map="parameters" to-map="createPaymentGroupAndMemberMap"/>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml?rev=1051608&r1=1051607&r2=1051608&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml Tue Dec 21 18:48:54 2010
@@ -23,7 +23,9 @@ under the License.
 
     <simple-method method-name="updateRateAmount" short-description="update/create a rate amount value">
         <set value="_CREATE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
+        <check-permission permission="ACCOUNTING" action="${securityAction}">
+            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+        </check-permission>
         <check-errors/>
 
         <!-- set defaults -->
@@ -72,7 +74,9 @@ under the License.
 
     <simple-method method-name="deleteRateAmount" short-description="update/create a rate amount value">
         <set value="_CREATE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
+        <check-permission permission="ACCOUNTING" action="${securityAction}">
+            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+        </check-permission>
         <check-errors/>
 
         <!-- set defaults -->
@@ -97,16 +101,20 @@ under the License.
         <if-not-empty field="rateAmount">
             <now-timestamp field="rateAmount.thruDate"/>
             <store-value value-field="rateAmount"/>
-            <else>
-                <add-error><fail-message message="could not find record to be deleted"/></add-error>
-            </else>
+        <else>
+            <add-error>
+                <fail-property resource="AccountingErrorUiLabels" property="AccountingDeleteRateAmount"/>
+            </add-error>
+        </else>
         </if-not-empty>
 
     </simple-method>
 
     <simple-method method-name="getRateAmount" short-description="Get the applicable rate amount value">
         <set value="_READ" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
+        <check-permission permission="ACCOUNTING" action="${securityAction}">
+            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+        </check-permission>
         <check-errors/>
         <!--
            Search for the applicable rate from most specific to most general in the RateAmount entity
@@ -293,7 +301,9 @@ under the License.
     <!-- party rate services -->
     <simple-method method-name="updatePartyRate" short-description="Update/Create PartyRate">
         <set value="_CREATE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
+        <check-permission permission="ACCOUNTING" action="${securityAction}">
+            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+        </check-permission>
         <check-errors/>
 
         <!-- check if already exist is so expire current record -->
@@ -322,7 +332,9 @@ under the License.
 
     <simple-method method-name="checkOtherDefaultRate" short-description="remove an other defaultRate flag">
         <set value="_CREATE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
+        <check-permission permission="ACCOUNTING" action="${securityAction}">
+            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+        </check-permission>
         <check-errors/>
         <if-compare field="newEntity.defaultRate" value="Y" operator="equals">
             <entity-and entity-name="PartyRate" list="rates" filter-by-date="true">
@@ -338,7 +350,9 @@ under the License.
     </simple-method>
     <simple-method method-name="deletePartyRate" short-description="Delete PartyRate">
         <set value="_UPDATE" field="securityAction"/>
-        <check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
+        <check-permission permission="ACCOUNTING" action="${securityAction}">
+            <fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
+        </check-permission>
         <check-errors/>
 
         <entity-one entity-name="PartyRate" value-field="lookedUpValue"/>