OFBiz › OFBiz - Commits

svn commit: r889851 [12/17] - in /ofbiz/branches/addbirt: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/data/helpdata/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/fin...

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

svn commit: r889851 [12/17] - in /ofbiz/branches/addbirt: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/data/helpdata/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/fin...

doogie-3
Modified: ofbiz/branches/addbirt/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/product/config/ProductUiLabels.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/addbirt/applications/product/config/ProductUiLabels.xml Fri Dec 11 23:11:39 2009
@@ -29,7 +29,7 @@
         <value xml:lang="es">La dirección de facturación es la misma que la dirección de envío</value>
         <value xml:lang="fr">L'adresse de facturation est la même que celle de livraison</value>
         <value xml:lang="it">Indirizzo Fatturazione è lo stesso di quello di Spedizione</value>
-        <value xml:lang="nl">Faktuur adres is hetzelfde als het verzend adres</value>
+        <value xml:lang="nl">Faktuuradres is hetzelfde als het verzendadres</value>
         <value xml:lang="ro">Adresa Facturare este aceiasi cu cel de expediere</value>
         <value xml:lang="ru">Платежный адрес тот же что и адрес доставки</value>
         <value xml:lang="th">ที่อยู่ใบเสร็จรับเงินเหมือนกับที่อยู่การส่งสินค้า</value>
@@ -42,6 +42,7 @@
         <value xml:lang="es">OFBiz: Administrador de Almacén</value>
         <value xml:lang="fr">OFBiz: Gestion de stock</value>
         <value xml:lang="it">OFBiz: Gestione stabilimenti</value>
+        <value xml:lang="nl">OFBiz: Faciliteit Manager</value>
         <value xml:lang="ro">OFBiz: Gestiune Compartimente</value>
         <value xml:lang="ru">OFBiz: Управление объектами</value>
         <value xml:lang="th">OFBiz: การจัดการคลังสินค้า</value>
@@ -51,12 +52,14 @@
         <value xml:lang="en">Part of the Open For Business Family of Open Source Software</value>
         <value xml:lang="fr">Un module de la famille Open For Business, logiciel libre de gestion d'entreprise.</value>
         <value xml:lang="it">Part of the Open For Business Family of Open Source Software</value>
+        <value xml:lang="nl">Deel van de 'Open For Business' familie van open source software</value>
         <value xml:lang="zh">开源软件OFBiz的组成部分</value>
     </property>
     <property key="FacilityEstimatedShippingCharges">
         <value xml:lang="en">Estimated shipping charges</value>
         <value xml:lang="fr">Frais d'expédition estimés</value>
         <value xml:lang="it">Ricarico di spedizione stimato</value>
+        <value xml:lang="nl">Geschatte verzendkosten</value>
     </property>
     <property key="FacilityFacility">
         <value xml:lang="de">Lager</value>
@@ -134,7 +137,7 @@
         <value xml:lang="es">Por defecto: Ningún otro medio de envío disponible</value>
         <value xml:lang="fr">Par défaut : Aucun autre moyen d'expédition possible</value>
         <value xml:lang="it">Usare Default: Nessun altro metodo di spedizione disponibile.</value>
-        <value xml:lang="nl">Gebruik Standaard: Geen andere verzend methoden beschikbaar.</value>
+        <value xml:lang="nl">Gebruik Standaard: Geen andere verzendmethoden beschikbaar.</value>
         <value xml:lang="ro">Foloseste Default: Nici-o alta metoda de  expediere disponibila.</value>
         <value xml:lang="ru">Использовать по умолчанию: Не доступен ни один способ доставки.</value>
         <value xml:lang="th">ใช้ค่าเริ่มต้น : ไม่มีวิธีการขนส่งสินค้าอื่น ๆ ที่นำไปใช้ได้</value>
@@ -4640,6 +4643,7 @@
         <value xml:lang="es">Elegir Categoría Principal</value>
         <value xml:lang="fr">Choix de la catégorie principale</value>
         <value xml:lang="it">Scegli Categoria Principale</value>
+        <value xml:lang="nl">Lijst van hoofdcategoriën</value>
         <value xml:lang="ro">Alege Categoria Principala</value>
         <value xml:lang="ru">Выбр. корнев. категорию</value>
         <value xml:lang="th">เลือกหมวดหมู่ที่ได้รับความนิยม</value>
@@ -4747,6 +4751,7 @@
         <value xml:lang="es">Editar Categoría</value>
         <value xml:lang="fr">Modification de la catégorie</value>
         <value xml:lang="it">Mostra Categoria</value>
+        <value xml:lang="nl">Wijzig categorie</value>
         <value xml:lang="ro">Afiseaza Categoria</value>
         <value xml:lang="ru">Редактировать категорию</value>
         <value xml:lang="th">แก้ไขหมวดหมู่</value>
@@ -4821,6 +4826,7 @@
         <value xml:lang="es">Editar Productos de una Categoría</value>
         <value xml:lang="fr">Modification des catégories</value>
         <value xml:lang="it">Aggiorna Categoria Prodotti</value>
+        <value xml:lang="nl">Wijzig categorieproducten</value>
         <value xml:lang="ro">Actualizeaza Categoria Produs</value>
         <value xml:lang="ru">Изменить категорию продуктов</value>
         <value xml:lang="th">แก้ไขหมวดหมู่สินค้า</value>
@@ -4832,6 +4838,7 @@
         <value xml:lang="es">Editar jerarquía de una Categoría</value>
         <value xml:lang="fr">Modification de la hiérarchie des catégorie</value>
         <value xml:lang="it">Aggiorna Categoria Arrivo</value>
+        <value xml:lang="nl">Wijzig categorie hiërarchie</value>
         <value xml:lang="ro">Actualizeaza Categoria Sosire</value>
         <value xml:lang="ru">Изменить подчиненность категории</value>
         <value xml:lang="th">Edit Category Rollup</value>
@@ -5064,6 +5071,7 @@
         <value xml:lang="es">Editar Producto</value>
         <value xml:lang="fr">Modification de l'article</value>
         <value xml:lang="it">Aggiorna Prodotto</value>
+        <value xml:lang="nl">Wijzig product</value>
         <value xml:lang="ro">Actualizeaza Produs</value>
         <value xml:lang="ru">Редактировать продукт</value>
         <value xml:lang="th">แก้ไขสินค้า</value>
@@ -5383,6 +5391,7 @@
         <value xml:lang="es">Editar Reglas de Precio de un Producto</value>
         <value xml:lang="fr">Modification des règles de prix des articles</value>
         <value xml:lang="it">Aggiorna Regole Prezzo Prodotto</value>
+        <value xml:lang="nl">Wijzig productprijsregels</value>
         <value xml:lang="ro">Actualizeaza Reguli Pret Produs</value>
         <value xml:lang="ru">Изменить правила назначения цены продукта</value>
         <value xml:lang="th">แก้ไขข้อกำหนดราคาสินค้า</value>
@@ -5892,6 +5901,7 @@
         <value xml:lang="es">Buscar Regla de Precios de Productos</value>
         <value xml:lang="fr">Recherche de règles de prix</value>
         <value xml:lang="it">Ricerca Regole Prezzo Prodotto</value>
+        <value xml:lang="nl">Zoek productprijsregels</value>
         <value xml:lang="ro">Cauta Reguli Pret Produs</value>
         <value xml:lang="ru">Найти правила назначения цены продукта</value>
         <value xml:lang="th">ค้นหาสถานะราคาสินค้า</value>
