svn commit: r519101 - /ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl

[sichen]

Author: sichen
Date: Fri Mar 16 12:01:09 2007
New Revision: 519101

URL: http://svn.apache.org/viewvc?view=rev&rev=519101
Log:
Improve packing slip PDF so header and gift message footer are uniform across pages.

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

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl?view=diff&rev=519101&r1=519100&r2=519101
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl Fri Mar 16 12:01:09 2007
@@ -35,6 +35,9 @@
         <#assign carrier = (shipGroup.carrierPartyId)?default("N/A")>
         <fo:page-sequence master-reference="main">
         <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
+
+            <#list packages as package>
+
             <fo:block>
                  ${screens.render("component://order/widget/ordermgr/OrderPrintForms.xml#CompanyLogo")}
             </fo:block>
@@ -50,9 +53,6 @@
             </fo:block>
             <fo:block><fo:leader/></fo:block>
 
-
-            <#list packages as package>
-
             <fo:block font-size="14pt">${uiLabelMap.ProductShipmentId} #${shipmentId} / Package ${package_index + 1}</fo:block>
             <fo:block font-size="12pt">${uiLabelMap.ProductOrderId} #${shipment.primaryOrderId?default("N/A")} / ${shipment.primaryShipGroupSeqId?default("N/A")}</fo:block>
             <fo:block><fo:leader/></fo:block>
@@ -154,9 +154,7 @@
             </fo:table>
             </fo:block>
 
-            <#if package_has_next><fo:block break-before="page"/></#if>
-            </#list> <#-- packages -->
-
+            <#if shipGroup.giftMessage?has_content>
             <fo:block space-after.optimum="10pt" font-size="10pt">
             <fo:table>
                 <fo:table-column column-width="450pt"/>
@@ -176,6 +174,12 @@
                 </fo:table-body>
             </fo:table>
             </fo:block>
+          </#if>
+
+
+            <#if package_has_next><fo:block break-before="page"/></#if>
+            </#list> <#-- packages -->
+
         </fo:flow>
         </fo:page-sequence>