svn commit: r649067 - /ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl

[ChrisG-2]

Author: chrisg
Date: Thu Apr 17 05:38:03 2008
New Revision: 649067

URL: http://svn.apache.org/viewvc?rev=649067&view=rev
Log:
Fixes IndexOutOfBoundsException in ShipmentManifestReport
(missing fo:block when there's no weight)

See http://svn.apache.org/viewvc?view=rev&revision=647084
and http://svn.apache.org/viewvc?view=rev&revision=647086

Modified:
    ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl?rev=649067&r1=649066&r2=649067&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl Thu Apr 17 05:38:03 2008
@@ -85,20 +85,23 @@
                     </fo:block>                
                       <fo:block space-after.optimum="10pt" font-size="10pt">
                     <fo:table>
-                        <fo:table-column column-width="450pt"/>
+                        <fo:table-column column-width="225pt"/>
+                        <fo:table-column column-width="225pt"/>
                         <fo:table-body>
                             <fo:table-row font-weight="bold">
                                 <fo:table-cell padding="2pt" background-color="#D4D0C8">
+                                    <fo:block>${uiLabelMap.FormFieldTitle_shipmentPackageSeqId}: ${shipmentPackage.shipmentPackageSeqId}</fo:block>
+                                </fo:table-cell>
+                                <fo:table-cell padding="2pt" background-color="#D4D0C8">                              
                                     <fo:block text-align="center">
-                                    ${uiLabelMap.FormFieldTitle_shipmentPackageSeqId}: ${shipmentPackage.shipmentPackageSeqId}
                                     <#if shipmentPackage.weight?has_content && shipmentPackage.weightUomId?has_content>
                                         <#assign weightUom = shipmentPackage.getRelatedOne("WeightUom")>
-                                        ${uiLabelMap.ProductWeight}: ${shipmentPackage.weight} ${weightUom.get("description",locale)}                                        
+                                        ${uiLabelMap.ProductWeight}: ${shipmentPackage.weight} ${weightUom.get("description",locale)}
                                     </#if>
-                                    </fo:block>
+                                    </fo:block>                                        
                                 </fo:table-cell>
                             </fo:table-row>
-                        </fo:table-body>
+                        </fo:table-body>                                        
                     </fo:table>
                     </fo:block>                                    
                     <fo:table>