OFBiz › OFBiz - Commits

svn commit: r1128865 [2/27] - in /ofbiz/branches/jackrabbit20100709: ./ applications/accounting/config/ applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/...

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

svn commit: r1128865 [2/27] - in /ofbiz/branches/jackrabbit20100709: ./ applications/accounting/config/ applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/...

sascharodekamp
Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml Sun May 29 11:02:09 2011
@@ -24,6 +24,7 @@
         <value xml:lang="fr">Amortissements</value>
         <value xml:lang="hi_IN">परिशोधन</value>
         <value xml:lang="it">Ammortamento</value>
+        <value xml:lang="nl">Amortisatie</value>
         <value xml:lang="pt_BR">Amortização</value>
         <value xml:lang="ro">Amortizare</value>
         <value xml:lang="ru">Амортизация</value>
@@ -36,6 +37,7 @@
         <value xml:lang="fr">Capitalisations</value>
         <value xml:lang="hi_IN">कुल पूंजी</value>
         <value xml:lang="it">Capitalizzazioni</value>
+        <value xml:lang="nl">Kapitalisatie</value>
         <value xml:lang="pt_BR">Capitalização</value>
         <value xml:lang="ro">Capitalizare</value>
         <value xml:lang="ru">Капитализация</value>
@@ -48,6 +50,7 @@
         <value xml:lang="fr">Ligne de crédit</value>
         <value xml:lang="hi_IN">क्रेडिट सीमा</value>
         <value xml:lang="it">Riga Nota Credito</value>
+        <value xml:lang="nl">Kredietlijn</value>
         <value xml:lang="pt_BR">Linha de Crédito</value>
         <value xml:lang="ro">Linie Nota de Credit</value>
         <value xml:lang="ru">Кредитная линия</value>
@@ -61,6 +64,7 @@
         <value xml:lang="fr">Note de crédit</value>
         <value xml:lang="hi_IN">क्रेडिट मेमो</value>
         <value xml:lang="it">Nota Credito</value>
+        <value xml:lang="nl">Creditnota</value>
         <value xml:lang="pt_BR">Nota de Crédito</value>
         <value xml:lang="ro">Nota de Credit</value>
         <value xml:lang="ru">Кредитный мемориальный ордер</value>
@@ -74,6 +78,7 @@
         <value xml:lang="fr">Dépréciation</value>
         <value xml:lang="hi_IN">मूल्यह्रास</value>
         <value xml:lang="it">Deprecato</value>
+        <value xml:lang="nl">Afschrijving</value>
         <value xml:lang="pt_BR">Depreciação</value>
         <value xml:lang="ro">Depreciat</value>
         <value xml:lang="ru">Износ</value>
@@ -87,6 +92,7 @@
         <value xml:lang="fr">Débours</value>
         <value xml:lang="hi_IN">अदायगी</value>
         <value xml:lang="it">Esborso</value>
+        <value xml:lang="nl">Uitbelating</value>
         <value xml:lang="pt_BR">Desembolso</value>
         <value xml:lang="ro">Rambursari</value>
         <value xml:lang="ru">Выплата</value>
@@ -99,6 +105,7 @@
         <value xml:lang="fr">Externe</value>
         <value xml:lang="hi_IN">बाहरी</value>
         <value xml:lang="it">Esterno</value>
+        <value xml:lang="nl">Extern</value>
         <value xml:lang="pt_BR">Externo</value>
         <value xml:lang="ro">Extern</value>
         <value xml:lang="ru">Внешняя</value>
@@ -111,6 +118,7 @@
         <value xml:lang="fr">Paiement à recevoir</value>
         <value xml:lang="hi_IN">आवक भुगतान</value>
         <value xml:lang="it">Pagamento in entrata</value>
+        <value xml:lang="nl">Inkomende betaling</value>
         <value xml:lang="pt_BR">Pagamento na Entrada</value>
         <value xml:lang="zh">新收款</value>
         <value xml:lang="zh_TW">新收款</value>
@@ -120,6 +128,7 @@
         <value xml:lang="fr">Interne</value>
         <value xml:lang="hi_IN">आंतरिक</value>
         <value xml:lang="it">Interno</value>
+        <value xml:lang="nl">Intern</value>
         <value xml:lang="pt_BR">Interno</value>
         <value xml:lang="ro">Intern</value>
         <value xml:lang="ru">Внутренняя</value>
@@ -132,6 +141,7 @@
         <value xml:lang="fr">Stock</value>
         <value xml:lang="hi_IN">वस्तुसूची(Inventory)</value>
         <value xml:lang="it">Inventario</value>
+        <value xml:lang="nl">Voorraad</value>
         <value xml:lang="pt_BR">Inventário</value>
         <value xml:lang="zh">库存</value>
         <value xml:lang="zh_TW">庫存</value>
@@ -141,6 +151,7 @@
         <value xml:lang="fr">Inventaire des retours</value>
         <value xml:lang="hi_IN">वस्तुसूची(Inventory) में वापसी से</value>
         <value xml:lang="it">Inventario dal Reso</value>
+        <value xml:lang="nl">Voorraad retour</value>
         <value xml:lang="pt_BR">Inventário de Retornos</value>
         <value xml:lang="ro">Inventarul Returnarilor</value>
         <value xml:lang="ru">Возврат ТМЦ</value>
@@ -153,6 +164,7 @@
         <value xml:lang="fr">Différence d'inventaire</value>
         <value xml:lang="hi_IN">मद विचरण</value>
         <value xml:lang="it">Riga Varianza</value>
+        <value xml:lang="nl">Regelvariatie</value>
         <value xml:lang="pt_BR">Variância do Item</value>
         <value xml:lang="ro">Linie Variere</value>
         <value xml:lang="ru">Расхождение по позиции</value>
@@ -165,6 +177,7 @@
         <value xml:lang="fr">Production</value>
         <value xml:lang="hi_IN">विनिर्माण</value>
         <value xml:lang="it">Produzione</value>
+        <value xml:lang="nl">Productie</value>
         <value xml:lang="pt_BR">Produção</value>
         <value xml:lang="zh">生产</value>
         <value xml:lang="zh_TW">生產</value>
@@ -174,6 +187,7 @@
         <value xml:lang="fr">Note</value>
         <value xml:lang="hi_IN">टिप्पणी</value>
         <value xml:lang="it">Nota</value>
+        <value xml:lang="nl">Nota</value>
         <value xml:lang="pt_BR">Nota</value>
         <value xml:lang="ro">Nota</value>
         <value xml:lang="ru">Закладная</value>
@@ -186,6 +200,7 @@
         <value xml:lang="fr">Obligation</value>
         <value xml:lang="hi_IN">दायित्व</value>
         <value xml:lang="it">Obbligazione</value>
+        <value xml:lang="nl">Verplichting</value>
         <value xml:lang="pt_BR">Obrigação</value>
         <value xml:lang="ro">Obligatii</value>
         <value xml:lang="ru">Обязательство</value>
@@ -198,6 +213,7 @@
         <value xml:lang="fr">Autre interne</value>
         <value xml:lang="hi_IN">अन्य आंतरिक</value>
         <value xml:lang="it">Altri Interni</value>
+        <value xml:lang="nl">Andere intern</value>
         <value xml:lang="pt_BR">Outro Interno</value>
         <value xml:lang="ro">Alt Intern</value>
         <value xml:lang="ru">Другая внутренняя</value>
@@ -210,6 +226,7 @@
         <value xml:lang="fr">Autre obligation</value>
         <value xml:lang="hi_IN">अन्य दायित्व</value>
         <value xml:lang="it">Altra Obbligazione</value>
+        <value xml:lang="nl">Andere verplichtingen</value>
         <value xml:lang="pt_BR">Outra Obrigação</value>
         <value xml:lang="ro">Alta Obligatie</value>
         <value xml:lang="ru">Другое обязательство</value>
@@ -222,6 +239,7 @@
         <value xml:lang="fr">Paiement sortant</value>
         <value xml:lang="hi_IN">निर्गामी भुगतान</value>
         <value xml:lang="it">Pagamento in uscita</value>
+        <value xml:lang="nl">Uitgaande betaling</value>
         <value xml:lang="pt_BR">Pagamento na Saída</value>
         <value xml:lang="zh">新付款</value>
         <value xml:lang="zh_TW">新付款</value>
@@ -231,6 +249,7 @@
         <value xml:lang="fr">Paiement</value>
         <value xml:lang="hi_IN">भुगतान</value>
         <value xml:lang="it">Pagamento</value>
+        <value xml:lang="nl">Betaling</value>
         <value xml:lang="pt_BR">Pagamento</value>
         <value xml:lang="ro">Plati</value>
         <value xml:lang="ru">Платеж</value>
@@ -243,6 +262,7 @@
         <value xml:lang="fr">Paiment effectué</value>
         <value xml:lang="hi_IN">भुगतान लागू</value>
         <value xml:lang="it">Pagamento applicato</value>
+        <value xml:lang="nl">Betaling toegepast</value>
         <value xml:lang="pt_BR">Pagamento Executado</value>
         <value xml:lang="zh">应用的支付款</value>
         <value xml:lang="zh_TW">應用的支付款</value>
@@ -252,6 +272,7 @@
         <value xml:lang="fr">Clôture de période</value>
         <value xml:lang="hi_IN">अवधि समापन</value>
         <value xml:lang="it">Chiusura di Periodo Fiscale</value>