@@ -6143,6 +6153,7 @@
         <value xml:lang="es">Buscar Producto y precio</value>
         <value xml:lang="fr">Consulter les prix d'un article</value>
         <value xml:lang="it">Ricerca Prodotti e Prezzi</value>
+        <value xml:lang="nl">Zoeken productprijs</value>
         <value xml:lang="ro">Cauta Produse si Preturi</value>
         <value xml:lang="ru">Искать продукт и цену</value>
         <value xml:lang="th">ค้นหาสินค้าและราคา</value>
@@ -6154,6 +6165,7 @@
         <value xml:lang="es">Buscar tienda de producto</value>
         <value xml:lang="fr">Consulter le centre de profit</value>
         <value xml:lang="it">Ricerca Negozi</value>
+        <value xml:lang="nl">Zoeken winkel</value>
         <value xml:lang="ro">Cauta Magazine</value>
         <value xml:lang="ru">Искать склад продуктов</value>
         <value xml:lang="th">ค้นหาคลังสินค้า</value>
@@ -6939,6 +6951,7 @@
         <value xml:lang="es">Añadir Regla de Precios</value>
         <value xml:lang="fr">Ajouter des règles de prix</value>
         <value xml:lang="it">Aggiungi Regole Prezzo</value>
+        <value xml:lang="nl">Toevoegen prijsregel</value>
         <value xml:lang="ro">Adauga Reguli Pret</value>
         <value xml:lang="ru">Добавить правило</value>
         <value xml:lang="th">เพิ่มข้อบังคับราคา</value>
@@ -7384,6 +7397,7 @@
         <value xml:lang="es">Palabra clave alterna para la Enciclopedia</value>
         <value xml:lang="fr">Thésaurus de mots clés de remplacement</value>
         <value xml:lang="it">Alternare Chiave Dizionario</value>
+        <value xml:lang="nl">Alternieve trefwoordsynoniemen</value>
         <value xml:lang="ro">Alternare Cheie Dictionar</value>
         <value xml:lang="ru">Словарь альтернативных ключевых слов</value>
         <value xml:lang="th">Alternate KeyWord Thesaurus</value>
@@ -7798,6 +7812,7 @@
         <value xml:lang="es">Creación Automática de Palabras Clave para todos los Productos</value>
         <value xml:lang="fr">Création automatique de mots-clés pour tout article</value>
         <value xml:lang="it">Creazione Automatica Chiavi per Tutti i Prodotti</value>
+        <value xml:lang="nl">Automatisch aanmaken trefwoorden voor alle producten</value>
         <value xml:lang="ro">Creatie Automatica Chei pentru Toate Produsele </value>
         <value xml:lang="ru">Автоматически создать ключевые слова для всех продуктов</value>
         <value xml:lang="th">สร้างคีย์เวิร์ดอัตโนมัติสำหรับสินค้าทั้งหมด</value>
@@ -7878,6 +7893,7 @@
         <value xml:lang="es">Regresar a Editar Categoría</value>
         <value xml:lang="fr">Revenir à l'édition des catégories</value>
         <value xml:lang="it">Torna all'Aggiornamento della Categoria</value>
+        <value xml:lang="nl">Terug naar wijzigen categorie</value>
         <value xml:lang="ro">Intoarcete la Actualizarea Categoriei</value>
         <value xml:lang="ru">Обратно к редактированию категории</value>
         <value xml:lang="th">กลับไปยังการแก้ไขหมวดหมู่</value>
@@ -8017,6 +8033,7 @@
         <value xml:lang="es">Examinar Catálogos</value>
         <value xml:lang="fr">Consulter les catalogues</value>
         <value xml:lang="it">Mostra Cataloghi</value>
+ <value xml:lang="nl">Blader door catalogi</value>
         <value xml:lang="ro">Afiseaza Catalog</value>
         <value xml:lang="ru">Каталоги</value>
         <value xml:lang="th">แสดงหมวดหมู่</value>
@@ -8031,7 +8048,7 @@
         <value xml:lang="hi_IN">सूची देखिये</value>
         <value xml:lang="it">Sfoglia le categorie</value>
         <value xml:lang="ja">カタログの表示</value>
-        <value xml:lang="nl">Bekijk Categorieen</value>
+        <value xml:lang="nl">Bekijk Categorieën</value>
         <value xml:lang="pt_PT">Pesquisar Categorias</value>
         <value xml:lang="ro">Afisare Categorie</value>
         <value xml:lang="ru">Просмотр категорий</value>
@@ -8202,6 +8219,7 @@
         <value xml:lang="es">Página Principal de Administración de Catálogos</value>
         <value xml:lang="fr">Gestion des articles - Page Principale -</value>
         <value xml:lang="it">Pagina Principale Amministrazione Cataloghi</value>
+        <value xml:lang="nl">Hoofdpagina catalogusbeheer</value>
         <value xml:lang="ro">Pagina Principala Administratie Cataloage</value>
         <value xml:lang="ru">Главная страница администрирования каталога</value>
         <value xml:lang="th">หน้าหลักการจัดการหมวดหมู่</value>
@@ -8233,6 +8251,7 @@
         <value xml:lang="es">Lista detallada de Catálogos</value>
         <value xml:lang="fr">Liste des catalogues</value>
         <value xml:lang="it">Lista Dettaglio Catalogo</value>
+        <value xml:lang="nl">Lijst van catalogi</value>
         <value xml:lang="ro">Lista Detaliu Catalog</value>
         <value xml:lang="ru">Список каталогов</value>
         <value xml:lang="th">รายการรายละเอียดหมวดหมู่</value>
@@ -8266,6 +8285,7 @@
         <value xml:lang="es">Adplicación de Administración de Catálogos</value>
         <value xml:lang="fr">Application de gestion des articles</value>
         <value xml:lang="it">Applicazione Gestione Cataloghi</value>
+        <value xml:lang="nl">Catalogus Manager</value>
         <value xml:lang="ro">Aplicatie Gestiune Catalog</value>
         <value xml:lang="ru">Управление каталогом продуктов</value>
         <value xml:lang="th">โปรแกรมประยุกต์การจัดการหมวดหมู่</value>
@@ -8288,6 +8308,7 @@
         <value xml:lang="es">Nombre de Catálogo</value>
         <value xml:lang="fr">Nom du catalogue</value>
         <value xml:lang="it">Nome Catalogo</value>
+        <value xml:lang="nl">Catalogusnaam</value>
         <value xml:lang="ro">Nume Catalog</value>
         <value xml:lang="ru">Имя каталога</value>
         <value xml:lang="th">ชื่อหมวดหมู่</value>
@@ -8299,6 +8320,7 @@
         <value xml:lang="es">Nombre de Catálogo [Código]</value>
         <value xml:lang="fr">Catalogue ; Nom ; [Réf.]</value>
         <value xml:lang="it">Nome Catalogo [Codice]</value>
+        <value xml:lang="nl">Catalogusnaam [ID]</value>
         <value xml:lang="ro">Nume Catalog [Cod]</value>
         <value xml:lang="ru">Имя каталога [Код]</value>
         <value xml:lang="th">ชื่อหมวดหมู่ [รหัส]</value>
@@ -8464,6 +8486,7 @@
         <value xml:lang="es">Productos de esta Categoría</value>
         <value xml:lang="fr">Articles appartenant à cette catégorie</value>
         <value xml:lang="it">Prodotti per questa categoria</value>
