svn commit: r807946 - /ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl

[mor-2]

Author: mor
Date: Wed Aug 26 09:52:36 2009
New Revision: 807946

URL: http://svn.apache.org/viewvc?rev=807946&view=rev
Log:
Fixed order entry cart page, item backordered information should be shown only for sales order. Applied patch from Ratnesh Upadhyay, part of OFBIZ-2863 (https://issues.apache.org/jira/browse/OFBIZ-2863)

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=807946&r1=807945&r2=807946&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Wed Aug 26 09:52:36 2009
@@ -145,10 +145,10 @@
                     <#if product.productTypeId == "MARKETING_PKG_AUTO" || product.productTypeId == "MARKETING_PKG_PICK">
                     ${uiLabelMap.ProductMarketingPackageATP} = ${mktgPkgATPMap.get(productId)}, ${uiLabelMap.ProductMarketingPackageQOH} = ${mktgPkgQOHMap.get(productId)}
                     </#if>
-                    <#if availableToPromiseMap.get(cartLine.getProductId()) <= 0 >
+                    <#if (availableToPromiseMap.get(cartLine.getProductId()) <= 0) && (shoppingCart.getOrderType() == "SALES_ORDER")>
                       <span style="color: red;">[${cartLine.getQuantity()}&nbsp;${uiLabelMap.OrderBackOrdered}]</span>
                     <#else>
-                      <#if availableToPromiseMap.get(cartLine.getProductId()) < cartLine.getQuantity()>
+                      <#if (availableToPromiseMap.get(cartLine.getProductId()) < cartLine.getQuantity()) && (shoppingCart.getOrderType() == "SALES_ORDER")>
                         <#assign backOrdered = cartLine.getQuantity() - availableToPromiseMap.get(cartLine.getProductId())>
                         <span style="color: red;">[${backOrdered?if_exists}&nbsp;${uiLabelMap.OrderBackOrdered}]</span>
                       </#if>