You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ar...@apache.org on 2016/02/20 13:26:53 UTC
svn commit: r1731388 -
/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderitems.ftl
Author: arunpatidar
Date: Sat Feb 20 12:26:53 2016
New Revision: 1731388
URL: http://svn.apache.org/viewvc?rev=1731388&view=rev
Log:
[OFBIZ-6908] Fixed issue of order detail page for showing Received item qty in case of PO.
Modified:
ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderitems.ftl
Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=1731388&r1=1731387&r2=1731388&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderitems.ftl Sat Feb 20 12:26:53 2016
@@ -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>