+        <value xml:lang="nl">Producten in deze categorie</value>
         <value xml:lang="ro">Produse pentru aceasta categorie</value>
         <value xml:lang="ru">Продукты из категории</value>
         <value xml:lang="th">สินค้าจากหมวดหมู่นี้
@@ -8715,6 +8738,7 @@
         <value xml:lang="es">Elegir Categoría principal</value>
         <value xml:lang="fr">Choisir une catégorie supérieure</value>
         <value xml:lang="it">Scegli Categoria Principale</value>
+        <value xml:lang="nl">Lijst van hoofdcategoriën</value>
         <value xml:lang="ro">Alege Categorii Principale</value>
         <value xml:lang="ru">Категория верх. уровня</value>
         <value xml:lang="th">เลือกหมวดหมู่</value>
@@ -8896,6 +8920,7 @@
         <value xml:lang="es">Configuraciones</value>
         <value xml:lang="fr">Configurations</value>
         <value xml:lang="it">Configurazioni</value>
+        <value xml:lang="nl">Configuraties</value>
         <value xml:lang="ro">Configuratii</value>
         <value xml:lang="ru">Конфигурации</value>
         <value xml:lang="th">ตัวเลือก</value>
@@ -9230,6 +9255,7 @@
         <value xml:lang="es">Crear nuevo Catálogo</value>
         <value xml:lang="fr">Création d'un nouveau catalogue</value>
         <value xml:lang="it">Creare Nuovo Catalogo</value>
+        <value xml:lang="nl">Aanmaken nieuwe catalogus</value>
         <value xml:lang="ro">Creare Nou Catalog</value>
         <value xml:lang="ru">Новый каталог</value>
         <value xml:lang="th">สร้างหมวดหมู่ใหม่</value>
@@ -9241,6 +9267,7 @@
         <value xml:lang="es">Crear nueva Categoría</value>
         <value xml:lang="fr">Création d'une nouvelle catégorie</value>
         <value xml:lang="it">Creare nuova categoria</value>
+        <value xml:lang="nl">Aanmaken nieuwe categorie</value>
         <value xml:lang="ro">Creare Noua Categorie</value>
         <value xml:lang="ru">Новая категория</value>
         <value xml:lang="th">สร้างหมวดหมู่ใหม่</value>
@@ -9314,6 +9341,7 @@
         <value xml:lang="es">Crear nuevo Producto</value>
         <value xml:lang="fr">Création d'un nouvel article</value>
         <value xml:lang="it">Creare Nuovo Prodotto</value>
+        <value xml:lang="nl">Aanmaken nieuw product</value>
         <value xml:lang="ro">Creare Nou Produs</value>
         <value xml:lang="ru">Новый продукт</value>
         <value xml:lang="th">สร้างสินค้าใหม่</value>
@@ -9358,6 +9386,7 @@
         <value xml:lang="es">Crear Nueva Tienda de Productos</value>
         <value xml:lang="fr">Création d'un nouveau centre de profit</value>
         <value xml:lang="it">Creare Nuovo Negozio</value>
+        <value xml:lang="nl">Aanmaken nieuwe winkel</value>
         <value xml:lang="ro">Creare Nou Magazin</value>
         <value xml:lang="ru">Создать новый склад</value>
         <value xml:lang="th">สร้างคลังสินค้าใหม่</value>
@@ -9961,6 +9990,7 @@
         <value xml:lang="es">Editar Catálogo</value>
         <value xml:lang="fr">Modification du catalogue</value>
         <value xml:lang="it">Aggiorna Catalogo</value>
+        <value xml:lang="nl">Wijzig catalogus</value>
         <value xml:lang="ro">Actualizeaza Catalog</value>
         <value xml:lang="ru">Редактировать</value>
         <value xml:lang="th">แก้ไขหมวดหมู่</value>
@@ -9972,6 +10002,7 @@
         <value xml:lang="es">Editar Catálogo con Código</value>
         <value xml:lang="fr">Modification de catalogue avec sa référence</value>
         <value xml:lang="it">Aggiorna Catalogo con Codice Catalogo</value>
+        <value xml:lang="nl">Wijzigen catalogus met [ID]</value>
         <value xml:lang="ro">Actualizeaza Catalog cu Cod Catalog</value>
         <value xml:lang="ru">Редактировать каталог с кодом</value>
         <value xml:lang="th">แก้ไขหมวดหมู่ด้วยรหัสหมวดหมู่</value>
@@ -9983,6 +10014,7 @@
         <value xml:lang="es">Editar Categoría</value>
         <value xml:lang="fr">Modification de la catégorie</value>
         <value xml:lang="it">Aggiorna Categoria</value>
+        <value xml:lang="nl">Wijzig categorie</value>
         <value xml:lang="ro">Actualizeaza Categoria</value>
         <value xml:lang="ru">Редактировать</value>
         <value xml:lang="th">แก้ไขหมวดหมู่</value>
@@ -9994,6 +10026,7 @@
         <value xml:lang="es">Editar Categoría con Código</value>
         <value xml:lang="fr">Modification de la catégorie avec sa référence</value>
         <value xml:lang="it">Aggiorna Categoria con Codice Categoria</value>
+        <value xml:lang="nl">Wijzigen categorie met [ID]</value>
         <value xml:lang="ro">Actualizeaza Categoria cu Cod Categorie</value>
         <value xml:lang="ru">Редактировать категорию с кодом</value>
         <value xml:lang="th">แก้ไขหมวดหมู่ด้วยรหัสหมวดหมู่</value>
@@ -10082,6 +10115,7 @@
         <value xml:lang="es">Editar Producto</value>
         <value xml:lang="fr">Modification de l'article</value>
         <value xml:lang="it">Aggiorna Prodotto</value>
+        <value xml:lang="nl">Wijzig product</value>
         <value xml:lang="ro">Actualizeaza Produs</value>
         <value xml:lang="ru">Редактировать</value>
         <value xml:lang="th">แก้ไขสินค้า</value>
@@ -10111,6 +10145,7 @@
         <value xml:lang="es">Editar Producto con Código</value>
         <value xml:lang="fr">Modification de l'article de référence</value>
         <value xml:lang="it">Aggiorna Prodotto con Codice Prodotto</value>
+        <value xml:lang="nl">Wijzigen product met [ID]</value>
         <value xml:lang="ro">Actualizeaza Produs cu Cod Produs</value>
         <value xml:lang="ru">Редактировать продукт с кодом</value>
         <value xml:lang="th">แก้ไขสินค้าด้วยรหัสสินค้า</value>
@@ -10895,6 +10930,7 @@
         <value xml:lang="es">Carga rápida del Catálogo en el caché</value>
         <value xml:lang="fr">Chargement rapide d'article dans le cache</value>
         <value xml:lang="it">Caricamento Veloce Catalogo nella Cache</value>
+        <value xml:lang="nl">Catalogus in cache laden</value>
         <value xml:lang="ro">Incarcare Rapida Catalog in Cache</value>
         <value xml:lang="ru">Быстрая загрузка каталога в кэш</value>
         <value xml:lang="th">Fast Load Catalog into Cache</value>
@@ -10984,6 +11020,7 @@
         <value xml:lang="es">Características</value>
         <value xml:lang="fr">Caractéristiques</value>
         <value xml:lang="it">Caratteristiche</value>