+        <value xml:lang="nl">Periode afsluiting</value>
         <value xml:lang="pt_BR">Fechamento do Período</value>
         <value xml:lang="ro">Perioada Inchisa</value>
         <value xml:lang="ru">Закрытие периода</value>
@@ -264,6 +285,7 @@
         <value xml:lang="fr">Facture d'achat</value>
         <value xml:lang="hi_IN">खरीद चालान</value>
         <value xml:lang="it">Fattura di acquisto</value>
+        <value xml:lang="nl">Inkoopfactuur</value>
         <value xml:lang="pt_BR">Fatura de Compra</value>
         <value xml:lang="zh">购货发票</value>
         <value xml:lang="zh_TW">購貨發票</value>
@@ -274,6 +296,7 @@
         <value xml:lang="fr">Reçu</value>
         <value xml:lang="hi_IN">रसीद</value>
         <value xml:lang="it">Ricevute</value>
+        <value xml:lang="nl">Bon</value>
         <value xml:lang="pt_BR">Recibo</value>
         <value xml:lang="ro">Chitanta</value>
         <value xml:lang="ru">Выручка</value>
@@ -298,6 +321,7 @@
         <value xml:lang="fr">Facture de vente</value>
         <value xml:lang="hi_IN">बिक्री चालान</value>
         <value xml:lang="it">Fattura di vendita</value>
+        <value xml:lang="nl">Verkoopfactuur</value>
         <value xml:lang="pt_BR">Fatura da Venda</value>
         <value xml:lang="zh">销售发票</value>
         <value xml:lang="zh_TW">銷售發票</value>
@@ -307,6 +331,7 @@
         <value xml:lang="fr">Facture d'expédition</value>
         <value xml:lang="hi_IN">बिक्री शिपमेंट</value>
         <value xml:lang="it">Spedizione di vendita</value>
+        <value xml:lang="nl">Verkoop verzending</value>
         <value xml:lang="pt_BR">Entrega</value>
         <value xml:lang="zh">销售送货</value>
         <value xml:lang="zh_TW">銷售送貨</value>
@@ -316,6 +341,7 @@
         <value xml:lang="fr">Reçu d'expédition</value>
         <value xml:lang="hi_IN">शिपमेंट रसीद</value>
         <value xml:lang="it">Ricevuta di spedizione</value>
+        <value xml:lang="nl">Verzending bon</value>
         <value xml:lang="pt_BR">Recibo da Entrega</value>
         <value xml:lang="zh">送货收据</value>
         <value xml:lang="zh_TW">送貨收據</value>
@@ -337,6 +363,7 @@
         <value xml:lang="fr">Ajustement</value>
         <value xml:lang="hi_IN">समायोजन</value>
         <value xml:lang="it">Aggiustamento</value>
+        <value xml:lang="nl">Aanpassing</value>
         <value xml:lang="pt_BR">Ajuste</value>
         <value xml:lang="ru">Поправка</value>
         <value xml:lang="th">การปรับปรุงรายการ</value>
@@ -348,6 +375,7 @@
         <value xml:lang="fr">Dépôt</value>
         <value xml:lang="hi_IN">जमा</value>
         <value xml:lang="it">Deposito</value>
+        <value xml:lang="nl">Storting</value>
         <value xml:lang="pt_BR">Depósito</value>
         <value xml:lang="ru">Взнос</value>
         <value xml:lang="th">เงินมัดจำ</value>
@@ -359,6 +387,7 @@
         <value xml:lang="fr">Retrait</value>
         <value xml:lang="hi_IN">निकालना</value>
         <value xml:lang="it">Prelievo</value>
+        <value xml:lang="nl">Opname</value>
         <value xml:lang="pt_BR">Saque</value>
         <value xml:lang="ru">Отмена</value>
         <value xml:lang="th">ถอน</value>
@@ -371,6 +400,7 @@
         <value xml:lang="fr">Compte bancaire</value>
         <value xml:lang="hi_IN">बैंक खाता</value>
         <value xml:lang="it">Conto Bancario</value>
+        <value xml:lang="nl">Bankrekening</value>
         <value xml:lang="pt_BR">Conta Bancária</value>
         <value xml:lang="ru">Банковский счет</value>
         <value xml:lang="th">บัญชีธนาคาร</value>
@@ -395,6 +425,7 @@
         <value xml:lang="fr">Chèque cadeau</value>
         <value xml:lang="hi_IN">उपहार प्रमाण पत्र(GiftCertificate)</value>
         <value xml:lang="it">Certificato Omaggio</value>
+        <value xml:lang="nl">Cadeaubon</value>
         <value xml:lang="pt_BR">Vale Presente</value>
         <value xml:lang="ru">Подарочный сертификат</value>
         <value xml:lang="th">ของขวัญที่มีใบรับรอง</value>
@@ -407,6 +438,7 @@
         <value xml:lang="fr">Compte d'investissement</value>
         <value xml:lang="hi_IN">निवेश खाता</value>
         <value xml:lang="it">Conto Investimento</value>
+        <value xml:lang="nl">Beleggingsrekening</value>
         <value xml:lang="pt_BR">Conta Investimento</value>
         <value xml:lang="ru">Инвестиционный счет</value>
         <value xml:lang="th">บัญชีเงินลงทุน</value>
@@ -431,6 +463,7 @@
         <value xml:lang="fr">Compte de service crédit</value>
         <value xml:lang="hi_IN">सेवा जमा खाता</value>
         <value xml:lang="it">Conto Servizio Credito</value>
+        <value xml:lang="nl">Kredietservice rekening</value>
         <value xml:lang="pt_BR">Conta de Serviço de Crédito</value>
         <value xml:lang="ru">Сервисный кредитный счет</value>
         <value xml:lang="th">บริการเครดิตบัญชี</value>
@@ -442,6 +475,7 @@
         <value xml:lang="fr">Carte d'essence 1</value>
         <value xml:lang="hi_IN">गैस कार्ड नंबर 1</value>
         <value xml:lang="it">Numero Carta Carburante 1</value>
+        <value xml:lang="nl">Tankpas 1</value>
         <value xml:lang="pt_BR">Cartão de Abastecimento 1</value>
         <value xml:lang="ro">Nr.Card Carburant 1</value>
         <value xml:lang="ru">Газовая карта №1</value>
@@ -454,6 +488,7 @@
         <value xml:lang="fr">Carte d'essence 2</value>
         <value xml:lang="hi_IN">गैस कार्ड नंबर 2</value>
         <value xml:lang="it">Numero Carta Carburante 2</value>
+        <value xml:lang="nl">Tankpas 2</value>
         <value xml:lang="pt_BR">Cartão de Abastecimento 2</value>
         <value xml:lang="ro">Nr.Card Carburant 2</value>
         <value xml:lang="ru">Газовая карта №2</value>
@@ -466,6 +501,7 @@
         <value xml:lang="fr">Carte d'essence 3</value>
         <value xml:lang="hi_IN">गैस कार्ड नंबर 3</value>
         <value xml:lang="it">Numero Carta Carburante 3</value>
+        <value xml:lang="nl">Tankpas 3</value>
         <value xml:lang="pt_BR">Cartão de Abastecimento 3</value>
         <value xml:lang="ro">Nr.Card Carburant 3</value>
         <value xml:lang="ru">Газовая карта №3</value>
@@ -490,6 +526,7 @@
         <value xml:lang="fr">Numéro de traçage interne</value>
         <value xml:lang="hi_IN">आंतरिक ट्रैकिंग लेबल संख्या</value>
         <value xml:lang="it">Numero Interno Tracciatura Etichetta</value>
+        <value xml:lang="nl">Intern volglabelnummer</value>
         <value xml:lang="pt_BR">Número de Controle Interno</value>
         <value xml:lang="ro">Date Interne Nr.Eticheta </value>
         <value xml:lang="ru">Инвентарный номер</value>
@@ -514,6 +551,7 @@
         <value xml:lang="fr">Numéro d'Identification de Véhicule</value>
         <value xml:lang="hi_IN">वाहन पहचान संख्या (VIN)</value>
         <value xml:lang="it">Numero Identificazione Veicolo (VIN)</value>
+        <value xml:lang="nl">Voertuig Identificatie Nummer (VIN)</value>
         <value xml:lang="pt_BR">Numeração do Chassi (VIN)</value>
         <value xml:lang="ro">Nr Identificare Vehicol (VIN)</value>
         <value xml:lang="ru">Идентификационный номер автомобиля (VIN)</value>
@@ -526,6 +564,7 @@
         <value xml:lang="fr">Vente d'actif</value>
         <value xml:lang="hi_IN">परिसंपत्ति की बिक्री</value>
         <value xml:lang="it">Vendita Cespite</value>
+        <value xml:lang="nl">Verkoop van bezit</value>
         <value xml:lang="pt_BR">Venda de Ativo</value>
         <value xml:lang="ro">Bunuri in vanzare</value>
         <value xml:lang="ru">Продажа имущества</value>
@@ -538,6 +577,7 @@
         <value xml:lang="fr">Utilisation d'actif</value>
         <value xml:lang="hi_IN">परिसंपत्ति का उपयोग</value>
         <value xml:lang="it">Uso Cespite</value>
