svn commit: r957431 - /ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/cart/showcart.ftl

Author: jleroux
Date: Thu Jun 24 06:29:03 2010
New Revision: 957431

URL: http://svn.apache.org/viewvc?rev=957431&view=rev
Log:
Revert r957224 based on community consensus

Modified:
    ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/cart/showcart.ftl

Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/cart/showcart.ftl?rev=957431&r1=957430&r2=957431&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/cart/showcart.ftl (original)
+++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/cart/showcart.ftl Thu Jun 24 06:29:03 2010
@@ -81,9 +81,20 @@ under the License.
                   <td><input type="text" size="25" name="add_product_id" value="${productId?if_exists}"/>
                     <span class='tabletext'>
                       <a href="javascript:quicklookup(document.quickaddform.add_product_id)" class="buttontext">${uiLabelMap.OrderQuickLookup}</a>
-                      <a href="javascript:call_fieldlookupLayer(document.quickaddform.add_product_id,'<@ofbizUrl><#if orderType=="PURCHASE_ORDER">LookupSupplierProduct?partyId=${partyId?if_exists}<#else>LookupProduct</#if></@ofbizUrl>','','','topleft','true','false');">
+                      <a href="javascript:call_fieldlookup2(document.quickaddform.add_product_id,'<@ofbizUrl><#if orderType=="PURCHASE_ORDER">LookupSupplierProduct?partyId=${partyId?if_exists}<#else>LookupProduct</#if></@ofbizUrl>');">
                         <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
                       </a>
+                      <#-- FIXME Problem here: the input field is shared -->
+                      <#--if orderType=="PURCHASE_ORDER">                        
+                        <#if partyId?has_content>                                              
+                          <#assign fieldFormName="LookupSupplierProduct?partyId=${partyId}">
+                        <#else>
+                          <#assign fieldFormName="LookupSupplierProduct">
+                        </#if>
+                      <#else>
+                        <#assign fieldFormName="LookupProduct">
+                      </#if>
+                      <@htmlTemplate.lookupField formName="quickaddform" name="add_product_id" id="add_product_id" fieldFormName="${fieldFormName}"/-->
                       <a href="javascript:quicklookupGiftCertificate()" class="buttontext">${uiLabelMap.OrderAddGiftCertificate}</a>
                       <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()>
                         <a href="javascript:showQohAtp()" class="buttontext">${uiLabelMap.ProductAtpQoh}</a>