+        <value xml:lang="nl">Kenmerken</value>
         <value xml:lang="ro">Caracteristici</value>
         <value xml:lang="ru">Особенности</value>
         <value xml:lang="th">ลักษณะ</value>
@@ -11107,6 +11144,7 @@
         <value xml:lang="es">Características</value>
         <value xml:lang="fr">Caractéristiques</value>
         <value xml:lang="it">Caratteristiche</value>
+        <value xml:lang="nl">Kenmerken</value>
         <value xml:lang="ro">Caracteristica</value>
         <value xml:lang="ru">Особенности</value>
         <value xml:lang="th">ลักษณะ</value>
@@ -11183,6 +11221,7 @@
         <value xml:lang="es">Buscar producto</value>
         <value xml:lang="fr">Recherche d'un article</value>
         <value xml:lang="it">Ricerca Prodotto</value>
+        <value xml:lang="nl">Zoek product</value>
         <value xml:lang="ro">Cauta Produs</value>
         <value xml:lang="ru">Искать</value>
         <value xml:lang="th">ค้นหาสินค้า</value>
@@ -11194,6 +11233,7 @@
         <value xml:lang="es">Buscar producto con Código</value>
         <value xml:lang="fr">Recherche d'un article avec sa référence</value>
         <value xml:lang="it">Ricerca Prodotto con Valore Codice</value>
+        <value xml:lang="nl">Zoeken product met [ID]</value>
         <value xml:lang="ro">Cauta Produs cu Valoare Cod</value>
         <value xml:lang="ru">Искать продукт с кодом</value>
         <value xml:lang="th">ค้นหาสินค้าด้วยค่ารหัส</value>
@@ -11461,6 +11501,7 @@
         <value xml:lang="es">Regla Global de precios</value>
         <value xml:lang="fr">Règle globale de prix</value>
         <value xml:lang="it">Regola Globale Prezzi</value>
+        <value xml:lang="nl">Algemene prijsregel</value>
         <value xml:lang="ro">Regula Globala Pret</value>
         <value xml:lang="ru">Глобальное правило ценообразования</value>
         <value xml:lang="th">ข้อบังคับราคาโดยรวม</value>
@@ -11472,6 +11513,7 @@
         <value xml:lang="es">Reglas Globales de precios</value>
         <value xml:lang="fr">Règles globales de prix</value>
         <value xml:lang="it">Regole Globali Prezzi</value>
+        <value xml:lang="nl">Algemene prijsregels</value>
         <value xml:lang="ro">Regula Globala Preturi</value>
         <value xml:lang="ru">Глобальные правила ценообразования</value>
         <value xml:lang="th">ข้อบังคับราคาโดยรวม</value>
@@ -13740,6 +13782,7 @@
         <value xml:lang="es">Nuevo catálogo</value>
         <value xml:lang="fr">Nouveau catalogue</value>
         <value xml:lang="it">Nuovo Catalogo Prodotti</value>
+        <value xml:lang="nl">Nieuwe productcatalogus</value>
         <value xml:lang="ro">Nou Catalog Produse</value>
         <value xml:lang="ru">Новый каталог</value>
         <value xml:lang="th">หมวดหมู่สินค้าใหม่</value>
@@ -14178,6 +14221,7 @@
         <value xml:lang="es">No se encontraron reglas de precio</value>
         <value xml:lang="fr">Règles de prix non trouvées</value>
         <value xml:lang="it">Nessuna Regola Prezzo trovata</value>
+        <value xml:lang="nl">Geen prijsregels gevonden</value>
         <value xml:lang="ro">Nici-o regula de Pret Gasita ProductNoProductsInCategory=Nici-un produs in categorie</value>
         <value xml:lang="ru">Не найдены правила ценообразования</value>
         <value xml:lang="th">ไม่พบข้อบังคับราคา</value>
@@ -15772,6 +15816,7 @@
         <value xml:lang="es">Nombre de la regla de precio [CÓDIGO]</value>
         <value xml:lang="fr">Nom de la règle de prix [réf]</value>
         <value xml:lang="it">Nome Regola Prezzo [Codice]</value>
+        <value xml:lang="nl">Naam prijsregel [ID]</value>
         <value xml:lang="ro">Nume Regula Pret [Cod]</value>
         <value xml:lang="ru">Имя правила ценообразования [Код]</value>
         <value xml:lang="th">ชื่อข้อกำหนดราคา [รหัส]</value>
@@ -15783,6 +15828,7 @@
         <value xml:lang="es">Reglas de precio</value>
         <value xml:lang="fr">Règles de prix</value>
         <value xml:lang="it">Regole Prezzo</value>
+        <value xml:lang="nl">Prijsregels</value>
         <value xml:lang="ro">Regula Pret</value>
         <value xml:lang="ru">Ценообразование</value>
         <value xml:lang="th">ข้อกำหนดราคา</value>
@@ -15937,6 +15983,7 @@
         <value xml:lang="es">Lista de catálogos de productos</value>
         <value xml:lang="fr">Liste des catalogues</value>
         <value xml:lang="it">Lista Cataloghi Prodotto</value>
+        <value xml:lang="nl">Lijst van catalogi</value>
         <value xml:lang="ro">Lista Cataloage Produs</value>
         <value xml:lang="ru">Список продуктовых каталогов</value>
         <value xml:lang="th">รายการหมวดหมู่สินค้า</value>
@@ -16336,6 +16383,7 @@
         <value xml:lang="es">Lista de tiendas de productos</value>
         <value xml:lang="fr">Liste des centres de profit</value>
         <value xml:lang="it">Lista Negozi</value>
+        <value xml:lang="nl">Lijst van winkels</value>
         <value xml:lang="ro">Lista Magazin</value>
         <value xml:lang="ru">Список складов</value>
         <value xml:lang="th">รายการคลังสินค้า</value>
@@ -16557,6 +16605,7 @@
         <value xml:lang="es">Promociones</value>
         <value xml:lang="fr">Promotions</value>
         <value xml:lang="it">Promozioni</value>
+        <value xml:lang="nl">Promoties</value>
         <value xml:lang="ro">Promotii</value>
         <value xml:lang="ru">Акции</value>
         <value xml:lang="th">โปรโมชัน</value>
@@ -17121,6 +17170,7 @@
         <value xml:lang="es">Crear rápido Virtuales a partir de variantes</value>
         <value xml:lang="fr">Créer rapidement un article virtuel depuis des variantes</value>
         <value xml:lang="it">Creazione Veloce Virtuali da Varianti</value>
+        <value xml:lang="nl">Aanmaken virtuele producten van variantproducten</value>
         <value xml:lang="ro">Creare Rapida Virtuala de Variante</value>
         <value xml:lang="ru">Быстро создать виртуальный из вариантов</value>
         <value xml:lang="th">สร้างทั้งหมดจากการเปลี่ยนแปลงอย่างรวดเร็ว</value>
@@ -17904,6 +17954,7 @@
         <value xml:lang="es">Revisiones</value>
         <value xml:lang="fr">Approbations</value>
         <value xml:lang="it">Recensioni</value>
+        <value xml:lang="nl">Klantbeoordelingen</value>
         <value xml:lang="ro">Recenzii</value>
         <value xml:lang="ru">Отзывы</value>
         <value xml:lang="th">ตรวจสอบ</value>