+        <value xml:lang="nl">Gebruik van bezit</value>
         <value xml:lang="pt_BR">Uso de Ativo</value>
         <value xml:lang="ro">Bunuri in uz</value>
         <value xml:lang="ru">Использование имущества</value>
@@ -550,6 +590,7 @@
         <value xml:lang="fr">Coût standard d'installation</value>
         <value xml:lang="hi_IN">मानक स्थापना लागत</value>
         <value xml:lang="it">Costo Standard Iniziale</value>
+        <value xml:lang="nl">Standaard initiele kosten</value>
         <value xml:lang="pt_BR">Custo de Instalação Padrão</value>
         <value xml:lang="ro">Cost Standard Initial</value>
         <value xml:lang="ru">Стандартная стоимость установки</value>
@@ -562,6 +603,7 @@
         <value xml:lang="fr">Coût standard d'utilisation</value>
         <value xml:lang="hi_IN">मानक उपयोग की लागत</value>
         <value xml:lang="it">Costo Standard Uso</value>
+        <value xml:lang="nl">Standaard gebruikskosten</value>
         <value xml:lang="pt_BR">Custo de Uso Padrão</value>
         <value xml:lang="ro">Cost Standard in Uz</value>
         <value xml:lang="ru">Стандартная стоимость использования</value>
@@ -574,6 +616,7 @@
         <value xml:lang="fr">Matériel informatique</value>
         <value xml:lang="hi_IN">कंप्यूटर हार्डवेयर</value>
         <value xml:lang="it">Hardware per computer</value>
+        <value xml:lang="nl">Computer hardware</value>
         <value xml:lang="pt_BR">Hardware de Computador</value>
         <value xml:lang="zh">计算机硬件</value>
         <value xml:lang="zh_TW">電腦硬體</value>
@@ -583,6 +626,7 @@
         <value xml:lang="fr">Logiciel informatique</value>
         <value xml:lang="hi_IN">कंप्यूटर सॉफ्टवेयर</value>
         <value xml:lang="it">Software per computer</value>
+        <value xml:lang="nl">Computer software</value>
         <value xml:lang="pt_BR">Software</value>
         <value xml:lang="zh">计算机软件</value>
         <value xml:lang="zh_TW">電腦軟件</value>
@@ -592,6 +636,7 @@
         <value xml:lang="fr">Equipement</value>
         <value xml:lang="hi_IN">उपकरण</value>
         <value xml:lang="it">Attrezzature</value>
+        <value xml:lang="nl">Uitrusting</value>
         <value xml:lang="pt_BR">Equipamento</value>
         <value xml:lang="ro">Echipamente</value>
         <value xml:lang="ru">Оборудование</value>
@@ -616,6 +661,7 @@
         <value xml:lang="fr">Autre actif immobilisé</value>
         <value xml:lang="hi_IN">अन्य अचल संपत्ति</value>
         <value xml:lang="it">Altri Cespiti</value>
+        <value xml:lang="nl">Andere vaste activa</value>
         <value xml:lang="pt_BR">Outro Ativo Fixo</value>
         <value xml:lang="ro">Alte Mijloace Fixe</value>
         <value xml:lang="ru">Другие основные средства</value>
@@ -640,6 +686,7 @@
         <value xml:lang="fr">Propriété</value>
         <value xml:lang="hi_IN">संपत्ति</value>
         <value xml:lang="it">Proprietà</value>
+        <value xml:lang="nl">Eigendom</value>
         <value xml:lang="pt_BR">Propriedade</value>
         <value xml:lang="ro">Proprietati</value>
         <value xml:lang="ru">Имущество</value>
@@ -652,6 +699,7 @@
         <value xml:lang="fr">Bien immobilier</value>
         <value xml:lang="hi_IN">रियल एस्टेट</value>
         <value xml:lang="it">Immobiliare</value>
+        <value xml:lang="nl">Onroerend goed</value>
         <value xml:lang="pt_BR">Imóvel</value>
         <value xml:lang="ro">Imobile</value>
         <value xml:lang="ru">Недвижимость</value>
@@ -664,6 +712,7 @@
         <value xml:lang="fr">Véhicule</value>
         <value xml:lang="hi_IN">वाहन</value>
         <value xml:lang="it">Veicolo</value>
+        <value xml:lang="nl">Voertuig</value>
         <value xml:lang="pt_BR">Veículo</value>
         <value xml:lang="ro">Vehicol</value>
         <value xml:lang="ru">Транспорт</value>
@@ -676,6 +725,7 @@
         <value xml:lang="fr">Amortissement cumulé</value>
         <value xml:lang="hi_IN">संचित परिशोधन</value>
         <value xml:lang="it">Fondo Ammortamento Beni Intangibili</value>
+        <value xml:lang="nl">Cumulatieve amortisatie</value>
         <value xml:lang="pt_BR">Amortização Acumulada</value>
         <value xml:lang="ro">Amortizare Acumulata</value>
         <value xml:lang="ru">Аккумулированная амортизация</value>
@@ -688,6 +738,7 @@
         <value xml:lang="fr">Dépréciation cumulée</value>
         <value xml:lang="hi_IN">संचित मूल्यह्रास</value>
         <value xml:lang="it">Fondo Ammortamento Beni Tangibili</value>
+        <value xml:lang="nl">Cumulatieve afschrijvingen</value>
         <value xml:lang="pt_BR">Depreciação Acumulada</value>
         <value xml:lang="ro">Devalorizare Acumulata</value>
         <value xml:lang="ru">Аккумулированный износ</value>
@@ -700,6 +751,7 @@
         <value xml:lang="fr">Amortissement</value>
         <value xml:lang="hi_IN">ऋण परिशोधन</value>
         <value xml:lang="it">Ammortamento Beni Intangibili</value>
+        <value xml:lang="nl">Amortisatie</value>
         <value xml:lang="pt_BR">Amortização</value>
         <value xml:lang="ro">Amortizari</value>
         <value xml:lang="ru">Амортизация</value>
@@ -712,6 +764,7 @@
         <value xml:lang="fr">Actif</value>
         <value xml:lang="hi_IN">परिसंपत्ति</value>
         <value xml:lang="it">Attivo</value>
+        <value xml:lang="nl">Activa</value>
         <value xml:lang="pt_BR">Ativo</value>
         <value xml:lang="ro">Bunuri</value>
         <value xml:lang="ru">Активы</value>
@@ -736,6 +789,7 @@
         <value xml:lang="fr">Décaissement</value>
         <value xml:lang="hi_IN">नकद व्यय</value>
         <value xml:lang="it">Spese Di Cassa</value>
+        <value xml:lang="nl">Cash betaling</value>
         <value xml:lang="pt_BR">Despesa em Dinheiro</value>
         <value xml:lang="ro">Cheltuieli Casa</value>
         <value xml:lang="ru">Денежные расходы</value>
@@ -748,6 +802,7 @@
         <value xml:lang="fr">Encaissement</value>
         <value xml:lang="hi_IN">नकद आय</value>
         <value xml:lang="it">Ricavi di Cassa</value>
+        <value xml:lang="nl">Cash ontvangst</value>
         <value xml:lang="pt_BR">Renda em Dinheiro</value>
         <value xml:lang="ro">Venituri din Casa</value>
         <value xml:lang="ru">Денежный доходы</value>
@@ -760,6 +815,7 @@
         <value xml:lang="fr">Coût direct des marchandises vendues</value>
         <value xml:lang="hi_IN">बेचे हुए माल के व्यय की लागत</value>
         <value xml:lang="it">Costo dela Merce Venduta</value>
+        <value xml:lang="nl">Kostprijs verkochte goederen</value>
         <value xml:lang="pt_BR">Custo de Mercadoria Vendida</value>
         <value xml:lang="ro">Cost de Vinzare Cumparare</value>
         <value xml:lang="ru">Стоимость проданных товаров</value>
@@ -772,6 +828,7 @@
         <value xml:lang="fr">Crédit</value>
         <value xml:lang="hi_IN">जमा</value>
         <value xml:lang="it">Avere</value>
+        <value xml:lang="nl">Krediet</value>
         <value xml:lang="pt_BR">Crédito</value>
         <value xml:lang="ro">Credit</value>
         <value xml:lang="ru">Кредит</value>
@@ -784,6 +841,7 @@
         <value xml:lang="fr">Actif à court terme</value>
         <value xml:lang="hi_IN">वर्तमान परिसंपत्ति</value>
         <value xml:lang="it">Attivo Circolante</value>
+        <value xml:lang="nl">Vlottende activa</value>
         <value xml:lang="pt_BR">Ativo Circulante</value>
         <value xml:lang="ro">Bunuri Actuale</value>
         <value xml:lang="ru">Текущие активы</value>
@@ -796,6 +854,7 @@
         <value xml:lang="fr">Dette à court terme</value>
         <value xml:lang="hi_IN">चालू दायित्व</value>
         <value xml:lang="it">Debiti a Breve Termine</value>
+        <value xml:lang="nl">Kortlopende schulden</value>
         <value xml:lang="pt_BR">Passivo Circulante</value>
         <value xml:lang="ro">Pasivitati Actuale</value>
         <value xml:lang="ru">Текущие обязательства</value>
@@ -808,6 +867,7 @@
         <value xml:lang="fr">Débit</value>
         <value xml:lang="hi_IN">नामे</value>
         <value xml:lang="it">Dare</value>
