Author: apatel
Date: Sat Aug 16 19:52:24 2014
New Revision: 1618407
URL: http://svn.apache.org/r1618407
Log:
[OFBIZ-5715] good usability fix. Thanks for help.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
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?rev=1618407&r1=1618406&r2=1618407&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Sat Aug
16 19:52:24 2014
@@ -272,8 +272,13 @@ under the License.
<tr valign="top">
<td><b>${uiLabelMap.OrderRemaining}</b></td>
<td>${remainingQuantity}</td>
-
<td><b>${uiLabelMap.OrderQtyShipped}</b></td>
- <td>${shippedQuantity}</td>
+ <#if
orderHeader.orderTypeId == "PURCHASE_ORDER">
+
<td><b>${uiLabelMap.OrderPlannedInReceive}</b></td>
+
<td>${totalReceived}</td>
+ <#else>
+
<td><b>${uiLabelMap.OrderQtyShipped}</b></td>
+
<td>${shippedQuantity}</td>
+ </#if>
</tr>
<tr valign="top">
<td><b>${uiLabelMap.OrderShortfalled}</b></td>
