svn commit: r522466 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.properties webapp/ordermgr/order/editorderitems.ftl webapp/ordermgr/order/orderitems.ftl

[rayb-2]

Author: rayb
Date: Mon Mar 26 02:40:07 2007
New Revision: 522466

URL: http://svn.apache.org/viewvc?view=rev&rev=522466
Log:
Shows "discontinued" against any product that has been in the orderview/edit screen. It's useful for testing but also helpful for the average user to see items that might be a problem. Final part of OFBIZ-501.

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.properties
    ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?view=diff&rev=522466&r1=522465&r2=522466
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.properties Mon Mar 26 02:40:07 2007
@@ -237,6 +237,7 @@
 OrderIsThisGift=Is This a Gift?
 OrderIssuedToShipmentItem=Issued to Shipment Item
 OrderIssuedWithoutShipment=Issued Without a Shipment (Immediate, Physical Store)
+OrderItemDiscontinued=Discontinued
 OrderItemStatus=Item Status
 OrderItemTotal=Item Total
 OrderItemsBackOrdered=Items Backordered

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?view=diff&rev=522466&r1=522465&r2=522466
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Mon Mar 26 02:40:07 2007
@@ -75,6 +75,12 @@
                             <#assign orderItemName = orderItemType.description/>
                             </#if>
                             <p>${uiLabelMap.ProductProduct}: ${orderItemName}</p>
+                            <#if productId?exists>
+                                <#assign product = orderItem.getRelatedOneCache("Product")>
+                                <#if product.salesDiscontinuationDate?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(product.salesDiscontinuationDate)>
+                                    <span style="color: red;">${uiLabelMap.OrderItemDiscontinued}: ${product.salesDiscontinuationDate}</span>
+                                </#if>
+                            </#if>
                             ${uiLabelMap.CommonDescription}:<br />
                             <input style="textBox" type="text" size="20" name="idm_${orderItem.orderItemSeqId}" value="${orderItem.itemDescription?if_exists}"/>
                             </#if>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?view=diff&rev=522466&r1=522465&r2=522466
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Mon Mar 26 02:40:07 2007
@@ -69,9 +69,15 @@
                   </td>
                 <#else>
                   <td valign="top">
+                    <#if productId?exists>
+                      <#assign product = orderItem.getRelatedOneCache("Product")>
+                    </#if>
                     <div class="tabletext">
                       <#if productId?exists>
                         ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?if_exists}
+                        <#if product.salesDiscontinuationDate?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(product.salesDiscontinuationDate)>
+                          <br/><span style="color: red;">${uiLabelMap.OrderItemDiscontinued}: ${product.salesDiscontinuationDate}</span>
+                        </#if>
                       <#elseif orderItemType?exists>
                         ${orderItemType.description} - ${orderItem.itemDescription?if_exists}
                       <#else>
@@ -90,7 +96,6 @@
                       <#-- INVENTORY -->
                       <#if (orderHeader.statusId != "ORDER_COMPLETED") && availableToPromiseMap?exists && quantityOnHandMap?exists && availableToPromiseMap.get(productId)?exists && quantityOnHandMap.get(productId)?exists>
                       <#assign quantityToProduce = 0>
-                      <#assign product = orderItem.getRelatedOneCache("Product")>
                       <#assign atpQuantity = availableToPromiseMap.get(productId)?default(0)>
                       <#assign qohQuantity = quantityOnHandMap.get(productId)?default(0)>
                       <#assign mktgPkgATP = mktgPkgATPMap.get(productId)?default(0)>