+        <value xml:lang="nl">Debit</value>
         <value xml:lang="pt_BR">Débito</value>
         <value xml:lang="ro">Debit</value>
         <value xml:lang="ru">Дебит</value>
@@ -821,6 +881,7 @@
         <value xml:lang="fr">Dépréciation</value>
         <value xml:lang="hi_IN">मूल्यह्रास</value>
         <value xml:lang="it">Ammortamento Beni Tangibili</value>
+        <value xml:lang="nl">Afschrijving</value>
         <value xml:lang="pt_BR">Depreciação</value>
         <value xml:lang="ro">Devalorizari</value>
         <value xml:lang="ru">Износ</value>
@@ -833,6 +894,7 @@
         <value xml:lang="fr">Capitaux propres distribués</value>
         <value xml:lang="hi_IN">इक्विटी वितरण</value>
         <value xml:lang="it">Distribuzione Azioni</value>
+        <value xml:lang="nl">Eigen vermogen distributie</value>
         <value xml:lang="pt_BR">Distribuição de Bens</value>
         <value xml:lang="ro">Distributie de Actiuni</value>
         <value xml:lang="ru">Распределение прибыли</value>
@@ -857,6 +919,7 @@
         <value xml:lang="fr">Capitaux propres</value>
         <value xml:lang="hi_IN">इक्विटी</value>
         <value xml:lang="it">Patrimonio Netto</value>
+        <value xml:lang="nl">Vermogen</value>
         <value xml:lang="pt_BR">Bens</value>
         <value xml:lang="ro">Actiuni</value>
         <value xml:lang="ru">Собственные средства</value>
@@ -869,6 +932,7 @@
         <value xml:lang="fr">Charges</value>
         <value xml:lang="hi_IN">व्यय</value>
         <value xml:lang="it">Costi</value>
+        <value xml:lang="nl">Kosten</value>
         <value xml:lang="pt_BR">Despesa</value>
         <value xml:lang="ro">Cheltuieli</value>
         <value xml:lang="ru">Расходы</value>
@@ -881,6 +945,7 @@
         <value xml:lang="fr">Revenus</value>
         <value xml:lang="hi_IN">आय</value>
         <value xml:lang="it">Ricavi</value>
+        <value xml:lang="nl">Opbrengsten</value>
         <value xml:lang="pt_BR">Renda</value>
         <value xml:lang="ro">Venit</value>
         <value xml:lang="ru">Доходы</value>
@@ -893,6 +958,7 @@
         <value xml:lang="fr">Charges financières</value>
         <value xml:lang="hi_IN">ब्याज व्यय</value>
         <value xml:lang="it">Costi per Interessi</value>
+        <value xml:lang="nl">Rentekosten</value>
         <value xml:lang="pt_BR">Custo sobre Juros</value>
         <value xml:lang="ro">Dobanda Cheltuieli</value>
         <value xml:lang="ru">Выплата процентов</value>
@@ -905,6 +971,7 @@
         <value xml:lang="fr">Ajustement d'inventaire</value>
         <value xml:lang="hi_IN">सूची समायोजन</value>
         <value xml:lang="it">Modifiche di Inventario</value>
+        <value xml:lang="nl">Voorraad aanpassing</value>
         <value xml:lang="pt_BR">Ajuste do Inventário</value>
         <value xml:lang="ro">Reglaj Inventar</value>
         <value xml:lang="ru">Поправка остаков ТМЦ</value>
@@ -917,6 +984,7 @@
         <value xml:lang="fr">Actif en stock</value>
         <value xml:lang="hi_IN">सूची परिसंपत्ति</value>
         <value xml:lang="it">Inventario cespite</value>
+        <value xml:lang="nl">voorraad materiaal</value>
         <value xml:lang="pt_BR">Inventário de Ativo</value>
         <value xml:lang="zh">存货资产</value>
         <value xml:lang="zh_TW">存貨資產</value>
@@ -926,6 +994,7 @@
         <value xml:lang="fr">Dette</value>
         <value xml:lang="hi_IN">दायित्व</value>
         <value xml:lang="it">Passività</value>
+        <value xml:lang="nl">Schulden</value>
         <value xml:lang="pt_BR">Passivo</value>
         <value xml:lang="ro">Pasivitati</value>
         <value xml:lang="ru">Обязательства</value>
@@ -938,6 +1007,7 @@
         <value xml:lang="fr">Actif à long terme</value>
         <value xml:lang="hi_IN">दीर्घकालिक परिसंपत्ति</value>
         <value xml:lang="it">Cespiti</value>
+        <value xml:lang="nl">Vaste activa</value>
         <value xml:lang="pt_BR">Ativo Operacional de Longo Prazo</value>
         <value xml:lang="ro">Bunuri pe Termen Lung</value>
         <value xml:lang="ru">Долгосрочные активы</value>
@@ -950,6 +1020,7 @@
         <value xml:lang="fr">Dette à long terme</value>
         <value xml:lang="hi_IN">दीर्घकालिक दायित्व</value>
         <value xml:lang="it">Finanziamenti e Altri Debiti a Lungo Termine</value>
+        <value xml:lang="nl">Langlopende schuld</value>
         <value xml:lang="pt_BR">Passivo Exigível a Londo Prazo</value>
         <value xml:lang="ro">Pasivitati pe Termen Lung</value>
         <value xml:lang="ru">Долгосрочные обязательства</value>

Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml Sun May 29 11:02:09 2011
@@ -178,7 +178,7 @@
         <value xml:lang="fr">Rapprochement de compte</value>
         <value xml:lang="hi_IN">लेखा पुनर्मिलान</value>
         <value xml:lang="it">Riconciliazione</value>
-        <value xml:lang="nl">Afstemming rekening</value>
+        <value xml:lang="nl">Afstemming grootboekrekening</value>
         <value xml:lang="pt">Reconciliação de Conta</value>
         <value xml:lang="th">การเช็คยอดบัญชี</value>
         <value xml:lang="zh">账户对账</value>
@@ -190,7 +190,7 @@
         <value xml:lang="fr">Rapprochements de compte</value>
         <value xml:lang="hi_IN">लेखा पुनर्मिलान</value>
         <value xml:lang="it">Riconciliazioni</value>
-        <value xml:lang="nl">Afstemmingen</value>
+        <value xml:lang="nl">Afstemmingen grootboekrekening</value>
         <value xml:lang="pt">Reconciliações de Contas</value>
         <value xml:lang="th">การเช็คยอดบัญชี</value>
         <value xml:lang="zh">账户对账</value>
@@ -202,7 +202,7 @@
         <value xml:lang="fr">Transactions comptables</value>
         <value xml:lang="hi_IN">लेखा गतिविधियाँ</value>
         <value xml:lang="it">Prime Note</value>
-        <value xml:lang="nl">Boekhoudtransacties</value>
+        <value xml:lang="nl">Boekingen</value>
         <value xml:lang="pt">Transações Contábeis</value>
         <value xml:lang="th">รายการบัญชี</value>
         <value xml:lang="zh">交易记账</value>
@@ -214,7 +214,7 @@
         <value xml:lang="fr">Entrées de transactions comptables</value>
         <value xml:lang="hi_IN">लेखा लेनदेन की प्रविष्टियाँ</value>
         <value xml:lang="it">Righe Prime Note</value>
-        <value xml:lang="nl">Ingaves Boekhoudtransacties</value>
+        <value xml:lang="nl">Aanmaken boeking</value>
         <value xml:lang="pt">Escrituração de Transações Contábeis</value>
         <value xml:lang="th">รายการบัญชีรายรับ</value>
         <value xml:lang="zh">交易记录记账</value>
@@ -1942,7 +1942,7 @@
         <value xml:lang="fr">Comptes de facturation</value>
         <value xml:lang="hi_IN">देयकांकन(बिलिंग) खातें</value>
         <value xml:lang="it">Conti Fatturazione</value>
-        <value xml:lang="nl">factuurrekeningen</value>
+        <value xml:lang="nl">Factuurrekeningen</value>
         <value xml:lang="pt">Contas de cobrança</value>
         <value xml:lang="ro">Conturi Facturare</value>
         <value xml:lang="ru">Кредитные счета</value>
@@ -2197,6 +2197,7 @@
         <value xml:lang="en">Cash Flow Statement</value>
         <value xml:lang="fr">Tableau des flux de trésorerie</value>
         <value xml:lang="hi_IN">रोकड प्रवाह विवरण</value>
+        <value xml:lang="nl">Kasboek</value>
         <value xml:lang="pt">Demonstração dos Fluxos de Caixa</value>
         <value xml:lang="zh_TW">現金流量表</value>
     </property>
@@ -2204,6 +2205,7 @@
         <value xml:lang="en">Chart of accounts for</value>
         <value xml:lang="fr">Plan comptable pour</value>
         <value xml:lang="hi_IN">लेखा-चित्र के लिए</value>
+        <value xml:lang="nl">Overzicht grootboekrekeningen voor</value>
         <value xml:lang="pt">Plano de Contas para</value>
         <value xml:lang="zh_TW">會計科目表</value>
     </property>
@@ -2486,7 +2488,7 @@
         <value xml:lang="fr">Bilan comparatif</value>
         <value xml:lang="hi_IN">तुलनात्मक तुलन-पत्र</value>
         <value xml:lang="it">Stato Patrimoniale Comparativo</value>
