svn commit: r984399 [8/16] - in /ofbiz/branches/jquery: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/data/helpdata/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/ appl...

Modified: ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml Wed Aug 11 13:22:40 2010
@@ -727,7 +727,7 @@
         <value xml:lang="de">Vereinbarungsselement Seq. ID</value>
         <value xml:lang="en">Agreement Item Seq Id</value>
         <value xml:lang="es">Código de secuenca del ítem del acuerdo</value>
-        <value xml:lang="fr">Réf. séq. d'un point d'accord</value>
+        <value xml:lang="fr">Réf. séq. d'un point d'accord commercial</value>
         <value xml:lang="it">N.Seq. Riga Accordo</value>
         <value xml:lang="th">รหัสรายการหัวข้อสัญญา</value>
         <value xml:lang="zh">合同明细序号</value>
@@ -736,7 +736,7 @@
         <value xml:lang="de">Gang ID</value>
         <value xml:lang="en">Aisle Id</value>
         <value xml:lang="es">Código de pasillo</value>
-        <value xml:lang="fr">Réf. d'allée</value>
+        <value xml:lang="fr">Réf. d'allée du lieu de stockage</value>
         <value xml:lang="it">Corridoio</value>
         <value xml:lang="th">รหัสชั้นวางสินค้า</value>
         <value xml:lang="zh">巷道标识</value>
@@ -818,7 +818,7 @@
         <value xml:lang="de">Gebiet ID</value>
         <value xml:lang="en">Area Id</value>
         <value xml:lang="es">Código de área</value>
-        <value xml:lang="fr">Réf. de secteur</value>
+        <value xml:lang="fr">Réf. de secteur du lieu de stockage</value>
         <value xml:lang="it">Area</value>
         <value xml:lang="th">รหัสพื้นที่</value>
         <value xml:lang="zh">区域标识</value>
@@ -1124,7 +1124,7 @@
         <value xml:lang="de">Transportunternehmen ID</value>
         <value xml:lang="en">carrier Id</value>
         <value xml:lang="es">Código de transportista</value>
-        <value xml:lang="fr">Réf. transporteur</value>
+        <value xml:lang="fr">Réf. de transporteur</value>
         <value xml:lang="it">Corriere</value>
         <value xml:lang="ru">Код перевозчика</value>
         <value xml:lang="th">รหัสผู้ส่ง</value>
@@ -1134,7 +1134,7 @@
         <value xml:lang="de">Transportunternehmen Akteur ID</value>
         <value xml:lang="en">Carrier Party Id</value>
         <value xml:lang="es">Código de participante del transportista</value>
-        <value xml:lang="fr">Réf. de transporteur</value>
+        <value xml:lang="fr">Réf. de transporteur (acteur)</value>
         <value xml:lang="it">Corriere</value>
         <value xml:lang="nl">Vervoerder Id</value>
         <value xml:lang="ro">Cod Curier</value>
@@ -1202,7 +1202,7 @@
         <value xml:lang="de">Zeichensatz ID</value>
         <value xml:lang="en">Character Set Id</value>
         <value xml:lang="es">Código del conjunto de caracteres</value>
-        <value xml:lang="fr">Ensemble de caractères</value>
+        <value xml:lang="fr">Ensemble de caractères [Réf.]</value>
         <value xml:lang="it">Set di Caratteri</value>
         <value xml:lang="ro">Set de Caractere</value>
         <value xml:lang="ru">Код символьного набора</value>
@@ -1403,7 +1403,7 @@
         <value xml:lang="de">Kosten Einheit ID</value>
         <value xml:lang="en">Cost Uom Id</value>
         <value xml:lang="es">Unidad de medida del coste</value>
-        <value xml:lang="fr">Unité de mesure de coût</value>
+        <value xml:lang="fr">Unité de mesure de coût [Réf.]</value>
         <value xml:lang="it">Udm Costo</value>
         <value xml:lang="ro">Udm Cost</value>
         <value xml:lang="ru">Валюта</value>
@@ -1631,7 +1631,7 @@
         <value xml:lang="de">Digitales Produkt Hochladen Kategorie ID</value>
         <value xml:lang="en">Dig Prod Upload Category Id</value>
         <value xml:lang="es">Categoría de carga producto digital</value>
-        <value xml:lang="fr">Catégorie de téléchargement d'articles numériques</value>
+        <value xml:lang="fr">Catégorie de téléchargement d'articles numériques [Réf.]</value>
         <value xml:lang="it">Codice Categoria Caricamento Prodotti Digitali</value>
         <value xml:lang="ro">Cod Categoria Incarcare Produse Digitale</value>
         <value xml:lang="ru">Загружать цифр. продукты в категорию</value>
@@ -1749,7 +1749,7 @@
         <value xml:lang="de">Geo ID ausschliessen</value>
         <value xml:lang="en">Excl. Geo Id</value>
         <value xml:lang="es">Excl. lugar</value>
-        <value xml:lang="fr">Excl. lieu</value>
+        <value xml:lang="fr">Excl. lieu [Réf.]</value>
         <value xml:lang="it">Esc. Geo.</value>
         <value xml:lang="ru">Исключать территорию</value>
         <value xml:lang="th">แยกออกจากรหัสโครงสร้าง</value>
@@ -1819,7 +1819,7 @@
         <value xml:lang="de">Einrichtung ID</value>
         <value xml:lang="en">Facility Id</value>
         <value xml:lang="es">Código de almacén</value>
-        <value xml:lang="fr">Lieu de stockage</value>
+        <value xml:lang="fr">Lieu de stockage [Réf.]</value>
         <value xml:lang="it">Codice stabilimento</value>
         <value xml:lang="nl">Faciliteit Id</value>
         <value xml:lang="ro">Cod Compartiment</value>
@@ -2443,7 +2443,7 @@
         <value xml:lang="de">Maximale Lebensdauer Zeiteinheit ID</value>
         <value xml:lang="en">Max Life Time Uom Id</value>
         <value xml:lang="es">UDM tiempo de vida máximo</value>
-        <value xml:lang="fr">Unité de temps disponible</value>
+        <value xml:lang="fr">Unité de temps disponible [Réf.]</value>
         <value xml:lang="it">Udm Massimo Tempo di Vita</value>
         <value xml:lang="ru">Код времени для макс. вр. жизни</value>
         <value xml:lang="th">รหัสหน่วยวัดอายุการใช้งานมาก</value>
@@ -2483,7 +2483,7 @@
         <value xml:lang="de">Maximum Betrag Währungseinheit ID</value>
         <value xml:lang="en">Maximum Amount Uom Id</value>
         <value xml:lang="es">UDM Cantidad máxima</value>
-        <value xml:lang="fr">Unité de mesure de montant maxi</value>
+        <value xml:lang="fr">Unité de mesure de montant maxi [Réf.]</value>
         <value xml:lang="it">Udm Importo Massimo</value>
         <value xml:lang="ro">Udm Valoare Maxima</value>
         <value xml:lang="ru">Макс. сумма</value>
@@ -2713,7 +2713,7 @@
         <value xml:lang="de">Organisation Akteur ID übersteuern</value>
         <value xml:lang="en">Override Org Party Id</value>
         <value xml:lang="es">Reemplazar código de participante original</value>
