svn commit: r1178183 [2/3] - in /ofbiz/branches/jackrabbit20100709: ./ applications/accounting/config/ applications/content/src/org/ofbiz/content/data/ applications/content/webapp/content/website/ applications/content/widget/ applications/humanres/scri...

[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=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml Sun Oct  2 12:22:57 2011
@@ -24,7 +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="nl">Amortisatie</value>
         <value xml:lang="pt_BR">Amortização</value>
         <value xml:lang="ro">Amortizare</value>
         <value xml:lang="ru">Амортизация</value>
@@ -37,7 +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="nl">Kapitalisatie</value>
         <value xml:lang="pt_BR">Capitalização</value>
         <value xml:lang="ro">Capitalizare</value>
         <value xml:lang="ru">Капитализация</value>
@@ -50,7 +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="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>
@@ -64,7 +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="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>
@@ -78,7 +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="nl">Afschrijving</value>
         <value xml:lang="pt_BR">Depreciação</value>
         <value xml:lang="ro">Depreciat</value>
         <value xml:lang="ru">Износ</value>
@@ -92,7 +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="nl">Uitbelating</value>
         <value xml:lang="pt_BR">Desembolso</value>
         <value xml:lang="ro">Rambursari</value>
         <value xml:lang="ru">Выплата</value>
@@ -105,7 +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="nl">Extern</value>
         <value xml:lang="pt_BR">Externo</value>
         <value xml:lang="ro">Extern</value>
         <value xml:lang="ru">Внешняя</value>
@@ -118,7 +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="nl">Inkomende betaling</value>
         <value xml:lang="pt_BR">Pagamento na Entrada</value>
         <value xml:lang="zh">新收款</value>
         <value xml:lang="zh_TW">新收款</value>
@@ -128,7 +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="nl">Intern</value>
         <value xml:lang="pt_BR">Interno</value>
         <value xml:lang="ro">Intern</value>
         <value xml:lang="ru">Внутренняя</value>
@@ -141,7 +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="nl">Voorraad</value>
         <value xml:lang="pt_BR">Inventário</value>
         <value xml:lang="zh">库存</value>
         <value xml:lang="zh_TW">庫存</value>
@@ -151,7 +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="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>
@@ -164,7 +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="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>
@@ -177,7 +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="nl">Productie</value>
         <value xml:lang="pt_BR">Produção</value>
         <value xml:lang="zh">生产</value>
         <value xml:lang="zh_TW">生產</value>
@@ -187,7 +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="nl">Nota</value>
         <value xml:lang="pt_BR">Nota</value>
         <value xml:lang="ro">Nota</value>
         <value xml:lang="ru">Закладная</value>
@@ -200,7 +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="nl">Verplichting</value>
         <value xml:lang="pt_BR">Obrigação</value>
         <value xml:lang="ro">Obligatii</value>
         <value xml:lang="ru">Обязательство</value>
@@ -213,7 +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="nl">Andere intern</value>
         <value xml:lang="pt_BR">Outro Interno</value>
         <value xml:lang="ro">Alt Intern</value>
         <value xml:lang="ru">Другая внутренняя</value>
@@ -226,7 +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="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>
@@ -239,7 +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="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>
@@ -249,7 +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="nl">Betaling</value>
         <value xml:lang="pt_BR">Pagamento</value>
         <value xml:lang="ro">Plati</value>
         <value xml:lang="ru">Платеж</value>
@@ -262,7 +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="nl">Betaling toegepast</value>
         <value xml:lang="pt_BR">Pagamento Executado</value>
         <value xml:lang="zh">应用的支付款</value>
         <value xml:lang="zh_TW">應用的支付款</value>
@@ -272,7 +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="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>
@@ -285,7 +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="nl">Inkoopfactuur</value>
         <value xml:lang="pt_BR">Fatura de Compra</value>
         <value xml:lang="zh">购货发票</value>
         <value xml:lang="zh_TW">購貨發票</value>
@@ -296,7 +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="nl">Bon</value>
         <value xml:lang="pt_BR">Recibo</value>
         <value xml:lang="ro">Chitanta</value>
         <value xml:lang="ru">Выручка</value>
@@ -321,7 +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="nl">Verkoopfactuur</value>
         <value xml:lang="pt_BR">Fatura da Venda</value>
         <value xml:lang="zh">销售发票</value>
         <value xml:lang="zh_TW">銷售發票</value>
@@ -331,7 +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="nl">Verkoop verzending</value>
         <value xml:lang="pt_BR">Entrega</value>
         <value xml:lang="zh">销售送货</value>
         <value xml:lang="zh_TW">銷售送貨</value>
@@ -341,7 +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="nl">Verzending bon</value>
         <value xml:lang="pt_BR">Recibo da Entrega</value>
         <value xml:lang="zh">送货收据</value>
         <value xml:lang="zh_TW">送貨收據</value>
@@ -363,7 +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="nl">Aanpassing</value>
         <value xml:lang="pt_BR">Ajuste</value>
         <value xml:lang="ru">Поправка</value>
         <value xml:lang="th">การปรับปรุงรายการ</value>
@@ -375,7 +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="nl">Storting</value>
         <value xml:lang="pt_BR">Depósito</value>
         <value xml:lang="ru">Взнос</value>
         <value xml:lang="th">เงินมัดจำ</value>
@@ -387,7 +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="nl">Opname</value>
         <value xml:lang="pt_BR">Saque</value>
         <value xml:lang="ru">Отмена</value>
         <value xml:lang="th">ถอน</value>
@@ -400,7 +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="nl">Bankrekening</value>
         <value xml:lang="pt_BR">Conta Bancária</value>
         <value xml:lang="ru">Банковский счет</value>
         <value xml:lang="th">บัญชีธนาคาร</value>
@@ -425,7 +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="nl">Cadeaubon</value>
         <value xml:lang="pt_BR">Vale Presente</value>
         <value xml:lang="ru">Подарочный сертификат</value>
         <value xml:lang="th">ของขวัญที่มีใบรับรอง</value>
@@ -438,7 +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="nl">Beleggingsrekening</value>
         <value xml:lang="pt_BR">Conta Investimento</value>
         <value xml:lang="ru">Инвестиционный счет</value>
         <value xml:lang="th">บัญชีเงินลงทุน</value>
@@ -463,7 +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="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>
@@ -475,7 +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="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>
@@ -488,7 +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="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>
@@ -501,7 +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="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>
@@ -526,7 +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="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>
@@ -551,7 +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="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>
@@ -564,7 +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="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>
@@ -577,7 +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="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>
@@ -590,7 +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="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>
@@ -603,7 +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="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>
@@ -616,7 +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="nl">Computer hardware</value>
         <value xml:lang="pt_BR">Hardware de Computador</value>
         <value xml:lang="zh">计算机硬件</value>
         <value xml:lang="zh_TW">電腦硬體</value>
@@ -626,7 +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="nl">Computer software</value>
         <value xml:lang="pt_BR">Software</value>
         <value xml:lang="zh">计算机软件</value>
         <value xml:lang="zh_TW">電腦軟件</value>
@@ -636,7 +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="nl">Uitrusting</value>
         <value xml:lang="pt_BR">Equipamento</value>
         <value xml:lang="ro">Echipamente</value>
         <value xml:lang="ru">Оборудование</value>
@@ -661,7 +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="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>
@@ -686,7 +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="nl">Eigendom</value>
         <value xml:lang="pt_BR">Propriedade</value>
         <value xml:lang="ro">Proprietati</value>
         <value xml:lang="ru">Имущество</value>
@@ -699,7 +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="nl">Onroerend goed</value>
         <value xml:lang="pt_BR">Imóvel</value>
         <value xml:lang="ro">Imobile</value>
         <value xml:lang="ru">Недвижимость</value>
@@ -712,7 +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="nl">Voertuig</value>
         <value xml:lang="pt_BR">Veículo</value>
         <value xml:lang="ro">Vehicol</value>
         <value xml:lang="ru">Транспорт</value>
@@ -725,7 +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="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>
@@ -738,7 +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="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>
@@ -751,7 +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="nl">Amortisatie</value>
         <value xml:lang="pt_BR">Amortização</value>
         <value xml:lang="ro">Amortizari</value>
         <value xml:lang="ru">Амортизация</value>
@@ -764,7 +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="nl">Activa</value>
         <value xml:lang="pt_BR">Ativo</value>
         <value xml:lang="ro">Bunuri</value>
         <value xml:lang="ru">Активы</value>
@@ -789,7 +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="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>
@@ -802,7 +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="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>
@@ -815,7 +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="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>
@@ -828,7 +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="nl">Krediet</value>
         <value xml:lang="pt_BR">Crédito</value>
         <value xml:lang="ro">Credit</value>
         <value xml:lang="ru">Кредит</value>
@@ -841,7 +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="nl">Vlottende activa</value>
         <value xml:lang="pt_BR">Ativo Circulante</value>
         <value xml:lang="ro">Bunuri Actuale</value>
         <value xml:lang="ru">Текущие активы</value>
@@ -854,7 +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="nl">Kortlopende schulden</value>
         <value xml:lang="pt_BR">Passivo Circulante</value>
         <value xml:lang="ro">Pasivitati Actuale</value>
         <value xml:lang="ru">Текущие обязательства</value>
@@ -867,7 +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="nl">Debit</value>
         <value xml:lang="pt_BR">Débito</value>
         <value xml:lang="ro">Debit</value>
         <value xml:lang="ru">Дебит</value>
@@ -881,7 +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="nl">Afschrijving</value>
         <value xml:lang="pt_BR">Depreciação</value>
         <value xml:lang="ro">Devalorizari</value>
         <value xml:lang="ru">Износ</value>
@@ -894,7 +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="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>
@@ -919,7 +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="nl">Vermogen</value>
         <value xml:lang="pt_BR">Bens</value>
         <value xml:lang="ro">Actiuni</value>
         <value xml:lang="ru">Собственные средства</value>
@@ -932,7 +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="nl">Kosten</value>
         <value xml:lang="pt_BR">Despesa</value>
         <value xml:lang="ro">Cheltuieli</value>
         <value xml:lang="ru">Расходы</value>
@@ -945,7 +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="nl">Opbrengsten</value>
         <value xml:lang="pt_BR">Renda</value>
         <value xml:lang="ro">Venit</value>
         <value xml:lang="ru">Доходы</value>
@@ -958,7 +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="nl">Rentekosten</value>
         <value xml:lang="pt_BR">Custo sobre Juros</value>
         <value xml:lang="ro">Dobanda Cheltuieli</value>
         <value xml:lang="ru">Выплата процентов</value>
@@ -971,7 +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="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>
@@ -984,7 +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="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>
@@ -994,7 +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="nl">Schulden</value>
         <value xml:lang="pt_BR">Passivo</value>
         <value xml:lang="ro">Pasivitati</value>
         <value xml:lang="ru">Обязательства</value>
@@ -1007,7 +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="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>
@@ -1020,7 +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="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/content/src/org/ofbiz/content/data/DataServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/data/DataServices.java?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/data/DataServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/data/DataServices.java Sun Oct  2 12:22:57 2011
@@ -450,6 +450,7 @@ public class DataServices {
             } else if (binData != null) {
                 try {
                     RandomAccessFile out = new RandomAccessFile(file, "rw");
+                    out.setLength(binData.array().length);
                     out.write(binData.array());
                     out.close();
                 } catch (FileNotFoundException e) {

Modified: ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteCMSNav.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteCMSNav.ftl?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteCMSNav.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteCMSNav.ftl Sun Oct  2 12:22:57 2011
@@ -17,9 +17,12 @@
   under the License.
   -->
 <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script>
-<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/elrteEditor/elrte.min.js</@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/elrte-1.3/js/elrte.min.js</@ofbizContentUrl>"></script>
+<#if language?has_content && language != "en">
+<script language="javascript" src="<@ofbizContentUrl>/images/jquery/plugins/elrte-1.3/js/i18n/elrte.${language!"en"}.js</@ofbizContentUrl>" type="text/javascript"></script><#rt/>
+</#if>
 
-<link href="/images/jquery/plugins/elrteEditor/css/elrte.full.css" rel="stylesheet" type="text/css">
+<link href="/images/jquery/plugins/elrte-1.3/css/elrte.min.css" rel="stylesheet" type="text/css">
 
 <script type="text/javascript">
     jQuery(document).ready(loadTrees);
@@ -364,10 +367,11 @@ var rawdata_errors = [
         if($('#cmseditor').length) {
             var opts = {
                 cssClass : 'el-rte',
+                lang     : '${language}',
                 height   : 350,
                 toolbar  : 'maxi',
                 doctype  : '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">', //'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">',
-                cssfiles : ['/images/jquery/plugins/elrteEditor/css/elrte-inner.css']
+                cssfiles : ['/images/jquery/plugins/elrte-1.3/css/elrte-inner.css']
             }
             jQuery('#cmseditor').elrte(opts);
         }

Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml Sun Oct  2 12:22:57 2011
@@ -186,6 +186,7 @@ under the License.
                 <entity-one entity-name="WebSite" value-field="webSite"/>
 
                 <script location="component://content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy"/>
+                <set field="language" from-field="userLogin.lastLocale" default-value="en"/>
             </actions>
             <widgets>
                 <screenlet title="${uiLabelMap.PageTitleWebSiteCMSNav}">

Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml Sun Oct  2 12:22:57 2011
@@ -48,12 +48,9 @@
             <field-map field-name="partyIdFrom" from-field="parameters.parentpartyId"/>
         </entity-and>
         <if-not-empty field="partyRelationship">
-            <set field="fromDate" from-field="partyRelationship[0].fromDate"/>
+            <set-service-fields service-name="deletePartyRelationship" map="partyRelationship[0]" to-map="deletePartyRelationship"/>
         </if-not-empty>
-        <set field="orgRelCtx.partyIdTo" from-field="parameters.partyId"/>
-        <set field="orgRelCtx.partyIdFrom" from-field="parameters.parentpartyId"/>
-        <set field="orgRelCtx.fromDate" from-field="fromDate"/>
-        <call-service service-name="deletePartyRelationship" in-map-name="orgRelCtx"></call-service>
+        <call-service service-name="deletePartyRelationship" in-map-name="deletePartyRelationship"></call-service>
     </simple-method>
     
     <!-- Public Holiday -->

Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/WEB-INF/controller.xml Sun Oct  2 12:22:57 2011
@@ -1065,49 +1065,20 @@ under the License.
         <response name="success" type="view" value="main"/>
         <response name="error" type="view" value="main"/>
     </request-map>
-    <request-map uri="removeEmlpPosition">
-        <security https="true" auth="true"/>
-        <event type="simple" path="component://humanres/script/org/ofbiz/humanres/HumanResEvents.xml" invoke="removeEmlpPosition"/>
-        <response name="success" type="view" value="main"/>
-        <response name="error" type="view" value="main"/>
-    </request-map>
     <request-map uri="removeInternalOrg">
         <security https="true" auth="true"/>
         <event type="simple" path="component://humanres/script/org/ofbiz/humanres/HumanResEvents.xml" invoke="removeInternalOrg"/>
         <response name="success" type="view" value="main"/>
         <response name="error" type="view" value="main"/>
     </request-map>
-    <request-map uri="EditEmlPositionFtl">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditEmlPositionFtl"/>
-    </request-map>
     <request-map uri="EditInternalOrgFtl">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="EditInternalOrgFtl"/>
     </request-map>
-    <request-map uri="RemoveEmlPositionFtl">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="RemoveEmlPositionFtl"/>
-    </request-map>
     <request-map uri="RemoveInternalOrgFtl">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="RemoveInternalOrgFtl"/>
     </request-map>
-    <request-map uri="EditPerson">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditPerson"/>
-    </request-map>
-    <request-map uri="createEmplPositionFtl">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createEmplPosition"/>
-        <response name="success" type="view" value="main"/>
-        <response name="error" type="view" value="EditEmplPosition"/>
-    </request-map>
-    <request-map uri="createEmplPositionFulfillmentFtl">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createEmplPositionFulfillment"/>
-        <response name="success" type="view" value="main"/>
-    </request-map>
     <request-map uri="PublicHoliday">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="PublicHoliday"/>
@@ -1241,11 +1212,8 @@ under the License.
     <view-map name="EditEmplLeaveReasonTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditEmplLeaveReasonTypes"/>
     <view-map name="FindLeaveApprovals" type="screen" page="component://humanres/widget/EmplLeaveScreens.xml#FindLeaveApprovals"/>
     <view-map name="EditEmplLeaveStatus" type="screen" page="component://humanres/widget/EmplLeaveScreens.xml#EditEmplLeaveStatus"/>
-    <view-map name="EditEmlPositionFtl" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditEmplPositionFtl"/>
     <view-map name="EditInternalOrgFtl" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditInternalOrgFtl"/>
-    <view-map name="RemoveEmlPositionFtl" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#RemoveEmlPositionFtl"/>
     <view-map name="RemoveInternalOrgFtl" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#RemoveInternalOrgFtl"/>
-    <view-map name="EditPerson" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditPerson"/>
     
     <!-- ==================Recruitment View Map===================== -->
     <view-map name="FindJobRequisitions" type="screen" page="component://humanres/widget/RecruitmentScreens.xml#FindJobRequisitions"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/category/CategoryTree.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/category/CategoryTree.ftl?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/category/CategoryTree.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/category/CategoryTree.ftl Sun Oct  2 12:22:57 2011
@@ -137,13 +137,13 @@ var rawdata = [
                 dataSet = {"partyId" : NODE.attr("id")};
                 jQuery.ajax({
                     type: "GET",
-                    url: "EditEmlPositionFtl",
+                    url: "EditEmplPosition",
                     data: dataSet,
                     error: function(msg) {
                         alert("An error occured loading content! : " + msg);
                     },
                     success: function(msg) {
-                        jQuery('#dialog').html(msg);
+                        jQuery('div.page-container').html(msg);
                     }
                 });
             }
@@ -188,23 +188,23 @@ var rawdata = [
     if(node.attr('rel')=='N'){
         var items = {
             AddPerson: {
-            label: "Add Person",
-            action: function (NODE, TREE_OBJ) {
-                var dataSet = {};
-                dataSet = {"emplPositionId" : NODE.attr("id")};
-                jQuery.ajax({
-                    type: "GET",
-                    url: "EditPerson",
-                    data: dataSet,
-                    error: function(msg) {
-                        alert("An error occured loading content! : " + msg);
-                    },
-                    success: function(msg) {
-                        jQuery('#dialog').html(msg);
-                    }
-                });
-            }
-        }
+                label: "Add Person",
+                action: function (NODE, TREE_OBJ) {
+                    var dataSet = {};
+                    dataSet = {"emplPositionId" : NODE.attr("id")};
+                    jQuery.ajax({
+                        type: "GET",
+                        url: "EditEmplPositionFulfillments",
+                        data: dataSet,
+                        error: function(msg) {
+                            alert("An error occured loading content! : " + msg);
+                        },
+                        success: function(msg) {
+                            jQuery('div.page-container').html(msg);
+                        }
+                    });
+                }
+            }
         }
     }
 

Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/emplposition/editemplposition.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/emplposition/editemplposition.ftl?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/emplposition/editemplposition.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/emplposition/editemplposition.ftl Sun Oct  2 12:22:57 2011
@@ -24,31 +24,4 @@ under the License.
 </script>
 <div id="emplposition" title="Add Employee Position">
     ${screens.render("component://humanres/widget/EmplPositionScreens.xml#EditEmplPositionOnlyForm")}
-</div>
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<script type="text/javascript">
-    $("#dialog").dialog('open');
-    $(function() {
-        $( "#emplposition" ).dialog({ autoOpen: true, width: 450});
-    });
-</script>
-<div id="emplposition" title="Add Employee Position">
-    ${screens.render("component://humanres/widget/EmplPositionScreens.xml#EditEmplPositionOnlyForm")}
 </div>
\ No newline at end of file

Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/emplposition/removeemplposition.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/emplposition/removeemplposition.ftl?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/emplposition/removeemplposition.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/emplposition/removeemplposition.ftl Sun Oct  2 12:22:57 2011
@@ -24,31 +24,4 @@ under the License.
 </script>
 <div id="rmvemplposition" title="Remove Employee Position">
     ${screens.render("component://humanres/widget/EmplPositionScreens.xml#RemoveEmplPositionOnlyForm")}
-</div>
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<script type="text/javascript">
-    $("#dialog").dialog('open');
-    $(function() {
-        $( "#rmvemplposition" ).dialog({ autoOpen: true, width: 900});
-    });
-</script>
-<div id="rmvemplposition" title="Remove Employee Position">
-    ${screens.render("component://humanres/widget/EmplPositionScreens.xml#RemoveEmplPositionOnlyForm")}
 </div>
\ No newline at end of file

Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/internalorg/editinternalorg.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/internalorg/editinternalorg.ftl?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/internalorg/editinternalorg.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/internalorg/editinternalorg.ftl Sun Oct  2 12:22:57 2011
@@ -24,31 +24,4 @@ under the License.
 </script>
 <div id="internalOrg" title="Add Internal Organization">
     ${screens.render("component://humanres/widget/EmplPositionScreens.xml#EditInternalOrgOnlyForm")}
-</div>
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<script type="text/javascript">
-    $("#dialog").dialog('open');
-    $(function() {
-        $( "#internalOrg" ).dialog({ autoOpen: true, width: 350});
-    });
-</script>
-<div id="internalOrg" title="Add Internal Organization">
-    ${screens.render("component://humanres/widget/EmplPositionScreens.xml#EditInternalOrgOnlyForm")}
 </div>
\ No newline at end of file

Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/internalorg/removeinternalorg.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/internalorg/removeinternalorg.ftl?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/internalorg/removeinternalorg.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/internalorg/removeinternalorg.ftl Sun Oct  2 12:22:57 2011
@@ -34,41 +34,4 @@ under the License.
         <input type="hidden" name="partyId" value="${parameters.partyId?if_exists}"/>
         <input type="hidden" name="parentpartyId" value="${parameters.parentpartyId?if_exists}"/>
     </form>
-</div>
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<#assign partyGroup = delegator.findOne("PartyGroup", {"partyId" : parameters.partyId?if_exists}, true)/>
-<#if partyGroup?has_content>
-    <#assign partyname = partyGroup.groupName?if_exists/>
-</#if>
-<script type="text/javascript">
-    <!--
-    var answer = confirm ("Are you sure you want to remove '<#if partyname?exists>${partyname}<#else>${parameters.partyId?if_exists}</#if>'?")
-    if (answer)
-       document.removeInternalOrg.submit();
-    else
-       window.close();
-    // -->
-</script>
-<div id="rmvinternalorg" title="Remove Internal Organization">
-    <form name="removeInternalOrg" method="post" action="<@ofbizUrl>removeInternalOrg</@ofbizUrl>">
-        <input type="hidden" name="partyId" value="${parameters.partyId?if_exists}"/>
-        <input type="hidden" name="parentpartyId" value="${parameters.parentpartyId?if_exists}"/>
-    </form>
 </div>
\ No newline at end of file

Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/widget/EmplPositionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/widget/EmplPositionScreens.xml?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/humanres/widget/EmplPositionScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/humanres/widget/EmplPositionScreens.xml Sun Oct  2 12:22:57 2011
@@ -301,28 +301,6 @@
             </widgets>
         </section>
     </screen>
-    <screen name="EditEmplPositionFtl">
-        <section>
-            <widgets>
-                <platform-specific><html><html-template location="component://humanres/webapp/humanres/humanres/emplposition/editemplposition.ftl"/></html></platform-specific>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="EditEmplPositionOnlyForm">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleEditEmplPosition"/>
-                <set field="tabButtonItem" value="EditEmplPosition"/>
-                <set field="emplPositionId" from-field="parameters.emplPositionId"/>
-                <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <entity-one entity-name="EmplPosition" value-field="emplPosition"/>
-            </actions>
-            <widgets>
-                <include-form name="EditEmplPositionFtl" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
-            </widgets>
-        </section>
-    </screen>
     <screen name="EditInternalOrgFtl">
         <section>
             <actions>
@@ -345,27 +323,6 @@
             </widgets>
         </section>
     </screen>
-    <screen name="RemoveEmlPositionFtl">
-        <section>
-            <widgets>
-                <platform-specific><html><html-template location="component://humanres/webapp/humanres/humanres/emplposition/removeemplposition.ftl"/></html></platform-specific>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="RemoveEmplPositionOnlyForm">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleRemoveEmplPosition"/>
-                <set field="tabButtonItem" value="RemoveEmplPosition"/>
-                <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <entity-one entity-name="EmplPosition" value-field="emplPosition"/>
-            </actions>
-            <widgets>
-                <include-form name="ListEmplPositionsFtl" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
-            </widgets>
-        </section>
-    </screen>
     <screen name="RemoveInternalOrgFtl">
         <section>
             <widgets>
@@ -373,28 +330,4 @@
             </widgets>
         </section>
     </screen>
-    <screen name="EditEmplPositionFulfillmentsFtl">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleListEmplPositionFulfillments"/>
-                <set field="tabButtonItem" value="EditEmplPositionFulfillments"/>
-                <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="emplPositionId" from-field="parameters.emplPositionId"/>
-            </actions>
-            <widgets>
-                <screenlet id="AddEmplPositionFulfillmentPanel">
-                    <include-form name="AddEmplPositionFulfillmentFtl" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
-                </screenlet>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="EditPerson">
-        <section>
-            <widgets>
-                <platform-specific><html><html-template location="component://humanres/webapp/humanres/humanres/emplposition/editperson.ftl"/></html></platform-specific>
-            </widgets>
-        </section>
-    </screen>
 </screens>

Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/EmplPositionForms.xml?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/EmplPositionForms.xml Sun Oct  2 12:22:57 2011
@@ -98,9 +98,6 @@ under the License.
         <field name="submitButton" use-when="emplPosition==null" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <field name="submitButton" use-when="emplPosition!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="EditEmplPositionFtl" type="single" extends="EditEmplPosition">
-        <alt-target use-when="emplPosition==null" target="createEmplPositionFtl"/>
-    </form>
     <form name="ListEmplPositionFulfillments" type="list" target="updateEmplPositionFulfillment" title="" paginate-target="findEmplPositionFulfillments"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
@@ -346,34 +343,4 @@ under the License.
         <field name="dummy1" title="${uiLabelMap.CommonEmptyHeader}" position="1"><display/></field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
-    <form name="ListEmplPositionsFtl" extends="ListEmplPositions">
-        <field name="salaryFlag"><hidden/></field>
-        <field name="exemptFlag"><hidden/></field>
-        <field name="fulltimeFlag"><hidden/></field>
-        <field name="temporaryFlag"><hidden/></field>
-        <field name="actualFromDate"><hidden/></field>
-        <field name="actualThruDate"><hidden/></field>
-        <field name="removeButton" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-           <hyperlink description="${uiLabelMap.CommonRemove}" target="removeEmlpPosition">
-                <parameter param-name="emplPositionId"/>
-                <parameter param-name="partyId"/>
-            </hyperlink>
-        </field>
-    </form>
-    <form name="AddEmplPositionFulfillmentFtl" type="single" target="createEmplPositionFulfillmentFtl"
-        header-row-style="header-row" default-table-style="basic-table">
-        <auto-fields-service service-name="createEmplPositionFulfillment"/>
-        <field name="partyId" tooltip="${uiLabelMap.CommonRequired}">
-            <drop-down allow-empty="false" >
-                <entity-options description="${partyId}" entity-name="PartyRole" key-field-name="partyId">
-                    <entity-constraint name="roleTypeId" value="EMPLOYEE"/>
-                    <entity-order-by field-name="partyId"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="emplPositionId"><hidden /></field>
-        <field name="fromDate" title="${uiLabelMap.CommonFromDate}" tooltip="${uiLabelMap.CommonRequired}"/>
-        <field name="dummy1" title="${uiLabelMap.CommonEmptyHeader}" position="1"><display/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
-    </form>
 </forms>

Modified: ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml Sun Oct  2 12:22:57 2011
@@ -4990,4 +4990,7 @@
         <value xml:lang="zh_CN">shoppingListId 是必须的参数</value>
         <value xml:lang="zh_TW">購物列表ID是一個必須的參數。</value>
     </property>
+    <property key="OrderCannotAddVirtualProductToQuote">
+        <value xml:lang="en">You cannot add a 'Virtual' product here, select one of the related variants.</value>
+    </property>
 </resource>

Modified: ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml Sun Oct  2 12:22:57 2011
@@ -431,21 +431,6 @@
         <value xml:lang="zh">有效吗</value>
         <value xml:lang="zh_TW">有效嗎</value>
     </property>
-    <property key="FormFieldTitle_isPublic">
-        <value xml:lang="ar">جمهور</value>
-        <value xml:lang="de">Ist öffentlich</value>
-        <value xml:lang="en">Is Public</value>
-        <value xml:lang="es">Es público</value>
-        <value xml:lang="fr">Est public</value>
-        <value xml:lang="it">E' Pubblica</value>
-        <value xml:lang="nl">Publiekelijk toegankelijk</value>
-        <value xml:lang="pt_BR">É Pulico</value>
-        <value xml:lang="ro">Este Public</value>
-        <value xml:lang="ru">Публичный?</value>
-        <value xml:lang="th">สาธารณะ</value>
-        <value xml:lang="zh">公开吗</value>
-        <value xml:lang="zh_TW">公開嗎</value>
-    </property>
     <property key="FormFieldTitle_isRushOrder">
         <value xml:lang="de">Ist Eilauftrag</value>
         <value xml:lang="en">Is Rush Order</value>

Propchange: ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct  2 12:22:57 2011
@@ -2,4 +2,4 @@
 /ofbiz/branches/dojo1.4/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-952957
 /ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:952958-1044489
 /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264
-/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:962442-1176458
+/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:962442-1178182

Modified: ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Sun Oct  2 12:22:57 2011
@@ -343,6 +343,11 @@ under the License.
         <if-empty field="parameters.quoteUnitPrice">
             <if-not-empty field="parameters.productId">
                 <entity-one entity-name="Product" value-field="product"/>
+                <if-compare operator="equals" value="Y" field="product.isVirtual">
+                    <add-error>
+                        <fail-property resource="OrderErrorUiLabels" property="OrderCannotAddVirtualProductToQuote"/>
+                    </add-error>
+                </if-compare>
                 <if>
                     <condition>
                         <and>

Propchange: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct  2 12:22:57 2011
@@ -2,4 +2,4 @@
 /ofbiz/branches/dojo1.4/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-952957
 /ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:952958-1044489
 /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
-/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:962442-1176458
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:962442-1178182

Propchange: ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct  2 12:22:57 2011
@@ -2,4 +2,4 @@
 /ofbiz/branches/dojo1.4/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-952957
 /ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:952958-1044489
 /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264
-/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:962442-1176458
+/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:962442-1178182

Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FieldLookupForms.xml?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FieldLookupForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FieldLookupForms.xml Sun Oct  2 12:22:57 2011
@@ -149,7 +149,7 @@ under the License.
             </drop-down>
         </field>
         <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
-            <drop-down allow-empty="false" no-current-selected-key="${defaultOrganizationPartyCurrencyUomId}">
+            <drop-down allow-empty="false" no-current-selected-key="${defaultCurrencyUomId}">
                 <entity-options key-field-name="uomId" description="${description} - ${abbreviation}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
                     <entity-order-by field-name="description"/>

Modified: ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml Sun Oct  2 12:22:57 2011
@@ -10317,6 +10317,21 @@
         <value xml:lang="zh">有数据库表</value>
         <value xml:lang="zh_TW">有資料庫表</value>
     </property>
+    <property key="FormFieldTitle_isPublic">
+        <value xml:lang="ar">جمهور</value>
+        <value xml:lang="de">Ist öffentlich</value>
+        <value xml:lang="en">Is Public</value>
+        <value xml:lang="es">Es público</value>
+        <value xml:lang="fr">Accès public</value>
+        <value xml:lang="it">E' Pubblica</value>
+        <value xml:lang="nl">Publiekelijk toegankelijk</value>
+        <value xml:lang="pt_BR">É Pulico</value>
+        <value xml:lang="ro">Este Public</value>
+        <value xml:lang="ru">Публичный?</value>
+        <value xml:lang="th">สาธารณะ</value>
+        <value xml:lang="zh">公开吗</value>
+        <value xml:lang="zh_TW">公開嗎</value>
+    </property>
     <property key="FormFieldTitle_lastModifiedByUserLogin">
         <value xml:lang="ar">آخر تغيير من طرف المستخدم</value>
         <value xml:lang="de">Zuletzt geändert von Benutzeranmeldung</value>

Propchange: ofbiz/branches/jackrabbit20100709/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct  2 12:22:57 2011
@@ -2,4 +2,4 @@
 /ofbiz/branches/dojo1.4/framework/common/widget/HelpScreens.xml:951708-952957
 /ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml:952958-1044489
 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264
-/ofbiz/trunk/framework/common/widget/HelpScreens.xml:962442-1176458
+/ofbiz/trunk/framework/common/widget/HelpScreens.xml:962442-1178182

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/css/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/css/smoothness/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/css/smoothness/images/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/images/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/images/smileys/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/js/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/js/i18n/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/src/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/src/ellib/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/src/ellib/css/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/src/ellib/images/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/src/ellib/js/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/src/elrte/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/src/elrte/css/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/src/elrte/images/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/src/elrte/images/smileys/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/src/elrte/js/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/src/elrte/js/i18n/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/elrte-1.3/src/elrte/js/ui/
------------------------------------------------------------------------------
    bugtraq:number = true

Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/selectall.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/selectall.js?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/selectall.js (original)
+++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/selectall.js Sun Oct  2 12:22:57 2011
@@ -658,6 +658,7 @@ function ajaxInPlaceEditDisplayField(ele
     jElement.editable(function(value, settings){
         // removes all line breaks from the value param, because the parseJSON Function can't work with line breaks
      value = value.replace(/\n/g, " ");
+     value = value.replace(/\"/g,"&quot;");
 
         var resultField = jQuery.parseJSON('{"' + settings.name + '":"' + value + '"}');
         // merge both parameter objects together

Propchange: ofbiz/branches/jackrabbit20100709/framework/security/data/PasswordSecurityData.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct  2 12:22:57 2011
@@ -2,4 +2,4 @@
 /ofbiz/branches/dojo1.4/applications/securityext/data/PasswordSecurityData.xml:951708-952957
 /ofbiz/branches/jquery/applications/securityext/data/PasswordSecurityData.xml:952958-1044489
 /ofbiz/branches/multitenant20100310/applications/securityext/data/PasswordSecurityData.xml:921280-927264
-/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:962442-1176458
+/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:962442-1178182

Modified: ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java (original)
+++ ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java Sun Oct  2 12:22:57 2011
@@ -111,9 +111,9 @@ public class ServerHitBin {
     }
 
     protected static void countHit(String baseId, int type, HttpServletRequest request, long startTime, long runningTime, GenericValue userLogin, boolean isOriginal) {
-        Delegator delegator = (Delegator)request.getAttribute("delegator");
-        if (delegator == null){
-            String delegatorName = (String)request.getSession().getAttribute("delegatorName");
+        Delegator delegator = (Delegator) request.getAttribute("delegator");
+        if (delegator == null) {
+            String delegatorName = (String) request.getSession().getAttribute("delegatorName");
             delegator = DelegatorFactory.getDelegator(delegatorName);
         }
         if (delegator == null) {

Modified: ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java (original)
+++ ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java Sun Oct  2 12:22:57 2011
@@ -490,8 +490,8 @@ public class HtmlFormRenderer extends Ht
         writer.append("</textarea>");
 
         if (textareaField.getVisualEditorEnable()) {
-            writer.append("<script language=\"javascript\" src=\"/images/jquery/plugins/elrteEditor/elrte.min.js\" type=\"text/javascript\"></script>");
-            writer.append("<link href=\"/images/jquery/plugins/elrteEditor/css/elrte.full.css\" rel=\"stylesheet\" type=\"text/css\">");
+            writer.append("<script language=\"javascript\" src=\"/images/jquery/plugins/elrte-1.3/js/elrte.min.js\" type=\"text/javascript\"></script>");
+            writer.append("<link href=\"/images/jquery/plugins/elrte-1.3/css/elrte.min.css\" rel=\"stylesheet\" type=\"text/css\">");
             writer.append("<script language=\"javascript\" type=\"text/javascript\"> var opts = { cssClass : 'el-rte', toolbar : ");
             // define the toolsbar
             String buttons = textareaField.getVisualEditorButtons(context);
@@ -501,7 +501,7 @@ public class HtmlFormRenderer extends Ht
                 writer.append("maxi");
             }
             writer.append(", doctype  : '<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">', //'<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\">'");
-            writer.append(", cssfiles : ['/images/jquery/plugins/elrteEditor/css/elrte-inner.css'] ");
+            writer.append(", cssfiles : ['/images/jquery/plugins/elrte-1.3/css/elrte-inner.css'] ");
             writer.append("}");
             // load the wysiwyg editor
             writer.append("jQuery('#");