-        <value xml:lang="nl">Vergelijkingsbalans</value>
+        <value xml:lang="nl">Vergelijking Balans</value>
         <value xml:lang="pt">Comparativo do Balanço</value>
         <value xml:lang="th">เปรียบเทียบงบดุล</value>
         <value xml:lang="zh">比较资产负债表</value>
@@ -2496,6 +2498,7 @@
         <value xml:lang="en">Comparative Cash Flow Statement</value>
         <value xml:lang="fr">Tableau comparatif de flux de trésorerie</value>
         <value xml:lang="hi_IN">तुलनात्मक रोकड प्रवाह विवरण</value>
+        <value xml:lang="nl">Vergelijking Kasboek</value>
         <value xml:lang="pt">Demonstração dos Fluxos de Caixa comparativo</value>
         <value xml:lang="zh_TW">比較現金流量表</value>
     </property>
@@ -2505,6 +2508,7 @@
         <value xml:lang="fr">Comparatif Compte de résultat</value>
         <value xml:lang="hi_IN">तुलनात्मक आय विवरण</value>
         <value xml:lang="it">Conto Economico Comparativo</value>
+        <value xml:lang="nl">Vergelijking Resultatenrekening</value>
         <value xml:lang="pt">Comparativo de Demonstração de Resultados</value>
         <value xml:lang="zh_TW">比較損益表</value>
     </property>
@@ -2854,7 +2858,7 @@
         <value xml:lang="fr">Créer une transaction de paiement</value>
         <value xml:lang="hi_IN">भुगतान लेखा गतिविधि बनाएँ</value>
         <value xml:lang="it">Creazione Prima Nota Per Pagamento</value>
-        <value xml:lang="nl">Maak transactie voor betaalrekening aan</value>
+        <value xml:lang="nl">Aanmaken boeking van betaling</value>
         <value xml:lang="pt">Criar operação contabil de pagamento</value>
         <value xml:lang="th">สร้างรายการบัญชีการชำระเงิน</value>
         <value xml:lang="zh">新建支付会计交易</value>
@@ -2896,7 +2900,7 @@
         <value xml:lang="fr">Créer une transaction de vente</value>
         <value xml:lang="hi_IN">बिक्री लेखा गतिविधि बनाएँ</value>
         <value xml:lang="it">Creazione Prima Nota Per Vendite</value>
-        <value xml:lang="nl">Maak transatie voor verkoopadministratie</value>
+        <value xml:lang="nl">Aanmaken boeking van verkoop</value>
         <value xml:lang="pt">Criar transação contábil de vendas</value>
         <value xml:lang="th">สร้างบัญชีรายการขาย</value>
         <value xml:lang="zh">新建销售会计交易</value>
@@ -4148,7 +4152,7 @@
     </property>
     <property key="AccountingFindApPayments">
         <value xml:lang="en">Find AP Payments</value>
-        <value xml:lang="en">Recherche de paiements fournisseur</value>
+        <value xml:lang="fr">Recherche de paiements fournisseur</value>
         <value xml:lang="hi_IN">लेखा देय भुगतान खोजें</value>
         <value xml:lang="pt">Encontrar Pagamentos do contas a pagar</value>
         <value xml:lang="zh_TW">找尋應付支付</value>
@@ -5486,6 +5490,7 @@
         <value xml:lang="de">Probebilanz</value>
         <value xml:lang="en">GL Account Trial Balance</value>
         <value xml:lang="hi_IN">जीएल(GL) खाता तलपट(Trial Balance)</value>
+        <value xml:lang="nl">Grootboekrekening Proefbalans</value>
         <value xml:lang="pt">Balancete Teste da Conta Razão</value>
         <value xml:lang="zh_TW">總帳科目試算餘額</value>
     </property>
@@ -5563,7 +5568,7 @@
         <value xml:lang="fr">Configurations globales du GL</value>
         <value xml:lang="hi_IN">सार्विक जीएल(GL) सेटिंग्स</value>
         <value xml:lang="it">Configurazione Contabilità Generale</value>
-        <value xml:lang="nl">Algemene instellingen boekhouding</value>
+        <value xml:lang="nl">Boekhouding algemeen</value>
         <value xml:lang="pt">Configurações globais da contabilidade</value>
         <value xml:lang="th">การกำหนดบัญชีแยกประเภททั่วไป</value>
         <value xml:lang="zh">全局总账设置</value>
@@ -5664,7 +5669,7 @@
         <value xml:lang="fr">Déclaration de revenus</value>
         <value xml:lang="hi_IN">आय विवरण</value>
         <value xml:lang="it">Conto Economico</value>
-        <value xml:lang="nl">Inkomensoverzicht</value>
+        <value xml:lang="nl">Resultatenrekening</value>
         <value xml:lang="pt">Declaração de rendimentos</value>
         <value xml:lang="ro">Extract Cont in Intrare</value>
         <value xml:lang="ru">Результативный счет</value>
@@ -5735,6 +5740,7 @@
     <property key="AccountingInventoryValuation">
         <value xml:lang="en">Inventory Valuation</value>
         <value xml:lang="hi_IN">वस्तु मूल्यांकन</value>
+        <value xml:lang="nl">Voorraadwaardering</value>
         <value xml:lang="pt">Inventário de Avaliação</value>
         <value xml:lang="zh_TW">庫存評價表</value>
     </property>
@@ -6384,6 +6390,10 @@
         <value xml:lang="zh">销售发票</value>
         <value xml:lang="zh_TW">銷售發票</value>
     </property>
+    <property key="AccountingInvoiceSaveAsTemplate">
+        <value xml:lang="en">Save Invoice As Template</value>
+        <value xml:lang="it">Salva fattura come template</value>
+    </property>
     <property key="AccountingInvoiceStatusHistory">
         <value xml:lang="ar">سوابق الوضعيات</value>
         <value xml:lang="de">Statusverlauf</value>
@@ -6714,7 +6724,7 @@
         <value xml:lang="fr">Dettes</value>
         <value xml:lang="hi_IN">देयताएँ</value>
         <value xml:lang="it">Debiti</value>
-        <value xml:lang="nl">Schulden</value>
+        <value xml:lang="nl">Passiva</value>
         <value xml:lang="pt">Passivos</value>
         <value xml:lang="ro">Datorii-Debit</value>
         <value xml:lang="ru">Обязательства</value>
@@ -8063,7 +8073,7 @@
         <value xml:lang="en">Organization GL Settings</value>
         <value xml:lang="fr">Configurations internes du GL</value>
         <value xml:lang="hi_IN">संगठन जीएल(Gl) सेटिंग्स</value>
-        <value xml:lang="nl">Organisatie grootboek instellingen</value>
+        <value xml:lang="nl">Boekhouding organisatie</value>
         <value xml:lang="pt">Configurações da Contabilização da Organização</value>
         <value xml:lang="zh">组织机构总账设置</value>
         <value xml:lang="zh_TW">單位組織設定</value>
@@ -8236,7 +8246,7 @@
         <value xml:lang="fr">Résumé des comptes</value>
         <value xml:lang="hi_IN">लेखा सारांश</value>
         <value xml:lang="it">Sommario Conti</value>
-        <value xml:lang="nl">Samenvatting rekeningen</value>
+        <value xml:lang="nl">Overzicht grootboekrekeningen</value>
         <value xml:lang="pt">Resumo de contas</value>
         <value xml:lang="zh">账户总览</value>
         <value xml:lang="zh_TW">賬戶總覽</value>
@@ -10250,7 +10260,7 @@
         <value xml:lang="fr">Rapports</value>
         <value xml:lang="hi_IN">ब्यौरेवार विवरण</value>
         <value xml:lang="it">Stampe</value>
-        <value xml:lang="nl">Raporten</value>
+        <value xml:lang="nl">Overzichten</value>
         <value xml:lang="pt">Relatórios</value>
         <value xml:lang="ro">Tiparire</value>
         <value xml:lang="ru">Отчеты</value>
@@ -10651,7 +10661,7 @@
         <value xml:lang="fr">Configuration</value>
         <value xml:lang="hi_IN">विन्यास</value>
         <value xml:lang="it">Configurazione</value>
-        <value xml:lang="nl">Configuratie</value>
+        <value xml:lang="nl">Instellingen</value>
         <value xml:lang="pt">Configuração</value>
         <value xml:lang="th">ติดตั้ง</value>
         <value xml:lang="zh">设置</value>
@@ -11184,6 +11194,7 @@
     </property>
     <property key="AccountingTotalAccumulatedDepreciation">
         <value xml:lang="en">Total Accumulated Depreciation</value>
+        <value xml:lang="nl">Geaccumuleerde afschrijvingen totaal</value>      
         <value xml:lang="pt">Depreciação Acumulada Total</value>
     </property>
     <property key="AccountingTotalAmountPercentageIsNotEqualOneHundred">
@@ -11193,6 +11204,7 @@
     </property>
     <property key="AccountingTotalAssets">
         <value xml:lang="en">Total Assets</value>
+        <value xml:lang="nl">Totaal activa</value>      
         <value xml:lang="pt">Ativos Totais</value>
     </property>
     <property key="AccountingTotalCapital">
@@ -11264,6 +11276,14 @@
         <value xml:lang="en">Total Liabilities and Equities</value>
         <value xml:lang="pt">Total do Passivo e Ações</value>
     </property>