@@ -17935,6 +17986,7 @@
         <value xml:lang="es">Jerarquía</value>
         <value xml:lang="fr">Hiérarchie</value>
         <value xml:lang="it">Gerarchia</value>
+        <value xml:lang="nl">Hiërarchie</value>
         <value xml:lang="ro">Sosire</value>
         <value xml:lang="ru">Иерархия</value>
         <value xml:lang="th">Rollup</value>
@@ -18245,6 +18297,7 @@
         <value xml:lang="es">Buscar Productos</value>
         <value xml:lang="fr">Rechercher l'article</value>
         <value xml:lang="it">Ricerca Prodotti</value>
+        <value xml:lang="nl">Zoeken producten</value>
         <value xml:lang="ro">Cauta Produse </value>
         <value xml:lang="ru">Поиск продуктов</value>
         <value xml:lang="th">ค้นหาสินค้า</value>
@@ -19077,6 +19130,7 @@
         <value xml:lang="es">Envío</value>
         <value xml:lang="fr">Expédition</value>
         <value xml:lang="it">Metodi di Spedizione</value>
+        <value xml:lang="nl">Verzendmethoden</value>
         <value xml:lang="ru">Поставки</value>
         <value xml:lang="th">การขนส่ง</value>
         <value xml:lang="zh">送货</value>
@@ -19521,6 +19575,7 @@
         <value xml:lang="es">Nombre de tienda [código]</value>
         <value xml:lang="fr">Nom du centre de profit [réf]</value>
         <value xml:lang="it">Nome Negozio [Codice]</value>
+        <value xml:lang="nl">Naam winkel [ID]</value>
         <value xml:lang="ro">Nume Magazin [Cod]</value>
         <value xml:lang="ru">Имя склада [Код]</value>
         <value xml:lang="th">ชื่อคลังสินค้า [รหัส]</value>
@@ -19594,6 +19649,7 @@
         <value xml:lang="es">Tiendas</value>
         <value xml:lang="fr">Centres de profit</value>
         <value xml:lang="it">Negozi</value>
+        <value xml:lang="nl">Winkels</value>
         <value xml:lang="ro">Magazine</value>
         <value xml:lang="ru">Торговые точки</value>
         <value xml:lang="th">คลังสินค้า</value>
@@ -19747,6 +19803,7 @@
         <value xml:lang="es">Suscripciones</value>
         <value xml:lang="fr">Abonnements</value>
         <value xml:lang="it">Abbonamenti</value>
+        <value xml:lang="nl">Abonnementen</value>
         <value xml:lang="ro">Abonamente</value>
         <value xml:lang="ru">Подписки</value>
         <value xml:lang="th">การสั่งซื้อ</value>
@@ -20026,6 +20083,7 @@
         <value xml:lang="es">Tesauro</value>
         <value xml:lang="fr">Thésaurus</value>
         <value xml:lang="it">Sinonimi</value>
+        <value xml:lang="nl">Trefwoord synoniemen</value>
         <value xml:lang="ro">Sinonime</value>
         <value xml:lang="ru">Словари</value>
         <value xml:lang="th">สารานุกรม</value>

Modified: ofbiz/branches/addbirt/applications/product/data/ProductDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/product/data/ProductDemoData.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/product/data/ProductDemoData.xml (original)
+++ ofbiz/branches/addbirt/applications/product/data/ProductDemoData.xml Fri Dec 11 23:11:39 2009
@@ -32,6 +32,19 @@
     <ProductTypeAttr productTypeId="FINISHED_GOOD" attrName="Pricing Complete?"/>
     <ProductTypeAttr productTypeId="FINISHED_GOOD" attrName="Listing Approved?"/>
     
-    
-    
+    <!-- Not real examples just put there to avoid error -->
+    <ProductTypeAttr productTypeId="ASSET_USAGE" attrName="Asset usage?"/>
+    <ProductTypeAttr productTypeId="SERVICE" attrName="Service?"/>
+    <ProductTypeAttr productTypeId="GOOD" attrName="Good?"/>
+    <ProductTypeAttr productTypeId="RAW_MATERIAL" attrName="Raw material?"/>
+    <ProductTypeAttr productTypeId="SUBASSEMBLY" attrName="Subassembly?"/>
+    <ProductTypeAttr productTypeId="DIGITAL_GOOD" attrName="Digital Good?"/>
+    <ProductTypeAttr productTypeId="FINDIG_GOOD" attrName="Finished/Digital Good"/>
+    <ProductTypeAttr productTypeId="AGGREGATED" attrName="Configurable Good?"/>
+    <ProductTypeAttr productTypeId="MARKETING_PKG" attrName="Marketing Package?"/>
+    <ProductTypeAttr productTypeId="MARKETING_PKG_AUTO" attrName="Marketing Package: Auto Manufactured?"/>
+    <ProductTypeAttr productTypeId="MARKETING_PKG_PICK" attrName="Marketing Package: Pick Assembly?"/>
+    <ProductTypeAttr productTypeId="WIP" attrName="Work In Process?"/>
+    <ProductTypeAttr productTypeId="AGGREGATED_CONF" attrName="Configurable Good Configuration?"/>
+        
 </entity-engine-xml>

Modified: ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Fri Dec 11 23:11:39 2009
@@ -48,48 +48,44 @@
             estimatedShipDate: estimatedShipWorkEffId
             estimatedArrivalDate: estimatedArrivalWorkEffId
         -->
-        <!-- always create the WorkEfforts, even if dates aren't specified yet; when they are they will be set in the update service... -->
-
-        <!-- the Ship WorkEffort entity -->
-        <!-- SC 20070816 I am commenting out the shipment work efforts because there seems to be no code
-        <set value="Shipment #${newEntity.shipmentId} Ship" field="shipWorkEffortMap.workEffortName"/>
-        <set value="EVENT" field="shipWorkEffortMap.workEffortTypeId"/>
-        <set value="CAL_TENTATIVE" field="shipWorkEffortMap.currentStatusId"/>
-        <set from-field="parameters.estimatedShipDate" field="shipWorkEffortMap.estimatedStartDate"/>
-        <set from-field="parameters.estimatedShipDate" field="shipWorkEffortMap.estimatedCompletionDate"/>
-        <set from-field="parameters.originFacilityId" field="shipWorkEffortMap.facilityId"/>
-        <set from-field="userLogin.partyId" field="shipWorkEffortMap.quickAssignPartyId"/>
-        <call-service service-name="createWorkEffort" in-map-name="shipWorkEffortMap">
-            <result-to-field result-name="workEffortId" field="newEntity.estimatedShipWorkEffId"/>
-        </call-service>
-        <if-not-empty field="newEntity.partyIdFrom">
-            <set from-field="newEntity.estimatedShipWorkEffId" field="assignPartyToWorkEffortShip.workEffortId"/>
-            <set from-field="newEntity.partyIdFrom" field="assignPartyToWorkEffortShip.partyId"/>
-            <set value="CAL_ATTENDEE" field="assignPartyToWorkEffortShip.roleTypeId"/>
-            <set value="CAL_SENT" field="assignPartyToWorkEffortShip.statusId"/>
-            <call-service service-name="assignPartyToWorkEffort" in-map-name="assignPartyToWorkEffortShip"/>
+        <if-not-empty field="parameters.estimatedShipDate">
+            <set value="Shipment #${newEntity.shipmentId} Ship" field="shipWorkEffortMap.workEffortName"/>
+            <set value="EVENT" field="shipWorkEffortMap.workEffortTypeId"/>
+            <set value="CAL_TENTATIVE" field="shipWorkEffortMap.currentStatusId"/>
+            <set from-field="parameters.estimatedShipDate" field="shipWorkEffortMap.estimatedStartDate"/>
+            <set from-field="parameters.estimatedShipDate" field="shipWorkEffortMap.estimatedCompletionDate"/>
+            <set from-field="parameters.originFacilityId" field="shipWorkEffortMap.facilityId"/>
+            <set from-field="userLogin.partyId" field="shipWorkEffortMap.quickAssignPartyId"/>
+            <call-service service-name="createWorkEffort" in-map-name="shipWorkEffortMap">
+                <result-to-field result-name="workEffortId" field="newEntity.estimatedShipWorkEffId"/>
+            </call-service>
+            <if-not-empty field="newEntity.partyIdFrom">
+                <set from-field="newEntity.estimatedShipWorkEffId" field="assignPartyToWorkEffortShip.workEffortId"/>
+                <set from-field="newEntity.partyIdFrom" field="assignPartyToWorkEffortShip.partyId"/>
+                <set value="CAL_ATTENDEE" field="assignPartyToWorkEffortShip.roleTypeId"/>
+                <set value="CAL_SENT" field="assignPartyToWorkEffortShip.statusId"/>
+                <call-service service-name="assignPartyToWorkEffort" in-map-name="assignPartyToWorkEffortShip"/>
+            </if-not-empty>
         </if-not-empty>
