[OFBiz] SVN: r7787 - in trunk/applications: order/webapp/ordermgr/WEB-INF/actions/order order/webapp/ordermgr/order product/webapp/facility/shipment

[sichen@svn.ofbiz.org]

Author: sichen
Date: 2006-06-13 12:35:52 -0500 (Tue, 13 Jun 2006)
New Revision: 7787

Modified:
   trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh
   trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl
   trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
Log:
Show logo of a shipment's primary order on packing slip.  Apache OFBIZ-21 by Fred Forrester

Modified: trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh
===================================================================
--- trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh	2006-06-13 16:15:54 UTC (rev 7786)
+++ trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh	2006-06-13 17:35:52 UTC (rev 7787)
@@ -36,12 +36,16 @@
 orderId = parameters.get("orderId");
 invoice = (GenericValue) parameters.get("invoice");
 invoiceId = parameters.get("invoiceId");
+shipmentId = parameters.get("shipmentId");
 returnHeader = (GenericValue) parameters.get("returnHeader");
 returnId = parameters.get("returnId");
 nowTimestamp = UtilDateTime.nowTimestamp();
 
 if (orderHeader == null && orderId != null) {
     orderHeader = (GenericValue) delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", orderId));
+} else if (shipmentId != null) {
+    shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap("shipmentId", shipmentId));
+    orderHeader = shipment.getRelatedOne("PrimaryOrderHeader");
 }
 
 if (invoice == null && invoiceId != null)	{

Modified: trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl	2006-06-13 16:15:54 UTC (rev 7786)
+++ trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl	2006-06-13 17:35:52 UTC (rev 7787)
@@ -23,12 +23,16 @@
            <fo:table-column column-width="4.5in"/>
            <fo:table-column column-width="2in"/>
             <fo:table-body>
-              <fo:table-row >
+              <fo:table-row>
                 <fo:table-cell>
-                   <fo:block>
-	            <#if logoImageUrl?has_content><fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="80px"/></#if>
+                   <fo:block text-align="left">
+	            <#if logoImageUrl?has_content>
+                    <fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px"/>
+                </#if>
                   </fo:block>
                 </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
                 <fo:table-cell>
                   <fo:block>${companyName}</fo:block>
                   <#if postalAddress?exists>

Modified: trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
===================================================================
--- trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl	2006-06-13 16:15:54 UTC (rev 7786)
+++ trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl	2006-06-13 17:35:52 UTC (rev 7787)
@@ -42,6 +42,9 @@
         <#assign carrier = (shipGroup.carrierPartyId)?default("N/A")>
         <fo:page-sequence master-reference="main">
         <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
+            <fo:block>
+                 ${screens.render("component://order/widget/ordermgr/OrderPrintForms.xml#CompanyLogo")}
+            </fo:block>
             <fo:block text-align="right">
                 <fo:instream-foreign-object>
                     <barcode:barcode xmlns:barcode="http://barcode4j.krysalis.org/ns"