You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/11/12 00:07:43 UTC

svn commit: r1034192 [2/3] - in /ofbiz/branches/jquery: ./ applications/accounting/config/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/invoice/ applications/accounting/servicedef/ applications/accounting/src/o...

Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestForms.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestForms.xml (original)
+++ ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestForms.xml Thu Nov 11 23:07:40 2010
@@ -76,7 +76,7 @@ under the License.
           <service service-name="performFind" result-map="result" result-map-list="listIt">
             <field-map field-name="inputFields" from-field="parameters"/>
             <field-map field-name="entityName" from-field="entityName"/>
-            <field-map field-name="orderBy" value="-lastModifiedDate"/>
+            <field-map field-name="orderBy" from-field="parameters.sortField"/>
             <field-map field-name="viewIndex" from-field="viewIndex"/>
             <field-map field-name="viewSize" from-field="viewSize"/>
           </service>
@@ -85,25 +85,25 @@ under the License.
 
     <form name="ListRequestList" type="list" use-row-submit="true" list-name="custRequests" title="List of customer requests"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
-        <field name="custRequestId"><hidden/></field>
-        <field name="custRequestName">
-            <hyperlink description="${custRequestName} [${custRequestId}]" target="ViewRequest">
+        <field name="custRequestId" sort-field="true">
+            <hyperlink description="${custRequestId}" target="ViewRequest">
                 <parameter param-name="custRequestId"/>
             </hyperlink>
         </field>
-        <field name="priority"><display/></field>
-        <field name="responseRequiredDate"><display/></field>
-        <field name="fromPartyId">
+        <field name="custRequestName" sort-field="true"><display/></field>
+        <field name="priority" sort-field="true"><display/></field>
+        <field name="responseRequiredDate" sort-field="true"><display/></field>
+        <field name="fromPartyId" sort-field="true">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}">
                 <sub-hyperlink description="[${fromPartyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                     <parameter param-name="partyId" from-field="fromPartyId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="statusId">
+        <field name="statusId" sort-field="true">
             <display-entity also-hidden="false" entity-name="StatusItem"/>
         </field>
-        <field name="lastModifiedDate"><display/></field>
+        <field name="lastModifiedDate" sort-field="true"><display/></field>
         <!--field name="statusId"><hidden value="CRQ_REJECTED"/></field-->
         <field name="rejectButton">
             <hyperlink target="setCustRequestStatus" description="${uiLabelMap.FormFieldTitle_rejectButton}">

Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml (original)
+++ ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml Thu Nov 11 23:07:40 2010
@@ -30,13 +30,19 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.OrderFindRequests}" collapsible="true" id="findRequests">
-                            <link target="request" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
-                            <include-form name="FindRequests" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
-                        </screenlet>
-                        <screenlet title="${uiLabelMap.OrderRequestList}" navigation-form-name="ListRequests" >
-                            <include-form name="ListRequests" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
-                        </screenlet>
+                        <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+                            <decorator-section name="menu-bar">
+                                <container style="button-bar">
+                                    <link target="request" text="${uiLabelMap.OrderNewRequest}" style="buttontext create"/>
+                                </container>
+                            </decorator-section>
+                            <decorator-section name="search-options">
+                                <include-form name="FindRequests" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
+                            </decorator-section>
+                            <decorator-section name="search-results">
+                                <include-form name="ListRequests" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
+                            </decorator-section>
+                        </decorator-screen>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/branches/jquery/applications/party/data/PartyTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/data/PartyTypeData.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/data/PartyTypeData.xml (original)
+++ ofbiz/branches/jquery/applications/party/data/PartyTypeData.xml Thu Nov 11 23:07:40 2010
@@ -62,6 +62,7 @@ under the License.
     <ContactMechPurposeType contactMechPurposeTypeId="BILLING_EMAIL" description="Billing (AP) Email"/>
     <ContactMechPurposeType contactMechPurposeTypeId="PAYMENT_EMAIL" description="Payment (AR) Email"/>
     <ContactMechPurposeType contactMechPurposeTypeId="OTHER_EMAIL" description="Other Email Address"/>
+    <ContactMechPurposeType contactMechPurposeTypeId="SUPPORT_EMAIL" description="Support Email"/>
     <ContactMechPurposeType contactMechPurposeTypeId="ORDER_EMAIL" description="Order Notification Email Address"/>
     <ContactMechPurposeType contactMechPurposeTypeId="PRIMARY_WEB_URL" description="Primary Website URL"/>
 

Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 11 23:07:40 2010
@@ -1,3 +1,3 @@
 /incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456
 /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
-/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1030401
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1034179

Modified: ofbiz/branches/jquery/applications/product/config/ProductEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/config/ProductEntityLabels.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/config/ProductEntityLabels.xml (original)
+++ ofbiz/branches/jquery/applications/product/config/ProductEntityLabels.xml Thu Nov 11 23:07:40 2010
@@ -562,7 +562,7 @@
         <value xml:lang="en">Engineering Bill of Materials</value>
         <value xml:lang="es">Lista de materiales de ingeniería</value>
         <value xml:lang="fr">Nomenclatures d'étude</value>
-        <value xml:lang="it">Distinta base ingegnerizzata</value>
+        <value xml:lang="it">Distinta base ingegneria</value>
         <value xml:lang="ro">Lista repere Inginerizata</value>
         <value xml:lang="ru">Конструкторская спецификация материалов</value>
         <value xml:lang="th">วิศวะกรรมศาสตร์รายการวัตถุ</value>

Modified: ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml Thu Nov 11 23:07:40 2010
@@ -5141,7 +5141,7 @@
         <value xml:lang="en">Edit Product Associations</value>
         <value xml:lang="es">Editar Asociaciones de un Producto</value>
         <value xml:lang="fr">Modification des associations d'articles</value>
-        <value xml:lang="it">Aggiorna Associazioni Prodotto</value>
+        <value xml:lang="it">Aggiorna associazioni prodotto</value>
         <value xml:lang="ro">Actualizeaza Asociatii Produs</value>
         <value xml:lang="ru">Изменить ассоциации продукта</value>
         <value xml:lang="th">แก้ไขกลุ่มสินค้า</value>
@@ -5946,6 +5946,10 @@
         <value xml:lang="th">Find Inventory Item Labels</value>
         <value xml:lang="zh">查找库存明细标签</value>
     </property>
+    <property key="PageTitleFindProduct">
+        <value xml:lang="en">Find Product</value>
+        <value xml:lang="it">Ricerca prodotti</value>
+    </property>
     <property key="PageTitleFindProductCatalog">
         <value xml:lang="de">Produktkatalog suchen</value>
         <value xml:lang="en">Find Product Catalog</value>
@@ -7761,7 +7765,7 @@
         <value xml:lang="en">Association Type</value>
         <value xml:lang="es">Tipo de Asociación</value>
         <value xml:lang="fr">Type d'association</value>
-        <value xml:lang="it">Tipo Associazione</value>
+        <value xml:lang="it">Tipo associazione</value>
         <value xml:lang="ro">Tip Asociatie </value>
         <value xml:lang="ru">Тип ассоциации</value>
         <value xml:lang="th">ประเภทกลุ่ม</value>
@@ -7772,7 +7776,7 @@
         <value xml:lang="en">Association Type ID</value>
         <value xml:lang="es">Código de Tipo de Asociación</value>
         <value xml:lang="fr">Réf. du type d'association</value>
-        <value xml:lang="it">Tipo Associazione</value>
+        <value xml:lang="it">Tipo associazione</value>
         <value xml:lang="ro">Tip Asociatie</value>
         <value xml:lang="ru">Тип ассоциации</value>
         <value xml:lang="th">รหัสประเภทกลุ่ม</value>