-        -->
-        <!-- the Arrival WorkEffort entity -->
-        <!--
-        <set value="Shipment #${newEntity.shipmentId} Arrival" field="arrivalWorkEffortMap.workEffortName"/>
-        <set value="EVENT" field="arrivalWorkEffortMap.workEffortTypeId"/>
-        <set value="CAL_TENTATIVE" field="arrivalWorkEffortMap.currentStatusId"/>
-        <set from-field="parameters.estimatedArrivalDate" field="arrivalWorkEffortMap.estimatedStartDate"/>
-        <set from-field="parameters.estimatedArrivalDate" field="arrivalWorkEffortMap.estimatedCompletionDate"/>
-        <set from-field="parameters.destinationFacilityId" field="arrivalWorkEffortMap.facilityId"/>
-        <set from-field="userLogin.partyId" field="arrivalWorkEffortMap.quickAssignPartyId"/>
-        <call-service service-name="createWorkEffort" in-map-name="arrivalWorkEffortMap">
-            <result-to-field result-name="workEffortId" field="newEntity.estimatedArrivalWorkEffId"/>
-        </call-service>
-        <if-not-empty field="newEntity.partyIdTo">
-            <set from-field="newEntity.estimatedArrivalWorkEffId" field="assignPartyToWorkEffortArrival.workEffortId"/>
-            <set from-field="newEntity.partyIdTo" field="assignPartyToWorkEffortArrival.partyId"/>
-            <set value="CAL_ATTENDEE" field="assignPartyToWorkEffortArrival.roleTypeId"/>
-            <set value="CAL_SENT" field="assignPartyToWorkEffortArrival.statusId"/>
-            <call-service service-name="assignPartyToWorkEffort" in-map-name="assignPartyToWorkEffortArrival"/>
+        <if-not-empty field="parameters.estimatedArrivalDate">
+            <set value="Shipment #${newEntity.shipmentId} Arrival" field="arrivalWorkEffortMap.workEffortName"/>
+            <set value="EVENT" field="arrivalWorkEffortMap.workEffortTypeId"/>
+            <set value="CAL_TENTATIVE" field="arrivalWorkEffortMap.currentStatusId"/>
+            <set from-field="parameters.estimatedArrivalDate" field="arrivalWorkEffortMap.estimatedStartDate"/>
+            <set from-field="parameters.estimatedArrivalDate" field="arrivalWorkEffortMap.estimatedCompletionDate"/>
+            <set from-field="parameters.destinationFacilityId" field="arrivalWorkEffortMap.facilityId"/>
+            <set from-field="userLogin.partyId" field="arrivalWorkEffortMap.quickAssignPartyId"/>
+            <call-service service-name="createWorkEffort" in-map-name="arrivalWorkEffortMap">
+                <result-to-field result-name="workEffortId" field="newEntity.estimatedArrivalWorkEffId"/>
+            </call-service>
+            <if-not-empty field="newEntity.partyIdTo">
+                <set from-field="newEntity.estimatedArrivalWorkEffId" field="assignPartyToWorkEffortArrival.workEffortId"/>
+                <set from-field="newEntity.partyIdTo" field="assignPartyToWorkEffortArrival.partyId"/>
+                <set value="CAL_ATTENDEE" field="assignPartyToWorkEffortArrival.roleTypeId"/>
+                <set value="CAL_SENT" field="assignPartyToWorkEffortArrival.statusId"/>
+                <call-service service-name="assignPartyToWorkEffort" in-map-name="assignPartyToWorkEffortArrival"/>
+            </if-not-empty>
         </if-not-empty>
-        -->
 
         <create-value value-field="newEntity"/>
 
@@ -156,7 +152,6 @@
         <check-errors/>
 
         <!-- Check the pickup and delivery dates for changes and update the corresponding WorkEfforts -->
-        <!--
         <if>
             <condition>
                 <or>
@@ -174,11 +169,13 @@
                 <entity-one entity-name="WorkEffort" value-field="estShipWe" auto-field-map="false">
                     <field-map field-name="workEffortId" from-field="lookedUpValue.estimatedShipWorkEffId"/>
                 </entity-one>
-                <set from-field="parameters.estimatedShipDate" field="estShipWe.estimatedStartDate"/>
-                <set from-field="parameters.estimatedShipDate" field="estShipWe.estimatedCompletionDate"/>
-                <set from-field="parameters.originFacilityId" field="estShipWe.facilityId"/>
-                <set-service-fields service-name="updateWorkEffort" map="estShipWe" to-map="estShipWeUpdMap"/>
-                <call-service service-name="updateWorkEffort" in-map-name="estShipWeUpdMap"/>
+                <if-not-empty field="estShipWe">
+                    <set from-field="parameters.estimatedShipDate" field="estShipWe.estimatedStartDate"/>
+                    <set from-field="parameters.estimatedShipDate" field="estShipWe.estimatedCompletionDate"/>
+                    <set from-field="parameters.originFacilityId" field="estShipWe.facilityId"/>
+                    <set-service-fields service-name="updateWorkEffort" map="estShipWe" to-map="estShipWeUpdMap"/>
+                    <call-service service-name="updateWorkEffort" in-map-name="estShipWeUpdMap"/>
+                </if-not-empty>
             </then>
         </if>
         <if>
@@ -195,16 +192,19 @@
                 </or>
             </condition>
             <then>
-                <set from-field="lookedUpValue.estimatedArrivalWorkEffId" field="estimatedArrivalWorkEffortMap.workEffortId"/>
                 <find-by-primary-key entity-name="WorkEffort" map="estimatedArrivalWorkEffortMap" value-field="estimatedArrivalWorkEffort"/>
