[OFBiz] SVN: r4998 - trunk/applications/product/webapp/facility/shipment

[jacopo at svn.ofbiz.org]

Author: jacopo
Date: 2005-05-16 07:34:43 -0500 (Mon, 16 May 2005)
New Revision: 4998

Modified:
   trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl
Log:
Show sub component information (if available) for products in a shipment package.

Modified: trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl
===================================================================
--- trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl	2005-05-15 09:27:27 UTC (rev 4997)
+++ trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl	2005-05-16 12:34:43 UTC (rev 4998)
@@ -80,8 +80,13 @@
 		<tr>
 			<td><div class="tabletext">&nbsp;</div></td>
 			<td colspan="2"><div class="tabletext">${uiLabelMap.ProductPackage} :${shipmentPackageContent.shipmentPackageSeqId}</div></td>
-			<td><div class="tabletext">${shipmentPackageContent.quantity?if_exists}</div></td>
+			<td><div class="tabletext">${shipmentPackageContent.quantity?if_exists}&nbsp;</div></td>
+                        <#if shipmentPackageContent.subProductId?has_content>
+                        <td><div class="tabletext">${uiLabelMap.ProductSubProduct} :${shipmentPackageContent.subProductId}</div></td>
+                        <td><div class="tabletext">${shipmentPackageContent.subProductQuantity?if_exists}</div></td>
+                        <#else>
 			<td colspan="2"><div class="tabletext">&nbsp;</div></td>
+                        </#if>
 			<td><div class="tabletext"><a href="<@ofbizUrl>/deleteShipmentItemPackageContent?shipmentId=${shipmentId}&shipmentItemSeqId=${shipmentPackageContent.shipmentItemSeqId}&shipmentPackageSeqId=${shipmentPackageContent.shipmentPackageSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></div></td>
 		</tr>
 	</#list>