-        <value xml:lang="fr">Remplacer la réf. org. d'acteur</value>
+        <value xml:lang="fr">Remplacer la réf. originelle d'acteur</value>
         <value xml:lang="it">Sostituisce Organizzazione</value>
         <value xml:lang="th">ยกเลิกรหัสกลุ่มองค์กร</value>
         <value xml:lang="zh">覆盖组织机构会员标识</value>
@@ -2751,7 +2751,7 @@
         <value xml:lang="de">Übergeordnete Einrichtung ID</value>
         <value xml:lang="en">Parent Facility Id</value>
         <value xml:lang="es">Código Almacén precursor</value>
-        <value xml:lang="fr">Lieu de stockage parent</value>
+        <value xml:lang="fr">Lieu de stockage parent [Réf.]</value>
         <value xml:lang="it">Stabilimento padre</value>
         <value xml:lang="zh">上级场所标识</value>
     </property>
@@ -2953,7 +2953,7 @@
         <value xml:lang="de">Produktkategorie ID</value>
         <value xml:lang="en">Product Category Id</value>
         <value xml:lang="es">Código Categoría de productos</value>
-        <value xml:lang="fr">Catégorie</value>
+        <value xml:lang="fr">Catégorie [Réf.]</value>
         <value xml:lang="it">Categoria Prodotto</value>
         <value xml:lang="ro">Categorie Produs</value>
         <value xml:lang="ru">Код категории продукта</value>
@@ -2997,7 +2997,7 @@
         <value xml:lang="de">Produktmerkmal Kategorie ID</value>
         <value xml:lang="en">Product Feature Category Id</value>
         <value xml:lang="es">Código Categoría de característica de producto</value>
-        <value xml:lang="fr">Catégorie de caractéristique d'article</value>
+        <value xml:lang="fr">Catégorie de caractéristique d'article [Réf.]</value>
         <value xml:lang="it">Categoria Caratteristica Prodotto</value>
         <value xml:lang="ro">Categorie Caracteristica Produs</value>
         <value xml:lang="ru">Код категории особенности</value>
@@ -3019,7 +3019,7 @@
         <value xml:lang="de">Interaktionstyp</value>
         <value xml:lang="en">Interaction Type</value>
         <value xml:lang="es">Código Tipo de interacción</value>
-        <value xml:lang="fr">Type d'interaction</value>
+        <value xml:lang="fr">Type d'interaction [Réf.]</value>
         <value xml:lang="it">Tipo di interazione</value>
         <value xml:lang="zh">交互类型</value>
     </property>
@@ -3167,7 +3167,7 @@
         <value xml:lang="de">Produkt Laden ID</value>
         <value xml:lang="en">Product Store Id</value>
         <value xml:lang="es">Código de tienda</value>
-        <value xml:lang="fr">Centre de profit</value>
+        <value xml:lang="fr">Centre de profit [Réf.]</value>
         <value xml:lang="it">Negozio</value>
         <value xml:lang="nl">Produkt Winkel Id</value>
         <value xml:lang="ro">Magazin</value>
@@ -3575,7 +3575,7 @@
         <value xml:lang="de">Aufzählung des Bedarfs</value>
         <value xml:lang="en">Requirement Method Enum Id</value>
         <value xml:lang="es">Tipo de método de requisito</value>
-        <value xml:lang="fr">Méthode retenue pour le réapprovisionnement</value>
+        <value xml:lang="fr">Méthode retenue pour le réapprovisionnement [Réf.]</value>
         <value xml:lang="it">Richiesta Scelta Tipo Metodo Fabbisogno</value>
         <value xml:lang="nl">Vereisten methodelijst ID</value>
         <value xml:lang="ro">Cerere Alegere Tip Metoda Necesar</value>
@@ -3599,7 +3599,7 @@
         <value xml:lang="de">Art der Auftragsreservierung</value>
         <value xml:lang="en">Reserve Order Enum Id</value>
         <value xml:lang="es">Orden de reserva</value>
-        <value xml:lang="fr">Ordre de réservation</value>
+        <value xml:lang="fr">Ordre de réservation [Réf.]</value>
         <value xml:lang="it">Scegli Tipo Riservamento Ordine</value>
         <value xml:lang="nl">Voorraadcirculatie methode ID</value>
         <value xml:lang="ro">Alege Tip Rezervare Comanda</value>
@@ -4102,7 +4102,7 @@
         <value xml:lang="de">Einheit ID</value>
         <value xml:lang="en">termUomId</value>
         <value xml:lang="es">Código Unidad de medida</value>
-        <value xml:lang="fr">Unité de mesure de temps/fréquence</value>
+        <value xml:lang="fr">Unité de mesure de temps/fréquence [Réf.]</value>
         <value xml:lang="it">Udm Termini</value>
         <value xml:lang="ro">Udm Termene</value>
         <value xml:lang="ru">Единицы измерения</value>
@@ -4296,7 +4296,7 @@
         <value xml:lang="de">Varianz Grund ID</value>
         <value xml:lang="en">Variance Reason Id</value>
         <value xml:lang="es">Código razón de variación</value>
-        <value xml:lang="fr">Motif de la variation</value>
+        <value xml:lang="fr">Motif de la variation [Réf.]</value>
         <value xml:lang="it">Motivazione Varianza</value>
         <value xml:lang="ro">Motivare Varianta</value>
         <value xml:lang="ru">Код причины разногласий</value>
@@ -7002,7 +7002,7 @@
         <value xml:lang="de">Akteur ID hinzufügen</value>
         <value xml:lang="en">Add Party Id</value>
         <value xml:lang="es">Añadir Código de Participante</value>
-        <value xml:lang="fr">Ajouter une identité d'acteur</value>
+        <value xml:lang="fr">Ajouter une réf. d'acteur</value>
         <value xml:lang="it">Aggiungi Codice Soggetto</value>
         <value xml:lang="ro">Adauga Cod Subiect</value>
         <value xml:lang="ru">Добавить код участника</value>
@@ -7494,7 +7494,7 @@
         <value xml:lang="de">Betrag Währungseinheit Typ ID</value>
         <value xml:lang="en">Amount Uom Type Id</value>
         <value xml:lang="es">Moneda del Importe</value>
-        <value xml:lang="fr">Type d'unité de mesure de montant</value>
+        <value xml:lang="fr">Type d'unité de mesure de montant [Réf.]</value>
         <value xml:lang="it">Udm Importo</value>
         <value xml:lang="ro">Udm Valoare</value>
         <value xml:lang="ru">Количество чего?</value>
@@ -8339,7 +8339,7 @@
         <value xml:lang="de">Katalog [ID]</value>
         <value xml:lang="en">Catalog [ID]</value>
         <value xml:lang="es">Catálogo [código]</value>
-        <value xml:lang="fr">Catalogue [réf]</value>
+        <value xml:lang="fr">Catalogue [Réf.]</value>
         <value xml:lang="it">Catalogo [Codice]</value>
         <value xml:lang="ro">Catalog [Cod]</value>
         <value xml:lang="ru">Каталог [Код]</value>
@@ -8497,7 +8497,7 @@
         <value xml:lang="de">Kategorie ID</value>
         <value xml:lang="en">Category ID</value>
         <value xml:lang="es">Código de Categoría</value>
-        <value xml:lang="fr">Catég.</value>
+        <value xml:lang="fr">Catég. [Réf.]</value>
         <value xml:lang="it">Codice Categoria</value>
         <value xml:lang="ro">Cod Categorie</value>
         <value xml:lang="ru">Категория</value>
@@ -8744,7 +8744,7 @@
         <value xml:lang="de">Untergeordnete Kategorie ID</value>
         <value xml:lang="en">Child Category ID</value>
         <value xml:lang="es">Código de Categoría Hija</value>
-        <value xml:lang="fr">Catégorie fille</value>
+        <value xml:lang="fr">Catégorie fille [Réf.]</value>
         <value xml:lang="it">Codice Categoria Figlia</value>
         <value xml:lang="ro">Cod Categorie Fica</value>
         <value xml:lang="ru">Код подчин. категории</value>
@@ -9147,7 +9147,7 @@
         <value xml:lang="de">Inhalt [ID]</value>
         <value xml:lang="en">Content [ID]</value>
         <value xml:lang="es">Contenido [CÓDIGO]</value>
-        <value xml:lang="fr">Contenu [réf]</value>
+        <value xml:lang="fr">Contenu [Réf.]</value>
         <value xml:lang="it">Contenuto [Codice]</value>
         <value xml:lang="ro">Continut [Cod]</value>
         <value xml:lang="ru">Контент [Код]</value>
@@ -9189,7 +9189,7 @@
         <value xml:lang="de">Einrichtung nicht gefunden mit der ID</value>
         <value xml:lang="en">Could Not Find Facility with ID</value>
         <value xml:lang="es">No se pudo encontrar Almacén con el Código</value>
-        <value xml:lang="fr">Impossible de trouver le lieu de stockage avec la référence</value>
+        <value xml:lang="fr">Impossible de trouver le lieu de stockage avec sa référence</value>
         <value xml:lang="it">Non Trovata Stabilimento con Codice</value>
         <value xml:lang="ro">Negasit Compartiment cu Cod</value>
         <value xml:lang="ru">Невозможно найти объект с кодом</value>
@@ -9853,7 +9853,7 @@
         <value xml:lang="de">Tiefe Einheit ID</value>
         <value xml:lang="en">Depth Uom Id</value>
         <value xml:lang="es">Código de la UDM de la profundidad</value>
-        <value xml:lang="fr">Unité de mesure de profondeur</value>
+        <value xml:lang="fr">Unité de mesure de profondeur [Réf.]</value>
         <value xml:lang="it">UdM Profondità</value>
         <value xml:lang="ro">UdM Profunzime </value>
         <value xml:lang="ru">Ед. изм. глубины</value>
@@ -10086,7 +10086,7 @@
         <value xml:lang="de">Katalog bearbeiten mit der Katalog ID</value>
         <value xml:lang="en">Edit Catalog with Catalog ID</value>
         <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="fr">Modification de catalogue (saisir ou rechercher 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>
@@ -10110,7 +10110,7 @@
         <value xml:lang="de">Kategorie bearbeiten mit der Kategorie ID</value>
         <value xml:lang="en">Edit Category with Category ID</value>
         <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="fr">Modification de la catégorie (saisir ou rechercher 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>
@@ -10166,7 +10166,7 @@
         <value xml:lang="de">Merkmal bearbeiten mit der ID</value>
         <value xml:lang="en">Edit Feature with ID</value>
         <value xml:lang="es">Editar Característica con Código</value>
-        <value xml:lang="fr">Modification de caractéristique de réf:</value>
+        <value xml:lang="fr">Modification de la caractéristique de réf:</value>
         <value xml:lang="it">Aggiorna Caratteristica con Codice</value>
         <value xml:lang="ro">Actualizeaza Caracteristica cu Cod</value>
         <value xml:lang="ru">Редактировать особенность с кодом</value>
@@ -10229,7 +10229,7 @@
         <value xml:lang="de">Produkt bearbeiten mit der Produkt ID</value>
         <value xml:lang="en">Edit Product with Product ID</value>
         <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="fr">Modification de l'article (saisir ou rechercher sa 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>
@@ -10735,7 +10735,7 @@
         <value xml:lang="de">Einrichtung oder Container ID</value>
         <value xml:lang="en">Facility or Container ID</value>
         <value xml:lang="es">Almacén o Código del contenedor</value>
-        <value xml:lang="fr">Lieu de stockage ou réf. de contenant</value>
+        <value xml:lang="fr">Réf. de lieu de stockage ou de contenant</value>
         <value xml:lang="it">Stabilimento o Codice Contenitore</value>
         <value xml:lang="ro">Compartiment sau Cod Contenitor</value>
         <value xml:lang="ru">Объект или код контейнера</value>
@@ -10796,7 +10796,7 @@
         <value xml:lang="de">Einrichtungsgruppe ID</value>
         <value xml:lang="en">Facility Group ID</value>
         <value xml:lang="es">Código de grupo de Almacén</value>
-        <value xml:lang="fr">Groupe de lieux de stockage [réf]</value>
+        <value xml:lang="fr">Groupe de lieux de stockage [Réf.]</value>
         <value xml:lang="it">Codice Gruppo Stabilimento</value>
         <value xml:lang="ro">Cod Grup Compartiment</value>
         <value xml:lang="ru">Код группы объектов</value>
@@ -10873,7 +10873,7 @@
         <value xml:lang="de">Einrichtung ID</value>
         <value xml:lang="en">Facility ID</value>
         <value xml:lang="es">Código de Almacén</value>
-        <value xml:lang="fr">Réf. de lieux de stockage</value>
+        <value xml:lang="fr">Réf. de lieu de stockage</value>
         <value xml:lang="it">Codice Stabilimento</value>
         <value xml:lang="ro">Cod Compartiment</value>
         <value xml:lang="ru">Код объекта</value>
@@ -10945,7 +10945,7 @@
         <value xml:lang="de">Einrichtung Namen [ID]</value>
         <value xml:lang="en">Facility Name [ID]</value>
         <value xml:lang="es">Nombre del Almacén [CÓDIGO]</value>
-        <value xml:lang="fr">Nom du lieu de stockage [Réf]</value>
+        <value xml:lang="fr">Nom du lieu de stockage [Réf.]</value>
         <value xml:lang="it">Nome Stabilimento [Codice]</value>
         <value xml:lang="ro">Nume Compartiment [Cod]</value>
         <value xml:lang="ru">Название объекта [Код]</value>
@@ -10998,7 +10998,7 @@
         <value xml:lang="de">Einrichtungstyp ID</value>
         <value xml:lang="en">Facility Type ID</value>
         <value xml:lang="es">Código de tipo de Almacén</value>
-        <value xml:lang="fr">Type de lieu de stockage</value>
+        <value xml:lang="fr">Type de lieu de stockage [Réf.]</value>
         <value xml:lang="it">Tipo Stabilimento</value>
         <value xml:lang="ro">Tip Compartiment ID</value>
         <value xml:lang="ru">Код типа объектов</value>
@@ -15243,7 +15243,7 @@
         <value xml:lang="de">Einfache Felder übersteuern</value>
         <value xml:lang="en">Override Simple Fields</value>
         <value xml:lang="es">Reemplazar campos simples</value>
-        <value xml:lang="fr">Mise à jour des champs descriptifs de la fiche article (à supprimer si vous voulez utiliser "alternate locale", autrement dit traduire)</value>
+        <value xml:lang="fr">Mise à jour des champs descriptifs de la fiche article (à supprimer si vous voulez utiliser alternate locale, autrement dit traduire)</value>
         <value xml:lang="it">Sovrapponi Campi Semplici</value>
         <value xml:lang="ro">Suprapune Campuri Simple </value>
         <value xml:lang="ru">Заменить простые поля</value>
@@ -15933,7 +15933,7 @@
         <value xml:lang="de">Preisregel Name [ID]</value>
         <value xml:lang="en">Price Rule Name [ID]</value>
         <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="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>
@@ -16690,7 +16690,7 @@
         <value xml:lang="de">Aktionsname [ID]</value>
         <value xml:lang="en">Promo Name [ID]</value>
         <value xml:lang="es">Nombre de la promoción [CÓDIGO]</value>
-        <value xml:lang="fr">Nom de la promotion [réf]</value>
+        <value xml:lang="fr">Nom de la promotion [Réf.]</value>
         <value xml:lang="it">Nome Promozione [Codice]</value>
         <value xml:lang="ro">Nume Promotie [Cod]</value>
         <value xml:lang="ru">Имя акции [Код]</value>
@@ -19702,7 +19702,7 @@
         <value xml:lang="de">Laden Namen [ID]</value>
         <value xml:lang="en">Store Name [ID]</value>
         <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="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>
@@ -20091,7 +20091,7 @@
         <value xml:lang="de">Ziel Typ Enum [ID]</value>
         <value xml:lang="en">Target Type Enum [Id]</value>
         <value xml:lang="es">Enumeración del tipo de objetivo [CÓDIGO]</value>
-        <value xml:lang="fr">Type d'énumérateur cible [réf]</value>
+        <value xml:lang="fr">Type d'énumérateur cible [Réf.]</value>
         <value xml:lang="it">Tipo Destinazione</value>
         <value xml:lang="ro">Tip Destinatie</value>
         <value xml:lang="ru">Код типа назначения [Код]</value>
@@ -21205,7 +21205,7 @@
         <value xml:lang="de">Webseite [ID]</value>
         <value xml:lang="en">WebSite [ID]</value>
         <value xml:lang="es">Sitio web [CÓDIGO]</value>
-        <value xml:lang="fr">Site Web [réf]</value>
+        <value xml:lang="fr">Site Web [Réf.]</value>
         <value xml:lang="it">Sito Web [Codice]</value>
         <value xml:lang="ro">Sit Web [Cod]</value>
         <value xml:lang="ru">WebСайт [Код]</value>

Modified: ofbiz/branches/jquery/applications/product/data/ProductPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/data/ProductPortletData.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/data/ProductPortletData.xml (original)
+++ ofbiz/branches/jquery/applications/product/data/ProductPortletData.xml Wed Aug 11 13:22:40 2010
@@ -47,4 +47,4 @@
       <PortalPageColumn portalPageId="ProductStoreFacility" columnSeqId="00001"/>
         <PortalPagePortlet portalPageId="ProductStoreFacility" portalPortletId="PrdStoreFacilityMgmt" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
 
-</entity-engine-xml>
\ No newline at end of file
+</entity-engine-xml>

Modified: ofbiz/branches/jquery/applications/product/data/ProductTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/data/ProductTypeData.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/data/ProductTypeData.xml (original)
+++ ofbiz/branches/jquery/applications/product/data/ProductTypeData.xml Wed Aug 11 13:22:40 2010
@@ -179,7 +179,7 @@ under the License.
     <ProductAssocType description="Also Bought" hasTable="N" parentTypeId="" productAssocTypeId="ALSO_BOUGHT"/>
     <ProductAssocType description="Upgrade or Up-Sell" hasTable="N" parentTypeId="" productAssocTypeId="PRODUCT_UPGRADE"/>
     <ProductAssocType description="Complementary or Cross-Sell" hasTable="N" parentTypeId="" productAssocTypeId="PRODUCT_COMPLEMENT"/>
-    <ProductAssocType description="Incompatable" hasTable="N" parentTypeId="" productAssocTypeId="PRODUCT_INCOMPATABLE"/>
+    <ProductAssocType description="Incompatible" hasTable="N" parentTypeId="" productAssocTypeId="PRODUCT_INCOMPATABLE"/>
     <ProductAssocType description="New Version, Replacement" hasTable="N" parentTypeId="" productAssocTypeId="PRODUCT_OBSOLESCENCE"/>
     <ProductAssocType description="Actual Product Component" hasTable="N" parentTypeId="" productAssocTypeId="PRODUCT_COMPONENT"/>
     <ProductAssocType description="Equivalent or Substitute" hasTable="N" parentTypeId="" productAssocTypeId="PRODUCT_SUBSTITUTE"/>

Modified: ofbiz/branches/jquery/applications/product/entitydef/eecas.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/entitydef/eecas.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/entitydef/eecas.xml (original)
+++ ofbiz/branches/jquery/applications/product/entitydef/eecas.xml Wed Aug 11 13:22:40 2010
@@ -21,10 +21,17 @@ under the License.
 <entity-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entity-eca.xsd">
     <!-- Product Keyword Indexing ECAs -->
-    <eca entity="Product" operation="create-store" event="return">
+    <eca entity="Product" operation="create" event="return">
         <condition field-name="autoCreateKeywords" operator="not-equals" value="N"/>
         <action service="indexProductKeywords" mode="sync" value-attr="productInstance"/>
     </eca>
+    <eca entity="Product" operation="store" event="return">
+        <condition field-name="autoCreateKeywords" operator="not-equals" value="N"/>
+        <action service="indexProductKeywords" mode="sync"/>
+    </eca>
+    <eca entity="GoodIdentification" operation="create-store" event="return">
+        <action service="indexProductKeywords" mode="sync"/>
+    </eca>
     <eca entity="ProductAttribute" operation="create-store" event="return">
         <action service="indexProductKeywords" mode="sync"/>
     </eca>

Modified: ofbiz/branches/jquery/applications/product/entitydef/entitymodel_old.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/entitydef/entitymodel_old.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/entitydef/entitymodel_old.xml (original)
+++ ofbiz/branches/jquery/applications/product/entitydef/entitymodel_old.xml Wed Aug 11 13:22:40 2010
@@ -57,4 +57,4 @@ under the License.
       </relation>
     </entity>
 
-</entitymodel>
\ No newline at end of file
+</entitymodel>

Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/UpgradeServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/UpgradeServices.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/UpgradeServices.xml (original)
+++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/UpgradeServices.xml Wed Aug 11 13:22:40 2010
@@ -56,4 +56,4 @@ under the License.
         </iterate>
     </simple-method>
 
-</simple-methods>
\ No newline at end of file
+</simple-methods>

Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Wed Aug 11 13:22:40 2010
@@ -684,7 +684,7 @@ under the License.
         <set field="quantityOnHandTotal" value="0" type="BigDecimal"/>
         <set from-field="parameters.productId" field="lookupMktgPkgParams.productId"/>
         <entity-one entity-name="Product" value-field="product"/>
-        <set field="isMarketingPkgAuto" value="${groovy: org.ofbiz.common.CommonWorkers.hasParentType(delegator, 'ProductType', 'productTypeId', product.productTypeId, 'parentTypeId', 'MARKETING_PKG_AUTO')}" type="Boolean"/>
+        <set field="isMarketingPkgAuto" value="${groovy: org.ofbiz.entity.util.EntityTypeUtil.hasParentType(delegator, 'ProductType', 'productTypeId', product.productTypeId, 'parentTypeId', 'MARKETING_PKG_AUTO')}" type="Boolean"/>
         <if-compare field="isMarketingPkgAuto" operator="equals" value="true" type="Boolean">
             <set value="MANUF_COMPONENT" field="lookupMktgPkgParams.type"/>
         <else>
@@ -1355,4 +1355,4 @@ under the License.
             </else>
         </if-empty>
     </simple-method>
-</simple-methods>
\ No newline at end of file
+</simple-methods>

Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original)
+++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Wed Aug 11 13:22:40 2010
@@ -591,7 +591,7 @@ under the License.
 
             <set from-field="parameters.productId" field="callServiceMap.productId"/>
             <set from-field="productStore.inventoryFacilityId" field="callServiceMap.facilityId"/>
-            <set field="isMarketingPkg" value="${groovy: org.ofbiz.common.CommonWorkers.hasParentType(delegator, 'ProductType', 'productTypeId', product.productTypeId, 'parentTypeId', 'MARKETING_PKG')}" type="Boolean"/>
+            <set field="isMarketingPkg" value="${groovy: org.ofbiz.entity.util.EntityTypeUtil.hasParentType(delegator, 'ProductType', 'productTypeId', product.productTypeId, 'parentTypeId', 'MARKETING_PKG')}" type="Boolean"/>
             <if-compare field="isMarketingPkg" operator="equals" value="true" type="Boolean">
                 <call-service service-name="getMktgPackagesAvailable" in-map-name="callServiceMap">
                     <result-to-field result-name="availableToPromiseTotal"/>
@@ -624,7 +624,7 @@ under the License.
                     <!-- Right now the answer is yes, it only succeeds if one facility has sufficient inventory for the order. -->
                     <set from-field="parameters.productId" field="callServiceMap.productId"/>
                     <set from-field="productStoreFacility.facilityId" field="callServiceMap.facilityId"/>
-                    <set field="isMarketingPkg" value="${groovy: org.ofbiz.common.CommonWorkers.hasParentType(delegator, 'ProductType', 'productTypeId', product.productTypeId, 'parentTypeId', 'MARKETING_PKG')}" type="Boolean"/>
+                    <set field="isMarketingPkg" value="${groovy: org.ofbiz.entity.util.EntityTypeUtil.hasParentType(delegator, 'ProductType', 'productTypeId', product.productTypeId, 'parentTypeId', 'MARKETING_PKG')}" type="Boolean"/>
                     <if-compare field="isMarketingPkg" operator="equals" value="true" type="Boolean">
                         <call-service service-name="getMktgPackagesAvailable" in-map-name="callServiceMap">
                             <result-to-field result-name="availableToPromiseTotal"/>

Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (original)
+++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml Wed Aug 11 13:22:40 2010
@@ -50,4 +50,4 @@ under the License.
         </assert>
         <check-errors/>
     </simple-method>
-</simple-methods>
\ No newline at end of file
+</simple-methods>

Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/ProductPriceTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/ProductPriceTests.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/ProductPriceTests.xml (original)
+++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/ProductPriceTests.xml Wed Aug 11 13:22:40 2010
@@ -63,4 +63,4 @@ under the License.
         </assert>
         <check-errors/>
     </simple-method>
-</simple-methods>
\ No newline at end of file
+</simple-methods>

Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Wed Aug 11 13:22:40 2010
@@ -182,10 +182,10 @@ under the License.
             </if-not-empty>
             <if-compare value="0" operator="not-equals" field="qtyForShipmentItem" type="BigDecimal">
                 <!-- add the qtyForShipmentItem to the shipmentItem -->
-                <set from-field="paremeters.quantity" field="originalQuantity"/>
-                <set from-field="qtyForShipmentItem" field="paremeters.quantity"/>
+                <set from-field="parameters.quantity" field="originalQuantity"/>
+                <set from-field="qtyForShipmentItem" field="parameters.quantity"/>
                 <call-simple-method method-name="findCreateIssueShipmentItem"/>
-                <set from-field="originalQuantity" field="paremeters.quantity"/>
+                <set from-field="originalQuantity" field="parameters.quantity"/>
             </if-compare>
         <else>
             <!-- decrement the orderShipment.quantity -->

Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml (original)
+++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml Wed Aug 11 13:22:40 2010
@@ -532,4 +532,4 @@ under the License.
             </if-not-empty>
         </if-compare>
     </simple-method>
-</simple-methods>
\ No newline at end of file
+</simple-methods>

Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/shipment/shipment/ShipmentGatewayConfigServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/shipment/shipment/ShipmentGatewayConfigServices.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/script/org/ofbiz/shipment/shipment/ShipmentGatewayConfigServices.xml (original)
+++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/shipment/shipment/ShipmentGatewayConfigServices.xml Wed Aug 11 13:22:40 2010
@@ -55,4 +55,4 @@ under the License.
         <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-field="lookedUpValue"/>
     </simple-method>
-</simple-methods>
\ No newline at end of file
+</simple-methods>

Modified: ofbiz/branches/jquery/applications/product/servicedef/services_shipmentgateway.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/servicedef/services_shipmentgateway.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/servicedef/services_shipmentgateway.xml (original)
+++ ofbiz/branches/jquery/applications/product/servicedef/services_shipmentgateway.xml Wed Aug 11 13:22:40 2010
@@ -60,4 +60,4 @@ under the License.
         <auto-attributes entity-name="ShipmentGatewayConfigType" include="pk" mode="IN" optional="false"/>
         <auto-attributes entity-name="ShipmentGatewayConfigType" include="nonpk" mode="IN" optional="true"/>
     </service>
-</services>
\ No newline at end of file
+</services>

Modified: ofbiz/branches/jquery/applications/product/servicedef/services_upgrade.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/servicedef/services_upgrade.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/servicedef/services_upgrade.xml (original)
+++ ofbiz/branches/jquery/applications/product/servicedef/services_upgrade.xml Wed Aug 11 13:22:40 2010
@@ -42,4 +42,4 @@ under the License.
         </description>
     </service>
 
-</services>
\ No newline at end of file
+</services>

Modified: ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java (original)
+++ ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java Wed Aug 11 13:22:40 2010
@@ -34,7 +34,6 @@ import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.common.CommonWorkers;
 import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
@@ -45,6 +44,7 @@ import org.ofbiz.entity.condition.Entity
 import org.ofbiz.entity.model.DynamicViewEntity;
 import org.ofbiz.entity.model.ModelKeyMap;
 import org.ofbiz.entity.util.EntityListIterator;
+import org.ofbiz.entity.util.EntityTypeUtil;
 import org.ofbiz.service.DispatchContext;
 import org.ofbiz.service.GenericServiceException;
 import org.ofbiz.service.LocalDispatcher;
@@ -755,7 +755,7 @@ public class InventoryServices {
 
                 // get both the real ATP/QOH available and the quantities available from marketing packages
                 try {
-                    if (CommonWorkers.hasParentType(delegator, "ProductType", "productTypeId", product.getString("productTypeId"), "parentTypeId", "MARKETING_PKG")) {
+                    if (EntityTypeUtil.hasParentType(delegator, "ProductType", "productTypeId", product.getString("productTypeId"), "parentTypeId", "MARKETING_PKG")) {
                         mktgPkgInvResult = dispatcher.runSync("getMktgPackagesAvailable", UtilMisc.toMap("productId", productId, "facilityId", facility.getString("facilityId")));
                     }
                     invResult = dispatcher.runSync("getInventoryAvailableByFacility", UtilMisc.toMap("productId", productId, "facilityId", facility.getString("facilityId")));
@@ -772,7 +772,7 @@ public class InventoryServices {
                     if (fatp != null) atp = atp.add(fatp);
                     if (fqoh != null) qoh = qoh.add(fqoh);
                 }
-                if (CommonWorkers.hasParentType(delegator, "ProductType", "productTypeId", product.getString("productTypeId"), "parentTypeId", "MARKETING_PKG") && !ServiceUtil.isError(mktgPkgInvResult)) {
+                if (EntityTypeUtil.hasParentType(delegator, "ProductType", "productTypeId", product.getString("productTypeId"), "parentTypeId", "MARKETING_PKG") && !ServiceUtil.isError(mktgPkgInvResult)) {
                     BigDecimal fatp = (BigDecimal) mktgPkgInvResult.get("availableToPromiseTotal");
                     BigDecimal fqoh = (BigDecimal) mktgPkgInvResult.get("quantityOnHandTotal");
                     if (fatp != null) mktgPkgAtp = mktgPkgAtp.add(fatp);
@@ -814,7 +814,7 @@ public class InventoryServices {
             // TODO Auto-generated catch block
             e.printStackTrace();
         }
-        if (CommonWorkers.hasParentType(delegator, "ProductType", "productTypeId", product.getString("productTypeId"), "parentTypeId", "MARKETING_PKG")) {
+        if (EntityTypeUtil.hasParentType(delegator, "ProductType", "productTypeId", product.getString("productTypeId"), "parentTypeId", "MARKETING_PKG")) {
             try {
                 resultOutput = dispatcher.runSync("getMktgPackagesAvailable", contextInput);
             } catch (GenericServiceException e) {

Modified: ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java (original)
+++ ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java Wed Aug 11 13:22:40 2010
@@ -521,7 +521,7 @@ public class UpsServices {
                     return ServiceUtil.returnError("Weight value not found for ShipmentRouteSegment with shipmentId " + shipmentId + ", shipmentRouteSegmentId " + shipmentRouteSegmentId + ", and shipmentPackageSeqId " + shipmentPackage.getString("shipmentPackageSeqId"));
                 }
                 BigDecimal boxWeight = shipmentPackage.getBigDecimal("weight");
-                UtilXml.addChildElementValue(packageWeightElement, "Weight", UtilValidate.isNotEmpty(boxWeight) ? ""+boxWeight.intValue() : "", shipmentConfirmRequestDoc);
+                UtilXml.addChildElementValue(packageWeightElement, "Weight", UtilValidate.isNotEmpty(boxWeight) ? ""+ boxWeight.setScale(0, boxWeight.ROUND_CEILING) : "", shipmentConfirmRequestDoc);
                 // Adding only when order is not an international order
                 if (!internationalServiceCodes.contains(carrierServiceCode)) {
                     Element referenceNumberElement = UtilXml.addChildElement(packageElement, "ReferenceNumber", shipmentConfirmRequestDoc);

Modified: ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/verify/VerifyPickServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/verify/VerifyPickServices.java?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/verify/VerifyPickServices.java (original)
+++ ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/verify/VerifyPickServices.java Wed Aug 11 13:22:40 2010
@@ -104,4 +104,4 @@ public class VerifyPickServices {
         session.clearAllRows();
         return ServiceUtil.returnSuccess();
     }
-}
\ No newline at end of file
+}

Modified: ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSessionRow.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSessionRow.java?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSessionRow.java (original)
+++ ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSessionRow.java Wed Aug 11 13:22:40 2010
@@ -177,4 +177,4 @@ public class VerifyPickSessionRow implem
         }
     }
 
-}
\ No newline at end of file
+}

Modified: ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java (original)
+++ ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java Wed Aug 11 13:22:40 2010
@@ -202,4 +202,4 @@ public class WeightPackageServices {
         return ServiceUtil.returnSuccess(UtilProperties.getMessage("ProductUiLabels", "FacilityThereIsProblemOccuredInPaymentCapture", locale));
     }
 
-}
\ No newline at end of file
+}

Modified: ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java (original)
+++ ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java Wed Aug 11 13:22:40 2010
@@ -549,4 +549,4 @@ public class WeightPackageSession implem
         return orderedQuantity.intValue();
     }
 
-}
\ No newline at end of file
+}

Modified: ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSessionLine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSessionLine.java?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSessionLine.java (original)
+++ ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSessionLine.java Wed Aug 11 13:22:40 2010
@@ -131,4 +131,4 @@ public class WeightPackageSessionLine im
             throw new GeneralException(ServiceUtil.getErrorMessage(packageResp));
         }
     }
-}
\ No newline at end of file
+}

Modified: ofbiz/branches/jquery/applications/product/testdef/CatalogTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/testdef/CatalogTests.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/testdef/CatalogTests.xml (original)
+++ ofbiz/branches/jquery/applications/product/testdef/CatalogTests.xml Wed Aug 11 13:22:40 2010
@@ -33,4 +33,4 @@ under the License.
     <test-case case-name="category-tests">
         <simple-method-test location="component://product/script/org/ofbiz/product/test/CategoryTests.xml"/>
     </test-case>
-</test-suite>
\ No newline at end of file
+</test-suite>

Modified: ofbiz/branches/jquery/applications/product/testdef/CostTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/testdef/CostTests.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/testdef/CostTests.xml (original)
+++ ofbiz/branches/jquery/applications/product/testdef/CostTests.xml Wed Aug 11 13:22:40 2010
@@ -25,4 +25,4 @@ under the License.
     <test-case case-name="cost-tests">
         <simple-method-test location="component://product/script/org/ofbiz/product/test/CostTests.xml"/>
     </test-case>
-</test-suite>
\ No newline at end of file
+</test-suite>

Modified: ofbiz/branches/jquery/applications/product/testdef/FacilityTest.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/testdef/FacilityTest.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/testdef/FacilityTest.xml (original)
+++ ofbiz/branches/jquery/applications/product/testdef/FacilityTest.xml Wed Aug 11 13:22:40 2010
@@ -35,4 +35,4 @@ under the License.
         <simple-method-test location="component://product/script/org/ofbiz/shipment/test/ShipmentTests.xml"/>
     </test-case>
 
-</test-suite>
\ No newline at end of file
+</test-suite>

Modified: ofbiz/branches/jquery/applications/product/testdef/data/ProductPriceTestData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/testdef/data/ProductPriceTestData.xml?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/testdef/data/ProductPriceTestData.xml (original)
+++ ofbiz/branches/jquery/applications/product/testdef/data/ProductPriceTestData.xml Wed Aug 11 13:22:40 2010
@@ -32,4 +32,4 @@ under the License.
     <ProductPrice productId="DemoProduct-1" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2006-05-13 12:00:00.0" price="15.00" createdDate="2006-05-13 12:00:00.0"  lastModifiedDate="2006-05-13 12:00:00.0"/>
     <ProductPrice productId="DemoProduct-2" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2006-05-13 12:00:00.0" price="5.00" createdDate="2006-05-13 12:00:00.0"  lastModifiedDate="2006-05-13 12:00:00.0"/>
     <ProductPrice productId="DemoProduct-3" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2006-05-13 12:00:00.0" price="10.00" createdDate="2006-05-13 12:00:00.0"  lastModifiedDate="2006-05-13 12:00:00.0"/>
-</entity-engine-xml>
\ No newline at end of file
+</entity-engine-xml>

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/ChooseTopCategory.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/ChooseTopCategory.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/ChooseTopCategory.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/ChooseTopCategory.groovy Wed Aug 11 13:22:40 2010
@@ -21,4 +21,4 @@ import org.ofbiz.product.category.*
 
 CategoryWorker.getCategoriesWithNoParent(request, "noParentCategories");
 noParentCategories = request.getAttribute("noParentCategories");
-context.noParentCategories = noParentCategories;
\ No newline at end of file
+context.noParentCategories = noParentCategories;

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/FastLoadCache.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/FastLoadCache.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/FastLoadCache.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/FastLoadCache.groovy Wed Aug 11 13:22:40 2010
@@ -58,4 +58,4 @@ products.close();
 messageList.add(ptimer.timerString("Finished Products"));
 messageList.add("Loaded " + numProducts + " products");
 
-context.messageList = messageList;
\ No newline at end of file
+context.messageList = messageList;

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy Wed Aug 11 13:22:40 2010
@@ -113,4 +113,4 @@ if (fileType) {
             productCategory.store();
         }
     }
-}
\ No newline at end of file
+}

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryProducts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryProducts.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryProducts.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryProducts.groovy Wed Aug 11 13:22:40 2010
@@ -40,4 +40,4 @@ context.viewSize = outMap.viewSize;
 context.lowIndex = outMap.lowIndex;
 context.highIndex = outMap.highIndex;
 context.listSize = outMap.listSize;
-context.productCategoryMembers = outMap.productCategoryMembers;
\ No newline at end of file
+context.productCategoryMembers = outMap.productCategoryMembers;

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy Wed Aug 11 13:22:40 2010
@@ -136,4 +136,4 @@ if (fileType) {
             configItem.store();
         }
     }
-}
\ No newline at end of file
+}

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy Wed Aug 11 13:22:40 2010
@@ -74,4 +74,4 @@ updateProductContentWrapper.putInContext
 
 context.productContentData = productContentData;
 updateProductContentWrapper.putInContext("content", content);
-updateProductContentWrapper.putInContext("contentId", contentId);
\ No newline at end of file
+updateProductContentWrapper.putInContext("contentId", contentId);

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy Wed Aug 11 13:22:40 2010
@@ -32,4 +32,4 @@ if (configOption) {
     createConfigProductWrapper.putInContext("configOptionId", configOptionId);
     createConfigProductWrapper.putInContext("configItemId", configItemId);
     context.createConfigProductWrapper = createConfigProductWrapper;
-}
\ No newline at end of file
+}

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/feature/EditFeatureCategoryFeatures.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/feature/EditFeatureCategoryFeatures.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/feature/EditFeatureCategoryFeatures.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/feature/EditFeatureCategoryFeatures.groovy Wed Aug 11 13:22:40 2010
@@ -110,4 +110,4 @@ while (productFeatureIter) {
         productFeatureApplMap.put(productFeatureAppl.productFeatureId, productFeatureAppl.productFeatureApplTypeId);
     }
 }
-context.productFeatureApplMap = productFeatureApplMap;
\ No newline at end of file
+context.productFeatureApplMap = productFeatureApplMap;

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.groovy Wed Aug 11 13:22:40 2010
@@ -59,4 +59,4 @@ context.searchOperator = searchOperator;
 context.searchConstraintStrings = searchConstraintStrings;
 context.searchSortOrderString = searchSortOrderString;
 context.supplerPartyRoleAndPartyDetails = supplerPartyRoleAndPartyDetails;
-context.goodIdentificationTypes = goodIdentificationTypes;
\ No newline at end of file
+context.goodIdentificationTypes = goodIdentificationTypes;

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy Wed Aug 11 13:22:40 2010
@@ -49,4 +49,4 @@ context.paging = result.paging;
 context.previousViewSize = result.previousViewSize;
 context.searchCategory = result.searchCategory;
 context.searchConstraintStrings = result.searchConstraintStrings;
-context.searchSortOrderString = result.searchSortOrderString;
\ No newline at end of file
+context.searchSortOrderString = result.searchSortOrderString;

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearchbox.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearchbox.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearchbox.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearchbox.groovy Wed Aug 11 13:22:40 2010
@@ -28,4 +28,4 @@ if (state) {
         isOpen = "open".equals(state);
     }
 }
-context.isOpen = isOpen;
\ No newline at end of file
+context.isOpen = isOpen;

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/miniproductlist.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/miniproductlist.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/miniproductlist.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/miniproductlist.groovy Wed Aug 11 13:22:40 2010
@@ -50,4 +50,4 @@ if (isOpen) {
     context.listSize = outMap.listSize;
     context.productCategory = outMap.productCategory;
     context.productCategoryMembers = outMap.productCategoryMembers;
-}
\ No newline at end of file
+}

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/sidecatalogs.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/sidecatalogs.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/sidecatalogs.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/sidecatalogs.groovy Wed Aug 11 13:22:40 2010
@@ -43,4 +43,4 @@ if (curProdCatalogId) {
 } else {
     curProdCatalogId = (String) session.getAttribute("curProdCatalogId");
 }
-context.curProdCatalogId = curProdCatalogId;
\ No newline at end of file
+context.curProdCatalogId = curProdCatalogId;

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/sidedeepcategory.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/sidedeepcategory.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/sidedeepcategory.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/find/sidedeepcategory.groovy Wed Aug 11 13:22:40 2010
@@ -54,4 +54,4 @@ if (categoryList) {
     catContentWrappers = [:];
     CategoryWorker.getCategoryContentWrappers(catContentWrappers, categoryList, request);
     context.catContentWrappers = catContentWrappers;
-}
\ No newline at end of file
+}

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/lookup/LookupVariantProduct.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/lookup/LookupVariantProduct.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/lookup/LookupVariantProduct.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/lookup/LookupVariantProduct.groovy Wed Aug 11 13:22:40 2010
@@ -75,4 +75,4 @@ if (security.hasEntityPermission("CATALO
         context.productFeatureIds = productFeatureIds;
         context.productVariantId = productVariantId;
     }
-}
\ No newline at end of file
+}

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.groovy Wed Aug 11 13:22:40 2010
@@ -28,4 +28,4 @@ context.inputParamEnums = delegator.find
 
 context.condOperEnums = delegator.findList("Enumeration", EntityCondition.makeCondition([enumTypeId : 'PROD_PRICE_COND']), null, ['sequenceId'], null, true);
 
-context.productPriceActionTypes = delegator.findList("ProductPriceActionType", null, null, ['description'], null, true);
\ No newline at end of file
+context.productPriceActionTypes = delegator.findList("ProductPriceActionType", null, null, ['description'], null, true);

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromCategory.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromCategory.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromCategory.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromCategory.groovy Wed Aug 11 13:22:40 2010
@@ -108,4 +108,4 @@ while (productFeatureIter) {
         productFeatureApplMap.put(productFeatureAppl.productFeatureId, productFeatureAppl.productFeatureApplTypeId);
     }
 }
-context.productFeatureApplMap = productFeatureApplMap;
\ No newline at end of file
+context.productFeatureApplMap = productFeatureApplMap;

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.groovy Wed Aug 11 13:22:40 2010
@@ -41,4 +41,4 @@ if (productFeatureGroupId) {
     // this will not break out the product features by view size
     context.listSize = productFeatures.size();
     context.highIndex = productFeatures.size();
-}
\ No newline at end of file
+}

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy Wed Aug 11 13:22:40 2010
@@ -94,4 +94,4 @@ while (itr <= 5) {
 
 context.bestSellingProducts = topSellingProducts;
 
-context.now = UtilDateTime.toDateString(UtilDateTime.nowDate());
\ No newline at end of file
+context.now = UtilDateTime.toDateString(UtilDateTime.nowDate());

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.groovy Wed Aug 11 13:22:40 2010
@@ -85,4 +85,4 @@ if (product) {
     context.assocFromProducts = product.getRelated("MainProductAssoc", null, ['sequenceNum']);
 
     context.assocToProducts = product.getRelated("AssocProductAssoc");
-}
\ No newline at end of file
+}

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy Wed Aug 11 13:22:40 2010
@@ -138,4 +138,4 @@ if (fileType) {
             product.store();
         }
     }
-}
\ No newline at end of file
+}

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductInventoryItems.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductInventoryItems.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductInventoryItems.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductInventoryItems.groovy Wed Aug 11 13:22:40 2010
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-import org.ofbiz.common.CommonWorkers
 import org.ofbiz.entity.condition.*
+import org.ofbiz.entity.util.EntityTypeUtil
 import org.ofbiz.product.inventory.InventoryWorker
 
 if (product) {
-    boolean isMarketingPackage = CommonWorkers.hasParentType(delegator, "ProductType", "productTypeId", product.productTypeId, "parentTypeId", "MARKETING_PKG");
+    boolean isMarketingPackage = EntityTypeUtil.hasParentType(delegator, "ProductType", "productTypeId", product.productTypeId, "parentTypeId", "MARKETING_PKG");
     context.isMarketingPackage = (isMarketingPackage? "true": "false");
     //If product is virtual gather summary data from variants
     if (product.isVirtual && "Y".equals(product.isVirtual)) {
@@ -162,4 +162,4 @@ if (product) {
         context.showEmpty = showEmpty;
         context.purchaseOrders = purchaseOrders;
     }
-}
\ No newline at end of file
+}

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy Wed Aug 11 13:22:40 2010
@@ -314,4 +314,4 @@ String showPublish = "false";
 if (prodCatMembs.size() == 0) {
     showPublish = "true";
 }
-context.showPublish = showPublish;
\ No newline at end of file
+context.showPublish = showPublish;

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/QuickAddVariants.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/QuickAddVariants.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/QuickAddVariants.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/product/QuickAddVariants.groovy Wed Aug 11 13:22:40 2010
@@ -21,4 +21,4 @@ result = dispatcher.runSync("getProductF
 context.featureTypes = result.productFeatureTypes;
 
 result = dispatcher.runSync("getVariantCombinations", [productId : productId]);
-context.featureCombinationInfos = result.featureCombinations;
\ No newline at end of file
+context.featureCombinationInfos = result.featureCombinations;

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromoCode.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromoCode.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromoCode.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromoCode.groovy Wed Aug 11 13:22:40 2010
@@ -47,4 +47,4 @@ context.productPromo = productPromo;
 context.productPromoCodeId = productPromoCodeId;
 context.productPromoCode = productPromoCode;
 context.productPromoCodeEmails = productPromoCodeEmails;
-context.productPromoCodeParties = productPromoCodeParties;
\ No newline at end of file
+context.productPromoCodeParties = productPromoCodeParties;

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy Wed Aug 11 13:22:40 2010
@@ -84,4 +84,4 @@ if (paymentServiceTypeEnumId == "PRDS_PA
     context.paymentCustomMethods = null;
 } else {
     context.paymentCustomMethods = delegator.findList("CustomMethod", customMethodsCond, null, ["description"], null, false);
-}
\ No newline at end of file
+}

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreSurveys.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreSurveys.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreSurveys.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreSurveys.groovy Wed Aug 11 13:22:40 2010
@@ -38,4 +38,4 @@ context.surveyApplTypes = delegator.find
 
 context.productCategories = delegator.findList("ProductCategory", null, null, ['description'], null, false);
 
-context.nowTimestampString = UtilDateTime.nowTimestamp().toString();
\ No newline at end of file
+context.nowTimestampString = UtilDateTime.nowTimestamp().toString();

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/thesaurus/EditKeywordThesaurus.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/thesaurus/EditKeywordThesaurus.groovy?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/thesaurus/EditKeywordThesaurus.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/thesaurus/EditKeywordThesaurus.groovy Wed Aug 11 13:22:40 2010
@@ -70,4 +70,4 @@ for (i='a'; i<='z'; i++) {
 context.relationshipEnums = relationshipEnums;
 context.keywordThesauruses = newKeywordThesaurus;
 context.firstLetter = firstLetter;
-context.letterList = letterList;
\ No newline at end of file
+context.letterList = letterList;

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl Wed Aug 11 13:22:40 2010
@@ -106,7 +106,8 @@ under the License.
                     <td width="15%">${uiLabelMap.ProductDefaultPrice}:</td>
                     <td>
                         <input type="hidden" name="defaultPrice" value="${requestParameters.defaultPrice?if_exists}"/>
-                        <div>&nbsp;${requestParameters.defaultPrice?default("&nbsp;")}</div>
+                        <input type="hidden" name="currencyUomId" value="${requestParameters.currencyUomId?if_exists}"/>
+                        <div>&nbsp;${requestParameters.defaultPrice?default("&nbsp;")}&nbsp;${requestParameters.currencyUomId?default("&nbsp;")}</div>
                     </td>
                 </tr>
                 <tr>

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl?rev=984399&r1=984398&r2=984399&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl Wed Aug 11 13:22:40 2010
@@ -63,7 +63,18 @@ under the License.
                 </tr>
                 <tr>
                     <td width="15%">${uiLabelMap.ProductDefaultPrice}:</td>
-                    <td><input type="text" name="defaultPrice" size="8"/></td>
+                    <td><input type="text" name="defaultPrice" size="8"/>
+                    <#assign findCurrenciesMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("uomTypeId", "CURRENCY_MEASURE")>
+                    <#assign currencies = delegator.findByAndCache('Uom', findCurrenciesMap) />
+                    <#if currencies?has_content && (currencies?size > 0)>
+                        <select name="currencyUomId">
+                            <option value=""></option>
+                            <#list currencies as currency>
+                                <option value="${currency.uomId}">${currency.get("description",locale)} [${currency.uomId}]</option>
+                            </#list>
+                        </select>
+                    </#if>
+                    </td>
                 </tr>
                 <tr>
                     <td width="15%">${uiLabelMap.ProductAverageCost}:</td>