-                <set from-field="parameters.estimatedArrivalDate" field="estimatedArrivalWorkEffort.estimatedStartDate"/>
-                <set from-field="parameters.estimatedArrivalDate" field="estimatedArrivalWorkEffort.estimatedCompletionDate"/>
-                <set from-field="parameters.destinationFacilityId" field="estimatedArrivalWorkEffort.facilityId"/>
-                <set-service-fields service-name="updateWorkEffort" map="estimatedArrivalWorkEffort" to-map="estimatedArrivalWorkEffortUpdMap"/>
-                <call-service service-name="updateWorkEffort" in-map-name="estimatedArrivalWorkEffortUpdMap"/>
+                <entity-one entity-name="WorkEffort" value-field="estimatedArrivalWorkEffort" auto-field-map="false">
+                    <field-map field-name="workEffortId" from-field="lookedUpValue.estimatedArrivalWorkEffId"/>
+                </entity-one>
+                <if-not-empty field="estimatedArrivalWorkEffort">
+                    <set from-field="parameters.estimatedArrivalDate" field="estimatedArrivalWorkEffort.estimatedStartDate"/>
+                    <set from-field="parameters.estimatedArrivalDate" field="estimatedArrivalWorkEffort.estimatedCompletionDate"/>
+                    <set from-field="parameters.destinationFacilityId" field="estimatedArrivalWorkEffort.facilityId"/>
+                    <set-service-fields service-name="updateWorkEffort" map="estimatedArrivalWorkEffort" to-map="estimatedArrivalWorkEffortUpdMap"/>
+                    <call-service service-name="updateWorkEffort" in-map-name="estimatedArrivalWorkEffortUpdMap"/>
+                </if-not-empty>
             </then>
         </if>
-        -->
 
         <!-- if the partyIdTo or partyIdFrom has changed, add WEPAs -->
         <if>

Modified: ofbiz/branches/addbirt/applications/product/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/product/servicedef/services.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/product/servicedef/services.xml (original)
+++ ofbiz/branches/addbirt/applications/product/servicedef/services.xml Fri Dec 11 23:11:39 2009
@@ -438,7 +438,7 @@
     </service>
     
     <service name="uploadProductAdditionalViewImages" engine="simple"
-        location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="uploadProductAdditionalViewImages" auth="true">
+        location="component://product/script/org/ofbiz/product/product/ProductContentServices.xml" invoke="uploadProductAdditionalViewImages" auth="true">
         <description>Upload Additional View Images For Product</description>
         <permission-service service-name="genericContentPermission" main-action="UPDATE"/>
         <attribute name="productId" type="String" mode="INOUT" optional="false"/>

