Author: jleroux
Date: Wed Jun 23 11:16:33 2010
New Revision: 957160
URL: http://svn.apache.org/viewvc?rev=957160&view=rev
Log:
Product.productTypeId may not exist in a custom application
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=957160&r1=957159&r2=957160&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
Wed Jun 23 11:16:33 2010
@@ -156,7 +156,7 @@ under the License.
<span style="color: red; font-size:
15px;">[${backOrdered?if_exists} ${uiLabelMap.OrderBackOrdered}]</span>
</#if>
</#if>
- <#if (availableToPromiseMap.get(cartLine.getProductId())
<= 0) && (shoppingCart.getOrderType() == 'SALES_ORDER') &&
product.productTypeId != "DIGITAL_GOOD" && product.productTypeId !=
"MARKETING_PKG_AUTO" && product.productTypeId != "MARKETING_PKG_PICK">
+ <#if (availableToPromiseMap.get(cartLine.getProductId())
<= 0) && (shoppingCart.getOrderType() == 'SALES_ORDER') &&
product.productTypeId! != "DIGITAL_GOOD" && product.productTypeId! !=
"MARKETING_PKG_AUTO" && product.productTypeId! != "MARKETING_PKG_PICK">
<span style="color:
red;">[${cartLine.getQuantity()} ${uiLabelMap.OrderBackOrdered}]</span>
<#else>
<#if (availableToPromiseMap.get(cartLine.getProductId())
< cartLine.getQuantity()) && (shoppingCart.getOrderType() == 'SALES_ORDER') &&
product.productTypeId != "DIGITAL_GOOD" && product.productTypeId !=
"MARKETING_PKG_AUTO" && product.productTypeId != "MARKETING_PKG_PICK">