Author: jacopoc
Date: Thu Apr 10 09:03:29 2008
New Revision: 646857
URL: http://svn.apache.org/viewvc?rev=646857&view=rev
Log:
Modified the Packing Slip report to use the common decorator for FOP reports.
Added:
ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlipShipmentBarCode.fo.ftl
(with props)
Modified:
ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
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?rev=646857&r1=646856&r2=646857&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
Thu Apr 10 09:03:29 2008
@@ -18,38 +18,13 @@
-->
<#escape x as x?xml>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
-
-<fo:layout-master-set>
- <fo:simple-page-master master-name="main" page-height="11in"
page-width="8.5in"
- margin-top="0.5in" margin-bottom="1in" margin-left="1in"
margin-right="1in">
- <fo:region-body margin-top="1in"/>
- <fo:region-before extent="1in"/>
- <fo:region-after extent="1in"/>
- </fo:simple-page-master>
-</fo:layout-master-set>
<#if hasPermission>
<#assign shipGroup =
shipment.getRelatedOne("PrimaryOrderItemShipGroup")?if_exists>
<#assign carrier = (shipGroup.carrierPartyId)?default("N/A")>
- <fo:page-sequence master-reference="main">
- <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
<#if packages?has_content>
<#list packages as package>
- <fo:block>
-
${screens.render("component://order/widget/ordermgr/OrderPrintScreens.xml#CompanyLogo")}
- </fo:block>
- <fo:block text-align="right">
- <fo:instream-foreign-object>
- <barcode:barcode
xmlns:barcode="http://barcode4j.krysalis.org/ns";
- message="${shipment.shipmentId}">
- <barcode:code39>
- <barcode:height>8mm</barcode:height>
- </barcode:code39>
- </barcode:barcode>
- </fo:instream-foreign-object>
- </fo:block>
<fo:block><fo:leader/></fo:block>
<fo:block font-size="14pt">${uiLabelMap.ProductShipmentId}
#${shipmentId} / Package ${package_index + 1}<#if (packages?size > 1)> of
${packages?size}</#if></fo:block>
@@ -197,14 +172,9 @@
</fo:block>
</#if>
- </fo:flow>
- </fo:page-sequence>
-
<#else>
<fo:block font-size="14pt">
${uiLabelMap.ProductFacilityViewPermissionError}
</fo:block>
</#if>
-
-</fo:root>
</#escape>
Added:
ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlipShipmentBarCode.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlipShipmentBarCode.fo.ftl?rev=646857&view=auto
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlipShipmentBarCode.fo.ftl
(added)
+++
ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlipShipmentBarCode.fo.ftl
Thu Apr 10 09:03:29 2008
@@ -0,0 +1,31 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#escape x as x?xml>
+ <fo:block>
+ <fo:instream-foreign-object>
+ <barcode:barcode
xmlns:barcode="http://barcode4j.krysalis.org/ns";
+ message="${shipment.shipmentId}">
+ <barcode:code39>
+ <barcode:height>8mm</barcode:height>
+ </barcode:code39>
+ </barcode:barcode>
+ </fo:instream-foreign-object>
+ </fo:block>
+</#escape>
Propchange:
ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlipShipmentBarCode.fo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlipShipmentBarCode.fo.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange:
ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlipShipmentBarCode.fo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml?rev=646857&r1=646856&r2=646857&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml Thu
Apr 10 09:03:29 2008
@@ -290,9 +290,35 @@
<script
location="component://product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.bsh"/>
</actions>
<widgets>
- <platform-specific>
- <html><html-template
location="component://product/webapp/facility/shipment/PackingSlip.fo.ftl"/></html>
- </platform-specific>
+ <decorator-screen name="FoReportDecorator"
location="component://common/widget/CommonScreens.xml">
+ <!-- at the top left of every page we put the logo and
company information -->
+ <decorator-section name="topLeft">
+ <section>
+ <widgets>
+ <include-screen name="CompanyLogo"
location="component://order/widget/ordermgr/OrderPrintScreens.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ <!-- at the top right of every page we put the order
information -->
+ <decorator-section name="topRight">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template
location="component://product/webapp/facility/shipment/PackingSlipShipmentBarCode.fo.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template
location="component://product/webapp/facility/shipment/PackingSlip.fo.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
</widgets>
</section>
</screen>