+    <property key="AccountingTotalLiabilities">
+        <value xml:lang="en">Total Liabilities</value>
+        <value xml:lang="nl">Totaal kortlopende schulden</value>      
+    </property>
+    <property key="AccountingTotalEquities">
+        <value xml:lang="en">Total Equities</value>
+        <value xml:lang="nl">Totaal eigen vermogen</value>      
+    </property>
     <property key="AccountingTotalNetSales">
         <value xml:lang="en">Total Net Sales</value>
         <value xml:lang="hi_IN">कुल शुद्ध विक्रय</value>
@@ -11324,7 +11344,7 @@
         <value xml:lang="fr">Totaux de transaction</value>
         <value xml:lang="hi_IN">गतिविधि के योग</value>
         <value xml:lang="it">Totali Prime Note</value>
-        <value xml:lang="nl">Totalen transactie</value>
+        <value xml:lang="nl">Totalen grootboekrekeningen</value>
         <value xml:lang="pt">Totais de transação</value>
         <value xml:lang="th">ผลรวมรายการ</value>
         <value xml:lang="zh">交易合计</value>
@@ -12192,7 +12212,7 @@
         <value xml:lang="fr">Résumé</value>
         <value xml:lang="hi_IN">सारांश</value>
         <value xml:lang="it">Sommario</value>
-        <value xml:lang="nl">Samenvatting</value>
+        <value xml:lang="nl">Snel naar...</value>
         <value xml:lang="pt">Resumo</value>
         <value xml:lang="th">สรุป</value>
         <value xml:lang="zh">总览</value>
@@ -12210,7 +12230,7 @@
         <value xml:lang="fr">Code du compte</value>
         <value xml:lang="hi_IN">खाता कोड</value>
         <value xml:lang="it">Codice Conto</value>
-        <value xml:lang="nl">Accountcode</value>
+        <value xml:lang="nl">Grootboekrekeningnummer</value>
         <value xml:lang="pt">Código da conta</value>
         <value xml:lang="ro">Cod Cont</value>
         <value xml:lang="ru">Код счета</value>
@@ -12256,7 +12276,7 @@
         <value xml:lang="fr">Nom du compte</value>
         <value xml:lang="hi_IN">खाता नाम</value>
         <value xml:lang="it">Nome Conto</value>
-        <value xml:lang="nl">Accountnaam</value>
+        <value xml:lang="nl">Grootboekrekeningnaam</value>
         <value xml:lang="pt">Nome da Conta</value>
         <value xml:lang="ro">Nume Cont</value>
         <value xml:lang="ru">Название счета</value>
@@ -12837,6 +12857,7 @@
         <value xml:lang="en">Cost Centers</value>
         <value xml:lang="fr">Centres de coût</value>
         <value xml:lang="hi_IN">लागत केंद्र</value>
+        <value xml:lang="nl">Kostenplaatsen</value>
         <value xml:lang="pt">Centros de custo</value>
         <value xml:lang="zh_TW">成本中心</value>
     </property>
@@ -17134,7 +17155,7 @@
         <value xml:lang="fr">Transactions comptables non postées</value>
         <value xml:lang="hi_IN">अनपोस्टेड लेखा गतिविधियाँ</value>
         <value xml:lang="it">Prime Note non Contabilizzate</value>
