You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/03/26 22:56:30 UTC
svn commit: r1305581 [3/36] - in /ofbiz/branches/20111205EmailHandling: ./
applications/accounting/config/ applications/accounting/data/
applications/accounting/entitydef/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/acc...
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/config/AccountingUiLabels.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/accounting/config/AccountingUiLabels.xml Mon Mar 26 20:56:02 2012
@@ -296,6 +296,7 @@
<value xml:lang="fr">Ajouter une période de temps</value>
<value xml:lang="hi_IN">सà¥à¤µà¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤¿à¤¤ समय à¤
वधि à¤à¥à¤¡à¤¼à¥à¤</value>
<value xml:lang="it">Aggiungi Periodi di Tempo Personalizzati</value>
+ <value xml:lang="nl">Aangepaste periode toevoegen</value>
<value xml:lang="pt">Adicionar perÃodo personalizado</value>
<value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸²à¸£à¸à¸³à¸«à¸à¸à¸£à¸°à¸¢à¸°à¹à¸§à¸¥à¸²</value>
<value xml:lang="zh">æ·»å å®å¶æ¶é´æ®µ</value>
@@ -303,6 +304,7 @@
</property>
<property key="AccountingAddFinAccountReconciliations">
<value xml:lang="en">Add Financial Account Reconciliations for Financial Account : ${finAccount.finAccountName} [${finAccountId}]</value>
+ <value xml:lang="nl">Toevoegen afstemmingen voor Financiele rekening : ${finAccount.finAccountName} [${finAccountId}]</value>
<value xml:lang="pt">Adicionar Reconciliação de Conta Financeira para Conta Financeira: ${finAccount.finAccountName} [${finAccountId}]</value>
<value xml:lang="zh">为财å¡è´¦ç® ${finAccount.finAccountName} [${finAccountId}] æ·»å è´¢å¡è´¦ç®å¯¹è´¦</value>
</property>
@@ -325,7 +327,7 @@
<value xml:lang="fr">Ajouter une identification d'immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ à¤à¥ पहà¤à¤¾à¤¨ à¤à¥à¤¡à¤¼à¥à¤</value>
<value xml:lang="it">Nuova identificazione cespite</value>
- <value xml:lang="nl">Voeg vaste activa-identificatie toe</value>
+ <value xml:lang="nl">Vaste activa-id toevoegen</value>
<value xml:lang="pt">Adicionar Identificação de Ativos Fixos</value>
<value xml:lang="ro">Actualizeaza Identitate Mijloc Fix</value>
<value xml:lang="ru">РедакÑиÑование иденÑиÑикаÑоÑов ÐС</value>
@@ -339,6 +341,7 @@
<value xml:lang="fr">Ajouter une commande de maintenance d'immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ रà¤à¤°à¤à¤¾à¤µ à¤à¥ à¤à¤¦à¥à¤¶ à¤à¥à¤¡à¤¼à¥à¤</value>
<value xml:lang="it">Nuovo ordine di manutenzione cespite</value>
+ <value xml:lang="nl">Opdracht voor onderhoud op vaste activa toevoegen</value>
<value xml:lang="pt">Adicionar Pedido de Manutenção de Ativos Fixos</value>
<value xml:lang="th">à¹à¸à¹à¹à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸³à¸£à¸¸à¸à¸£à¸±à¸à¸©à¸²à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸</value>
<value xml:lang="zh">æ·»å åºå®èµäº§ç»´ä¿®ä¿å
»è®¢å</value>
@@ -365,7 +368,7 @@
<value xml:lang="fr">Ajouter une mesure de la maintenance d'immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ मापठरà¥à¤¡à¤¿à¤à¤ à¤à¥à¤¡à¤¼à¥à¤</value>
<value xml:lang="it">Nuova misura contatori cespite</value>
- <value xml:lang="nl">Voeg meterwaarde vaste activa toe</value>
+ <value xml:lang="nl">Meterwaarde vaste activa toevoegen</value>
<value xml:lang="pt">Adicionar leitura de medidor de Ativos Fixos</value>
<value xml:lang="th">Add Fixed Asset Maintenance Meter</value>
<value xml:lang="zh">æ·»å åºå®èµäº§ä»ªè¡¨è¯»æ°</value>
@@ -377,6 +380,7 @@
<value xml:lang="fr">Ajouter une tâche d'un acteur à une immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ मà¥à¤ नियत à¤à¤¾à¤°à¥à¤¯ à¤à¤°à¤¨à¥ à¤à¥ लिठपारà¥à¤à¥ à¤à¥à¤¡à¤¼à¥à¤</value>
<value xml:lang="it">Nuova assegnazione cespite a soggetto</value>
+ <value xml:lang="nl">Taaktoewijzing Vaste Activa toevoegen</value>
<value xml:lang="pt">Adicionar Atribuição de Ativos Fixos ao participante</value>
<value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸</value>
<value xml:lang="zh">æ·»å ä¼ååºå®èµäº§åé
</value>
@@ -389,6 +393,7 @@
<value xml:lang="fr">Ajouter l'enregistrement d'immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ à¤à¥ लिठपà¤à¤à¥à¤¯à¤¨ à¤à¥à¤¡à¤¼à¥à¤</value>
<value xml:lang="it">Nuova registrazione cespite</value>
+ <value xml:lang="nl">Registratie ID voor Vaste Activa toevoegen</value>
<value xml:lang="pt">Adicionar Registro de de Ativo Fixo</value>
<value xml:lang="ro">Actualizeaza Inregistrare Mijloc Fix</value>
<value xml:lang="ru">ÐзмениÑÑ ÑегиÑÑÑаÑий ÐС</value>
@@ -440,7 +445,7 @@
<value xml:lang="hi_IN">नया EFT à¤à¤¼à¤¾à¤¤à¤¾</value>
<value xml:lang="it">Aggiungi nuovo conto EFT</value>
<value xml:lang="ja">Add New EFT Account</value>
- <value xml:lang="nl">Voeg een nieuwe bankrekening toe</value>
+ <value xml:lang="nl">Nieuwe bankrekening toevoegen</value>
<value xml:lang="pt">Adicionar Nova Conta EFT</value>
<value xml:lang="pt_PT">Adicionar Nova Conta EFT</value>
<value xml:lang="ro">Adauga Nou Cont EFT</value>
@@ -458,7 +463,7 @@
<value xml:lang="hi_IN">नया à¤à¤ªà¤¹à¤¾à¤° à¤à¤¼à¤¾à¤¤à¤¾</value>
<value xml:lang="it">Aggiungi nuova carta omaggio</value>
<value xml:lang="ja">ã®ããã«ã¼ãã®è¿½å </value>
- <value xml:lang="nl">Voeg een nieuwe tegoedbon toe</value>
+ <value xml:lang="nl">Tegoedbon toevoegen</value>
<value xml:lang="pt">Adicionar Novo Cartão de presente</value>
<value xml:lang="ro">Adauga Noua Carte Omagiu</value>
<value xml:lang="ru">ÐобавиÑÑ Ð½Ð¾Ð²ÑÑ Ð´Ð¸ÑконÑнÑÑ ÐºÐ°ÑÑÑ</value>
@@ -481,6 +486,7 @@
<property key="AccountingAddPaymentGroupMember">
<value xml:lang="en">Add Payment Group Member</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ समà¥à¤¹ सदसà¥à¤¯ à¤à¥à¤¡à¤¼à¥à¤</value>
+ <value xml:lang="nl">Payment Group Member toevoegen</value>
<value xml:lang="pt">Adicionar Membro do Grupo de Pagamento</value>
<value xml:lang="zh">æ·»å æ¯ä»ç»æå</value>
<value xml:lang="zh_TW">å¢å æ¯ä»ç¾¤çµæå¡</value>
@@ -488,6 +494,7 @@
<property key="AccountingAddTax">
<value xml:lang="en">Add Tax</value>
<value xml:lang="fr">Ajouter les taxes</value>
+ <value xml:lang="nl">Belastingen toevoegen</value>
<value xml:lang="zh">æ·»å ç¨é¡¹</value>
</property>
<property key="AccountingAddTaxAuthorityGlAccount">
@@ -638,6 +645,7 @@
<value xml:lang="fr">Point de l'accord commercial (articles) pour rapport</value>
<value xml:lang="hi_IN">à¤
नà¥à¤¬à¤à¤§ वसà¥à¤¤à¥ à¤à¤¤à¥à¤ªà¤¾à¤¦ à¤à¥ लिठबà¥à¤¯à¥à¤°à¥à¤µà¤¾à¤° विवरण</value>
<value xml:lang="it">Prodotti riga contratto per i report</value>
+ <value xml:lang="nl">Overeenkomst items producten voor rapport</value>
<value xml:lang="pt">Itens do acordo para o Relatório</value>
<value xml:lang="zh">ç¨äºæ¥è¡¨çååæ¡æ¬¾äº§å</value>
<value xml:lang="zh_TW">ç¨äºå ±è¡¨çååæ¢æ¬¾ç¢å</value>
@@ -663,6 +671,7 @@
<value xml:lang="fr">Point de l'accord commercial (articles/fournisseur) pour rapport</value>
<value xml:lang="hi_IN">à¤
नà¥à¤¬à¤à¤§ वसà¥à¤¤à¥ पà¥à¤°à¤¦à¤¾à¤¯à¤ à¤à¥ लिठबà¥à¤¯à¥à¤°à¥à¤µà¤¾à¤° विवरण</value>
<value xml:lang="it">Prodotti fornitore riga contratto per i report</value>
+ <value xml:lang="nl">Overeenkomst item leverancier producten voor rapport</value>
<value xml:lang="pt">Fornecedores dos itens do acordo para relatório</value>
<value xml:lang="zh">ç¨äºæ¥è¡¨çååæ¡æ¬¾ä¾è´§å产å</value>
<value xml:lang="zh_TW">ç¨äºå ±è¡¨çååæ¢æ¬¾ä¾è²¨åç¢å</value>
@@ -707,7 +716,7 @@
<value xml:lang="fr">Points d'accord commercial</value>
<value xml:lang="hi_IN">à¤
नà¥à¤¬à¤à¤§ मदà¥à¤</value>
<value xml:lang="it">Righe Contratto</value>
- <value xml:lang="nl">Overeenkomst Items</value>
+ <value xml:lang="nl">Overeenkomst items</value>
<value xml:lang="pt">Itens do acordo</value>
<value xml:lang="ro">Linii Contract</value>
<value xml:lang="ru">ÐлеменÑÑ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñа</value>
@@ -991,6 +1000,7 @@
<value xml:lang="fr">Modifier le vendeur</value>
<value xml:lang="hi_IN">विà¤à¥à¤°à¥à¤¤à¤¾ à¤à¥ सà¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤à¤°à¥à¤</value>
<value xml:lang="it">Aggiorna fornitore</value>
+ <value xml:lang="nl">Leverancier wijzigen</value>
<value xml:lang="pt">Editar fornecedor</value>
<value xml:lang="zh">ç¼è¾ä¾åºå</value>
<value xml:lang="zh_TW">編輯ä¾æå</value>
@@ -1031,6 +1041,7 @@
<property key="AccountingApPaymentGroupMenu">
<value xml:lang="en">AP Payment Groups</value>
<value xml:lang="fr">Groupes de paiement AP</value>
+ <value xml:lang="nl">AP Betalingsgroepen</value>
<value xml:lang="pt">Grupos de pagamento de contas a pagar</value>
<value xml:lang="zh">åºä»æ¯ä»ç»</value>
<value xml:lang="zh_TW">æä»æ¯ä»ç¾¤çµ</value>
@@ -1218,6 +1229,7 @@
<value xml:lang="fr">Page d'accueil de la comptabilité client</value>
<value xml:lang="hi_IN">मà¥à¤à¥à¤¯ पà¥à¤·à¥à¤ पà¥à¤°à¤¾à¤ªà¥à¤¯ à¤à¤¾à¤¤à¤¾</value>
<value xml:lang="it">Pagina principale conto creditori</value>
+ <value xml:lang="nl">Hoofdpagina Debiteuren</value>
<value xml:lang="pt">Página principal do contas a receber</value>
<value xml:lang="zh">åºæ¶è´¦æ·é¦é¡µ</value>
<value xml:lang="zh_TW">ææ¶è³¬æ¶é¦é </value>
@@ -1269,6 +1281,7 @@
<property key="AccountingArPaymentGroupMenu">
<value xml:lang="en">AR Payment Groups</value>
<value xml:lang="fr">Groupes de paiement</value>
+ <value xml:lang="nl">AP Betalingsgroepen</value>
<value xml:lang="pt">Grupos de Pagamento do Contas a receber</value>
<value xml:lang="zh">åºæ¶æ¯ä»ç»</value>
<value xml:lang="zh_TW">ææ¶æ¯ä»ç¾¤çµ</value>
@@ -4332,6 +4345,7 @@
<property key="AccountingFindArInvoices">
<value xml:lang="en">Find AR Invoices</value>
<value xml:lang="hi_IN">लà¥à¤à¤¾ पà¥à¤°à¤¾à¤ªà¥à¤¯ à¤à¤¾à¤²à¤¾à¤¨ à¤à¥à¤à¥à¤</value>
+ <value xml:lang="nl">Crediteuren facturen vinden</value>
<value xml:lang="pt">Encontrar Faturas do contas a receber</value>
<value xml:lang="zh">æ¥æ¾åºæ¶å票</value>
<value xml:lang="zh_TW">æ¾å°ææ¶ç¼ç¥¨</value>
@@ -4339,6 +4353,7 @@
<property key="AccountingFindArPaymentGroups">
<value xml:lang="en">Find AR Payment Groups</value>
<value xml:lang="fr">Recherche de groupes de paiement</value>
+ <value xml:lang="nl">AR Betalingsgroepen vinden</value>
<value xml:lang="pt">Buscar os grupos de pagamento do contas a receber</value>
<value xml:lang="zh">æ¥æ¾åºæ¶æ¯ä»ç»</value>
<value xml:lang="zh_TW">æ¾å°ææ¶æ¯ä»ç¾¤çµ</value>
@@ -4346,6 +4361,7 @@
<property key="AccountingFindArPayments">
<value xml:lang="en">Find AR Payments</value>
<value xml:lang="hi_IN">लà¥à¤à¤¾ पà¥à¤°à¤¾à¤ªà¥à¤¯ à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¥à¤</value>
+ <value xml:lang="nl">Crediteuren betalingen vinden</value>
<value xml:lang="pt">Encontrar Pagamentos do contas a receber</value>
<value xml:lang="zh">æ¥æ¾åºæ¶æ¯ä»</value>
<value xml:lang="zh_TW">æ¾å°ææ¶æ¯ä»</value>
@@ -4358,6 +4374,7 @@
</property>
<property key="AccountingFindFinAccountReconciliations">
<value xml:lang="en">Find Financial Account Reconciliations</value>
+ <value xml:lang="nl">Afstemmingen financiele rekeningen vinden</value>
<value xml:lang="pt">Encontrar reconciliações de Conta Financeira</value>
<value xml:lang="zh">æ¥æ¾è´¢å¡è´¦ç®å¯¹è´¦</value>
</property>
@@ -4397,6 +4414,7 @@
<value xml:lang="en">Find Payment Group</value>
<value xml:lang="fr">Recherche de groupes de paiement</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ समà¥à¤¹ à¤à¥à¤à¥à¤</value>
+ <value xml:lang="nl">Betalingsgroep vinden</value>
<value xml:lang="pt">Encontrar Grupo de pagamento</value>
<value xml:lang="zh">æ¥æ¾æ¯ä»ç»</value>
<value xml:lang="zh_TW">æ¾å°æ¯ä»ç¾¤çµ</value>
@@ -4405,6 +4423,7 @@
<value xml:lang="en">Find Purchase Invoices</value>
<value xml:lang="fr">Recherche de factures d'achat</value>
<value xml:lang="hi_IN">à¤à¤°à¥à¤¦ à¤à¤¾à¤²à¤¾à¤¨ à¤à¥à¤à¥à¤</value>
+ <value xml:lang="nl">Inkoopfactuur vinden</value>
<value xml:lang="pt">Encontrar faturas de compra</value>
<value xml:lang="zh">æ¥æ¾éè´å票</value>
<value xml:lang="zh_TW">æ¾å°æ¡è³¼ç¼ç¥¨</value>
@@ -4437,6 +4456,7 @@
<value xml:lang="en">Find Sales Invoices For Commission Run</value>
<value xml:lang="hi_IN">दलालॠà¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥ लिठबिà¤à¥à¤°à¥ à¤à¤¾à¤²à¤¾à¤¨ à¤à¥à¤à¥à¤</value>
<value xml:lang="it">Ricerca fatture di vendita per commissione</value>
+ <value xml:lang="nl">Verkoopfactuur voor commissierun vinden</value>
<value xml:lang="pt">Encontrar faturas de venda por Comissão</value>
<value xml:lang="zh">为佣é计ç®æ¥æ¾éå®å票</value>
</property>
@@ -4459,6 +4479,7 @@
<property key="AccountingFirstNameOnCardMissing">
<value xml:lang="de">Vorname des Karteninhabers fehlt</value>
<value xml:lang="en">First Name on Card is missing</value>
+ <value xml:lang="nl">Voornaam van de kaarthouder ontbreekt</value>
<value xml:lang="pt">Primeiro nome no cartão está faltando</value>
<value xml:lang="zh">缺å°å¡ä¸å§åç第ä¸ç»åæ¯</value>
<value xml:lang="zh_TW">æ²æå¡çä¸çåå</value>
@@ -5750,6 +5771,9 @@
<value xml:lang="pt">Reconciliação de contabilidade para: ${finAccount.finAccountName} [${finAccountId}]</value>
<value xml:lang="zh">æ»è´¦å¯¹è´¦ï¼${finAccount.finAccountName} [${finAccountId}]</value>
</property>
+ <property key="AccountingGlMappings">
+ <value xml:lang="en">GL Mappings</value>
+ </property>
<property key="AccountingGlobalGLSettings">
<value xml:lang="de">Hauptbuch-Einstellungen, global</value>
<value xml:lang="en">Global GL Settings</value>
@@ -5764,6 +5788,7 @@
</property>
<property key="AccountingGrossMargin">
<value xml:lang="en">Gross Margin</value>
+ <value xml:lang="nl">Bruto marge</value>
<value xml:lang="pt">Margem Bruta</value>
<value xml:lang="zh">æ¯å©</value>
</property>
@@ -5851,6 +5876,7 @@
</property>
<property key="AccountingIncomeFromOperations">
<value xml:lang="en">Income From Operations</value>
+ <value xml:lang="nl">Operationele inkomsten</value>
<value xml:lang="pt">Resultado Operacional</value>
<value xml:lang="zh">è¥è¿æ¶å
¥</value>
</property>
@@ -8239,6 +8265,7 @@
</property>
<property key="AccountingOperatingExpenses">
<value xml:lang="en">Operating Expenses</value>
+ <value xml:lang="nl">Operationele kosten</value>
<value xml:lang="pt">Despesas Operacionais</value>
<value xml:lang="zh">è¥ä¸è´¹ç¨</value>
</property>
@@ -8335,6 +8362,7 @@
<value xml:lang="fr">Réf. d'org.</value>
<value xml:lang="hi_IN">सà¤à¤à¤ न पारà¥à¤à¥ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
<value xml:lang="it">Organizzazione</value>
+ <value xml:lang="nl">Organisatie ID</value>
<value xml:lang="pt">ID de organização participante</value>
<value xml:lang="th">รหัสà¸à¸à¸à¹à¸à¸£à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value>
<value xml:lang="zh">ç»ç»ä¼åæ è¯</value>
@@ -8642,6 +8670,7 @@
<property key="AccountingPastDueInvoices">
<value xml:lang="en">Past Due Invoices</value>
<value xml:lang="fr">Factures en attente de règlement</value>
+ <value xml:lang="nl">Vervallen facturen</value>
<value xml:lang="pt">Faturas passdas em débito</value>
<value xml:lang="zh">è¿æå票</value>
</property>
@@ -10481,6 +10510,7 @@
<value xml:lang="en">Purchase Invoices</value>
<value xml:lang="fr">Factures d'achat</value>
<value xml:lang="hi_IN">à¤à¤°à¥à¤¦ à¤à¤¾à¤²à¤¾à¤¨</value>
+ <value xml:lang="nl">Inkoopfacturen</value>
<value xml:lang="pt">Faturas de Compra</value>
<value xml:lang="zh">éè´å票</value>
</property>
@@ -10520,6 +10550,7 @@
<value xml:lang="fr">Taux</value>
<value xml:lang="hi_IN">मà¥à¤²à¥à¤¯</value>
<value xml:lang="it">Tassi</value>
+ <value xml:lang="nl">Tarieven</value>
<value xml:lang="pt">Tarifas</value>
<value xml:lang="zh">ç¨ç</value>
<value xml:lang="zh_TW">ç¨
ç</value>
@@ -10557,6 +10588,7 @@
<value xml:lang="de">Kontenabstimmung</value>
<value xml:lang="en">Reconciliation</value>
<value xml:lang="hi_IN">मिलाप</value>
+ <value xml:lang="nl">Afstemming</value>
<value xml:lang="pt">Reconciliação</value>
<value xml:lang="zh">对账</value>
<value xml:lang="zh_TW">調ç¯</value>
@@ -10772,6 +10804,7 @@
<property key="AccountingSagePayPaymentError">
<value xml:lang="en">Problem at SagePay</value>
<value xml:lang="it">Problemi di SagePay</value>
+ <value xml:lang="nl">Probleem bij SagePay</value>
<value xml:lang="zh">SagePayåºé</value>
</property>
<property key="AccountingSagePayPaymentInvalidInformationPassed">
@@ -10792,6 +10825,7 @@
<property key="AccountingSagePayPaymentRefunded">
<value xml:lang="en">Payment Refunded</value>
<value xml:lang="it">Pagamento rimborsato</value>
+ <value xml:lang="nl">Betaling teruggewezen</value>
<value xml:lang="zh">æ¯ä»å·²é</value>
</property>
<property key="AccountingSagePayPaymentReleaseRequestMalformed">
@@ -10903,6 +10937,7 @@
<value xml:lang="de">Vertreter</value>
<value xml:lang="en">Sales Agents</value>
<value xml:lang="hi_IN">विà¤à¥à¤°à¤¯ दलाल</value>
+ <value xml:lang="nl">Vertegenwoordiger</value>
<value xml:lang="pt">Agentes de Vendas</value>
<value xml:lang="zh">éå®ä»£ç</value>
<value xml:lang="zh_TW">é·å®ä»£ç</value>
@@ -10926,6 +10961,7 @@
<value xml:lang="de">Verkaufsrechnungen</value>
<value xml:lang="en">Sales Invoices</value>
<value xml:lang="hi_IN">विà¤à¥à¤°à¤¯ à¤à¤¾à¤²à¤¾à¤¨ </value>
+ <value xml:lang="nl">Verkoopfacturen</value>
<value xml:lang="pt">Faturas</value>
<value xml:lang="zh">éå®å票</value>
<value xml:lang="zh_TW">é·å®ç¼ç¥¨</value>
@@ -10948,23 +10984,27 @@
<property key="AccountingSecurityPayNotProperlyConfigurated">
<value xml:lang="en">ERROR: Getting SecurePay property configuration</value>
<value xml:lang="it">ERRORE: Ricavando la configurazione di SecurePay</value>
+ <value xml:lang="nl">ERROR: ophalen SecurePay configuratie</value>
<value xml:lang="zh">é误ï¼è·åSecurePayå±æ§è®¾ç½®æ¶</value>
</property>
<property key="AccountingSecurityPayPaymentWasNotSent">
<value xml:lang="en">Payment was not sent to server.</value>
<value xml:lang="it">Pagamento non è stato inviato al server.</value>
+ <value xml:lang="nl">Betaling is niet naar de server verzonden</value>
<value xml:lang="zh">æ¯ä»æ²¡æåéå°æå¡å¨ã</value>
</property>
<property key="AccountingSelectAction">
<value xml:lang="en">Select Action</value>
<value xml:lang="fr">Choisir une action</value>
<value xml:lang="hi_IN">à¤à¤¾à¤°à¥à¤¯ à¤à¥à¤¨à¥à¤</value>
+ <value xml:lang="nl">Actie selecteren</value>
<value xml:lang="pt">Selecionar Ação</value>
<value xml:lang="zh">éæ©æä½</value>
</property>
<property key="AccountingSelectPartiesForCommissionInvoice">
<value xml:lang="en">Select The Parties For Commission Invoice</value>
<value xml:lang="hi_IN">दलालॠà¤à¤¾à¤²à¤¾à¤¨ à¤à¥ लिठपारà¥à¤à¤¿à¤¯à¥à¤ à¤à¥à¤¨à¥à¤</value>
+ <value xml:lang="nl">Partijen voor commisiefactuur selecteren</value>
<value xml:lang="pt">Selecionar participantes para fatura de Comissão</value>
<value xml:lang="zh">为佣éå票éæ©ä¼å</value>
</property>
@@ -11438,6 +11478,7 @@
<property key="AccountingTaxCannotCalculate">
<value xml:lang="en">Cannot calculate tax, no shipping or.......</value>
<value xml:lang="it">Non è possibile calcolare le tasse, nessuna spedizione o.......</value>
+ <value xml:lang="nl">Belasting kan niet berekend worden, geen transport of .....</value>
<value xml:lang="pt">Não é possÃvel calcular o imposto, não envio ou .......</value>
<value xml:lang="zh">æ æ³ç®ç¨ï¼æ²¡æè¿è¾æ......</value>
</property>
@@ -11477,6 +11518,7 @@
<property key="AccountingTermAmount">
<value xml:lang="en">Term Amount</value>
<value xml:lang="hi_IN">शरà¥à¤¤ राशà¥</value>
+ <value xml:lang="nl">Conditie bedrag</value>
<value xml:lang="pt">Quantia do prazo</value>
<value xml:lang="zh">æéé¢</value>
</property>
@@ -11512,6 +11554,7 @@
<property key="AccountingTheBalanceOfLastYear">
<value xml:lang="en">The balance of last year</value>
<value xml:lang="hi_IN">पिà¤à¤²à¥ वरà¥à¤· à¤à¤¾ शà¥à¤·</value>
+ <value xml:lang="nl">Saldo vorig jaar</value>
<value xml:lang="pt">O saldo do ano passado</value>
<value xml:lang="zh">ä¸å¹´ä½é¢</value>
</property>
@@ -11626,47 +11669,55 @@
<property key="AccountingTotalCashBalance">
<value xml:lang="en">Total Cash Balance</value>
<value xml:lang="hi_IN">à¤à¥à¤² नà¤à¤¦à¥ शà¥à¤·</value>
+ <value xml:lang="nl">Totaal saldo cash</value>
<value xml:lang="pt">Saldo Total em caixa</value>
<value xml:lang="zh">ç°éä½é¢å计</value>
</property>
<property key="AccountingTotalClosingCashBalance">
<value xml:lang="en">Total Closing Cash Balance</value>
<value xml:lang="hi_IN">à¤à¥à¤² बà¤à¤¦ नà¤à¤¦à¥ शà¥à¤·</value>
+ <value xml:lang="nl">Totaal eindbalans cash</value>
<value xml:lang="pt">Saldo Total de Caixa de Encerramento</value>
<value xml:lang="zh">ææ«ç°éä½é¢</value>
</property>
<property key="AccountingTotalCommissionAmount">
<value xml:lang="en">Total Commission Amount</value>
<value xml:lang="hi_IN">à¤à¥à¤² दलालॠराशà¥</value>
+ <value xml:lang="nl">Totaal bedrag commissies</value>
<value xml:lang="pt">Quantia Total da Comissão</value>
<value xml:lang="zh">ä½£éå计</value>
</property>
<property key="AccountingTotalCostCenterAmount">
<value xml:lang="en">Cost center amount percentage saved successfully</value>
+ <value xml:lang="nl">Percentage kostenplaats succesvol opgeslagen</value>
<value xml:lang="pt">Porcentagem da Quantia central de custo salva com sucesso</value>
<value xml:lang="zh">æåä¿åäºè´¹ç¨ä¸å¿éé¢ç¾åæ¯</value>
</property>
<property key="AccountingTotalCredit_Disbursement">
<value xml:lang="en">Total Credit(Disbursement)</value>
<value xml:lang="hi_IN">à¤à¥à¤² à¤à¤®à¤¾</value>
+ <value xml:lang="nl">Totaal Credit (betalingen)</value>
<value xml:lang="pt">Crédito Total (Desembolso)</value>
<value xml:lang="zh">è´·æ¹å计ï¼æ¯åºï¼</value>
</property>
<property key="AccountingTotalCurrentAssetBalance">
<value xml:lang="en">Total Current Asset Balance</value>
<value xml:lang="hi_IN">à ¤â¢Ã Â¥Ã ¤² à ¤šà ¤¾à ¤²à ¥â à ¤¸à ¤®à ¥Ã ¤ªà ¤¤à ¥Ã ¤¤à ¤¿ à ¤°à ¤¾à ¤¶à ¥â¬</value>
+ <value xml:lang="nl">Totaal vlottende activa</value>
<value xml:lang="pt">Total do Balanço Patrimonial atual</value>
<value xml:lang="zh">æµå¨èµäº§ä½é¢å计</value>
</property>
<property key="AccountingTotalDebit_Receipts">
<value xml:lang="en">Total Debit(Receipts)</value>
<value xml:lang="hi_IN">à¤à¥à¤² नामà¥</value>
+ <value xml:lang="nl">Totaal Debet (ontvangsten)</value>
<value xml:lang="pt">Débito Total (Recibos)</value>
<value xml:lang="zh">åæ¹å计ï¼æ¶å
¥ï¼</value>
</property>
<property key="AccountingTotalEndingCashBalance">
<value xml:lang="en">Total Ending Cash Balance</value>
<value xml:lang="hi_IN">à¤à¥à¤² à¤
à¤à¤¤à¤¿à¤® नà¤à¤¦à¥ शà¥à¤·</value>
+ <value xml:lang="nl">Totaal eindbalans cash</value>
<value xml:lang="pt">Saldo Total Final de Caixa</value>
<value xml:lang="zh">ææ«ç°éä½é¢å计</value>
</property>
@@ -11699,48 +11750,56 @@
<property key="AccountingTotalNetSales">
<value xml:lang="en">Total Net Sales</value>
<value xml:lang="hi_IN">à¤à¥à¤² शà¥à¤¦à¥à¤§ विà¤à¥à¤°à¤¯</value>
+ <value xml:lang="nl">Totaal netto verkopen</value>
<value xml:lang="pt">Total das vendas lÃquidas</value>
<value xml:lang="zh">åéå®å计</value>
</property>
<property key="AccountingTotalNumberOfOrders">
<value xml:lang="en">Total Number of Orders</value>
<value xml:lang="hi_IN">à¤à¥à¤² à¤à¤¦à¥à¤¶à¥à¤ à¤à¥ सà¤à¤à¥à¤¯à¤¾</value>
+ <value xml:lang="nl">Totaal aantal orders</value>
<value xml:lang="pt">Número total de pedidos</value>
<value xml:lang="zh">订åæ°éå计</value>
</property>
<property key="AccountingTotalOfTheCurrentMonth">
<value xml:lang="en">Total of the current month</value>
<value xml:lang="hi_IN">à¤à¤¾à¤²à¥ माह à¤à¥ à¤à¥à¤²</value>
+ <value xml:lang="nl">Totaal van huidige maand</value>
<value xml:lang="pt">Total do mês atual</value>
<value xml:lang="zh">å½æå计</value>
</property>
<property key="AccountingTotalOfYearToDate">
<value xml:lang="en">Total of Year To Date</value>
<value xml:lang="hi_IN">वरà¥à¤· सॠदिनाà¤à¤ à¤à¤¾ à¤à¥à¤²</value>
+ <value xml:lang="nl">Totaal van jaar tot nu</value>
<value xml:lang="pt">Total do Ano até o momento</value>
<value xml:lang="zh">å½å¹´å计</value>
</property>
<property key="AccountingTotalOpeningCashBalance">
<value xml:lang="en">Total Opening Cash Balance</value>
<value xml:lang="hi_IN">à¤à¥à¤² à¤
थ नà¤à¤¦à¥ शà¥à¤·</value>
+ <value xml:lang="nl">Totaal openingsbalans cash</value>
<value xml:lang="pt">Saldo de Abertura de Caixa Total</value>
<value xml:lang="zh">æåç°éä½é¢å计</value>
</property>
<property key="AccountingTotalOperationalCashBalance">
<value xml:lang="en">Total Operational Cash Balance</value>
<value xml:lang="hi_IN">à ¤â¢Ã Â¥Ã ¤² à ¤â¢Ã Â¥Ã ¤°à ¤¿à ¤¯à ¤¾à ¤¶à ¥â¬Ã ¤² à ¤¨à ¤â¢Ã ¤¦à ¥â¬</value>
+ <value xml:lang="nl">Totaal operationele balans cash</value>
<value xml:lang="pt">Saldo de Caixa Operacional Total</value>
<value xml:lang="zh">ç°éä½é¢å计</value>
</property>
<property key="AccountingTotalPeriodCashBalance">
<value xml:lang="en">Total Period Cash Balance</value>
<value xml:lang="hi_IN">à¤à¥à¤² à¤
वधि नà¤à¤¦à¥ शà¥à¤·</value>
+ <value xml:lang="nl">Totaal periode balans cash</value>
<value xml:lang="pt">Saldo Total do perÃodo em caixa</value>
<value xml:lang="zh">æ¶é´æ®µç°éä½é¢å计</value>
</property>
<property key="AccountingTotalQuantityOnHand">
<value xml:lang="en">Total Quantity On Hand</value>
<value xml:lang="hi_IN">à¤à¥à¤² मातà¥à¤°à¤¾ हाथ पर</value>
+ <value xml:lang="nl">Totaal hoeveelheden onder handen</value>
<value xml:lang="pt">Total das quantidades disponÃveis</value>
<value xml:lang="zh">ç°åæ°éå计</value>
</property>
@@ -11757,6 +11816,7 @@
<property key="AccountingTransactionIsAlreadyReconciled">
<value xml:lang="en">Transaction Is already Reconciled</value>
<value xml:lang="hi_IN">à¤à¤¤à¤¿à¤µà¤¿à¤§à¤¿ पहलॠसॠहॠसमà¤à¥à¤¤à¤¾ हà¥</value>
+ <value xml:lang="nl">Transactie is al afgestemd</value>
<value xml:lang="pt">Transação já foi reconciliada</value>
<value xml:lang="zh">交æå·²ç»å¯¹è¿è´¦äº</value>
</property>
@@ -11774,6 +11834,7 @@
<property key="AccountingTransactionTotalsReport">
<value xml:lang="en">Transaction Totals Report</value>
<value xml:lang="hi_IN">à¤à¤¤à¤¿à¤µà¤¿à¤§à¤¿ यà¥à¤ बà¥à¤¯à¥à¤°à¥à¤µà¤¾à¤° विवरण</value>
+ <value xml:lang="nl">Rapport transatie-totalen</value>
<value xml:lang="pt">Relatório de Transações totais</value>
<value xml:lang="zh">交ææ»é¢æ¥å</value>
</property>
@@ -14706,6 +14767,9 @@
<value xml:lang="pt">Nova categoria de Conta Razão</value>
<value xml:lang="zh">æ°å»ºæ»è´¦è´¦æ·åç±»</value>
</property>
+ <property key="FormFieldTitle_NextDepreciationAmount">
+ <value xml:lang="en">Next depreciation amount</value>
+ </property>
<property key="FormFieldTitle_notApplied">
<value xml:lang="en">Not Applied</value>
<value xml:lang="fr">Non alloué</value>
@@ -15828,6 +15892,7 @@
<value xml:lang="en">Source Id</value>
<value xml:lang="hi_IN">सà¥à¤°à¥à¤¤ à¤à¥à¤°à¤®à¤¾à¤à¤(SourceId)</value>
<value xml:lang="it">Id sorgente</value>
+ <value xml:lang="nl">Bron ID</value>
<value xml:lang="pt">Id da fonte</value>
<value xml:lang="zh">æ¥æºæ è¯</value>
<value xml:lang="zh_TW">ä¾æºç·¨è</value>
@@ -16023,7 +16088,7 @@
<value xml:lang="fr">Valeur du texte</value>
<value xml:lang="hi_IN">पाठà¥à¤¯ मान</value>
<value xml:lang="it">Testo Valore</value>
- <value xml:lang="nl">Text Value</value>
+ <value xml:lang="nl">Textwaarde</value>
<value xml:lang="pt">Valor do Texto</value>
<value xml:lang="ru">ТекÑÑовое знаÑение</value>
<value xml:lang="th">à¸à¹à¸²à¸à¸±à¸§à¸à¸±à¸à¸©à¸£</value>
@@ -16043,6 +16108,7 @@
<value xml:lang="en">Thru Due Date</value>
<value xml:lang="fr">Jusqu'à la date d'échéance</value>
<value xml:lang="hi_IN">à¤
नà¥à¤¤à¤¿à¤® दिनाà¤à¤ तà¤</value>
+ <value xml:lang="nl">Tot vervaldatum</value>
<value xml:lang="pt">Data de Vencimento do débito</value>
<value xml:lang="zh">æªæ¢æ¥æç»äº</value>
</property>
@@ -16050,6 +16116,7 @@
<value xml:lang="en">Thru Invoice Date</value>
<value xml:lang="fr">Jusqu'Ã la date de facture</value>
<value xml:lang="hi_IN">à¤à¤¾à¤²à¤¾à¤¨ दिनाà¤à¤ तà¤</value>
+ <value xml:lang="nl">Tot factuurdatum</value>
<value xml:lang="pt">Data de vencimento da fatura</value>
<value xml:lang="zh">å票æªæ¢æ¥æ</value>
</property>
@@ -16077,6 +16144,7 @@
<value xml:lang="fr">Réf de feuille d'activité d'un acteur</value>
<value xml:lang="hi_IN">Timesheet पारà¥à¤à¥ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
<value xml:lang="it">Soggetto Timbratura</value>
+ <value xml:lang="nl">Party ID Urenstaat</value>
<value xml:lang="pt">ID do participante da folha de horas trabalhadas</value>
<value xml:lang="zh">å·¥æ¶è¡¨ä¼åæ è¯</value>
<value xml:lang="zh_TW">å·¥æ表æå¡ID</value>
@@ -16129,6 +16197,7 @@
<value xml:lang="fr">Total alloué</value>
<value xml:lang="hi_IN">à¤à¥à¤² à¤à¤ªà¥à¤²à¤¾à¤à¤¡ à¤à¤¾à¤²à¤¾à¤¨</value>
<value xml:lang="it">Totale fattura applicato</value>
+ <value xml:lang="nl">Totaal rekening toegepast</value>
<value xml:lang="pt">Total da fatura Aplicada</value>
<value xml:lang="zh">å
¨é¨å·²å¼å票</value>
<value xml:lang="zh_TW">å
¨é¨å·²éç¼ç¥¨</value>
@@ -16138,6 +16207,7 @@
<value xml:lang="fr">Montant total</value>
<value xml:lang="hi_IN">à¤à¥à¤² राशि</value>
<value xml:lang="it">Importo Totale</value>
+ <value xml:lang="nl">Totaal bedrag</value>
<value xml:lang="pt">Quantia Total</value>
<value xml:lang="zh">éé¢å计</value>
<value xml:lang="zh_TW">éé¡åè¨</value>
@@ -16145,6 +16215,7 @@
<property key="FormFieldTitle_totalOfCurrentFiscalPeriod">
<value xml:lang="en">Total of Current Fiscal Period</value>
<value xml:lang="hi_IN">à¤à¤¾à¤²à¥ वितà¥à¤¤ वरà¥à¤· à¤
वधि à¤à¤¾ à¤à¥à¤²</value>
+ <value xml:lang="nl">Totaal van huidige fiscale period</value>
<value xml:lang="pt">Total do perÃodo fiscal atual</value>
<value xml:lang="zh">æ¬è´¢å¹´å计</value>
</property>
@@ -16423,6 +16494,9 @@
<value xml:lang="pt">Pagamentos de Depósito e Criar lote</value>
<value xml:lang="zh">å款æ¯ä»å¹¶å建æ¹éå¤ç</value>
</property>
+ <property key="PageTitleFixedAssetDepreciationHistory">
+ <value xml:lang="en">Deprecation history</value>
+ </property>
<property key="PageTitleEditAgreement">
<value xml:lang="de">Vereinbarung ändern</value>
<value xml:lang="en">Edit Agreement</value>
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/data/AccountingPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/data/AccountingPortletData.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/accounting/data/AccountingPortletData.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/accounting/data/AccountingPortletData.xml Mon Mar 26 20:56:02 2012
@@ -74,4 +74,11 @@
screenLocation="component://accounting/widget/InvoiceScreens.xml"
description="List Invoices for a certain supplier who is just logged in"/>
<PortletPortletCategory portalPortletId="ListSupplierInvoices" portletCategoryId="ACCOUNTING"/>
+
+ <PortalPortlet portalPortletId="ListPayments" portletName="List Customer Payments"
+ screenName="ListPayments"
+ screenLocation="component://accounting/widget/PaymentScreens.xml"
+ description="List of Payments"
+ editFormName="EditPaymentAttributes" editFormLocation="component://accounting/widget/PaymentForms.xml"/>
+ <PortletPortletCategory portalPortletId="ListPayments" portletCategoryId="ACCOUNTING"/>
</entity-engine-xml>
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/data/DemoGlSetupData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/data/DemoGlSetupData.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/accounting/data/DemoGlSetupData.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/accounting/data/DemoGlSetupData.xml Mon Mar 26 20:56:02 2012
@@ -398,7 +398,7 @@ under the License.
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6012" periodTypeId="FISCAL_QUARTER" fromDate="2010-04-01" thruDate="2010-07-01" isClosed="N" periodNum="3" periodName="2010/Q2" parentPeriodId="6010"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6013" periodTypeId="FISCAL_QUARTER" fromDate="2010-07-01" thruDate="2010-10-01" isClosed="N" periodNum="4" periodName="2010/Q3" parentPeriodId="6010"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6014" periodTypeId="FISCAL_QUARTER" fromDate="2010-10-01" thruDate="2011-01-01" isClosed="N" periodNum="5" periodName="2010/Q4" parentPeriodId="6010"/>
- <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6015" periodTypeId="FISCAL_YEAR" fromDate="2011-01-01" thruDate="2012-01-01" isClosed="N" periodNum="1" periodName="2011"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6015" periodTypeId="FISCAL_YEAR" fromDate="2011-01-01" thruDate="2020-01-01" isClosed="N" periodNum="1" periodName="2011-2020"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6016" periodTypeId="FISCAL_QUARTER" fromDate="2011-01-01" thruDate="2011-04-01" isClosed="N" periodNum="2" periodName="2011/Q1" parentPeriodId="6015"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6017" periodTypeId="FISCAL_QUARTER" fromDate="2011-04-01" thruDate="2011-07-01" isClosed="N" periodNum="3" periodName="2011/Q2" parentPeriodId="6015"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6018" periodTypeId="FISCAL_QUARTER" fromDate="2011-07-01" thruDate="2011-10-01" isClosed="N" periodNum="4" periodName="2011/Q3" parentPeriodId="6015"/>
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/data/DemoPaymentsInvoices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/data/DemoPaymentsInvoices.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/accounting/data/DemoPaymentsInvoices.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/accounting/data/DemoPaymentsInvoices.xml Mon Mar 26 20:56:02 2012
@@ -159,8 +159,8 @@ under the License.
<!-- Demo invoice data for sales invoice with INVOICE_PAID status -->
<Party partyId="DemoCustAgent"/>
<PartyRole partyId="DemoCustAgent" roleTypeId="SALES_REP"/>
- <Product productId="WG-9943"/>
- <Product productId="WG-9943-B3"/>
+ <Product productId="WG-9943" productTypeId="FINISHED_GOOD"/>
+ <Product productId="WG-9943-B3" productTypeId="FINISHED_GOOD"/>
<Agreement agreementId="8000" partyIdFrom="Company" partyIdTo="DemoCustAgent" agreementTypeId="COMMISSION_AGREEMENT" description="Commission Agreement with DemoCustAgent"/>
<AgreementItem agreementId="8000" agreementItemSeqId="0001" agreementItemTypeId="AGREEMENT_COMMISSION" currencyUomId="USD" agreementText="Commission in USD"/>
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/entitydef/entitymodel.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/accounting/entitydef/entitymodel.xml Mon Mar 26 20:56:02 2012
@@ -3904,7 +3904,7 @@ under the License.
</view-entity>
<entity entity-name="RateType" package-name="org.ofbiz.accounting.rate"
- title="Rate Type Entity">
+ title="Rate Type Entity" default-resource-name="AccountingEntityLabels">
<field name="rateTypeId" type="id-ne"></field>
<field name="description" type="description"></field>
<prim-key field="rateTypeId"/>
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Mon Mar 26 20:56:02 2012
@@ -24,7 +24,7 @@ under the License.
<simple-method method-name="getArithmeticSettingsInline" short-description="getArithmeticSettingsInline">
<property-to-field resource="arithmetic" property="finaccount.decimals" field="roundingDecimals" default="2"/>
<property-to-field resource="arithmetic" property="finaccount.roundingSimpleMethod" field="roundingMode" default="HalfUp"/>
- <log level="info" message="Got settings from arithmetic.properties: roundingDecimals=${roundingDecimals}, roundingMode=${roundingMode}"/>
+ <log level="verbose" message="Got settings from arithmetic.properties: roundingDecimals=${roundingDecimals}, roundingMode=${roundingMode}"/>
</simple-method>
<simple-method method-name="createFinAccount" short-description="Create a Financial Account">
@@ -366,7 +366,7 @@ under the License.
<!-- Okay, now just store the results -->
<entity-one entity-name="FinAccount" value-field="finAccount"/>
- <log level="info" message="In updateFinAccountBalancesFromTrans/Auth updating FinAccount with ID [${finAccountId}] with actualBalance: ${finAccount.actualBalance} -> ${actualBalanceSum}, and availableBalance: ${finAccount.availableBalance} -> ${availableBalanceSum}"/>
+ <log level="verbose" message="In updateFinAccountBalancesFromTrans/Auth updating FinAccount with ID [${finAccountId}] with actualBalance: ${finAccount.actualBalance} -> ${actualBalanceSum}, and availableBalance: ${finAccount.availableBalance} -> ${availableBalanceSum}"/>
<set field="finAccount.actualBalance" from-field="actualBalanceSum"/>
<set field="finAccount.availableBalance" from-field="availableBalanceSum"/>
<store-value value-field="finAccount"/>
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Mon Mar 26 20:56:02 2012
@@ -2321,6 +2321,8 @@ under the License.
<set field="createAcctgTransAndEntriesInMap.glFiscalTypeId" value="ACTUAL"/>
<set field="createAcctgTransAndEntriesInMap.acctgTransTypeId" value="SALES_INVOICE"/>
<set field="createAcctgTransAndEntriesInMap.invoiceId" from-field="parameters.invoiceId"/>
+ <set field="createAcctgTransAndEntriesInMap.partyId" from-field="invoice.partyId"/>
+ <set field="createAcctgTransAndEntriesInMap.roleTypeId" value="BILL_TO_CUSTOMER"/>
<set field="createAcctgTransAndEntriesInMap.acctgTransEntries" from-field="acctgTransEntries"/>
<set field="createAcctgTransAndEntriesInMap.transactionDate" from-field="invoice.invoiceDate"/>
<call-service service-name="createAcctgTransAndEntries" in-map-name="createAcctgTransAndEntriesInMap">
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml Mon Mar 26 20:56:02 2012
@@ -176,10 +176,20 @@ under the License.
<entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
+
+ <now-timestamp field="nowTimestamp"/>
+ <set field="findCustomTimePeriodsMap.userLogin" from-field="userLogin"/>
+ <set field="findCustomTimePeriodsMap.findDate" from-field="nowTimestamp" type="Timestamp"/>
+ <set field="findCustomTimePeriodsMap.organizationPartyId" value="Company"/>
+ <call-service service-name="findCustomTimePeriods" in-map-name="findCustomTimePeriodsMap">
+ <result-to-field result-name="customTimePeriodList"/>
+ </call-service>
+ <first-from-list list="customTimePeriodList" entry="customTimePeriod"/>
+
<set field="getAcctgTransEntriesAndTransTotalMap.userLogin" from-field="userLogin"/>
<set field="getAcctgTransEntriesAndTransTotalMap.organizationPartyId" value="Company"/>
- <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" value="2011-01-01 16:55:01.0" type="Timestamp"/>
- <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" value="2011-12-31 16:55:01.0" type="Timestamp"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" from-field="customTimePeriod.fromDate" type="Timestamp"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" from-field="customTimePeriod.thruDate" type="Timestamp"/>
<set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="210000"/>
<call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap">
<result-to-field result-name="debitTotal" field="payableDebitTotal"/>
@@ -244,10 +254,20 @@ under the License.
<entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
+
+ <now-timestamp field="nowTimestamp"/>
+ <set field="findCustomTimePeriodsMap.userLogin" from-field="userLogin"/>
+ <set field="findCustomTimePeriodsMap.findDate" from-field="nowTimestamp" type="Timestamp"/>
+ <set field="findCustomTimePeriodsMap.organizationPartyId" value="Company"/>
+ <call-service service-name="findCustomTimePeriods" in-map-name="findCustomTimePeriodsMap">
+ <result-to-field result-name="customTimePeriodList"/>
+ </call-service>
+ <first-from-list list="customTimePeriodList" entry="customTimePeriod"/>
+
<set field="getAcctgTransEntriesAndTransTotalMap.userLogin" from-field="userLogin"/>
<set field="getAcctgTransEntriesAndTransTotalMap.organizationPartyId" value="Company"/>
- <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" value="2011-01-01 16:55:01.0" type="Timestamp"/>
- <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" value="2011-12-31 16:55:01.0" type="Timestamp"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" from-field="customTimePeriod.fromDate" type="Timestamp"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" from-field="customTimePeriod.thruDate" type="Timestamp"/>
<set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="210000"/>
<call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap">
<result-to-field result-name="debitTotal" field="payableDebitTotal"/>
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml Mon Mar 26 20:56:02 2012
@@ -348,10 +348,20 @@ under the License.
<entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
+
+ <now-timestamp field="nowTimestamp"/>
+ <set field="findCustomTimePeriodsMap.userLogin" from-field="userLogin"/>
+ <set field="findCustomTimePeriodsMap.findDate" from-field="nowTimestamp" type="Timestamp"/>
+ <set field="findCustomTimePeriodsMap.organizationPartyId" value="Company"/>
+ <call-service service-name="findCustomTimePeriods" in-map-name="findCustomTimePeriodsMap">
+ <result-to-field result-name="customTimePeriodList"/>
+ </call-service>
+ <first-from-list list="customTimePeriodList" entry="customTimePeriod"/>
+
<set field="getAcctgTransEntriesAndTransTotalMap.userLogin" from-field="userLogin"/>
<set field="getAcctgTransEntriesAndTransTotalMap.organizationPartyId" value="Company"/>
- <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" value="2011-01-01 16:55:01.0" type="Timestamp"/>
- <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" value="2011-12-31 16:55:01.0" type="Timestamp"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" from-field="customTimePeriod.fromDate" type="Timestamp"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" from-field="customTimePeriod.thruDate" type="Timestamp"/>
<set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="120000"/>
<call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap">
<result-to-field result-name="debitTotal" field="receivableDebitTotal"/>
@@ -420,10 +430,20 @@ under the License.
<entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
+
+ <now-timestamp field="nowTimestamp"/>
+ <set field="findCustomTimePeriodsMap.userLogin" from-field="userLogin"/>
+ <set field="findCustomTimePeriodsMap.findDate" from-field="nowTimestamp" type="Timestamp"/>
+ <set field="findCustomTimePeriodsMap.organizationPartyId" value="Company"/>
+ <call-service service-name="findCustomTimePeriods" in-map-name="findCustomTimePeriodsMap">
+ <result-to-field result-name="customTimePeriodList"/>
+ </call-service>
+ <first-from-list list="customTimePeriodList" entry="customTimePeriod"/>
+
<set field="getAcctgTransEntriesAndTransTotalMap.userLogin" from-field="userLogin"/>
<set field="getAcctgTransEntriesAndTransTotalMap.organizationPartyId" value="Company"/>
- <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" value="2011-01-01 16:55:01.0" type="Timestamp"/>
- <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" value="2011-12-31 16:55:01.0" type="Timestamp"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" from-field="customTimePeriod.fromDate" type="Timestamp"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" from-field="customTimePeriod.thruDate" type="Timestamp"/>
<set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="210000"/>
<call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap">
<result-to-field result-name="debitTotal" field="payableDebitTotal"/>
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java (original)
+++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java Mon Mar 26 20:56:02 2012
@@ -43,6 +43,7 @@ import org.ofbiz.entity.condition.Entity
import org.ofbiz.entity.condition.EntityOperator;
import org.ofbiz.entity.util.EntityFindOptions;
import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.order.finaccount.FinAccountHelper;
import org.ofbiz.order.order.OrderReadHelper;
import org.ofbiz.product.store.ProductStoreWorker;
@@ -541,7 +542,7 @@ public class FinAccountPaymentServices {
}
String currencyUom = (String) context.get("currency");
if (UtilValidate.isEmpty(currencyUom)) {
- currencyUom = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD");
+ currencyUom = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator);
}
// validate the amount
@@ -634,7 +635,7 @@ public class FinAccountPaymentServices {
}
String currencyUom = (String) context.get("currency");
if (UtilValidate.isEmpty(currencyUom)) {
- currencyUom = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD");
+ currencyUom = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator);
}
GenericValue finAccount;
@@ -658,7 +659,7 @@ public class FinAccountPaymentServices {
"AccountingFinAccountExpired",
UtilMisc.toMap("thruDate", finAccount.getTimestamp("thruDate")), locale));
}
- Debug.log("Deposit into financial account #" + finAccountId + " [" + amount + "]", module);
+ Debug.logInfo("Deposit into financial account #" + finAccountId + " [" + amount + "]", module);
// get the previous balance
BigDecimal previousBalance = finAccount.getBigDecimal("actualBalance");
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java (original)
+++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java Mon Mar 26 20:56:02 2012
@@ -27,6 +27,7 @@ import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.base.util.*;
import org.ofbiz.base.util.string.FlexibleStringExpander;
import org.ofbiz.order.order.OrderReadHelper;
@@ -110,7 +111,7 @@ public class FinAccountProductServices {
// make sure we have a currency
if (currency == null) {
- currency = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD");
+ currency = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator);
}
// get the product store
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java (original)
+++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java Mon Mar 26 20:56:02 2012
@@ -282,7 +282,7 @@ public class FinAccountServices {
}
String statusId = finAccount.getString("statusId");
- Debug.log("FinAccount Balance [" + balance + "] Available [" + availableBalance + "] - Status: " + statusId, module);
+ Debug.logInfo("FinAccount Balance [" + balance + "] Available [" + availableBalance + "] - Status: " + statusId, module);
Map<String, Object> result = ServiceUtil.returnSuccess();
result.put("availableBalance", availableBalance);
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original)
+++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Mon Mar 26 20:56:02 2012
@@ -2207,7 +2207,7 @@ public class InvoiceServices {
}
}
} else {
- Debug.log("No payments found for Invoice #" + invoiceId, module);
+ Debug.logInfo("No payments found for Invoice #" + invoiceId, module);
}
return ServiceUtil.returnSuccess();
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java (original)
+++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java Mon Mar 26 20:56:02 2012
@@ -84,9 +84,7 @@ public class BillingAccountWorker {
if (billingAccountRoleList.size() > 0) {
BigDecimal totalAvailable = BigDecimal.ZERO;
- Iterator<GenericValue> billingAcctIter = billingAccountRoleList.iterator();
- while (billingAcctIter.hasNext()) {
- GenericValue billingAccountRole = billingAcctIter.next();
+ for(GenericValue billingAccountRole : billingAccountRoleList) {
GenericValue billingAccountVO = billingAccountRole.getRelatedOne("BillingAccount");
// skip accounts that have thruDate < nowTimestamp
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java (original)
+++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java Mon Mar 26 20:56:02 2012
@@ -39,6 +39,7 @@ import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.order.finaccount.FinAccountHelper;
import org.ofbiz.order.order.OrderReadHelper;
import org.ofbiz.product.store.ProductStoreWorker;
@@ -74,7 +75,7 @@ public class GiftCertificateServices {
}
String currencyUom = (String) context.get("currency");
if (UtilValidate.isEmpty(currencyUom)) {
- currencyUom = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD");
+ currencyUom = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator);
}
String cardNumber = null;
@@ -153,7 +154,7 @@ public class GiftCertificateServices {
result.put("processResult", Boolean.TRUE);
result.put("responseCode", "1");
result.put("referenceNum", refNum);
- Debug.log("Create GC Result - " + result, module);
+ Debug.logInfo("Create GC Result - " + result, module);
return result;
}
@@ -175,7 +176,7 @@ public class GiftCertificateServices {
}
String currencyUom = (String) context.get("currency");
if (UtilValidate.isEmpty(currencyUom)) {
- currencyUom = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD");
+ currencyUom = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator);
}
String finAccountId = null;
@@ -242,7 +243,7 @@ public class GiftCertificateServices {
result.put("processResult", Boolean.TRUE);
result.put("responseCode", "1");
result.put("referenceNum", refNum);
- Debug.log("Add Funds GC Result - " + result, module);
+ Debug.logInfo("Add Funds GC Result - " + result, module);
return result;
}
@@ -263,7 +264,7 @@ public class GiftCertificateServices {
}
String currencyUom = (String) context.get("currency");
if (UtilValidate.isEmpty(currencyUom)) {
- currencyUom = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD");
+ currencyUom = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator);
}
// validate the amount
@@ -325,7 +326,7 @@ public class GiftCertificateServices {
result.put("processResult", procResult);
result.put("responseCode", "2");
result.put("referenceNum", refNum);
- Debug.log("Redeem GC Result - " + result, module);
+ Debug.logInfo("Redeem GC Result - " + result, module);
return result;
}
@@ -350,13 +351,13 @@ public class GiftCertificateServices {
}
// TODO: get the real currency from context
- //String currencyUom = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD");
+ //String currencyUom = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator);
// get the balance
BigDecimal balance = finAccount.get("availableBalance") == null ? BigDecimal.ZERO : finAccount.getBigDecimal("availableBalance");
Map<String, Object> result = ServiceUtil.returnSuccess();
result.put("balance", balance);
- Debug.log("GC Balance Result - " + result, module);
+ Debug.logInfo("GC Balance Result - " + result, module);
return result;
}
@@ -370,7 +371,7 @@ public class GiftCertificateServices {
String currency = (String) context.get("currency");
// make sure we have a currency
if (currency == null) {
- currency = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD");
+ currency = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator);
}
// get the authorizations
@@ -469,7 +470,7 @@ public class GiftCertificateServices {
// make sure we have a currency
if (currency == null) {
- currency = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD");
+ currency = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator);
}
// obtain the order information
@@ -647,7 +648,7 @@ public class GiftCertificateServices {
// make sure we have a currency
if (currency == null) {
- currency = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD");
+ currency = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator);
}
Map<String, Object> refundCtx = FastMap.newInstance();
@@ -714,7 +715,7 @@ public class GiftCertificateServices {
// make sure we have a currency
if (currency == null) {
- currency = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD");
+ currency = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator);
}
// get the product store
@@ -798,9 +799,7 @@ public class GiftCertificateServices {
// make a map of answer info
Map<String, Object> answerMap = FastMap.newInstance();
if (responseAnswers != null) {
- Iterator<GenericValue> rai = responseAnswers.iterator();
- while (rai.hasNext()) {
- GenericValue answer = rai.next();
+ for(GenericValue answer : responseAnswers) {
GenericValue question = null;
try {
question = answer.getRelatedOne("SurveyQuestion");
@@ -971,7 +970,7 @@ public class GiftCertificateServices {
// make sure we have a currency
if (currency == null) {
- currency = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD");
+ currency = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator);
}
// get the product store
@@ -1036,9 +1035,7 @@ public class GiftCertificateServices {
// make a map of answer info
Map<String, Object> answerMap = FastMap.newInstance();
if (responseAnswers != null) {
- Iterator<GenericValue> rai = responseAnswers.iterator();
- while (rai.hasNext()) {
- GenericValue answer = rai.next();
+ for(GenericValue answer : responseAnswers) {
GenericValue question = null;
try {
question = answer.getRelatedOne("SurveyQuestion");
@@ -1355,7 +1352,7 @@ public class GiftCertificateServices {
}
if (finAccount != null) {
String dbPin = finAccount.getString("finAccountCode");
- Debug.log("GC Pin Validation: [Sent: " + pinNumber + "] [Actual: " + dbPin + "]", module);
+ Debug.logInfo("GC Pin Validation: [Sent: " + pinNumber + "] [Actual: " + dbPin + "]", module);
if (dbPin != null && dbPin.equals(pinNumber)) {
return true;
}
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original)
+++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Mon Mar 26 20:56:02 2012
@@ -53,6 +53,7 @@ import org.ofbiz.entity.condition.Entity
import org.ofbiz.entity.model.ModelEntity;
import org.ofbiz.entity.util.EntityListIterator;
import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.order.order.OrderChangeHelper;
import org.ofbiz.order.order.OrderReadHelper;
import org.ofbiz.party.contact.ContactHelper;
@@ -236,10 +237,7 @@ public class PaymentGatewayServices {
}
if (UtilValidate.isNotEmpty(otherPaymentMethodAndCreditCardList)) {
- Iterator<GenericValue> otherPaymentMethodAndCreditCardIter = otherPaymentMethodAndCreditCardList.iterator();
- while (otherPaymentMethodAndCreditCardIter.hasNext()) {
- GenericValue otherPaymentMethodAndCreditCard = otherPaymentMethodAndCreditCardIter.next();
-
+ for (GenericValue otherPaymentMethodAndCreditCard : otherPaymentMethodAndCreditCardList) {
// change OrderPaymentPreference in memory only and call auth service
orderPaymentPreference.set("paymentMethodId", otherPaymentMethodAndCreditCard.getString("paymentMethodId"));
Map<String, Object> authRetryResult = authPayment(dispatcher, userLogin, orh, orderPaymentPreference, totalRemaining, reAuth, transAmount);
@@ -367,9 +365,7 @@ public class PaymentGatewayServices {
int finished = 0;
int hadError = 0;
List<String> messages = FastList.newInstance();
- Iterator<GenericValue> payments = paymentPrefs.iterator();
- while (payments.hasNext()) {
- GenericValue paymentPref = payments.next();
+ for(GenericValue paymentPref : paymentPrefs) {
if (reAuth && "PAYMENT_AUTHORIZED".equals(paymentPref.getString("statusId"))) {
String paymentConfig = null;
// get the payment settings i.e. serviceName and config properties file name
@@ -765,10 +761,8 @@ public class PaymentGatewayServices {
// iterate over the prefs and release each one
List<GenericValue> finished = FastList.newInstance();
- Iterator<GenericValue> payments = paymentPrefs.iterator();
- while (payments.hasNext()) {
- paymentPref = payments.next();
- Map<String, Object> releaseContext = UtilMisc.toMap("userLogin", userLogin, "orderPaymentPreferenceId", paymentPref.getString("orderPaymentPreferenceId"));
+ for(GenericValue pPref : paymentPrefs) {
+ Map<String, Object> releaseContext = UtilMisc.toMap("userLogin", userLogin, "orderPaymentPreferenceId", pPref.getString("orderPaymentPreferenceId"));
Map<String, Object> releaseResult = null;
try {
releaseResult = dispatcher.runSync("releaseOrderPaymentPreference", releaseContext);
@@ -826,11 +820,9 @@ public class PaymentGatewayServices {
List<GenericValue> messageEntities = FastList.newInstance();
List<String> messages = UtilGenerics.cast(context.get("internalRespMsgs"));
if (UtilValidate.isNotEmpty(messages)) {
- Iterator<String> i = messages.iterator();
- while (i.hasNext()) {
+ for(String message : messages) {
GenericValue respMsg = delegator.makeValue("PaymentGatewayRespMsg");
String respMsgId = delegator.getNextSeqId("PaymentGatewayRespMsg");
- String message = i.next();
respMsg.set("paymentGatewayRespMsgId", respMsgId);
respMsg.set("paymentGatewayResponseId", responseId);
respMsg.set("pgrMessage", message);
@@ -2158,9 +2150,9 @@ public class PaymentGatewayServices {
}
if (amount.compareTo(ZERO) == 0) {
amount = paymentPreference.getBigDecimal("maxAmount");
- Debug.log("resetting payment amount from 0.00 to correctMax amount", module);
+ Debug.logInfo("resetting payment amount from 0.00 to correctMax amount", module);
}
- Debug.log("reauth with amount: " + amount, module);
+ Debug.logInfo("reauth with amount: " + amount, module);
// first re-auth the card
Map<String, Object> authPayRes = authPayment(dispatcher, userLogin, orh, paymentPreference, amount, true, null);
@@ -2620,7 +2612,7 @@ public class PaymentGatewayServices {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
"AccountingPaymentCreationError", locale));
}
- //Debug.log("Payment created : " + paymentId, module);
+ //Debug.logInfo("Payment created : " + paymentId, module);
if (paymentId == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
@@ -3089,7 +3081,7 @@ public class PaymentGatewayServices {
// this record is not to be stored, just passed to the service for use
// get the default currency
- String currency = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD");
+ String currency = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator);
// prepare the auth context
Map<String, Object> authContext = FastMap.newInstance();
@@ -3254,7 +3246,7 @@ public class PaymentGatewayServices {
requestContext.put("billToParty", orh.getBillToParty());
requestContext.put("billToEmail", billToEmail);
requestContext.put("referenceCode", referenceCode);
- String currency = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD");
+ String currency = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator);
requestContext.put("currency", currency);
requestContext.put("creditAmount", context.get("amount"));
} else {
@@ -3693,7 +3685,7 @@ public class PaymentGatewayServices {
cal.setTimeInMillis(txStamp.getTime());
cal.add(Calendar.MINUTE, 2);
Timestamp twoMinAfter = new Timestamp(cal.getTimeInMillis());
- Debug.log("Re-Auth Capture Test : Tx Date - " + txStamp + " : 2 Min - " + twoMinAfter + " : Now - " + nowStamp, module);
+ Debug.logInfo("Re-Auth Capture Test : Tx Date - " + txStamp + " : 2 Min - " + twoMinAfter + " : Now - " + nowStamp, module);
if (nowStamp.after(twoMinAfter)) {
result.put("captureResult", Boolean.FALSE);
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java (original)
+++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java Mon Mar 26 20:56:02 2012
@@ -263,7 +263,7 @@ public class PaymentWorker {
}
/**
- * Method to return the total amount of an payment which is applied to a payment
+ * Method to return the total amount of a payment which is applied to a payment
* @param payment GenericValue object of the Payment
* @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
@@ -298,7 +298,10 @@ public class PaymentWorker {
}
public static BigDecimal getPaymentNotApplied(GenericValue payment) {
- return payment.getBigDecimal("amount").subtract(getPaymentApplied(payment)).setScale(decimals,rounding);
+ if (payment != null) {
+ return payment.getBigDecimal("amount").subtract(getPaymentApplied(payment)).setScale(decimals,rounding);
+ }
+ return BigDecimal.ZERO;
}
public static BigDecimal getPaymentNotApplied(GenericValue payment, Boolean actual) {
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original)
+++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Mon Mar 26 20:56:02 2012
@@ -110,9 +110,7 @@ public class TaxAuthorityServices {
}
// add up amounts from adjustments (amount OR exemptAmount, sourcePercentage)
- Iterator<GenericValue> taxAdustmentIter = taxAdustmentList.iterator();
- while (taxAdustmentIter.hasNext()) {
- GenericValue taxAdjustment = taxAdustmentIter.next();
+ for(GenericValue taxAdjustment : taxAdustmentList) {
if ("SALES_TAX".equals(taxAdjustment.getString("orderAdjustmentTypeId"))) {
taxPercentage = taxPercentage.add(taxAdjustment.getBigDecimal("sourcePercentage"));
BigDecimal adjAmount = taxAdjustment.getBigDecimal("amount");
@@ -298,9 +296,7 @@ public class TaxAuthorityServices {
EntityOperator.AND,
EntityCondition.makeCondition("taxAuthGeoId", EntityOperator.EQUALS, "_NA_")));
- Iterator<GenericValue> taxAuthorityIter = taxAuthoritySet.iterator();
- while (taxAuthorityIter.hasNext()) {
- GenericValue taxAuthority = taxAuthorityIter.next();
+ for(GenericValue taxAuthority : taxAuthoritySet) {
EntityCondition taxAuthCond = EntityCondition.makeCondition(
EntityCondition.makeCondition("taxAuthPartyId", EntityOperator.EQUALS, taxAuthority.getString("taxAuthPartyId")),
EntityOperator.AND,
@@ -332,9 +328,7 @@ public class TaxAuthorityServices {
}
List<GenericValue> pcmList = delegator.findList("ProductCategoryMember", productIdCond, UtilMisc.toSet("productCategoryId"), null, null, true);
pcmList = EntityUtil.filterByDate(pcmList, true);
- Iterator<GenericValue> pcmIter = pcmList.iterator();
- while (pcmIter.hasNext()) {
- GenericValue pcm = pcmIter.next();
+ for(GenericValue pcm : pcmList) {
productCategoryIdSet.add(pcm.getString("productCategoryId"));
}
@@ -396,9 +390,7 @@ public class TaxAuthorityServices {
}
// find the right entry(s) based on purchase amount
- Iterator<GenericValue> flIt = filteredList.iterator();
- while (flIt.hasNext()) {
- GenericValue taxAuthorityRateProduct = flIt.next();
+ for(GenericValue taxAuthorityRateProduct : filteredList) {
BigDecimal taxRate = taxAuthorityRateProduct.get("taxPercentage") != null ? taxAuthorityRateProduct.getBigDecimal("taxPercentage") : ZERO_BASE;
BigDecimal taxable = ZERO_BASE;
@@ -478,9 +470,7 @@ public class TaxAuthorityServices {
Set<String> billToPartyIdSet = FastSet.newInstance();
billToPartyIdSet.add(billToPartyId);
List<GenericValue> partyRelationshipList = EntityUtil.filterByDate(delegator.findByAndCache("PartyRelationship", UtilMisc.toMap("partyIdTo", billToPartyId, "partyRelationshipTypeId", "GROUP_ROLLUP")), true);
- Iterator<GenericValue> partyRelationshipIter = partyRelationshipList.iterator();
- while (partyRelationshipIter.hasNext()) {
- GenericValue partyRelationship = partyRelationshipIter.next();
+ for(GenericValue partyRelationship : partyRelationshipList) {
billToPartyIdSet.add(partyRelationship.getString("partyIdFrom"));
}
handlePartyTaxExempt(taxAdjValue, billToPartyIdSet, taxAuthGeoId, taxAuthPartyId, taxAmount, nowTimestamp, delegator);
@@ -575,7 +565,7 @@ public class TaxAuthorityServices {
UtilMisc.toList("-fromDate"));
taxAuthorityAssocList = EntityUtil.filterByDate(taxAuthorityAssocList, true);
GenericValue taxAuthorityAssoc = EntityUtil.getFirst(taxAuthorityAssocList);
- // Debug.log("Parent assoc to " + taxAuthGeoId + " : " + taxAuthorityAssoc, module);
+ // Debug.logInfo("Parent assoc to " + taxAuthGeoId + " : " + taxAuthorityAssoc, module);
if (taxAuthorityAssoc != null) {
handlePartyTaxExempt(adjValue, billToPartyIdSet, taxAuthorityAssoc.getString("taxAuthGeoId"), taxAuthorityAssoc.getString("taxAuthPartyId"), taxAmount, nowTimestamp, delegator);
}