svn commit: r628125 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml widget/GlSetupForms.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r628125 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml widget/GlSetupForms.xml

jacopoc
Author: jacopoc
Date: Fri Feb 15 09:09:16 2008
New Revision: 628125

URL: http://svn.apache.org/viewvc?rev=628125&view=rev
Log:
Small misc/temp fixes.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=628125&r1=628124&r2=628125&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Fri Feb 15 09:09:16 2008
@@ -598,6 +598,9 @@
         <value xml:lang="th">กำหนดการชำระเงินในใบกำกับสินค้า</value>
         <value xml:lang="zh">为这张发票指定支付额</value>
     </property>
+    <property key="AccountingAssignPurchaseInvoiceToRevenue">
+        <value xml:lang="en">Assign Purchase Invoice type to Revenue GL Account Number</value>
+    </property>
     <property key="AccountingAssignSalesInvoiceToRevenue">
         <value xml:lang="ar">تعيين نوع فاتورة البيع إلى رقم حساب العائدات</value>
         <value xml:lang="en">Assign Sales Invoice type to Revenue GL Account Number</value>
@@ -725,11 +728,11 @@
         <value xml:lang="zh">账单账户</value>
     </property>
     <property key="AccountingBillingAccountBalanceNotFound">
-        <value xml:lang="ar">حساب الفوترة [${billingAccountId}] ميزانية غير موجودة...(
+        <value xml:lang="ar">حساب الفوترة [${billingAccountId}] ميزانية غير موجودة...(
 "</value>
         <value xml:lang="en">Billing Account [${billingAccountId}] balance not found...(
 "</value>
-        <value xml:lang="es">Cuenta de facturación [${billingAccountId}] balance no encontrado...(
+        <value xml:lang="es">Cuenta de facturación [${billingAccountId}] balance no encontrado...(
 "</value>
         <value xml:lang="fr">Pas trouvé le solde du compte de facturation [${billingAccountId}]...</value>
         <value xml:lang="it">Conto Fatturazione [${billingAccountId}] bilancio non trovato...(
@@ -746,11 +749,11 @@
 "</value>
     </property>
     <property key="AccountingBillingAccountBalanceProblem">
-        <value xml:lang="ar">حساب الفوترة [${billingAccountId}] لا يعتد بميزانية إيجابية: ${billingAccountApplyAvailable?currency(${isoCode})}
+        <value xml:lang="ar">حساب الفوترة [${billingAccountId}] لا يعتد بميزانية إيجابية: ${billingAccountApplyAvailable?currency(${isoCode})}
 </value>
         <value xml:lang="en">Billing Account [${billingAccountId}] doesn't have a positive balance: ${billingAccountAvailableBalance?currency(${isoCode})}
 </value>
-        <value xml:lang="es">Cuenta de facturación [${billingAccountId}] no tiene un balance positivo: ${billingAccountApplyAvailable?currency(${isoCode})}
+        <value xml:lang="es">Cuenta de facturación [${billingAccountId}] no tiene un balance positivo: ${billingAccountApplyAvailable?currency(${isoCode})}
 </value>
         <value xml:lang="fr">Le compte de facturation [${billingAccountId}] n'a pas un solde positif: ${billingAccountApplyAvailable?currency(${isoCode})}</value>
         <value xml:lang="it">Conto Fatturazione [${billingAccountId}] non ha un bilancio positivo: ${billingAccountApplyAvailable?currency(${isoCode})}
@@ -769,7 +772,7 @@
         <value xml:lang="ar">العملات لا تتطابق, حساب الفوترة [${billingAccountId}] عملته: ${accountCurrencyUomId} و التسديد [${paymentId}] عملته: ${paymentCurrencyUomId}</value>
         <value xml:lang="en">Currencies are not the same, Billing Account [${billingAccountId}] has currency: ${accountCurrencyUomId} and Payment [${paymentId}] has currency: ${paymentCurrencyUomId}
 </value>
-        <value xml:lang="es">Monedas no son las mismas, Cuenta de facturación [${billingAccountId}] tiene moneda: ${accountCurrencyUomId} y pago [${paymentId}] tiene moneda: ${paymentCurrencyUomId}
+        <value xml:lang="es">Monedas no son las mismas, Cuenta de facturación [${billingAccountId}] tiene moneda: ${accountCurrencyUomId} y pago [${paymentId}] tiene moneda: ${paymentCurrencyUomId}
 </value>
         <value xml:lang="fr">Les monnaies ne sont pas identiques, le compte de facturation [${billingAccountId}] est en monnaie ${accountCurrencyUomId} et le paiement [${paymentId}] est en monnaie ${paymentCurrencyUomId}</value>
         <value xml:lang="it">Valute non sono le stesse, Conto Fatturazione [${billingAccountId}] ha valuta: ${accountCurrencyUomId} e Pagamento [${paymentId}] ha valuta: ${paymentCurrencyUomId}
@@ -809,11 +812,11 @@
         <value xml:lang="zh">账单账户发票</value>
     </property>
     <property key="AccountingBillingAccountLessRequested">
-        <value xml:lang="ar">حساب الفوترة  [${billingAccountId}]لديه ${billingAccountApplyAvailable?currency(${isoCode})} للتطبيق لكن ${amountApplied?currency(${isoCode})}مطلوبة
+        <value xml:lang="ar">حساب الفوترة  [${billingAccountId}]لديه ${billingAccountApplyAvailable?currency(${isoCode})} للتطبيق لكن ${amountApplied?currency(${isoCode})}مطلوبة
 </value>
         <value xml:lang="en">Billing Account [${billingAccountId}] has ${billingAccountApplyAvailable?currency(${isoCode})} to apply but ${amountApplied?currency(${isoCode})} is requested
 </value>
-        <value xml:lang="es">Cuenta de facturación [${billingAccountId}] tiene ${billingAccountApplyAvailable?currency(${isoCode})} por aplicar pero ${amountApplied?currency(${isoCode})} es requerido
+        <value xml:lang="es">Cuenta de facturación [${billingAccountId}] tiene ${billingAccountApplyAvailable?currency(${isoCode})} por aplicar pero ${amountApplied?currency(${isoCode})} es requerido
 </value>
         <value xml:lang="fr">Le compte de facturation [${billingAccountId}] a un solde de ${billingAccountApplyAvailable?currency(${isoCode})}; un montant de ${amountApplied?currency(${isoCode})} trop élevé ne peut être alloué</value>
         <value xml:lang="it">Conto Fatturazione [${billingAccountId}] ha ${billingAccountApplyAvailable?currency(${isoCode})} da applicare ma ${amountApplied?currency(${isoCode})} è richiesto
@@ -832,7 +835,7 @@
         <value xml:lang="ar">حساب الفوترة [${billingAccountId}] لديه سوى  ${newBillingAccountApplyAvailable?currency(${isoCode})} متوفرة إذن ${amountApplied?currency(${isoCode})} أكثر من اللازم</value>
         <value xml:lang="en">Billing Account [${billingAccountId}] has only  ${newBillingAccountApplyAvailable?currency(${isoCode})} available so ${amountApplied?currency(${isoCode})} is too much
 </value>
-        <value xml:lang="es">Cuenta de facturación [${billingAccountId}] tiene solo ${newBillingAccountApplyAvailable?currency(${isoCode})} disponible asi que ${amountApplied?currency(${isoCode})} es demasiado
+        <value xml:lang="es">Cuenta de facturación [${billingAccountId}] tiene solo ${newBillingAccountApplyAvailable?currency(${isoCode})} disponible asi que ${amountApplied?currency(${isoCode})} es demasiado
 </value>
         <value xml:lang="fr">Le compte de facturation [${billingAccountId}] est limité à  ${newBillingAccountApplyAvailable?currency(${isoCode})} donc ${amountApplied?currency(${isoCode})} est trop élevé</value>
         <value xml:lang="it">Conto Fatturazione [${billingAccountId}] ha solo  ${newBillingAccountApplyAvailable?currency(${isoCode})} disponibile così ${amountApplied?currency(${isoCode})} è troppo grande
@@ -851,7 +854,7 @@
         <value xml:lang="ar">حساب الفوترة ${billingAccountId}] عير موجود...</value>
         <value xml:lang="en">Billing Account [${billingAccountId}] not found...
 </value>
-        <value xml:lang="es">Cuenta de facturación [${billingAccountId}] no encontrada...
+        <value xml:lang="es">Cuenta de facturación [${billingAccountId}] no encontrada...
 </value>
         <value xml:lang="fr">Compte de facturation [${billingAccountId}] pas trouvé...</value>
         <value xml:lang="it">Conto Fatturazione [${billingAccountId}] non trovato...
@@ -2246,7 +2249,8 @@
         <value xml:lang="es">Si el mantenimiento del producto es especificado, será establecido/reestablecido automaticamente</value>
         <value xml:lang="fr">Si la maintenance est définie au niveau du produit, ceci sera mis à jour automatiquement</value>
         <value xml:lang="it">Se la Manutenzione Prodotto è specificata, questa sarà impostata/azzerata automaticamente</value>
-        <value xml:lang="ro">Daca Intretinerea Produsului este  specificata, aceasta va fi  setata
esetata in mod automat</value>
+        <value xml:lang="ro">Daca Intretinerea Produsului este  specificata, aceasta va fi  setata
+esetata in mod automat</value>
         <value xml:lang="ru">Если определено Обслуживание продукта, поле будет устанавливатся/сбрасываться автоматически</value>
         <value xml:lang="th">ถ้าการบำรุงรักษาสินค้าเป็นพิเศษ นี่จะกำหนดอัตโนมัติ</value>
         <value xml:lang="zh">如果指定了产品的维护保养,这会自动设置/复位</value>
@@ -2802,7 +2806,7 @@
         <value xml:lang="ar">الفاتورة  [${invoiceId}] قد ألغيت, لا يمكن تطبيقها على</value>
         <value xml:lang="en">Invoice [${invoiceId}] is cancelled, cannot be applied to...
 </value>
-        <value xml:lang="es">Factura [${invoiceId}] esta cancelada, no puede ser aplicada...
+        <value xml:lang="es">Factura [${invoiceId}] esta cancelada, no puede ser aplicada...
 </value>
         <value xml:lang="fr">Facture  [${invoiceId}] annullée, il ne peut y être alloué de paiement...</value>
         <value xml:lang="it">Fattura [${invoiceId}] è cancellato, non può essere applicato a...
@@ -2921,7 +2925,7 @@
         <value xml:lang="ar">الفاتورة [${invoiceId}] قد غطيت كليا بالتسديدات ...</value>
         <value xml:lang="en">Invoice [${invoiceId}]  is already completely covered by payments...
 </value>
-        <value xml:lang="es">Factura [${invoiceId}]  esta completamente cubierta por pagos...
+        <value xml:lang="es">Factura [${invoiceId}]  esta completamente cubierta por pagos...
 </value>
         <value xml:lang="fr">La facture  [${invoiceId}] a déjà été entièrement payée...</value>
         <value xml:lang="it">Fattura [${invoiceId}]  Ã¨ già completamente coperta dai pagamenti...
@@ -3029,7 +3033,7 @@
     <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 xml:lang="es">Factura [${invoiceId} Elemento [${invoiceItemSeqId} tiene ${invoiceItemApplyAvailable?currency(${isoCode})} para aplicar pero   ${amountApplied?currency(${isoCode})} es requerio
 </value>
         <value xml:lang="fr">La facture [${invoiceId} Item [${invoiceItemSeqId} est payable en ${invoiceItemApplyAvailable?currency(${isoCode})} mais  ${amountApplied?currency(${isoCode})} est requis</value>
         <value xml:lang="it">Fattura [${invoiceId} Riga [${invoiceItemSeqId} ha ${invoiceItemApplyAvailable?currency(${isoCode})} da applicare ma  ${amountApplied?currency(${isoCode})} è richiesta
@@ -3081,7 +3085,7 @@
     <property key="AccountingInvoiceItemPaymentCurrencyProblem">
         <value xml:lang="en">Payment currency [${paymentCurrencyId}] and invoice Item currency [${itemCurrency}] not the same
 "</value>
-        <value xml:lang="es">Moneda de pago [${paymentCurrencyId}] y moneda de elemento de factura [${itemCurrency}] no son las mismas
+        <value xml:lang="es">Moneda de pago [${paymentCurrencyId}] y moneda de elemento de factura [${itemCurrency}] no son las mismas
 "</value>
         <value xml:lang="fr">La monnaie de paiement [${paymentCurrencyId}] et la monnaie de la ligne de facture [${itemCurrency}] ne correspondent pas</value>
         <value xml:lang="it">Valuta Pagamento [${paymentCurrencyId}]e valuta riga fattura [${itemCurrency}] non sono le stesse
@@ -3128,7 +3132,7 @@
     <property key="AccountingInvoiceLessRequested">
         <value xml:lang="en">Invoice [${invoiceId} has ${invoiceApplyAvailable?currency(${isoCode})} to apply but  ${amountApplied?currency(${isoCode})} is requested
 </value>
-        <value xml:lang="es">Factura[${invoiceId} tiene ${invoiceApplyAvailable?currency(${isoCode})} para aplicar pero  ${amountApplied?currency(${isoCode})} es requerido
+        <value xml:lang="es">Factura[${invoiceId} tiene ${invoiceApplyAvailable?currency(${isoCode})} para aplicar pero  ${amountApplied?currency(${isoCode})} es requerido
 </value>
         <value xml:lang="fr">La facture [${invoiceId} est payable en ${invoiceApplyAvailable?currency(${isoCode})} mais ${amountApplied?currency(${isoCode})} est requis</value>
         <value xml:lang="it">Fattura [${invoiceId} ha ${invoiceApplyAvailable?currency(${isoCode})} da applicare ma  ${amountApplied?currency(${isoCode})} è richiesto
@@ -3146,7 +3150,7 @@
     <property key="AccountingInvoiceNotEnough">
         <value xml:lang="en">Requested Amount is ${tooMuch?currency(${isoCode})} to much for this Invoice [${invoiceId}]
 </value>
-        <value xml:lang="es">Cantidad requerida es ${tooMuch?currency(${isoCode})} demasiado para esta factura [${invoiceId}]
+        <value xml:lang="es">Cantidad requerida es ${tooMuch?currency(${isoCode})} demasiado para esta factura [${invoiceId}]
 </value>
         <value xml:lang="fr">Le montant requis est de ${tooMuch?currency(${isoCode})} trop élevé pour cette facture [${invoiceId}]</value>
         <value xml:lang="it">Importo Richiesto è ${tooMuch?currency(${isoCode})} troppo grande per questa Fattura [${invoiceId}]
@@ -3164,7 +3168,7 @@
     <property key="AccountingInvoiceNotFound">
         <value xml:lang="en">Invoice [${invoiceId}] record not found
 </value>
-        <value xml:lang="es">Factura [${invoiceId}] registro no encontrado
+        <value xml:lang="es">Factura [${invoiceId}] registro no encontrado
 </value>
         <value xml:lang="fr">Facture [${invoiceId}] pas trouvée</value>
         <value xml:lang="it">Fattura [${invoiceId}] record non trovato
@@ -3222,7 +3226,7 @@
     <property key="AccountingInvoicePaymentCurrencyProblem">
         <value xml:lang="en">Payment currency [${paymentCurrencyId}] and invoice currency [${invoiceCurrency}] not the same
 </value>
-        <value xml:lang="es">Moneda de pago [${paymentCurrencyId}] y moneda de factura [${invoiceCurrency}] no son iguales
+        <value xml:lang="es">Moneda de pago [${paymentCurrencyId}] y moneda de factura [${invoiceCurrency}] no son iguales
 </value>
         <value xml:lang="fr">La monnaie de paiement [${paymentCurrencyId}] et la monnaie de la facture [${invoiceCurrency}] ne correspondent pas</value>
         <value xml:lang="it">Valuta Pagamento [${paymentCurrencyId}] e valuta fattura [${invoiceCurrency}] non sono le stesse
@@ -3425,7 +3429,7 @@
     <property key="AccountingInvoiceTotalZero">
         <value xml:lang="en">Invoice [${invoiceId}] has a total value of zero....cannot apply anything...
 </value>
-        <value xml:lang="es">Factura [${invoiceId}] tiene un valor total de cero....no es posible aplicar nada...
+        <value xml:lang="es">Factura [${invoiceId}] tiene un valor total de cero....no es posible aplicar nada...
 </value>
         <value xml:lang="fr">La facture  [${invoiceId}] a un total de zéro... rien à appliquer...</value>
         <value xml:lang="it">Fattura [${invoiceId}] ha un valore totale di zero....non può essere applicato qualsiasi...
@@ -4506,7 +4510,7 @@
     <property key="AccountingPaymentApplicationNotFound">
         <value xml:lang="en">PaymentApplication record [${paymentApplicationId}] not found
 </value>
-        <value xml:lang="es">Registro de Aplicación de Pago [${paymentApplicationId}] not found
+        <value xml:lang="es">Registro de Aplicación de Pago [${paymentApplicationId}] not found
 </value>
         <value xml:lang="fr">L'allocation du paiement  [${paymentApplicationId}] n'a pas été trouvée</value>
         <value xml:lang="it">PaymentApplication record [${paymentApplicationId}] non trovato
@@ -4627,7 +4631,7 @@
     <property key="AccountingPaymentIdBlankNotSupplied">
         <value xml:lang="en">PaymentId blank or not supplied.... .....
 </value>
-        <value xml:lang="es">IdPago en blanco o no proporcionado.... .....
+        <value xml:lang="es">IdPago en blanco o no proporcionado.... .....
 </value>
         <value xml:lang="fr">Vous n'avez pas fourni de réf. de paiement...</value>
         <value xml:lang="it">Tipo Pagamento vuoto o supportato.... .....
@@ -4720,7 +4724,7 @@
     <property key="AccountingPaymentNotEnough">
         <value xml:lang="en">Payment [${paymentId}] has an amount (${paymentApplyAvailable?currency(${isoCode})} to apply and the  ${amountApplied?currency(${isoCode})} requested is too much
 </value>
-        <value xml:lang="es">Pago [${paymentId}] tiene una cantidad (${paymentApplyAvailable?currency(${isoCode})} para aplicar y ${amountApplied?currency(${isoCode})} requerido es demasiado
+        <value xml:lang="es">Pago [${paymentId}] tiene una cantidad (${paymentApplyAvailable?currency(${isoCode})} para aplicar y ${amountApplied?currency(${isoCode})} requerido es demasiado
 </value>
         <value xml:lang="fr">Le paiement [${paymentId}] est d'un montant à allouer de (${paymentApplyAvailable?currency(${isoCode})} et le montant demande ${amountApplied?currency(${isoCode})} est trop élevé</value>
         <value xml:lang="it">Pagamento [${paymentId}] ha un'importo (${paymentApplyAvailable?currency(${isoCode})} da applicare e ${amountApplied?currency(${isoCode})} richiesto è troppo grosso
@@ -4765,7 +4769,7 @@
     <property key="AccountingPaymentRecordNotFound">
         <value xml:lang="en">Payment [${paymentId}] record not found....
 </value>
-        <value xml:lang="es">Pago [${paymentId}] registro no encontrado....
+        <value xml:lang="es">Pago [${paymentId}] registro no encontrado....
 </value>
         <value xml:lang="fr">Pas trouvé de paiement [${paymentId}] </value>
         <value xml:lang="it">Pagamento [${paymentId}] record non trovato....
@@ -5170,6 +5174,9 @@
         <value xml:lang="th">ราคาสินค้า</value>
         <value xml:lang="zh">产品税率</value>
     </property>
+    <property key="AccountingPurchaseInvoiceToRevenue">
+        <value xml:lang="en">Purchase Invoice type to Revenue GL Account Number assignment list</value>
+    </property>
     <property key="AccountingQuantity">
         <value xml:lang="en">AccountingQuantity</value>
         <value xml:lang="th">จำนวน</value>
@@ -5427,7 +5434,7 @@
     <property key="AccountingSpecifyInvoiceToPaymentBillingAccountTaxGeoId">
         <value xml:lang="en">Specify either Invoice or toPayment or billing account or taxGeoId....
 </value>
-        <value xml:lang="es">Especificar cualquiera: factura o  paraPago o cuenta de facturación o IdAreaFiscal....
+        <value xml:lang="es">Especificar cualquiera: factura o  paraPago o cuenta de facturación o IdAreaFiscal....
 </value>
         <value xml:lang="fr">Préciser ou bien facture, paiement à, compte de facturation ou zone de taxation...</value>
         <value xml:lang="it">Specificato entrambi Fattura o A Pagare o conto fatturazione o autorità tasse geografia....

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=628125&r1=628124&r2=628125&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Fri Feb 15 09:09:16 2008
@@ -349,7 +349,7 @@
         <field name="invoiceItemTypeId" title="${uiLabelMap.AccountingInvoicePurchaseItemType}">
             <drop-down allow-empty="false" >
                 <entity-options description="${description}" entity-name="InvoiceItemType">
-                    <entity-constraint name="invoiceItemTypeId" operator="like" value="PINV_%"/>
+                    <entity-constraint name="invoiceItemTypeId" operator="like" value="PINV%"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>