-        <value xml:lang="nl">Onverwerkte transacties</value>
+        <value xml:lang="nl">Onverwerkte boekingen</value>
         <value xml:lang="pt">Transações Contábeis não enviadas</value>
         <value xml:lang="ro">Tranzactie ne Contabilizate</value>
         <value xml:lang="ru">Отмененные бухгалтерские проводки</value>

Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java Sun May 29 11:02:09 2011
@@ -58,9 +58,9 @@ public class InvoiceWorker {
 
     /**
      * Return the total amount of the invoice (including tax) using the the invoiceId as input.
-     * @param delegator
-     * @param invoiceId
-     * @return
+     * @param delegator the delegator
+     * @param invoiceId the invoice id
+     * @return Return the total amount of the invoice
      */
     public static BigDecimal getInvoiceTotal(Delegator delegator, String invoiceId) {
         return getInvoiceTotal(delegator, invoiceId, Boolean.TRUE);
@@ -69,11 +69,11 @@ public class InvoiceWorker {
     /**
      * Return the total amount of the invoice (including tax) using the the invoiceId as input.
      * with the ability to specify if the actual currency is required.
-     * @param delegator
-     * @param invoiceId
+     * @param delegator the delegator
+     * @param invoiceId the invoice Id
      * @param actualCurrency true: provide the actual currency of the invoice (could be different from the system currency)
      *                       false: if required convert the actual currency into the system currency.
-     * @return
+     * @return Return the total amount of the invoice
      */
     public static BigDecimal getInvoiceTotal(Delegator delegator, String invoiceId, Boolean actualCurrency) {
         if (delegator == null) {
@@ -96,7 +96,7 @@ public class InvoiceWorker {
 
     /**
      * Method to return the total amount of an invoice item i.e. quantity * amount
-     * @param invoice GenericValue object of the Invoice
+     * @param invoiceItem GenericValue object of the invoice item
      * @return the invoice total as BigDecimal
      */
     public static BigDecimal getInvoiceItemTotal(GenericValue invoiceItem) {
@@ -151,10 +151,10 @@ public class InvoiceWorker {
       *
       * Return the total amount of the invoice (including tax) using the the invoice GenericValue as input.
       * with the ability to specify if the actual currency is required.
-      * @param invoice
+      * @param invoice GenericValue object of the Invoice
       * @param actualCurrency true: provide the actual currency of the invoice (could be different from the system currency)
       *                       false: if required convert the actual currency into the system currency.
-      * @return
+      * @return Return the total amount of the invoice
       */
      public static BigDecimal getInvoiceTotal(GenericValue invoice, Boolean actualCurrency) {
         BigDecimal invoiceTotal = ZERO;
@@ -341,7 +341,9 @@ public class InvoiceWorker {
 
     /**
      * Method to return the total amount of an invoice which is not yet applied to a payment
-     * @param invoice GenericValue object of the Invoice
+     * @param delegator the delegator
+     * @param invoiceId the invoice id
+     * @param actualCurrency the currency
      * @return the invoice total as BigDecimal
      */
     public static BigDecimal getInvoiceNotApplied(Delegator delegator, String invoiceId, Boolean actualCurrency) {
@@ -359,9 +361,9 @@ public class InvoiceWorker {
     /**
      * Returns amount not applied (i.e., still outstanding) of an invoice at an asOfDate, based on Payment.effectiveDate <= asOfDateTime
      *
-     * @param invoice
-     * @param asOfDateTime
-     * @return
+     * @param invoice GenericValue object of the invoice
+     * @param asOfDateTime the date to use
+     * @return Returns amount not applied of the invoice
      */
     public static BigDecimal getInvoiceNotApplied(GenericValue invoice, Timestamp asOfDateTime) {
         return InvoiceWorker.getInvoiceTotal(invoice, Boolean.TRUE).subtract(getInvoiceApplied(invoice, asOfDateTime));
@@ -370,7 +372,8 @@ public class InvoiceWorker {
 
     /**
      * Method to return the total amount of an invoice which is applied to a payment
-     * @param invoice GenericValue object of the Invoice
+     * @param delegator the delegator
+     * @param invoiceId the invoice id
      * @return the invoice total as BigDecimal
      */
     public static BigDecimal getInvoiceApplied(Delegator delegator, String invoiceId) {
@@ -380,10 +383,10 @@ public class InvoiceWorker {
     /**
      * Returns amount applied to invoice before an asOfDateTime, based on Payment.effectiveDate <= asOfDateTime
      *
-     * @param delegator
-     * @param invoiceId
+     * @param delegator the delegator
+     * @param invoiceId the invoice id
      * @param asOfDateTime - a Timestamp
-     * @return
+     * @return returns amount applied to invoice before an asOfDateTime
      */
     public static BigDecimal getInvoiceApplied(Delegator delegator, String invoiceId, Timestamp asOfDateTime, Boolean actualCurrency) {
         if (delegator == null) {
@@ -419,7 +422,7 @@ public class InvoiceWorker {
     }
     /**
      * Method to return the total amount of an invoice which is applied to a payment
-     * @param invoice GenericValue object of the Invoice
+     * @param invoice GenericValue object of the invoice
      * @return the applied total as BigDecimal
      */
     public static BigDecimal getInvoiceApplied(GenericValue invoice) {
@@ -427,10 +430,10 @@ public class InvoiceWorker {
     }
 
     /**
-     * @param delegator
-     * @param invoiceId
-     * @param invoiceItemSeqId
-     * @return
+     * Return the amount applied to the invoice
+     * @param invoice GenericValue object of the invoice
+     * @param actualCurrency the currency of the invoice
+     * @return returns the amount applied to the invoice
      */
     public static BigDecimal getInvoiceApplied(GenericValue invoice, Boolean actualCurrency) {
         return getInvoiceApplied(invoice.getDelegator(), invoice.getString("invoiceId"), UtilDateTime.nowTimestamp(), actualCurrency);
@@ -440,7 +443,9 @@ public class InvoiceWorker {
     }
     /**
      * Method to return the amount of an invoiceItem which is applied to a payment
-     * @param invoice GenericValue object of the Invoice
+     * @param delegator the delegator
+     * @param invoiceId the invoice id
+     * @param invoiceItemSeqId the invoice item id
      * @return the invoice total as BigDecimal
      */
     public static BigDecimal getInvoiceItemApplied(Delegator delegator, String invoiceId, String invoiceItemSeqId) {
@@ -464,7 +469,7 @@ public class InvoiceWorker {
 
     /**
      * Method to return the total amount of an invoiceItem which is applied to a payment
-     * @param invoice GenericValue object of the Invoice
+     * @param invoiceItem GenericValue object of the invoice item
      * @return the applied total as BigDecimal
      */
     public static BigDecimal getInvoiceItemApplied(GenericValue invoiceItem) {
@@ -694,7 +699,7 @@ public class InvoiceWorker {
 
     /** Returns the invoice tax total for unattributed tax items, that is items which have no taxAuthPartyId value
      * @param invoice GenericValue object representing the invoice
-     * @return
+     * @return Returns the invoice tax total for unattributed tax items
      */
     public static BigDecimal getInvoiceUnattributedTaxTotal(GenericValue invoice) {
          List<GenericValue> invoiceTaxItems = null;

Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java Sun May 29 11:02:09 2011
@@ -128,9 +128,9 @@ public class BillingAccountWorker {
      * Calculates the "available" balance of a billing account, which is the
      * net balance minus amount of pending (not cancelled, rejected, or received) order payments.
      * When looking at using a billing account for a new order, you should use this method.
-     * @param billingAccountId
-     * @param delegator
-     * @return
+     * @param billingAccountId the billing account id
+     * @param delegator the delegato
+     * @return return the "available" balance of a billing account
      * @throws GenericEntityException
      */
     public static BigDecimal getBillingAccountBalance(Delegator delegator, String billingAccountId) throws GenericEntityException {
@@ -221,8 +221,8 @@ public class BillingAccountWorker {
     /**
      * Returns the amount which could be charged to a billing account, which is defined as the accountLimit minus account balance and minus the balance of outstanding orders
      * When trying to figure out how much of a billing account can be used to pay for an outstanding order, use this method
-     * @param billingAccount
-     * @return
+     * @param billingAccount GenericValue object of the billing account
+     * @return returns the amount which could be charged to a billing account
      * @throws GenericEntityException
      */
     public static BigDecimal getBillingAccountAvailableBalance(GenericValue billingAccount) throws GenericEntityException {
@@ -244,9 +244,9 @@ public class BillingAccountWorker {
     /**
      * Calculates the net balance of a billing account, which is sum of all amounts applied to invoices minus sum of all amounts applied from payments.
      * When charging or capturing an invoice to a billing account, use this method
-     * @param delegator
-     * @param billingAccountId
-     * @return
+     * @param delegator the delegator
+     * @param billingAccountId the billing account id
+     * @return the amount of the billing account which could be captured
      * @throws GenericEntityException
      */
     public static BigDecimal getBillingAccountNetBalance(Delegator delegator, String billingAccountId) throws GenericEntityException {
@@ -274,9 +274,9 @@ public class BillingAccountWorker {
 
     /**
      * Returns the amount of the billing account which could be captured, which is BillingAccount.accountLimit - net balance
-     * @param billingAccount
-     * @return
-     * @throws GenericEntityException
+     * @param billingAccount GenericValue object of the billing account
+     * @return the amount of the billing account which could be captured
+     * @throws GenericEntityException
      */
     public static BigDecimal availableToCapture(GenericValue billingAccount) throws GenericEntityException {
         BigDecimal netBalance = getBillingAccountNetBalance(billingAccount.getDelegator(), billingAccount.getString("billingAccountId"));

Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Sun May 29 11:02:09 2011
@@ -2811,8 +2811,8 @@ public class PaymentGatewayServices {
     /**
      * Gets the chronologically latest PaymentGatewayResponse from an OrderPaymentPreference which is either a PRDS_PAY_AUTH
      * or PRDS_PAY_REAUTH.  Used for capturing.
-     * @param orderPaymentPreference
-     * @return
+     * @param orderPaymentPreference GenericValue object of the order payment preference
+     * @return return the first authorization of the order payment preference
      */
     public static GenericValue getAuthTransaction(GenericValue orderPaymentPreference) {
         return EntityUtil.getFirst(getAuthTransactions(orderPaymentPreference));
@@ -2821,8 +2821,8 @@ public class PaymentGatewayServices {
     /**
      * Gets a chronologically ordered list of PaymentGatewayResponses from an OrderPaymentPreference which is either a PRDS_PAY_AUTH
      * or PRDS_PAY_REAUTH.
-     * @param orderPaymentPreference
-     * @return
+     * @param orderPaymentPreference GenericValue object of the order payment preference
+     * @return return the authorizations of the order payment preference
      */
     public static List<GenericValue> getAuthTransactions(GenericValue orderPaymentPreference) {
         List<GenericValue> authTransactions = null;

Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java Sun May 29 11:02:09 2011
@@ -201,7 +201,8 @@ public class PaymentWorker {
 
     /**
      * Method to return the total amount of an payment which is applied to a payment
-     * @param payment GenericValue object of the Payment
+     * @param delegator the delegator
+     * @param paymentId paymentId of the Payment
      * @return the applied total as BigDecimal
      */
     public static BigDecimal getPaymentApplied(Delegator delegator, String paymentId) {
@@ -228,8 +229,8 @@ public class PaymentWorker {
     }
     /**
      * Method to return the amount applied converted to the currency of payment
-     * @param String paymentApplicationId
-     * @return the applied amount as BigDecimal
+     * @param paymentApplicationId the payment application id
+     * @return appliedAmount the applied amount as BigDecimal
      */
     public static BigDecimal getPaymentAppliedAmount(Delegator delegator, String paymentApplicationId) {
         GenericValue paymentApplication = null;
@@ -264,7 +265,7 @@ public class PaymentWorker {
     /**
      * Method to return the total amount of an payment which is applied to a payment
      * @param payment GenericValue object of the Payment
-     * @param false for currency of the payment, true for the actual currency
+     * @param actual false for currency of the payment, true for the actual currency
      * @return the applied total as BigDecimal in the currency of the payment
      */
     public static BigDecimal getPaymentApplied(GenericValue payment, Boolean actual) {

Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java Sun May 29 11:02:09 2011
@@ -97,7 +97,7 @@ public class AIMPaymentServices {
         }
         Map<String, Object> reply = processCard(request, props, locale);
         //now we need to process the result
-        processAuthTransResult(reply, results);
+        processAuthTransResult(request, reply, results);
         return results;
     }
 
@@ -141,7 +141,7 @@ public class AIMPaymentServices {
             return results;
         }
         Map<String, Object> reply = processCard(request, props, locale);
-        processCaptureTransResult(reply, results);
+        processCaptureTransResult(request, reply, results);
         // if there is no captureRefNum, then the capture failed
         if (results.get("captureRefNum") == null) {
              return ServiceUtil.returnError((String) results.get("captureMessage"));
@@ -173,7 +173,9 @@ public class AIMPaymentServices {
         Properties props = buildAIMProperties(context, delegator);
         buildMerchantInfo(context, props, request);
         buildGatewayResponeConfig(context, props, request);
+        buildCustomerBillingInfo(context, props, request);
         buildEmailSettings(context, props, request);
+        buildInvoiceInfo(context, props, request);
         props.put("transType", "CREDIT");
         props.put("cardtype", creditCard.get("cardType"));
         buildRefundTransaction(context, props, request);
@@ -184,7 +186,7 @@ public class AIMPaymentServices {
             return results;
         }
         Map<String, Object> reply = processCard(request, props, locale);
-        results.putAll(processRefundTransResult(reply));
+        results.putAll(processRefundTransResult(request, reply));
         boolean refundResult = ((Boolean)results.get("refundResult")).booleanValue();
         String refundFlag = (String)results.get("refundFlag");
         // Since the refund failed, we are going to void the previous authorization against
@@ -221,7 +223,7 @@ public class AIMPaymentServices {
                         return reply;
                     }
                     results = ServiceUtil.returnSuccess();
-                    results.putAll(processRefundTransResult(reply));
+                    results.putAll(processRefundTransResult(request, reply));
                     return results;
                 } else {
                     // TODO: Modify the code to (a) do a void of the whole transaction, and (b)
@@ -249,7 +251,8 @@ public class AIMPaymentServices {
             return reply;
         }
         Map<String, Object> results = ServiceUtil.returnSuccess();
-        results.putAll(processReleaseTransResult(reply));
+        context.put("x_Amount", context.get("releaseAmount")); // hack for releaseAmount
+        results.putAll(processReleaseTransResult(context, reply));
         return results;
     }
 
@@ -301,7 +304,7 @@ public class AIMPaymentServices {
         }
         Map<String, Object> reply = processCard(request, props, locale);
         //now we need to process the result
-        processAuthCaptureTransResult(reply, results);
+        processAuthCaptureTransResult(request, reply, results);
         // if there is no captureRefNum, then the capture failed
         if (results.get("captureRefNum") == null) {
              return ServiceUtil.returnError((String) results.get("captureMessage"));
@@ -336,9 +339,12 @@ public class AIMPaymentServices {
                 result.put("authResult", Boolean.TRUE);
             } else {
                 result.put("authResult", Boolean.FALSE);
-                Debug.logInfo("responseCode:   " + ar.getResponseCode(), module);
-                Debug.logInfo("responseReason: " + ar.getReasonCode(), module);
-                Debug.logInfo("reasonText:     " + ar.getReasonText(), module);
+                if (Debug.infoOn()) {
+                    Debug.logInfo("transactionId:  " + ar.getTransactionId(), module);
+                    Debug.logInfo("responseCode:   " + ar.getResponseCode(), module);
+                    Debug.logInfo("responseReason: " + ar.getReasonCode(), module);
+                    Debug.logInfo("reasonText:     " + ar.getReasonText(), module);
+                }
             }
             result.put("httpResponse", httpResponse);
             result.put("authorizeResponse", ar);
@@ -542,6 +548,12 @@ public class AIMPaymentServices {
     private static void buildInvoiceInfo(Map<String, Object> params, Properties props, Map<String, Object> AIMRequest) {
         String description = UtilFormatOut.checkNull(props.getProperty("transDescription"));
         String orderId = UtilFormatOut.checkNull((String)params.get("orderId"));
+        if (UtilValidate.isEmpty(orderId)) {
+            GenericValue orderPaymentPreference = (GenericValue) params.get("orderPaymentPreference");
+            if (UtilValidate.isNotEmpty(orderPaymentPreference)) {
+                orderId = (String) orderPaymentPreference.get("orderId");
+            }
+        }
         AIMRequest.put("x_Invoice_Num", "Order " + orderId);
         AIMRequest.put("x_Description", description);
     }
@@ -581,6 +593,7 @@ public class AIMPaymentServices {
         AIMRequest.put("x_Card_Num", number);
         AIMRequest.put("x_Exp_Date", expDate);
         AIMRequest.put("x_Trans_ID", at.get("referenceNum"));
+        AIMRequest.put("x_ref_trans_id", at.get("referenceNum"));
         AIMRequest.put("x_Auth_Code", at.get("gatewayCode"));
         if (AIMRequest.get("x_market_type") != null) {
             AIMRequest.put("x_card_type", getCardType(UtilFormatOut.checkNull(cc.getString("cardType"))));
@@ -602,6 +615,7 @@ public class AIMPaymentServices {
         AIMRequest.put("x_Exp_Date", expDate);
         AIMRequest.put("x_Trans_ID", at.get("referenceNum"));
         AIMRequest.put("x_Auth_Code", at.get("gatewayCode"));
+        AIMRequest.put("x_ref_trans_id", at.get("referenceNum"));
         if (AIMRequest.get("x_market_type") != null) {
             AIMRequest.put("x_card_type", getCardType(UtilFormatOut.checkNull(cc.getString("cardType"))));
         }
@@ -614,6 +628,7 @@ public class AIMPaymentServices {
         AIMRequest.put("x_Currency_Code", currency);
         AIMRequest.put("x_Method", props.getProperty("method"));
         AIMRequest.put("x_Type", props.getProperty("transType"));
+        AIMRequest.put("x_ref_trans_id", at.get("referenceNum"));
         AIMRequest.put("x_Trans_ID", at.get("referenceNum"));
         AIMRequest.put("x_Auth_Code", at.get("gatewayCode"));
         Debug.logInfo("buildVoidTransaction. " + at.toString(), module);
@@ -625,7 +640,7 @@ public class AIMPaymentServices {
         return result;
     }
 
-    private static void processAuthTransResult(Map<String, Object> reply, Map<String, Object> results) {
+    private static void processAuthTransResult(Map<String, Object> request, Map<String, Object> reply, Map<String, Object> results) {
         AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse");
         Boolean authResult = (Boolean) reply.get("authResult");
         results.put("authResult", new Boolean(authResult.booleanValue()));
@@ -636,7 +651,11 @@ public class AIMPaymentServices {
             results.put("authRefNum", ar.getTransactionId());
             results.put("cvCode", ar.getCvResult());
             results.put("avsCode", ar.getAvsResult());
-            results.put("processAmount", ar.getAmount());
+            if (ar.getAmount() == BigDecimal.ZERO) {
+                results.put("processAmount", getXAmount(request));
+            } else {
+                results.put("processAmount", ar.getAmount());
+            }
         } else {
             results.put("authCode", ar.getResponseCode());
             results.put("processAmount", BigDecimal.ZERO);
@@ -645,7 +664,7 @@ public class AIMPaymentServices {
         Debug.logInfo("processAuthTransResult: " + results.toString(),module);
     }
 
-    private static void processCaptureTransResult(Map<String, Object> reply, Map<String, Object> results) {
+    private static void processCaptureTransResult(Map<String, Object> request, Map<String, Object> reply, Map<String, Object> results) {
         AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse");
         Boolean captureResult = (Boolean) reply.get("authResult");
         results.put("captureResult", new Boolean(captureResult.booleanValue()));
@@ -654,14 +673,18 @@ public class AIMPaymentServices {
         results.put("captureRefNum", ar.getTransactionId());
         if (captureResult.booleanValue()) { //passed
             results.put("captureCode", ar.getAuthorizationCode());
-            results.put("captureAmount", ar.getAmount());
+            if (ar.getAmount() == BigDecimal.ZERO) {
+                results.put("captureAmount", getXAmount(request));
+            } else {
+                results.put("captureAmount", ar.getAmount());
+            }
         } else {
             results.put("captureAmount", BigDecimal.ZERO);
         }
         Debug.logInfo("processCaptureTransResult: " + results.toString(),module);
     }
 
-    private static Map<String, Object> processRefundTransResult(Map<String, Object> reply) {
+    private static Map<String, Object> processRefundTransResult(Map<String, Object> request, Map<String, Object> reply) {
         Map<String, Object> results = FastMap.newInstance();
         AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse");
         Boolean captureResult = (Boolean) reply.get("authResult");
@@ -671,7 +694,11 @@ public class AIMPaymentServices {
         results.put("refundRefNum", ar.getTransactionId());
         if (captureResult.booleanValue()) { //passed
             results.put("refundCode", ar.getAuthorizationCode());
-            results.put("refundAmount", ar.getAmount());
+            if (ar.getAmount() == BigDecimal.ZERO) {
+                results.put("refundAmount", getXAmount(request));
+            } else {
+                results.put("refundAmount", ar.getAmount());
+            }
         } else {
             results.put("refundAmount", BigDecimal.ZERO);
         }
@@ -679,7 +706,7 @@ public class AIMPaymentServices {
         return results;
     }
 
-    private static Map<String, Object> processReleaseTransResult(Map<String, Object> reply) {
+    private static Map<String, Object> processReleaseTransResult(Map<String, Object> request, Map<String, Object> reply) {
         Map<String, Object> results = FastMap.newInstance();
         AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse");
         Boolean captureResult = (Boolean) reply.get("authResult");
@@ -689,7 +716,11 @@ public class AIMPaymentServices {
         results.put("releaseRefNum", ar.getTransactionId());
         if (captureResult.booleanValue()) { //passed
             results.put("releaseCode", ar.getAuthorizationCode());
-            results.put("releaseAmount", ar.getAmount());
+            if (ar.getAmount() == BigDecimal.ZERO) {
+                results.put("releaseAmount", getXAmount(request));
+            } else {
+                results.put("releaseAmount", ar.getAmount());
+            }
         } else {
             results.put("releaseAmount", BigDecimal.ZERO);
         }
@@ -697,7 +728,7 @@ public class AIMPaymentServices {
         return results;
     }
 
-    private static void processAuthCaptureTransResult(Map<String, Object> reply, Map<String, Object> results) {
+    private static void processAuthCaptureTransResult(Map<String, Object> request, Map<String, Object> reply, Map<String, Object> results) {
         AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse");
         Boolean authResult = (Boolean) reply.get("authResult");
         results.put("authResult", new Boolean(authResult.booleanValue()));
@@ -712,7 +743,11 @@ public class AIMPaymentServices {
             results.put("authRefNum", ar.getTransactionId());
             results.put("cvCode", ar.getCvResult());
             results.put("avsCode", ar.getAvsResult());
-            results.put("processAmount", ar.getAmount());
+            if (ar.getAmount() == BigDecimal.ZERO) {
+                results.put("processAmount", getXAmount(request));
+            } else {
+                results.put("processAmount", ar.getAmount());
+            }
         } else {
             results.put("authCode", ar.getResponseCode());
             results.put("processAmount", BigDecimal.ZERO);
@@ -754,4 +789,16 @@ public class AIMPaymentServices {
         if (((cardType.equalsIgnoreCase("DINERSCLUB")))) return "C";        
         return "";
     }
+    
+    private static BigDecimal getXAmount(Map<String, Object> request) {
+        BigDecimal amt = BigDecimal.ZERO;
+        if (request.get("x_Amount") != null) {
+            try {
+                amt = new BigDecimal((String) request.get("x_Amount"));
+            } catch (NumberFormatException e) {
+                Debug.logWarning(e, e.getMessage(), module);
+            }
+        }
+        return amt;
+    }
 }

Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java Sun May 29 11:02:09 2011
@@ -141,7 +141,7 @@ public class ValueLinkApi {
      * Obtain an instance of the ValueLinkApi; this method will always return an existing reference if one is available
      * @param delegator Delegator used to query the encryption keys
      * @param props Properties to use for the Api (usually payment.properties)
-     * @return
+     * @return Obtain an instance of the ValueLinkApi
      */
     public static ValueLinkApi getInstance(Delegator delegator, Properties props) {
         return getInstance(delegator, props, false);


Free forum by Nabble Edit this page