Modified: ofbiz/branches/addbirt/applications/product/src/org/ofbiz/product/config/ProductConfigWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/product/src/org/ofbiz/product/config/ProductConfigWorker.java?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/product/src/org/ofbiz/product/config/ProductConfigWorker.java (original)
+++ ofbiz/branches/addbirt/applications/product/src/org/ofbiz/product/config/ProductConfigWorker.java Fri Dec 11 23:11:39 2009
@@ -129,14 +129,14 @@
                             GenericValue component = components.get(i);
                             if (option.isVirtualComponent(component)) {
                                 String productParamName = "add_product_id" + k + "_" + cnt + "_" + variantIndex;
-                                String selectedProdcutId = request.getParameter(productParamName);
-                                if (UtilValidate.isEmpty(selectedProdcutId)) {
+                                String selectedProductId = request.getParameter(productParamName);
+                                if (UtilValidate.isEmpty(selectedProductId)) {
                                     Debug.logWarning("ERROR: Request param [" + productParamName + "] not found!", module);
                                 } else {
 
                                     //  handle also feature tree virtual variant methods
-                                    if (ProductWorker.isVirtual((Delegator)request.getAttribute("delegator"), selectedProdcutId)) {
-                                        if ("VV_FEATURETREE".equals(ProductWorker.getProductvirtualVariantMethod((Delegator)request.getAttribute("delegator"), selectedProdcutId))) {
+                                    if (ProductWorker.isVirtual((Delegator)request.getAttribute("delegator"), selectedProductId)) {
+                                        if ("VV_FEATURETREE".equals(ProductWorker.getProductVirtualVariantMethod((Delegator)request.getAttribute("delegator"), selectedProductId))) {
                                             // get the selected features
                                             List<String> selectedFeatures = FastList.newInstance();
                                             Enumeration paramNames = request.getParameterNames();
@@ -149,19 +149,19 @@
 
                                             // check if features are selected
                                             if (UtilValidate.isEmpty(selectedFeatures)) {
-                                                Debug.logWarning("ERROR: No features selected for productId [" + selectedProdcutId+ "]", module);
+                                                Debug.logWarning("ERROR: No features selected for productId [" + selectedProductId+ "]", module);
                                             }
 
-                                            String variantProductId = ProductWorker.getVariantFromFeatureTree(selectedProdcutId, selectedFeatures, (Delegator)request.getAttribute("delegator"));
+                                            String variantProductId = ProductWorker.getVariantFromFeatureTree(selectedProductId, selectedFeatures, (Delegator)request.getAttribute("delegator"));
                                             if (UtilValidate.isNotEmpty(variantProductId)) {
-                                                selectedProdcutId = variantProductId;
+                                                selectedProductId = variantProductId;
                                             } else {
                                                 Debug.logWarning("ERROR: Variant product not found!", module);
                                                 request.setAttribute("_EVENT_MESSAGE_", UtilProperties.getMessage("OrderErrorUiLabels", "cart.addToCart.incompatibilityVariantFeature", UtilHttp.getLocale(request)));
                                            }
                                         }
                                     }
-                                    configWrapper.setSelected(k, cnt, i, selectedProdcutId);
+                                    configWrapper.setSelected(k, cnt, i, selectedProductId);
                                 }
                                 variantIndex ++;
                             }

Modified: ofbiz/branches/addbirt/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java (original)
+++ ofbiz/branches/addbirt/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java Fri Dec 11 23:11:39 2009
@@ -421,9 +421,9 @@
         return returnShippingMethods;
     }
 
-    public static ProductStoreSurveyWrapper getRandomSurveyWrapper(ServletRequest request, String groupName) {
+    public static ProductStoreSurveyWrapper getRandomSurveyWrapper(HttpServletRequest request, String groupName) {
         GenericValue productStore = getProductStore(request);
-        HttpSession session = ((HttpServletRequest)request).getSession();
+        HttpSession session = request.getSession();
         if (productStore == null) {
             return null;
         }
@@ -434,7 +434,8 @@
         }
 
         String partyId = userLogin != null ? userLogin.getString("partyId") : null;
-        Map<String, Object> passThruFields = UtilHttp.getParameterMap(((HttpServletRequest)request));
+        String origParamMapId = UtilHttp.stashParameterMap(request);
+        Map<String, Object> passThruFields = UtilMisc.<String, Object>toMap("_ORIG_PARAM_MAP_ID_", origParamMapId);
 
         return getRandomSurveyWrapper(productStore.getDelegator(), productStore.getString("productStoreId"), groupName, partyId, passThruFields);
     }

Modified: ofbiz/branches/addbirt/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy (original)
+++ ofbiz/branches/addbirt/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy Fri Dec 11 23:11:39 2009
@@ -201,8 +201,8 @@
         oneRow.orderId = orderItem.orderId;
         oneRow.orderItemSeqId = orderItem.orderItemSeqId;
         oneRow.productId = orderItem.productId;
-        orderedQuantity = orderItem.getDouble("quantity");
-        canceledQuantity = orderItem.getDouble("cancelQuantity");
+        orderedQuantity = orderItemShipGroupAssoc.getDouble("quantity");
+        canceledQuantity = orderItemShipGroupAssoc.getDouble("cancelQuantity");
         if (canceledQuantity) {
             orderedQuantity = Double.valueOf(orderedQuantity.doubleValue() - canceledQuantity.doubleValue());
         }

Modified: ofbiz/branches/addbirt/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl (original)
+++ ofbiz/branches/addbirt/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl Fri Dec 11 23:11:39 2009
@@ -72,7 +72,9 @@
                                 <#if carrier != "_NA_">
                                    ${carrier}
                                 </#if>
-                                ${shipGroup.shipmentMethodTypeId?default("??")}
+                                <#if (shipGroup.shipmentMethodTypeId)?exists>
+                                  ${(shipGroup.getRelatedOne("ShipmentMethodType").get("description", locale))?default(shipGroup.shipmentMethodTypeId)}
+                                </#if>
                             </fo:block>
                         </fo:table-cell>
                         <fo:table-cell padding="2pt">

Modified: ofbiz/branches/addbirt/applications/product/widget/catalog/FeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/product/widget/catalog/FeatureForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/product/widget/catalog/FeatureForms.xml (original)
+++ ofbiz/branches/addbirt/applications/product/widget/catalog/FeatureForms.xml Fri Dec 11 23:11:39 2009
@@ -112,7 +112,7 @@
         header-row-style="header-row" default-table-style="basic-table">
         <field name="productFeatureTypeId"><text-find size="25"></text-find></field>
         <field name="description"><text-find size="25"></text-find></field>
-        <field name="searchButton" widget-style="smallSubmit"><submit/></field>
+        <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit/></field>
     </form>
     <form name="ListFeatureTypes" list-name="listIt" target="" title="" type="list" paginate-target="EditFeatureTypes"
         odd-row-style="alternate-row" default-table-style="basic-table">
@@ -165,8 +165,8 @@
         header-row-style="header-row" default-table-style="basic-table">
         <field name="productFeatureId"><text-find size="25"></text-find></field>
         <field name="productFeatureIdTo"><text-find size="25"></text-find></field>
-        <field name="searchButton" widget-style="smallSubmit"><submit/></field>
-        </form>
+        <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit/></field>
+    </form>
     <form name="ListFeatureInterActions" list-name="listIt" target="" title="" type="list" paginate-target="EditFeatureInterAction"
         odd-row-style="alternate-row" default-table-style="basic-table">
         <actions>
@@ -294,7 +294,7 @@
         header-row-style="header-row" default-table-style="basic-table">
         <field name="productFeatureCategoryId" title="${uiLabelMap.CommonId}"><text-find size="25"></text-find></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><text-find size="25"></text-find></field>
-        <field name="searchButton" widget-style="smallSubmit"><submit/></field>
+        <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit/></field>
     </form>
 
     <form name="ListProductFeature" type="list" list-name="listIt" paginate-target="EditFeatureCategories"

Modified: ofbiz/branches/addbirt/applications/product/widget/catalog/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/product/widget/catalog/FieldLookupForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/product/widget/catalog/FieldLookupForms.xml (original)
+++ ofbiz/branches/addbirt/applications/product/widget/catalog/FieldLookupForms.xml Fri Dec 11 23:11:39 2009
@@ -42,7 +42,7 @@
         </field>
         <field name="noConditionFind"><hidden value="Y"/></field>
         <!-- NOTE DEJ20070829 not sure why this is here, but it doesn't seem applicable for a general product lookup, also doesn't handle case where isVariant is null <field name="isVariant"><hidden value="N"/></field> -->
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="listLookupProduct" list-name="listIt" title="" type="list" paginate-target="LookupProduct"
         odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
@@ -79,7 +79,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="listLookupSupplierProduct" list-name="listIt" title="" type="list" paginate-target="LookupSupplierProduct"
         odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
@@ -168,7 +168,7 @@
 
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
         <field name="filterByDate"><hidden value="Y"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="listLookupProductAndPrice" list-name="listIt" title="" type="list"
         paginate-target="LookupProductAndPrice" odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
@@ -220,7 +220,7 @@
             </drop-down>
         </field>
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
 
         <sort-order>
             <field-group>
@@ -281,7 +281,7 @@
         </field>
 
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="listLookupProductFeature" list-name="listIt" title="" type="list" paginate-target="LookupProductFeature"
         odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
@@ -309,7 +309,7 @@
         <field name="payToPartyId"><text-find/></field>
 
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="listLookupProductStore" list-name="listIt" target="" title="" type="list"
         paginate-target="LookupProductStore" odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">

Modified: ofbiz/branches/addbirt/applications/product/widget/facility/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/product/widget/facility/FieldLookupForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/product/widget/facility/FieldLookupForms.xml (original)
+++ ofbiz/branches/addbirt/applications/product/widget/facility/FieldLookupForms.xml Fri Dec 11 23:11:39 2009
@@ -35,7 +35,7 @@
         </field>
 
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="listLookupFacility" list-name="listIt" title="" type="list"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupFacility">
@@ -72,7 +72,7 @@
             </drop-down>
         </field>
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="listLookupFacilityLocation" list-name="listIt" title="" type="list"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
@@ -115,7 +115,7 @@
         <field position="1" name="Datefrom" title="${uiLabelMap.CommonFromDate}"><date-time/></field>
         <field position="2" name="DateThru" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="listShipment" list-name="listIt" title="" type="list" paginate-target="LookupShipment"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">

Modified: ofbiz/branches/addbirt/applications/product/widget/facility/ShipmentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/product/widget/facility/ShipmentForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/product/widget/facility/ShipmentForms.xml (original)
+++ ofbiz/branches/addbirt/applications/product/widget/facility/ShipmentForms.xml Fri Dec 11 23:11:39 2009
@@ -197,10 +197,10 @@
         header-row-style="header-row" default-table-style="basic-table">
         <field name="action"><hidden value="search"/></field>
         <field name="shipmentId"><hidden/></field>
-        <field name="shipGroupSeqId"><hidden/></field>
         <field name="orderId" title="${uiLabelMap.ProductOrderId}">
             <lookup target-form-name="LookupOrderHeaderAndShipInfo"/>
         </field>
+        <field name="shipGroupSeqId"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}">
             <submit button-type="button"/>
         </field>

Modified: ofbiz/branches/addbirt/applications/product/widget/facility/ShipmentGatewayConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/product/widget/facility/ShipmentGatewayConfigForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/product/widget/facility/ShipmentGatewayConfigForms.xml (original)
+++ ofbiz/branches/addbirt/applications/product/widget/facility/ShipmentGatewayConfigForms.xml Fri Dec 11 23:11:39 2009
@@ -32,7 +32,7 @@
         </field>
         <field name="performSearch"><hidden value="Y"/></field>
         <field name="noConditionFind"><hidden value="Y"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit">
+        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
     </form>
@@ -295,7 +295,7 @@
         <field name="description" title="${uiLabelMap.FacilityShipmentGatewayConfigDescription}"><text-find ignore-case="true"/></field>
         <field name="performSearch"><hidden value="Y"/></field>
         <field name="noConditionFind"><hidden value="Y"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit">
+        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
     </form>

Propchange: ofbiz/branches/addbirt/applications/workeffort/config/WorkEffortEntityLabels.xml
------------------------------------------------------------------------------
    svn:eol-style = native


Free forum by Nabble Edit this page