You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2011/10/02 14:23:04 UTC
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...
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="<@o...@ofbizContentUrl>"></script>
-<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<#if language?has_content && language != "en">
+<script language="javascript" src="<@o...@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="<@o...@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,""");
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('#");