svn commit: r940821 - in /ofbiz/branches/release10.04: ./ applications/product/webapp/catalog/main.ftl specialpurpose/ebaystore/lib/

Author: jleroux
Date: Tue May  4 12:12:45 2010
New Revision: 940821

URL: http://svn.apache.org/viewvc?rev=940821&view=rev
Log:
"Applied fix from trunk for revision: 940815"
------------------------------------------------------------------------
r940815 | jleroux | 2010-05-04 14:01:23 +0200 (mar. 04 mai 2010) | 1 ligne

Forgot this one at r940410
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/product/webapp/catalog/main.ftl
    ofbiz/branches/release10.04/specialpurpose/ebaystore/lib/   (props changed)

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May  4 12:12:45 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940234,940248,940309,940401,940410,940425,940779
+/ofbiz/trunk:939988,939990,939999,940025,940234,940248,940309,940401,940410,940425,940779,940815

Modified: ofbiz/branches/release10.04/applications/product/webapp/catalog/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/catalog/main.ftl?rev=940821&r1=940820&r2=940821&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/webapp/catalog/main.ftl (original)
+++ ofbiz/branches/release10.04/applications/product/webapp/catalog/main.ftl Tue May  4 12:12:45 2010
@@ -39,7 +39,7 @@ under the License.
   <br />
   <div class="label">${uiLabelMap.ProductEditProductWithProductId}:</div>
   <form method="post" action="<@ofbizUrl>EditProduct</@ofbizUrl>" style="margin: 0;" name="EditProductForm">
-    <@htmlTemplate.lookupField name="productId" id="productId" formName="EditProductForm" fieldFormName="LookupProduct" presentation="window"/>
+    <@htmlTemplate.lookupField name="productId" id="productId" formName="EditProductForm" fieldFormName="LookupProduct"/>
     <input type="submit" value=" ${uiLabelMap.ProductEditProduct}" class="smallSubmit"/>
   </form>
   <br />

Propchange: ofbiz/branches/release10.04/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May  4 12:12:45 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:939988,939990,939999,940025,940234,940248,940309,940401,940410,940425,940779
+/ofbiz/trunk/specialpurpose/ebaystore/lib:939988,939990,939999,940025,940234,940248,940309,940401,940410,940425,940779,940815