Author: jleroux
Date: Wed Jun 23 14:41:31 2010
New Revision: 957224
URL: http://svn.apache.org/viewvc?rev=957224&view=rev
Log:
"Applied fix from trunk for revision: 957221"
------------------------------------------------------------------------
r957221 | jleroux | 2010-06-23 16:36:31 +0200 (mer. 23 juin 2010) | 1 ligne
Fix: "FIXME Problem here the input field is shared", now use also a layered
lookup, only remains the order item (a bit more convoluted)
------------------------------------------------------------------------
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 23 14:41:31 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,957221
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=957224&r1=957223&r2=957224&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
Wed Jun 23 14:41:31 2010
@@ -81,20 +81,9 @@ 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_fieldlookup2(document.quickaddform.add_product_id,'<@ofbizUrl><#if
orderType=="PURCHASE_ORDER">LookupSupplierProduct?partyId=${partyId?if_exists}<#else>LookupProduct</#if></@ofbizUrl>');">
+ <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');">
<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>