@@ -7794,7 +7798,7 @@
         <value xml:lang="en">Associations FROM this Product to</value>
         <value xml:lang="es">Asociaciones DE este Producto a</value>
         <value xml:lang="fr">Articles associés depuis cet article</value>
-        <value xml:lang="it">Associazioni da questo Prodotto a</value>
+        <value xml:lang="it">Associazioni da questo prodotto a</value>
         <value xml:lang="ro">Asociatie De la acest Produs la</value>
         <value xml:lang="ru">Ассоциации от этого продукта к</value>
         <value xml:lang="th">กลุ่มจากสินค้านี้ไปยัง</value>
@@ -7805,7 +7809,7 @@
         <value xml:lang="en">Associations TO this Product from</value>
         <value xml:lang="es">Asociaciones A este Producto de</value>
         <value xml:lang="fr">Articles associés à cet article</value>
-        <value xml:lang="it">Associazioni a questo Prodotto da</value>
+        <value xml:lang="it">Associazioni a questo prodotto da</value>
         <value xml:lang="ro">Asociatii La acest Produs de la</value>
         <value xml:lang="ru">Ассоциации к этому продукту от</value>
         <value xml:lang="th">กลุ่มสินค้านี้จาก</value>
@@ -10201,7 +10205,7 @@
         <value xml:lang="en">Edit Features for Feature Category</value>
         <value xml:lang="es">Editar Características para Categorías de Atributos</value>
         <value xml:lang="fr">Modification des caractéristiques de la catégorie :</value>
-        <value xml:lang="it">Aggiorna Caratteristiche per Categoria Caratteristica</value>
+        <value xml:lang="it">Aggiorna caratteristiche per categoria</value>
         <value xml:lang="ro">Actualizeaza Caracteristica pe Categorie Caracteristica</value>
         <value xml:lang="ru">Изменить особенности для категории</value>
         <value xml:lang="th">แก้ไขลักษณะด้วยรหัสหมวดหมู่</value>
@@ -14375,7 +14379,7 @@
         <value xml:lang="en">No Price Rules found</value>
         <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="it">Nessuna regola di 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>
@@ -15990,7 +15994,7 @@
         <value xml:lang="en">Edit Price Rule [ID]</value>
         <value xml:lang="es">Regla de precio [CÓDIGO]</value>
         <value xml:lang="fr">Modifier la règle de prix [Réf.]</value>
-        <value xml:lang="it">Regola Prezzo [Codice]</value>
+        <value xml:lang="it">Regola prezzo [Codice]</value>
         <value xml:lang="nl">Prijsregel [ID]</value>    
         <value xml:lang="ro">Regula Pret [Cod]</value>
         <value xml:lang="ru">правила ценообразования [Код]</value>
@@ -16002,7 +16006,7 @@
         <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="it">Nome Regola Prezzo [Codice]</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>
@@ -16300,7 +16304,7 @@
         <value xml:lang="en">Product Feature Maintenance</value>
         <value xml:lang="es">Mantenimiento de características de producto</value>
         <value xml:lang="fr">Maintenance de caractéristique de produits</value>
-        <value xml:lang="it">Manutenzione Caratteristica Prodotto</value>
+        <value xml:lang="it">Manutenzione caratteristica prodotto</value>
         <value xml:lang="ro">Intretinere Caracteristica Produs</value>
         <value xml:lang="ru">Поддержка особенностей продукта</value>
         <value xml:lang="th">การรักษาสภาพลักษณะสินค้า</value>
@@ -17681,7 +17685,7 @@
         <value xml:lang="en">(You must re-create the association to change this.)</value>
         <value xml:lang="es">(Debe volver a crear la asociación para cambiar esto)</value>
         <value xml:lang="fr">(Vous devez recréer l'association pour modifier cela.)</value>
-        <value xml:lang="it">(Tu devi ri-creare l'associazione per cambiarla a questo.)</value>
+        <value xml:lang="it">(Non può essere cambiato senza ri-creare l'associazione)</value>
         <value xml:lang="ro">( Pentru a putea schimba,trebuie sa recreezi asociatia.)</value>
         <value xml:lang="ru">(Чтобы это изменить вы должны повторно создать ассоциацию.)</value>
         <value xml:lang="th">(คุณต้องสร้างกลุ่มถึงการเปลี่ยนแปลงนี้อีกครั้ง)</value>
@@ -18728,7 +18732,7 @@
         <value xml:lang="en">Sequence Num</value>
         <value xml:lang="es">Nº de secuencia</value>
         <value xml:lang="fr">N° de séquence</value>
-        <value xml:lang="it">Num Sequenza </value>
+        <value xml:lang="it">Num sequenza</value>
         <value xml:lang="ro">Numar Secventa </value>
         <value xml:lang="ru">Послед. номер</value>
         <value xml:lang="th">หมายเลขรายการ</value>

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=1034192&r1=1034191&r2=1034192&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 Thu Nov 11 23:07:40 2010
@@ -418,12 +418,16 @@ under the License.
                 <set field="getAssoc.productIdTo" from-field="product.productId"/>
                 <set field="getAssoc.productAssocTypeId" value="PRODUCT_VARIANT"/>
                 <find-by-and entity-name="ProductAssoc" map="getAssoc" list="assocs"/>
-                <filter-list-by-date list="assocs" to-list="assocsDate"/>
-                <first-from-list entry="assoc" list="assocsDate"/>
-                <get-related-one value-field="assoc" relation-name="MainProduct" to-value-field="virtProduct"/>
-                <if-empty field="product.salesDiscWhenNotAvail">
-                    <set field="product.salesDiscWhenNotAvail" from-field="virtProduct.salesDiscWhenNotAvail"/>
-                </if-empty>
+                <if-not-empty field="assocs">
+                    <filter-list-by-date list="assocs" to-list="assocsDate"/>
+                    <first-from-list entry="assoc" list="assocsDate"/>
+                    <if-not-empty field="assoc">
+                        <get-related-one value-field="assoc" relation-name="MainProduct" to-value-field="virtProduct"/>
+                        <if-empty field="product.salesDiscWhenNotAvail">
+                            <set field="product.salesDiscWhenNotAvail" from-field="virtProduct.salesDiscWhenNotAvail"/>
+                        </if-empty>
+                    </if-not-empty>
+                </if-not-empty>    
             </if-compare>
         </if-not-empty>
 

Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original)
+++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml Thu Nov 11 23:07:40 2010
@@ -127,7 +127,7 @@ under the License.
                     <check-errors/>
                 </if-empty>
                 
-                <calculate field="parameters.taxAmount" type="BigDecimal" decimal-scale="3" rounding-mode="HalfEven">
+                <calculate field="parameters.taxAmount" type="BigDecimal" decimal-scale="3" rounding-mode="HalfUp">
                     <calcop operator="subtract">
                         <calcop operator="get" field="parameters.priceWithTax"/>
                         <calcop operator="divide">
@@ -142,7 +142,7 @@ under the License.
                         </calcop>
                     </calcop>
                 </calculate>
-                <calculate field="parameters.price" type="BigDecimal" decimal-scale="3" rounding-mode="HalfEven">
+                <calculate field="parameters.price" type="BigDecimal" decimal-scale="3" rounding-mode="HalfUp">
                     <calcop operator="subtract">
                         <calcop operator="get" field="parameters.priceWithTax"/>
                         <calcop operator="get" field="parameters.taxAmount"></calcop>

Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 11 23:07:40 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264
-/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1030401
+/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1034179

Modified: ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/KeywordIndex.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/KeywordIndex.java?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/KeywordIndex.java (original)
+++ ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/KeywordIndex.java Thu Nov 11 23:07:40 2010
@@ -32,6 +32,7 @@ import org.ofbiz.base.util.GeneralExcept
 import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilProperties;
+import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.common.KeywordSearchUtil;
 import org.ofbiz.content.data.DataResourceWorker;
 import org.ofbiz.entity.Delegator;
@@ -182,10 +183,11 @@ public class KeywordIndex {
                 }
             }
         }
