svn commit: r1051615 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: mrisaliti
Date: Tue Dec 21 19:08:46 2010 New Revision: 1051615 URL: http://svn.apache.org/viewvc?rev=1051615&view=rev Log: Replace some fail-message to fail-property tag in accounting component (OFBIZ-1874) Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1051615&r1=1051614&r2=1051615&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Dec 21 19:08:46 2010 @@ -2108,6 +2108,10 @@ <value xml:lang="hi_IN">बà¤à¤¦ नà¤à¤¦à¥ शà¥à¤·</value> <value xml:lang="zh_TW">ééç¾éé¤é¡</value> </property> + <property key="AccountingCOGSCostingMethodIsNotSupported"> + <value xml:lang="en">COGS costing method is not supported: ${partyAcctgPreference.cogsMethodId}</value> + <value xml:lang="it">Metodo costi COGS non è supportato: ${partyAcctgPreference.cogsMethodId}</value> + </property> <property key="AccountingComments"> <value xml:lang="ar">تعاÙÙÙ</value> <value xml:lang="de">Kommentare</value> @@ -5191,6 +5195,10 @@ <value xml:lang="en">The amount value is mandatory</value> <value xml:lang="it">L'importo fattura è obbligatorio</value> </property> + <property key="AccountingInvoiceBadInvoiceType"> + <value xml:lang="en">Bad invoiceTypeId ${invoiceType.invoiceTypeId}. Service createAcctgTransForCustomerReturnInvoice for type CUST_RTN_INVOICE.</value> + <value xml:lang="it">Tipo fattura errato ${invoiceType.invoiceTypeId}. Il servizio createAcctgTransForCustomerReturnInvoice vuole il tipo CUST_RTN_INVOICE.</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> @@ -7082,6 +7090,10 @@ <value xml:lang="en">Not a deposit financial account transaction.</value> <value xml:lang="hi_IN">à¤à¤®à¤¾ वितà¥à¤¤à¥à¤¯ à¤à¤¾à¤¤à¤¾ à¤à¤¤à¤¿à¤µà¤¿à¤§à¤¿ नहà¥à¤ हà¥</value> </property> + <property key="AccountingNotFindAccountingInventory"> + <value xml:lang="en">Could not find enough accounting inventory for product ${inventoryItem.productId}; remaining quantity: ${remainingQuantity}</value> + <value xml:lang="it">Non è possibile trovare abbastanza inventario contabile per il prodotto ${inventoryItem.productId}; quantità rimanente: ${remainingQuantity}à¥</value> + </property> <property key="AccountingNotModificationRecrationGlAccount"> <value xml:lang="ar">Ùا ÙÙ Ù٠تعÙÙر Ùذا دÙ٠إعادة إستØداث Øساب اÙÙ ØاسبÙ</value> <value xml:lang="de">Diese Einstellung kann nicht ohne Neuerstellung des HB Kontos geändert werden</value> @@ -8760,6 +8772,10 @@ <value xml:lang="zh">交æè¿è´¦</value> <value xml:lang="zh_TW">交æé賬</value> </property> + <property key="AccountingPostedBalanceAlreadyPresent"> + <value xml:lang="en">There is already a posted balance ${postedBalance} that doesn't match with the current one ${totalAmount}.</value> + <value xml:lang="it">C'è già un bilancio contabilizzato ${postedBalance} che non corrisponde con quello attuale ${totalAmount}.</value> + </property> <property key="AccountingPostedTransactionTotals"> <value xml:lang="de">Gebuchte Geamtsumme</value> <value xml:lang="en">Posted Totals</value> 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=1051615&r1=1051614&r2=1051615&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 19:08:46 2010 @@ -173,8 +173,8 @@ under the License. <if-compare field="trialBalanceResultMap.debitCreditDifference" operator="not-equals" value="0" type="BigDecimal"> <add-error> - <fail-property resource="AccountingUiLabels" property="AccountingNotPostingGlJournalTrialBalanceFailed"/> - </add-error> + <fail-property resource="AccountingUiLabels" property="AccountingNotPostingGlJournalTrialBalanceFailed"/> + </add-error> <check-errors/> </if-compare> @@ -236,8 +236,8 @@ under the License. <entity-one entity-name="AcctgTransEntry" value-field="acctgTransEntry"/> <if-compare field="acctgTransEntry.reconcileStatusId" operator="equals" value="AES_RECONCILED"> <add-error> - <fail-property resource="AccountingUiLabels" property="AccountingNotReconcilingTransEntryAlreadyReconciled"/> - </add-error> + <fail-property resource="AccountingUiLabels" property="AccountingNotReconcilingTransEntryAlreadyReconciled"/> + </add-error> <check-errors/> </if-compare> <make-value entity-name="GlReconciliationEntry" value-field="newEntity"/> @@ -282,7 +282,9 @@ under the License. <simple-method method-name="completeAcctgTransEntries" short-description="Completes, if possible, the AcctgTransEntries using the mappings defined in the gl setup"> <entity-one entity-name="AcctgTrans" value-field="acctgTrans"/> <if-compare field="acctgTrans.isPosted" operator="equals" value="Y"> - <add-error><fail-property resource="AccountingUiLabels" property="AccountingTransactionHasBeenAlreadyPosted"/></add-error> + <add-error> + <fail-property resource="AccountingUiLabels" property="AccountingTransactionHasBeenAlreadyPosted"/> + </add-error> <check-errors/> </if-compare> <get-related value-field="acctgTrans" relation-name="AcctgTransEntry" list="acctgTransEntries"/> @@ -657,8 +659,8 @@ under the License. <get-related value-field="customTimePeriod" relation-name="ChildCustomTimePeriod" list="openChildTimePeriods" map="openTimePeriodCondition"/> <iterate list="openChildTimePeriods" entry="openChildTimePeriod"> <add-error> - <fail-property resource="AccountingUiLabels" property="AccountingNoCustomTimePeriodClosedChild"/> - </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 --> @@ -670,8 +672,8 @@ under the License. </call-service> <if-empty field="lastClosedDate"> <add-error> - <fail-property resource="AccountingUiLabels" property="AccountingNoCustomTimePeriodClosedForClosedDate"/> - </add-error> + <fail-property resource="AccountingUiLabels" property="AccountingNoCustomTimePeriodClosedForClosedDate"/> + </add-error> </if-empty> <check-errors/> <entity-one entity-name="GlAccountClass" value-field="expenseGlAccountClass"> @@ -789,7 +791,9 @@ under the License. <field field="profitLossAccountHistory" type="GenericValue"/> </call-class-method> <if-compare-field field="postedBalance" to-field="totalAmount" operator="not-equals" type="BigDecimal"> - <add-error><fail-message message="There is already a posted balance [${postedBalance}] that doesn't match with the current one [${totalAmount}]."/></add-error> + <add-error> + <fail-property resource="AccountingUiLabels" property="AccountingPostedBalanceAlreadyPresent"/> + </add-error> </if-compare-field> <check-errors/> <else> @@ -1167,7 +1171,9 @@ under the License. <set value="-datetimeReceived" field="orderByString"/> </if-compare> <if-empty field="orderByString"> - <add-error><fail-message message="COGS costing method is not supported: ${partyAcctgPreference.cogsMethodId}"/></add-error> + <add-error> + <fail-property resource="AccountingUiLabels" property="AccountingCOGSCostingMethodIsNotSupported"/> + </add-error> <check-errors/> </if-empty> <entity-condition entity-name="InventoryItem" list="costInventoryItems"> @@ -1224,7 +1230,9 @@ under the License. </if-compare> </iterate> <if-compare field="remainingQuantity" operator="greater" value="0.0" type="BigDecimal"> - <add-error><fail-message message="Could not find enough accounting inventory for product [${inventoryItem.productId}]; remaining quantity: ${remainingQuantity}"/></add-error> + <add-error> + <fail-property resource="AccountingUiLabels" property="AccountingNotFindAccountingInventory"/> + </add-error> <check-errors/> </if-compare> </else> @@ -2013,7 +2021,9 @@ under the License. <field-to-result field="acctgTransId" result-name="acctgTransId"/> <else> <!-- This invoice is not a Customer Return. Return error --> - <add-error><fail-message message="Bad invoiceTypeId [${invoiceType.invoiceTypeId}]. Service createAcctgTransForCustomerReturnInvoice for type CUST_RTN_INVOICE."/></add-error> + <add-error> + <fail-property resource="AccountingUiLabels" property="AccountingInvoiceBadInvoiceType"/> + </add-error> </else> </if-compare> </simple-method> @@ -2738,7 +2748,9 @@ under the License. <log level="info" message="GlAccountCategoryMember expired for [${glAccountCategoryId}] and [${glAccountId}]"/> </if-not-empty> <else> - <add-error><fail-property resource="AccountingUiLabels" property="AccountingTotalAmountPercentageIsNotEqualOneHundred"/></add-error> + <add-error> + <fail-property resource="AccountingUiLabels" property="AccountingTotalAmountPercentageIsNotEqualOneHundred"/> + </add-error> <check-errors/> </else> </if-compare> @@ -2928,7 +2940,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 ${glReconciliation.statusId} to ${parameters.statusId}"/> <check-errors/> <else> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |