svn commit: r536958 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r536958 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl

jacopoc
Author: jacopoc
Date: Thu May 10 11:15:12 2007
New Revision: 536958

URL: http://svn.apache.org/viewvc?view=rev&rev=536958
Log:
Added status information for associated order items.

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?view=diff&rev=536958&r1=536957&r2=536958
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Thu May 10 11:15:12 2007
@@ -241,12 +241,14 @@
                 <#list linkedOrderItemsTo as linkedOrderItem>
                   <#assign linkedOrderId = linkedOrderItem.toOrderId>
                   <#assign linkedOrderItemSeqId = linkedOrderItem.toOrderItemSeqId>
+                  <#assign linkedOrderItemValue = linkedOrderItem.getRelatedOne("ToOrderItem")>
+                  <#assign linkedOrderItemValueStatus = linkedOrderItemValue.getRelatedOne("StatusItem")>
                   <tr>
                     <td>&nbsp;</td>
                     <td colspan="9">
                       <div class="tabletext">
                         <b><i>${uiLabelMap.OrderLinkedToOrderItem} (${linkedOrderItem.orderItemAssocTypeId})</i>:</b>
-                        <a href="/ordermgr/control/orderview?orderId=${linkedOrderId}" class="buttontext" style="font-size: xx-small;">${linkedOrderId}/${linkedOrderItemSeqId}</a>&nbsp;
+                        <a href="/ordermgr/control/orderview?orderId=${linkedOrderId}" class="buttontext" style="font-size: xx-small;">${linkedOrderId}/${linkedOrderItemSeqId}</a>&nbsp;${linkedOrderItemValueStatus.description?if_exists}
                       </div>
                     </td>
                   </tr>
@@ -256,12 +258,14 @@
                 <#list linkedOrderItemsFrom as linkedOrderItem>
                   <#assign linkedOrderId = linkedOrderItem.orderId>
                   <#assign linkedOrderItemSeqId = linkedOrderItem.orderItemSeqId>
+                  <#assign linkedOrderItemValue = linkedOrderItem.getRelatedOne("FromOrderItem")>
+                  <#assign linkedOrderItemValueStatus = linkedOrderItemValue.getRelatedOne("StatusItem")>
                   <tr>
                     <td>&nbsp;</td>
                     <td colspan="9">
                       <div class="tabletext">
                         <b><i>${uiLabelMap.OrderLinkedFromOrderItem} (${linkedOrderItem.orderItemAssocTypeId})</i>:</b>
-                        <a href="/ordermgr/control/orderview?orderId=${linkedOrderId}" class="buttontext" style="font-size: xx-small;">${linkedOrderId}/${linkedOrderItemSeqId}</a>&nbsp;
+                        <a href="/ordermgr/control/orderview?orderId=${linkedOrderId}" class="buttontext" style="font-size: xx-small;">${linkedOrderId}/${linkedOrderItemSeqId}</a>&nbsp;${linkedOrderItemValueStatus.description?if_exists}
                       </div>
                     </td>
                   </tr>