-
-        for (String str: strings) {
-            // call process keywords method here
-            KeywordSearchUtil.processKeywordsForIndex(str, keywords, separators, stopWordBagAnd, stopWordBagOr, removeStems, stemSet);
+        if (UtilValidate.isNotEmpty(strings)) {
+            for (String str: strings) {
+                // call process keywords method here
+                KeywordSearchUtil.processKeywordsForIndex(str, keywords, separators, stopWordBagAnd, stopWordBagOr, removeStems, stemSet);
+            }
         }
 
         List<GenericValue> toBeStored = FastList.newInstance();

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/controller.xml Thu Nov 11 23:07:40 2010
@@ -431,7 +431,11 @@ under the License.
     </request-map>
 
     <!-- ================ Product Requests ================= -->
-    <request-map uri="EditProduct">
+     <request-map uri="FindProduct">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="FindProduct"/>
+    </request-map>
+   <request-map uri="EditProduct">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="EditProduct"/>
     </request-map>
@@ -2754,6 +2758,7 @@ under the License.
     <view-map name="createProductInCategoryStart" type="screen" page="component://product/widget/catalog/CategoryScreens.xml#createProductInCategoryStart"/>
     <view-map name="CreateProductInCategoryCheckExisting" type="screen" page="component://product/widget/catalog/CategoryScreens.xml#CreateProductInCategoryCheckExisting"/>
 
+    <view-map name="FindProduct" type="screen" page="component://product/widget/catalog/ProductScreens.xml#FindProduct"/>
     <view-map name="EditProduct" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditProduct"/>
     <view-map name="EditProductPrices" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditProductPrices"/>
     <view-map name="EditProductAssetUsage" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditProductAssetUsage"/>

Modified: ofbiz/branches/jquery/applications/product/widget/catalog/CatalogMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/CatalogMenus.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/widget/catalog/CatalogMenus.xml (original)
+++ ofbiz/branches/jquery/applications/product/widget/catalog/CatalogMenus.xml Thu Nov 11 23:07:40 2010
@@ -19,6 +19,7 @@ under the License.
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
     <menu name="CatalogAppBar" title="${uiLabelMap.ProductCatalogManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+        <menu-item name="products" title="${uiLabelMap.ProductProducts}"><link target="FindProduct"/></menu-item>
         <menu-item name="featurecats" title="${uiLabelMap.ProductFeatureCats}"><link target="EditFeatureCategories"/></menu-item>
         <menu-item name="promos" title="${uiLabelMap.ProductPromos}"><link target="FindProductPromo"/></menu-item>
         <menu-item name="pricerules" title="${uiLabelMap.ProductPriceRules}"><link target="FindProductPriceRules"/></menu-item>
@@ -225,7 +226,7 @@ under the License.
         </menu-item>
     </menu>
 
-    <menu name="PriceRulesTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+    <menu name="PriceRulesButtonBar" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="FindRules" title="${uiLabelMap.CommonAdd}/${uiLabelMap.ProductFindRule}">
             <link target="FindProductPriceRules"/>
         </menu-item>

Modified: ofbiz/branches/jquery/applications/product/widget/catalog/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/CatalogScreens.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/widget/catalog/CatalogScreens.xml (original)
+++ ofbiz/branches/jquery/applications/product/widget/catalog/CatalogScreens.xml Thu Nov 11 23:07:40 2010
@@ -165,9 +165,9 @@ under the License.
                                 <if-has-permission permission="CATALOG" action="_VIEW"/>
                             </condition>
                             <widgets>
-                                <platform-specific>
-                                    <html><html-template location="component://product/webapp/catalog/catalog/FindProdCatalog.ftl"/></html>
-                                </platform-specific>
+                                <screenlet title="${uiLabelMap.ProductProductCatalogsList}">
+                                    <include-form name="ListProdCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/>
+                                </screenlet>
                             </widgets>
                             <fail-widgets>
                                 <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label>

Modified: ofbiz/branches/jquery/applications/product/widget/catalog/CategoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/CategoryForms.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/widget/catalog/CategoryForms.xml (original)
+++ ofbiz/branches/jquery/applications/product/widget/catalog/CategoryForms.xml Thu Nov 11 23:07:40 2010
@@ -211,4 +211,13 @@ under the License.
             </hyperlink>
         </field>
     </form>
+    <form name="ListTopCategory" type="list" list-name="noParentCategories" odd-row-style="alternate-row" default-table-style="basic-table">
+        <field name="productCategoryId"  widget-style="buttontext">
+            <hyperlink target="EditCategory" description="${productCategoryId}" also-hidden="false">
+                <parameter param-name="CATALOG_TOP_CATEGORY" value="${productCategoryId}"/>
+                <parameter param-name="productCategoryId" value="${productCategoryId}"/>
+            </hyperlink>
+        </field>
+        <field name="description"><display/></field>
+    </form>
 </forms>

Modified: ofbiz/branches/jquery/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/CommonScreens.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/branches/jquery/applications/product/widget/catalog/CommonScreens.xml Thu Nov 11 23:07:40 2010
@@ -51,6 +51,7 @@ under the License.
     <screen name="CommonProductDecorator">
         <section>
             <actions>
+                <set field="headerItem" value="products"/>
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="productId" from-field="parameters.productId"/>
@@ -117,9 +118,9 @@ under the License.
                                         </or>
                                     </condition>
                                     <widgets>
-                                        <decorator-section-include name="body"/>
-                                    </widgets>
-                                    <fail-widgets>
+                                <decorator-section-include name="body"/>
+                            </widgets>
+                            <fail-widgets>
                                         <label style="h3">${uiLabelMap.ProductNoExistingProductsFound}</label>
                                     </fail-widgets>
                                 </section>
@@ -398,7 +399,9 @@ under the License.
                         <container style="button-bar">
                             <link target="EditCategory" text="${uiLabelMap.ProductNewCategory}" style="buttontext create"/>
                         </container>
-                        <platform-specific><html><html-template location="component://product/webapp/catalog/ChooseTopCategory.ftl"/></html></platform-specific>
+                        <screenlet title="${uiLabelMap.ProductCategoryWithNoParent}">
+                            <include-form name="ListTopCategory" location="component://product/widget/catalog/CategoryForms.xml"/>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/branches/jquery/applications/product/widget/catalog/PriceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/PriceScreens.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/widget/catalog/PriceScreens.xml (original)
+++ ofbiz/branches/jquery/applications/product/widget/catalog/PriceScreens.xml Thu Nov 11 23:07:40 2010
@@ -99,7 +99,7 @@ under the License.
                 <decorator-screen name="CommonPriceDecorator">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://common/webcommon/includes/setPriceRulesCondEventJs.ftl"/></html></platform-specific>
-                        <include-menu name="PriceRulesTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+                        <include-menu name="PriceRulesButtonBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
                         <screenlet title="${uiLabelMap.ProductPriceRuleId} [${parameters.productPriceRuleId}]">
                             <label style="h6" text="${uiLabelMap.ProductConditionsActionsRemoveBefore}"/>
                             <horizontal-separator/>

Modified: ofbiz/branches/jquery/applications/product/widget/catalog/ProdCatalogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/ProdCatalogForms.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/widget/catalog/ProdCatalogForms.xml (original)
+++ ofbiz/branches/jquery/applications/product/widget/catalog/ProdCatalogForms.xml Thu Nov 11 23:07:40 2010
@@ -20,6 +20,22 @@ under the License.
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+    <form name="ListProdCatalog" list-name="listIt" target="" title="" type="list" paginate-target="FindProdCatalog"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
+        <actions>
+            <set field="parameters.sortField" from-field="parameters.sortField" default-value="prodCatalogId"/>
+            <entity-and entity-name="ProdCatalog" use-cache="true" list="listIt">
+                <order-by field-name="${parameters.sortField}"/>
+            </entity-and>
+        </actions>
+        <field name="prodCatalogId" title="${uiLabelMap.ProductCatalogNameId}" widget-style="buttontext" sort-field="true">
+            <hyperlink also-hidden="false" description="${prodCatalogId}" target="EditProdCatalog">
+                <parameter param-name="prodCatalogId"/>
+            </hyperlink>
+        </field>
+        <field name="catalogName" title="${uiLabelMap.ProductCatalogName}" sort-field="true"><display/></field>
+        <field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}" sort-field="true"><display/></field>
+    </form>
     <form name="EditProdCatalog" type="single" target="updateProdCatalog" title="" default-map-name="prodCatalog"
         header-row-style="header-row" default-table-style="basic-table" default-entity-name="ProdCatalog">
 

Modified: ofbiz/branches/jquery/applications/product/widget/catalog/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/ProductForms.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/branches/jquery/applications/product/widget/catalog/ProductForms.xml Thu Nov 11 23:07:40 2010
@@ -20,12 +20,41 @@ under the License.
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-    <!--  UNUSED FORM
-    <form name="EditProductSimpleTest" type="single" target="updateProduct" title=""
+    <form name="FindProduct" type="single" target="FindProduct" title="" default-map-name="product"
         header-row-style="header-row" default-table-style="basic-table">
-        <auto-fields-service service-name="updateProduct" map-name="product"/>
+        <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+        <field name="productId" title="${uiLabelMap.ProductProductId}"><text-find/></field>
+        <field name="internalName" title="${uiLabelMap.ProductInternalName}"><text-find/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit">
+            <submit button-type="button"/>
+        </field>
     </form>
-    -->
+
+    <form name="ListProducts" list-name="listIt" target="" title="" type="list" paginate-target="FindProduct"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
+        <actions>
+            <set field="entityName" value="Product"/>
+            <service service-name="performFind" result-map="result" result-map-list="listIt">
+                <field-map field-name="inputFields" from-field="requestParameters"/>
+                <field-map field-name="entityName" from-field="entityName"/>
+                <field-map field-name="orderBy" from-field="parameters.sortField"/>
+                <field-map field-name="viewIndex" from-field="viewIndex"/>
+                <field-map field-name="viewSize" from-field="viewSize"/>
+            </service>
+        </actions>
+        <field name="productId" sort-field="true">
+            <hyperlink also-hidden="false" description="${productId}" target="EditProduct">
+                <parameter param-name="productId"/>
+            </hyperlink>
+        </field>
+        
+        <field name="internalName" sort-field="true"><display/></field>
+        <field name="brandName" sort-field="true"><display/></field>
+        <field name="productName" sort-field="true"><display/></field>
+        <field name="description" sort-field="true"><display/></field>
+    </form>
+
+
     <form name="EditProduct" type="single" target="updateProduct" title="" default-map-name="product"
         header-row-style="header-row" default-table-style="basic-table">
 

Modified: ofbiz/branches/jquery/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/ProductScreens.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/branches/jquery/applications/product/widget/catalog/ProductScreens.xml Thu Nov 11 23:07:40 2010
@@ -21,6 +21,42 @@ under the License.
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
 
+    <screen name="FindProduct">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleFindProduct"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <condition>
+                                <if-service-permission service-name="acctgAgreementPermissionCheck" main-action="VIEW"/>
+                            </condition>
+                            <widgets>
+                                <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+                                    <decorator-section name="menu-bar">
+                                        <container style="button-bar">
+                                            <link target="EditProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext create"/>
+                                        </container>
+                                    </decorator-section>
+                                    <decorator-section name="search-options">
+                                        <include-form name="FindProduct" location="component://product/widget/catalog/ProductForms.xml"/>
+                                    </decorator-section>
+                                    <decorator-section name="search-results">
+                                        <include-form name="ListProducts" location="component://product/widget/catalog/ProductForms.xml"/>
+                                    </decorator-section>
+                                </decorator-screen>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.AccountingViewPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+         </section>
+    </screen>
     <screen name="EditProduct">
         <section>
             <actions>

Modified: ofbiz/branches/jquery/applications/product/widget/catalog/ProductStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/ProductStoreForms.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/widget/catalog/ProductStoreForms.xml (original)
+++ ofbiz/branches/jquery/applications/product/widget/catalog/ProductStoreForms.xml Thu Nov 11 23:07:40 2010
@@ -20,20 +20,22 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-    <form name="FindProductStore" type="list" list-name="productStores"
-        odd-row-style="alternate-row" default-table-style="basic-table">
-        <field name="ProductStoreNameId" title="${uiLabelMap.ProductStoreNameId}" widget-style="buttontext">
-            <hyperlink target="EditProductStore" description="${storeName} [${productStoreId}]">
-                <parameter param-name="productStoreId"/>
-            </hyperlink>
-        </field>
-        <field name="title" title="${uiLabelMap.ProductTitle}"><display/></field>
-        <field name="subtitle" title="${uiLabelMap.ProductSubTitle}"><display/></field>
-        <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="EditProductStore" description="${uiLabelMap.CommonEdit}">
+    <form name="ListProductStore" type="list" list-name="productStores"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
+        <actions>
+            <set field="parameters.sortField" from-field="parameters.sortField" default-value="storeName"/>
+            <entity-and entity-name="ProductStore" use-cache="true" list="productStores">
+                <order-by field-name="${parameters.sortField}"/>
+            </entity-and>
+        </actions>
+        <field name="productStoreId" title="${uiLabelMap.ProductStoreId}" widget-style="buttontext" sort-field="true">
+            <hyperlink target="EditProductStore" description="${productStoreId}">
                 <parameter param-name="productStoreId"/>
             </hyperlink>
         </field>
+        <field name="storeName" title="${uiLabelMap.ProductStoreName}" sort-field="true"><display/></field>
+        <field name="title" title="${uiLabelMap.ProductTitle}" sort-field="true"><display/></field>
+        <field name="subtitle" title="${uiLabelMap.ProductSubTitle}" sort-field="true"><display/></field>
     </form>
     <form name="EditProductStore" type="single" target="updateProductStore" title="" default-map-name="productStore"
         header-row-style="header-row" default-table-style="basic-table">

Modified: ofbiz/branches/jquery/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/StoreScreens.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/branches/jquery/applications/product/widget/catalog/StoreScreens.xml Thu Nov 11 23:07:40 2010
@@ -27,10 +27,6 @@ under the License.
                 <set field="titleProperty" value="PageTitleEditProductStoreList"/>
                 <set field="headerItem" value="store"/>
                 <set field="tabButtonItem" value="EditProductStoreList"/>
-
-                <entity-condition entity-name="ProductStore" list="productStores">
-                    <order-by field-name="storeName"/>
-                </entity-condition>
             </actions>
             <widgets>
                 <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}">
@@ -39,7 +35,7 @@ under the License.
                             <container style="button-bar">
                                 <link target="EditProductStore" text="${uiLabelMap.ProductCreateNewProductStore}" style="buttontext create"/>
                             </container>
-                            <include-form name="FindProductStore" location="component://product/widget/catalog/ProductStoreForms.xml"/>
+                            <include-form name="ListProductStore" location="component://product/widget/catalog/ProductStoreForms.xml"/>
                         </screenlet>
                     </decorator-section>
                 </decorator-screen>

Modified: ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/BirtWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/BirtWorker.java?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/BirtWorker.java (original)
+++ ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/BirtWorker.java Thu Nov 11 23:07:40 2010
@@ -23,6 +23,11 @@ import java.sql.SQLException;
 import java.util.Locale;
 import java.util.Map;
 
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
 import org.eclipse.birt.report.engine.api.EXCELRenderOption;
 import org.eclipse.birt.report.engine.api.EngineException;
 import org.eclipse.birt.report.engine.api.HTMLRenderOption;
@@ -36,7 +41,11 @@ import org.eclipse.birt.report.engine.ap
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.UtilGenerics;
+import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.birt.container.BirtContainer;
+import org.ofbiz.entity.Delegator;
+import org.ofbiz.security.Security;
+import org.ofbiz.service.LocalDispatcher;
 
 public class BirtWorker {
 
@@ -138,4 +147,45 @@ public class BirtWorker {
         task.run();
         task.close();
     }
+    
+    public static void setWebContextObjects(IReportEngine engine, HttpServletRequest request, HttpServletResponse response) {
+        HttpSession session = request.getSession();
+        ServletContext servletContext = session.getServletContext();
+        
+        // set delegator
+        Delegator delegator = (Delegator) session.getAttribute("delegator");
+        if (UtilValidate.isEmpty(delegator)) {
+            delegator = (Delegator) servletContext.getAttribute("delegator");
+        }
+        if (UtilValidate.isEmpty(delegator)) {
+            delegator = (Delegator) request.getAttribute("delegator");
+        }
+        if (UtilValidate.isNotEmpty(delegator)) {
+            engine.getConfig().getAppContext().put("delegator", delegator);
+        }
+
+        // set delegator
+        LocalDispatcher dispatcher = (LocalDispatcher) session.getAttribute("dispatcher");
+        if (UtilValidate.isEmpty(dispatcher)) {
+            dispatcher = (LocalDispatcher) servletContext.getAttribute("dispatcher");
+        }
+        if (UtilValidate.isEmpty(dispatcher)) {
+            dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
+        }
+        if (UtilValidate.isNotEmpty(dispatcher)) {
+            engine.getConfig().getAppContext().put("dispatcher", dispatcher);
+        }
+
+        // set security
+        Security security = (Security) session.getAttribute("security");
+        if (UtilValidate.isEmpty(security)) {
+            security = (Security) servletContext.getAttribute("security");
+        }
+        if (UtilValidate.isEmpty(security)) {
+            security = (Security) request.getAttribute("security");
+        }
+        if (UtilValidate.isNotEmpty(security)) {
+            engine.getConfig().getAppContext().put("security", dispatcher);
+        }
+    }
 }

Modified: ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java (original)
+++ ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java Thu Nov 11 23:07:40 2010
@@ -46,6 +46,8 @@ import org.ofbiz.base.util.string.Flexib
 import org.ofbiz.birt.BirtWorker;
 import org.ofbiz.birt.container.BirtContainer;
 import org.ofbiz.common.email.NotificationServices;
+import org.ofbiz.entity.Delegator;
+import org.ofbiz.security.Security;
 import org.ofbiz.service.DispatchContext;
 import org.ofbiz.service.LocalDispatcher;
 import org.ofbiz.service.ServiceUtil;
@@ -69,7 +71,10 @@ public class BirtEmailServices {
      */
     public static Map<String, Object> sendBirtMail(DispatchContext ctx, Map<String, ? extends Object> context) {
         Map<String, Object> serviceContext = UtilMisc.makeMapWritable(context);
+        Delegator delegator = ctx.getDelegator();
         LocalDispatcher dispatcher = ctx.getDispatcher();
+        Security security = ctx.getSecurity();
+        
         String webSiteId = (String) serviceContext.remove("webSiteId");
         String bodyText = (String) serviceContext.remove("bodyText");
         String bodyScreenUri = (String) serviceContext.remove("bodyScreenUri");
@@ -153,11 +158,14 @@ public class BirtEmailServices {
                     birtContentType = "application/pdf";
                 }
                 IReportEngine engine = BirtContainer.getReportEngine();
+                engine.getConfig().getAppContext().put("delegator", delegator);
+                engine.getConfig().getAppContext().put("dispatcher", dispatcher);
+                engine.getConfig().getAppContext().put("security", security);
+                
                 InputStream reportInputStream = BirtFactory.getReportInputStreamFromLocation(birtReportLocation);
                 IReportRunnable design = engine.openReportDesign(reportInputStream);
-                     Debug.logInfo("Export report as content type:" + birtContentType, module);
-                     BirtWorker.exportReport(design, context, birtContentType, baos);
-                // and generate the PDF
+                Debug.logInfo("Export report as content type:" + birtContentType, module);
+                BirtWorker.exportReport(design, context, birtContentType, baos);
                 baos.flush();
                 baos.close();
 

Modified: ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java (original)
+++ ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java Thu Nov 11 23:07:40 2010
@@ -24,9 +24,12 @@ import javax.servlet.http.HttpServletRes
 
 import org.eclipse.birt.core.exception.BirtException;
 import org.eclipse.birt.report.context.IContext;
+import org.eclipse.birt.report.engine.api.IReportEngine;
 import org.eclipse.birt.report.presentation.aggregation.layout.EngineFragment;
 import org.eclipse.birt.report.presentation.aggregation.layout.RequesterFragment;
 import org.eclipse.birt.report.service.BirtReportServiceFactory;
+import org.ofbiz.birt.BirtWorker;
+import org.ofbiz.birt.container.BirtContainer;
 import org.ofbiz.birt.report.context.OFBizBirtContext;
 import org.ofbiz.birt.report.service.OFBizBirtViewerReportService;
 
@@ -52,6 +55,9 @@ public class BirtEngineServlet extends o
     protected IContext __getContext( HttpServletRequest request,
             HttpServletResponse response ) throws BirtException
     {
+        IReportEngine reportEngine = BirtContainer.getReportEngine();
+        BirtWorker.setWebContextObjects(reportEngine, request, response);
+        
         BirtReportServiceFactory.getReportService( ).setContext(
                 getServletContext( ), null );
         return new OFBizBirtContext( request, response );

Modified: ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java (original)
+++ ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java Thu Nov 11 23:07:40 2010
@@ -24,10 +24,13 @@ import javax.servlet.http.HttpServletRes
 
 import org.eclipse.birt.core.exception.BirtException;
 import org.eclipse.birt.report.context.IContext;
+import org.eclipse.birt.report.engine.api.IReportEngine;
 import org.eclipse.birt.report.presentation.aggregation.layout.FramesetFragment;
 import org.eclipse.birt.report.presentation.aggregation.layout.RunFragment;
 import org.eclipse.birt.report.service.BirtReportServiceFactory;
 import org.eclipse.birt.report.servlet.ViewerServlet;
+import org.ofbiz.birt.BirtWorker;
+import org.ofbiz.birt.container.BirtContainer;
 import org.ofbiz.birt.report.context.OFBizBirtContext;
 import org.ofbiz.birt.report.service.OFBizBirtViewerReportService;
 
@@ -56,6 +59,9 @@ public class BirtViewerServlet extends V
     protected IContext __getContext( HttpServletRequest request,
             HttpServletResponse response ) throws BirtException
     {
+        IReportEngine reportEngine = BirtContainer.getReportEngine();
+        BirtWorker.setWebContextObjects(reportEngine, request, response);
+        
         BirtReportServiceFactory.getReportService( ).setContext(
                 getServletContext( ), null );
         return new OFBizBirtContext( request, response );

Modified: ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java (original)
+++ ofbiz/branches/jquery/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java Thu Nov 11 23:07:40 2010
@@ -70,6 +70,7 @@ public class BirtViewHandler implements 
     public void render(String name, String page, String info,
             String contentType, String encoding, HttpServletRequest request,
             HttpServletResponse response) throws ViewHandlerException {
+        
         try {
             IReportEngine engine = BirtContainer.getReportEngine();
             // open report design
@@ -80,6 +81,8 @@ public class BirtViewHandler implements 
             } else {
                 design = engine.openReportDesign(servletContext.getRealPath(page));
             }
+            
+            BirtWorker.setWebContextObjects(engine, request, response);
 
             Map<String, Object> context = FastMap.newInstance();
             // set parameters from request

Modified: ofbiz/branches/jquery/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original)
+++ ofbiz/branches/jquery/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Thu Nov 11 23:07:40 2010
@@ -67,6 +67,7 @@ import org.ofbiz.base.container.Containe
 import org.ofbiz.base.container.ContainerConfig.Container.Property;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.SSLUtil;
+import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilURL;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;

Modified: ofbiz/branches/jquery/framework/common/webcommon/login.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/login.ftl?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/webcommon/login.ftl (original)
+++ ofbiz/branches/jquery/framework/common/webcommon/login.ftl Thu Nov 11 23:07:40 2010
@@ -42,11 +42,15 @@ under the License.
             <td class="label">${uiLabelMap.CommonPassword}</td>
             <td><input type="password" name="PASSWORD" value="" size="20"/></td>
           </tr>
-          <#if ("Y" == useMultitenant)>
-            <tr>
-              <td class="label">${uiLabelMap.CommonTenantId}</td>
-              <td><input type="text" name="tenantId" value="${parameters.tenantId?if_exists}" size="20"/></td>
-            </tr>
+          <#if ("Y" == useMultitenant) >
+              <#if !requestAttributes.tenantId?exists>
+                  <tr>
+                      <td class="label">${uiLabelMap.CommonTenantId}</td>
+                      <td><input type="text" name="tenantId" value="${parameters.tenantId?if_exists}" size="20"/></td>
+                  </tr>
+              <#else>
+                  <input type="hidden" name="tenantId" value="${requestAttributes.tenantId?if_exists}"/>
+              </#if>
           </#if>
           <tr>
             <td colspan="2" align="center">

Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 11 23:07:40 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264
-/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1030401
+/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1034179

Modified: ofbiz/branches/jquery/framework/entity/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/entitydef/entitymodel.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/entity/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/jquery/framework/entity/entitydef/entitymodel.xml Thu Nov 11 23:07:40 2010
@@ -66,6 +66,8 @@ under the License.
     <entity entity-name="Tenant" package-name="org.ofbiz.entity.tenant">
         <field name="tenantId" type="id-ne"/>
         <field name="tenantName" type="name"/>
+        <field name="domainName" type="long-varchar"/>
+        <field name="initialPath" type="value"/>
         <field name="disabled" type="indicator"><description>Disabled if 'Y', defaults to 'N' (not disabled).</description></field>
         <prim-key field="tenantId"/>
     </entity>

Modified: ofbiz/branches/jquery/framework/images/webapp/images/ecommain.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/ecommain.css?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/images/webapp/images/ecommain.css (original)
+++ ofbiz/branches/jquery/framework/images/webapp/images/ecommain.css Thu Nov 11 23:07:40 2010
@@ -1078,6 +1078,54 @@ border-top: 1px #BBBBBB solid;
 border-bottom: 1px #BBBBBB solid;
 }
 
+/*=================== For the quickadd page =================================*/
+.quickaddall{
+float:right;
+padding-bottom:1em;
+padding-top:1em;
+}
+
+.quickaddtable{
+clear:both;
+}
+
+.quickaddtable span {
+display:inline;
+float:left;
+border-right:1px solid #BBBBBB;
+border-top:1px solid #BBBBBB;
+margin:0px;
+padding:3px;
+}
+
+.quickaddtable p {
+clear:left;
+margin:0px;
+padding:0px;
+height:100% !important; height:1em;
+}
+
+.quickaddtable span.pid {
+width:10%;
+}
+
+.quickaddtable span.name {
+width:50%;
+text-align:left;
+}
+
+.quickaddtable span.listPrice {
+width:10%
+}
+
+.quickaddtable span.totalPrice {
+width:10%
+}
+
+.quickaddtable span.qty {
+width:10%
+}
+
 /*
  * jQuery UI CSS Framework @VERSION
  *

Modified: ofbiz/branches/jquery/framework/images/webapp/images/selectall.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/selectall.js?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/images/webapp/images/selectall.js (original)
+++ ofbiz/branches/jquery/framework/images/webapp/images/selectall.js Thu Nov 11 23:07:40 2010
@@ -456,7 +456,14 @@ function setLookDescription(textFieldId,
         tooltipElement.html(description);
         lookupWrapperEl.append(tooltipElement);
     }
-}
+    
+    // after the description is set; the text field may have been updated 
+    // just in case, call onchange again
+    // JLR to be checked, thanks to Andrew explanations
+/*    if ($(textFieldId).onchange != null) {
+    	$(textFieldId).onchange();
+    }
+*/}
 
 /** Enable auto-completion for drop-down elements.*/
 

Modified: ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java (original)
+++ ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java Thu Nov 11 23:07:40 2010
@@ -50,10 +50,16 @@ import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.StringUtil;
 import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilHttp;
+import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilObject;
+import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.DelegatorFactory;
+import org.ofbiz.entity.GenericEntityException;
+import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.condition.EntityCondition;
+import org.ofbiz.entity.util.EntityUtil;
 import org.ofbiz.security.Security;
 import org.ofbiz.security.SecurityConfigurationException;
 import org.ofbiz.security.SecurityFactory;
@@ -266,6 +272,58 @@ public class ContextFilter implements Fi
                 return;
             }
         }
+        
+        // check if multi tenant is enabled
+        String useMultitenant = UtilProperties.getPropertyValue("general.properties", "multitenant");
+        if ("Y".equals(useMultitenant)) {
+            // get tenant delegator by domain name
+            String serverName = request.getServerName();
+            try {
+                // if tenant was specified, replace delegator with the new per-tenant delegator and set tenantId to session attribute
+                Delegator delegator = getDelegator(config.getServletContext());
+                List<EntityCondition> conds = FastList.newInstance();
+                conds.add(EntityCondition.makeCondition("domainName", serverName));
+                List<GenericValue> tenants = delegator.findList("Tenant", EntityCondition.makeCondition(conds), null, UtilMisc.toList("-createdStamp"), null, false);
+                if (UtilValidate.isNotEmpty(tenants)) {
+                    GenericValue tenant = EntityUtil.getFirst(tenants);
+                    String tenantId = tenant.getString("tenantId");
+                    
+                    // if the request URI is "/control/main" then redirect to the initial path
+                    if (httpRequest.getRequestURI().startsWith("/control/main")) {
+                        String initialPath = tenant.getString("initialPath");
+                        ((HttpServletResponse)response).sendRedirect(initialPath);
+                    }
+                    
+                    // make that tenant active, setup a new delegator and a new dispatcher
+                    String tenantDelegatorName = delegator.getDelegatorBaseName() + "#" + tenantId;
+                    httpRequest.getSession().setAttribute("delegatorName", tenantDelegatorName);
+                
+                    // after this line the delegator is replaced with the new per-tenant delegator
+                    delegator = DelegatorFactory.getDelegator(tenantDelegatorName);
+                    config.getServletContext().setAttribute("delegator", delegator);
+                    
+                    // clear web context objects
+                    config.getServletContext().setAttribute("authorization", null);
+                    config.getServletContext().setAttribute("security", null);
+                    config.getServletContext().setAttribute("dispatcher", null);
+                    
+                    // initialize authorizer
+                    getAuthz();
+                    // initialize security
+                    Security security = getSecurity();
+                    // initialize the services dispatcher
+                    LocalDispatcher dispatcher = getDispatcher(config.getServletContext());
+                    
+                    // set web context objects
+                    httpRequest.getSession().setAttribute("dispatcher", dispatcher);
+                    httpRequest.getSession().setAttribute("security", security);
+                    
+                    request.setAttribute("tenantId", tenantId);
+                }
+            } catch (GenericEntityException e) {
+                Debug.logWarning(e, "Unable to get Tenant", module);
+            }
+        }
 
         // we're done checking; continue on
         chain.doFilter(request, response);

Modified: ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ControlEventListener.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ControlEventListener.java?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ControlEventListener.java (original)
+++ ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ControlEventListener.java Thu Nov 11 23:07:40 2010
@@ -133,18 +133,20 @@ public class ControlEventListener implem
             Debug.log("Total Passive  : " + ControlEventListener.getTotalPassiveSessions(),  module);
             Debug.log("** note : this session has been counted as destroyed.", module);
             Debug.log("--------------------------------------------------------------------", module);
-            Debug.log("Visit ID       : " + visit.getString("visitId"), module);
-            Debug.log("Party ID       : " + visit.getString("partyId"), module);
-            Debug.log("Client IP      : " + visit.getString("clientIpAddress"), module);
-            Debug.log("Client Host    : " + visit.getString("clientHostName"), module);
-            Debug.log("Client User    : " + visit.getString("clientUser"), module);
-            Debug.log("WebApp         : " + visit.getString("webappName"), module);
-            Debug.log("Locale         : " + visit.getString("initialLocale"), module);
-            Debug.log("UserAgent      : " + visit.getString("initialUserAgent"), module);
-            Debug.log("Referrer       : " + visit.getString("initialReferrer"), module);
-            Debug.log("Initial Req    : " + visit.getString("initialRequest"), module);
-            Debug.log("Visit From     : " + visit.getString("fromDate"), module);
-            Debug.log("Visit Thru     : " + visit.getString("thruDate"), module);
+            if (visit != null) {
+                Debug.log("Visit ID       : " + visit.getString("visitId"), module);
+                Debug.log("Party ID       : " + visit.getString("partyId"), module);
+                Debug.log("Client IP      : " + visit.getString("clientIpAddress"), module);
+                Debug.log("Client Host    : " + visit.getString("clientHostName"), module);
+                Debug.log("Client User    : " + visit.getString("clientUser"), module);
+                Debug.log("WebApp         : " + visit.getString("webappName"), module);
+                Debug.log("Locale         : " + visit.getString("initialLocale"), module);
+                Debug.log("UserAgent      : " + visit.getString("initialUserAgent"), module);
+                Debug.log("Referrer       : " + visit.getString("initialReferrer"), module);
+                Debug.log("Initial Req    : " + visit.getString("initialRequest"), module);
+                Debug.log("Visit From     : " + visit.getString("fromDate"), module);
+                Debug.log("Visit Thru     : " + visit.getString("thruDate"), module);
+            }
             Debug.log("--------------------------------------------------------------------", module);
             Debug.log("--- Start Session Attributes: ---", module);
             Enumeration<String> sesNames = null;

Modified: ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java (original)
+++ ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java Thu Nov 11 23:07:40 2010
@@ -20,6 +20,7 @@ package org.ofbiz.webapp.control;
 
 import java.io.IOException;
 import java.util.Enumeration;
+import java.util.List;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
@@ -36,14 +37,19 @@ import org.ofbiz.base.util.StringUtil;
 import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilHttp;
 import org.ofbiz.base.util.UtilJ2eeCompat;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilTimer;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.condition.EntityCondition;
 import org.ofbiz.entity.transaction.GenericTransactionException;
 import org.ofbiz.entity.transaction.TransactionUtil;
+import org.ofbiz.entity.util.EntityUtil;
 import org.ofbiz.security.Security;
 import org.ofbiz.security.authz.Authorization;
 import org.ofbiz.service.LocalDispatcher;

Modified: ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java (original)
+++ ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java Thu Nov 11 23:07:40 2010
@@ -371,11 +371,19 @@ public class LoginWorker {
                 ServletContext servletContext = session.getServletContext();
                 
                 // make that tenant active, setup a new delegator and a new dispatcher
-                String delegatorName = delegator.getDelegatorName() + "#" + tenantId;
+                String delegatorName = delegator.getDelegatorBaseName() + "#" + tenantId;
                 
-                // after this line the delegator is replaced with the new per-tenant delegator
-                delegator = DelegatorFactory.getDelegator(delegatorName);
-                dispatcher = ContextFilter.makeWebappDispatcher(servletContext, delegator);
+                try {
+                    // after this line the delegator is replaced with the new per-tenant delegator
+                    delegator = DelegatorFactory.getDelegator(delegatorName);
+                    dispatcher = ContextFilter.makeWebappDispatcher(servletContext, delegator);
+                } catch (NullPointerException e) {
+                    Debug.logError(e, "Error getting tenant delegator", module);
+                    Map<String, String> messageMap = UtilMisc.toMap("errorMessage", "Tenant [" + tenantId + "]  not found...");
+                    String errMsg = UtilProperties.getMessage(resourceWebapp, "loginevents.following_error_occurred_during_login", messageMap, UtilHttp.getLocale(request));
+                    request.setAttribute("_ERROR_MESSAGE_", errMsg);
+                    return "error";
+                }
                 
                 // NOTE: these will be local for now and set in the request and session later, after we've verified that the user
                 setupNewDelegatorEtc = true;

Modified: ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original)
+++ ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Thu Nov 11 23:07:40 2010
@@ -750,7 +750,11 @@ public class RequestHandler {
         // add in the attributes as well so everything needed for the rendering context will be in place if/when we get back to this view
         paramMap.putAll(UtilHttp.getAttributeMap(req));
         UtilMisc.makeMapSerializable(paramMap);
-        req.getSession().setAttribute("_LAST_VIEW_NAME_", view);
+        if (paramMap.containsKey("_LAST_VIEW_NAME_")) { // Used by lookups to keep the real view (request)
+            req.getSession().setAttribute("_LAST_VIEW_NAME_", paramMap.get("_LAST_VIEW_NAME_"));
+        } else {
+            req.getSession().setAttribute("_LAST_VIEW_NAME_", view);
+        }
         req.getSession().setAttribute("_LAST_VIEW_PARAMS_", paramMap);
 
         if ("SAVED".equals(saveName)) {

Modified: ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl Thu Nov 11 23:07:40 2010
@@ -481,6 +481,11 @@ ${item.description}</span>
     );"></a><#rt>
 <#else>
     <#if ajaxEnabled?has_content && ajaxEnabled>
+      <#if parameters?has_content && parameters._LAST_VIEW_NAME_?has_content>
+        <#local ajaxUrl = ajaxUrl + "&amp;_LAST_VIEW_NAME_=" + parameters._LAST_VIEW_NAME_ />
+      <#else>
+        <#local ajaxUrl = ajaxUrl + "&amp;_LAST_VIEW_NAME_=main"/>
+      </#if>      
       <#if !ajaxUrl?contains("searchValueFieldName=")>
           <#if descriptionFieldName?has_content && showDescription == "true">
             <#local ajaxUrl = ajaxUrl + "&amp;searchValueFieldName=" + descriptionFieldName />
@@ -497,6 +502,14 @@ ${item.description}</span>
 </#if>
 <#if disabled?has_content && disabled><a id="${id}_clear" style="background:none;margin-left:5px;margin-right:15px;" class="clearField" href="javascript:void();" onclick="javascript:document.${formName}.${name}.value='';<#if descriptionFieldName?has_content>document.${formName}.${descriptionFieldName}.value='';</#if>">${clearText}</a></#if>
 </span>
+<#if ajaxEnabled?has_content && ajaxEnabled>
+      <#if parameters?has_content && parameters._LAST_VIEW_NAME_?has_content>
+        <#local ajaxUrl = ajaxUrl + "&amp;_LAST_VIEW_NAME_=" + parameters._LAST_VIEW_NAME_ />
+      <#else>
+        <#local ajaxUrl = ajaxUrl + "&amp;_LAST_VIEW_NAME_=main"/>
+      </#if>      
+    <script language="JavaScript" type="text/javascript">ajaxAutoCompleter('${ajaxUrl}', ${showDescription});</script><#t/>
+</#if>
 </#macro>
 
 <#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel paginateViewSizeLabel>

Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 11 23:07:40 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
-/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1030401
+/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1034179

Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Thu Nov 11 23:07:40 2010
@@ -21,6 +21,7 @@
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="EcommerceAboutUs">
         <value xml:lang="en">About Us</value>
+        <value xml:lang="fr">A propos</value>
         <value xml:lang="nl">Over ons</value>       
         <value xml:lang="pt_BR">Sobre</value>
     </property>
@@ -266,6 +267,10 @@
         <value xml:lang="en">Article Name</value>
         <value xml:lang="th">ชื่อบทความ</value>
     </property>
+    <property key="EcommerceAvailable">
+        <value xml:lang="en">Available:</value>
+        <value xml:lang="fr">Disponible :</value>
+    </property>
     <property key="EcommerceAssignItems">
         <value xml:lang="da">Tildel emne</value>
         <value xml:lang="en">Assign Items</value>
@@ -1552,6 +1557,10 @@
         <value xml:lang="th">ยาว</value>
         <value xml:lang="zh">长度</value>
     </property>
+    <property key="EcommerceLimit">
+        <value xml:lang="en">Limit:</value>
+        <value xml:lang="fr">Limite :</value>
+    </property>
     <property key="EcommerceLinkCards">
         <value xml:lang="da">Sammenkæd kort</value>
         <value xml:lang="de">Karten verknüpfen</value>
@@ -2105,7 +2114,7 @@
         <value xml:lang="de">Es gibt noch keine Einkaufslisten, legen Sie eine neue an</value>
         <value xml:lang="en">No shopping lists to select, create a new one</value>
         <value xml:lang="es">No hay lista de compras, cree una nueva</value>
-        <value xml:lang="fr">Aucuneliste d'achats à sélectionner, créez en une</value>
+        <value xml:lang="fr">Aucune liste d'achats à sélectionner, créez en une</value>
         <value xml:lang="hi_IN">कोई सूची चुनने योग्य नहीं, नया बनाऐं</value>
         <value xml:lang="it">Nessuna lista di acquisto da selezionare, crearne una nuova</value>
         <value xml:lang="ja">No shopping lists to select, create a new one</value>
@@ -2669,7 +2678,7 @@
         <value xml:lang="de">Retourenanfrage stellen für folgende Positionen:</value>
         <value xml:lang="en">Return Request</value>
         <value xml:lang="es">Su orden de devolución para los siguientes items :</value>
-        <value xml:lang="fr">Votre demande de retour des articles suivants:</value>
+        <value xml:lang="fr">Votre demande de retour des articles suivants :</value>
         <value xml:lang="hi_IN">सारे सामान का जवाब</value>
         <value xml:lang="it">La tua richiesta di reso per i seguenti articoli:</value>
         <value xml:lang="ja">Your return request for the following items:</value>
@@ -3217,7 +3226,7 @@
         <value xml:lang="de">Leider können Sie diese Seite nicht einem Freund mitteilen. Wählen Sie eine andere Kategorie oder ein anderes Produkt.</value>
         <value xml:lang="en">Tell A Friend Sorry</value>
         <value xml:lang="es">Disculpe, no puede enviar esta página a un amigo. Selecciones otra categoría o producto</value>
-        <value xml:lang="fr">Désolé, vous ne pouvez envoyer cette page à un ami. Choisissez plutôt à partir d'un catégorie ou d'un article</value>
+        <value xml:lang="fr">Désolé, vous ne pouvez envoyer cette page à un ami. Choisissez plutôt à partir d'une catégorie ou d'un article</value>
         <value xml:lang="hi_IN">माफ किजीये: यह पृष्ठ अपने दोस्त को नहीं भेज सकते, किसी प्रकार या सामान में से भेजें</value>
         <value xml:lang="it">Spiacente, non è possibile inviare questa pagina ad un amico. Per favore seleziona una categoria o un prodotto.</value>
         <value xml:lang="ja">Sorry, you cannot send this page to a friend. Please select from either a category or product.</value>
@@ -4496,6 +4505,7 @@
     <property key="PageTitleViewQuote">
         <value xml:lang="da">Vis tilbud</value>
         <value xml:lang="en">View Quote</value>
+        <value xml:lang="fr">Voir les devis</value>
         <value xml:lang="it">Mostra preventivo</value>
         <value xml:lang="nl">Bekijk offerte</value>     
         <value xml:lang="pt_BR">Visualizar citação</value>

Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl Thu Nov 11 23:07:40 2010
@@ -29,7 +29,6 @@ under the License.
         <tr valign="middle">
           <td class="label">${uiLabelMap.ProductCategory}</td>
           <td>${(searchCategory.description)?if_exists}</td>
-          <td>&nbsp;</td>
         </tr>
         <tr valign="middle">
           <td class="label">${uiLabelMap.ProductIncludeSubCategories}</td>

Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl?rev=1034192&r1=1034191&r2=1034192&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl Thu Nov 11 23:07:40 2010
@@ -172,7 +172,7 @@ function submitForm(form, mode, value) {
                         <#list billingAccountList as billingAccount>
                           <#assign availableAmount = billingAccount.accountBalance>
                           <#assign accountLimit = billingAccount.accountLimit>
-                          <option value="${billingAccount.billingAccountId}" <#if billingAccount.billingAccountId == selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")} [${billingAccount.billingAccountId}] Available: <@ofbizCurrency amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> Limit: <@ofbizCurrency amount=accountLimit isoCode=billingAccount.accountCurrencyUomId/></option>
+                          <option value="${billingAccount.billingAccountId}" <#if billingAccount.billingAccountId == selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")} [${billingAccount.billingAccountId}] ${uiLabelMap.EcommerceAvailable} <@ofbizCurrency amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> ${uiLabelMap.EcommerceLimit} <@ofbizCurrency amount=accountLimit isoCode=billingAccount.accountCurrencyUomId/></option>
                         </#list>
                     </select>
                     <label for="billingAccountId">${uiLabelMap.FormFieldTitle_billingAccountId}</label>