svn commit: r426421 - in /incubator/ofbiz/trunk/applica
Locked
 
|
Author: jacopoc
Date: Fri Jul 28 00:44:28 2006 New Revision: 426421 URL: http://svn.apache.org/viewvc?rev=426421&view=rev Log: Committed new version of the Shipment Manifest report from Marco Risaliti (OFBIZ-112). The patch was very good (thanks Marco!), however I've cleaned up a bit of formatting issues (mostly tabs to spaces and removed newlines before brackets) to make the code compliant with the OFBiz formatting conventions: http://docs.ofbiz.org/display/OFBADMIN/Coding+Conventions Added: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.bsh (with props) incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl (with props) Removed: incubator/ofbiz/trunk/applications/product/webapp/facility/shipmentreports/ Modified: incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipment.ftl incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl incubator/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml Modified: incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?rev=426421&r1=426420&r2=426421&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original) +++ incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties Fri Jul 28 00:44:28 2006 @@ -869,6 +869,7 @@ ProductPackItem=Pack Item ProductPackQty=Pack Qty ProductPackage=Package +ProductPackageQty=Package Qty ProductPackages=Packages ProductPackedQty=Packed Qty ProductPackOrder=Pack Order @@ -1127,6 +1128,7 @@ ProductShipamount=shipamount ProductShipmentId=Shipment Id ProductShipmentItemSeqId=Shipment Item Seq Id +ProductShipmentManifest=Manifest for Shipment ProductShipmentMethod=Shipment Method ProductShipmentMethodType=Shipment Method Type ProductShipmentNotFoundId=The Shipment was not found with ID Modified: incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?rev=426421&r1=426420&r2=426421&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original) +++ incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Fri Jul 28 00:44:28 2006 @@ -636,8 +636,8 @@ ProductIssedOrdered=Prelevato : Ordinato ProductIssue=Preleva ProductIssueAll=Preleva Tutte -ProductIssuedQuantity=Prelievo Quantit\u00e0 -ProductIssuedReservedTotalOrdered=[Prelievo + Riservato=Totale]=Ordinato +ProductIssuedQuantity=Quantit\u00e0 Prelevata +ProductIssuedReservedTotalOrdered=[Prelevata + Riservata=Totale]=Ordinato ProductItem=Riga ProductItemDescription=Descrizione Riga ProductItemId=Numero Riga @@ -852,6 +852,7 @@ ProductPackItem=Imballa Riga ProductPackQty=Quantit\u00e0 Da Imballare ProductPackage=Pacco +ProductPackageQty=Quantit\u00e0 Pacco ProductPackages=Pacchi ProductPackedQty=Quantit\u00e0 Imballata ProductPackOrder=Imballaggio Ordini @@ -1110,6 +1111,7 @@ ProductShipamount=importo spedizione ProductShipmentId=Numero Spedizione ProductShipmentItemSeqId=Numero Seq Riga Spedizione +ProductShipmentManifest=Manifesto della Spedizione ProductShipmentMethod=Metodo Spedizione ProductShipmentMethodType=Tipo Metodo Spedizione ProductShipmentNotFoundId=La Spedizione non \u00e8 stata trovata con Codice Added: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.bsh URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.bsh?rev=426421&view=auto ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.bsh (added) +++ incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.bsh Fri Jul 28 00:44:28 2006 @@ -0,0 +1,69 @@ +/* + * Copyright 2001-2006 The Apache Software Foundation + * + * Licensed 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. + */ + +import org.ofbiz.entity.*; +import org.ofbiz.base.util.*; +import org.ofbiz.content.report.*; + +shipmentId = request.getParameter("shipmentId"); +shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap("shipmentId", shipmentId)); + +if (shipment != null) { + shipmentPackageRouteSegs = shipment.getRelated("ShipmentPackageRouteSeg", null, UtilMisc.toList("shipmentRouteSegmentId", "shipmentPackageSeqId")); + shipmentPackageDatas = new LinkedList(); + if (shipmentPackageRouteSegs != null && shipmentPackageRouteSegs.size() > 0) { + shipmentPackageRouteSegsIter = shipmentPackageRouteSegs.iterator(); + while (shipmentPackageRouteSegsIter.hasNext()) { + shipmentPackageRouteSeg = shipmentPackageRouteSegsIter.next(); + shipmentPackages = shipmentPackageRouteSeg.getRelated("ShipmentPackage", null, UtilMisc.toList("shipmentPackageSeqId")); + print("shipmentPackages"+shipmentPackages); + shipmentRouteSegment = shipmentPackageRouteSeg.getRelatedOne("ShipmentRouteSegment"); + if (shipmentPackages != null && shipmentPackages.size() > 0) { + shipmentPackagesIter = shipmentPackages.iterator(); + while (shipmentPackagesIter.hasNext()) { + shipmentPackage = shipmentPackagesIter.next(); + shipmentItemsDatas = new LinkedList(); + shipmentPackageContents = shipmentPackage.getRelated("ShipmentPackageContent", null, UtilMisc.toList("shipmentItemSeqId")); + if (shipmentPackageContents != null && shipmentPackageContents.size() > 0) { + shipmentPackageContentsIter = shipmentPackageContents.iterator(); + while (shipmentPackageContentsIter.hasNext()) { + shipmentItemsData = new HashMap(); + shipmentPackageContent = shipmentPackageContentsIter.next(); + packageQuantity = shipmentPackageContent.getDouble("quantity"); + shipmentItem = shipmentPackageContent.getRelatedOne("ShipmentItem"); + if (shipmentItem != null) { + shippedQuantity = shipmentItem.getDouble("quantity"); + shipmentItemsData.put("shipmentItem", shipmentItem); + shipmentItemsData.put("shippedQuantity", shippedQuantity); + shipmentItemsData.put("packageQuantity", packageQuantity); + shipmentItemsDatas.add(shipmentItemsData); + } + } + } + shipmentPackageData = new HashMap(); + shipmentPackageData.put("shipmentPackage", shipmentPackage); + shipmentPackageData.put("shipmentRouteSegment", shipmentRouteSegment); + shipmentPackageData.put("shipmentItemsDatas", shipmentItemsDatas); + shipmentPackageDatas.add(shipmentPackageData); + } + } + } + } + context.put("shipmentPackageDatas", shipmentPackageDatas); +} + +context.put("shipmentId", shipmentId); +context.put("shipment", shipment); Propchange: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.bsh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.bsh ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.bsh ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=426421&r1=426420&r2=426421&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original) +++ incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Fri Jul 28 00:44:28 2006 @@ -598,6 +598,10 @@ <security https="true" auth="true"/> <response name="success" type="view" value="ShipmentBarCode.pdf"/> </request-map> + <request-map uri="ShipmentManifest.pdf"> + <security https="true" auth="true"/> + <response name="success" type="view" value="ShipmentManifest.pdf"/> + </request-map> <!-- ================ Shipment Scheduling Requests ================= --> <request-map uri="Scheduling"> @@ -931,13 +935,7 @@ <response name="error" type="view" value="EditShipmentItems"/> </request-map> --> - <!-- ================ Shipment Manifest Report Requests ================= --> - <request-map uri="ShipmentManifestReport.pdf"> - <security https="true" auth="true"/> - <event type="bsf" path="/shipmentreports/" invoke="ShipmentItemReportPrepare.bsh"/> - <response name="success" type="view" value="ShipmentManifestReport"/> - </request-map> - + <!-- ================ Inventory Reports Requests ================= --> <request-map uri="InventoryReports"> <security https="true" auth="true"/> @@ -988,7 +986,8 @@ <view-map name="PackOrder" type="screen" page="component://product/widget/facility/ShipmentScreens.xml#PackOrder"/> <view-map name="PackingSlip.pdf" type="screenfop" page="component://product/widget/facility/ShipmentScreens.xml#PackingSlip.fo"/> <view-map name="ShipmentBarCode.pdf" type="screenfop" page="component://product/widget/facility/ShipmentScreens.xml#ShipmentBarCode.fo"/> - + <view-map name="ShipmentManifest.pdf" type="screenfop" page="component://product/widget/facility/ShipmentScreens.xml#ShipmentManifest.fo"/> + <view-map name="ScheduleShipmentRouteSegment" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ScheduleShipmentRouteSegment"/> <view-map name="Labels" type="screen" page="component://product/widget/facility/FacilityScreens.xml#Labels"/> <view-map name="BatchPrintShippingLabels" type="screenfop" page="component://product/widget/facility/FacilityScreens.xml#BatchPrintShippingLabels"/> @@ -1002,9 +1001,7 @@ <view-map name="EditShipmentRouteSegments" type="screen" page="component://product/widget/facility/ShipmentScreens.xml#EditShipmentRouteSegments"/> <view-map name="AddItemsFromOrder" type="screen" page="component://product/widget/facility/ShipmentScreens.xml#AddItemsFromOrder"/> <view-map name="QuickShipOrder" type="screen" page="component://product/widget/facility/ShipmentScreens.xml#QuickShipOrder"/> - - <view-map name="ShipmentManifestReport" type="jasperreportspdf" page="/shipmentreports/ShipmentManifestReport.xml" content-type="application/pdf" encoding="none"/> - + <view-map name="InventoryReports" type="screen" page="component://product/widget/facility/ReportScreens.xml#InventoryReports"/> <!-- end of view mappings --> </site-conf> Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl?rev=426421&r1=426420&r2=426421&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl (original) +++ incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl Fri Jul 28 00:44:28 2006 @@ -21,7 +21,7 @@ </#if> --> <#if shipmentId?has_content> - <div><a href="<@ofbizUrl>ShipmentManifestReport.pdf?shipmentId=${shipmentId}</@ofbizUrl>" class="buttontext" target="_blank">${uiLabelMap.ProductGenerateShipmentManifestReport}</a></div> + <div><a href="<@ofbizUrl>ShipmentManifest.pdf?shipmentId=${shipmentId}</@ofbizUrl>" class="buttontext" target="_blank">${uiLabelMap.ProductGenerateShipmentManifestReport}</a></div> </#if> ${editShipmentWrapper.renderFormString(context)} Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl?rev=426421&r1=426420&r2=426421&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl (original) +++ incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl Fri Jul 28 00:44:28 2006 @@ -117,7 +117,7 @@ <#assign allDone = "yes"> <center> <a href="<@ofbizUrl>viewShipmentPackageRouteSegLabelImage?shipmentId=${requestParameters.shipmentId}&shipmentRouteSegmentId=${requestParameters.shipmentRouteSegmentId}&shipmentPackageSeqId=00001</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductShippingLabel}</a><br/> - <a href="<@ofbizUrl>ShipmentManifestReport.pdf?shipmentId=${requestParameters.shipmentId}&shipmentRouteSegmentId=${requestParameters.shipmentRouteSegmentId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductPackingSlip}</a> + <a href="<@ofbizUrl>ShipmentManifest.pdf?shipmentId=${requestParameters.shipmentId}&shipmentRouteSegmentId=${requestParameters.shipmentRouteSegmentId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductPackingSlip}</a> </center> </#if> <#else> Added: incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl?rev=426421&view=auto ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl (added) +++ incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl Fri Jul 28 00:44:28 2006 @@ -0,0 +1,204 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<#-- +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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. +--> +<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> + <#list shipmentPackageDatas as shipmentPackageData> + <#assign shipmentRouteSegment = shipmentPackageData.get("shipmentRouteSegment")> + <#assign shipmentPackage = shipmentPackageData.get("shipmentPackage")> + <#assign shipmentItemsDatas = shipmentPackageData.get("shipmentItemsDatas")> + <fo:page-sequence master-reference="main"> + <fo:static-content flow-name="xsl-region-after"> + <fo:block text-align="right" line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always"> + ${uiLabelMap.CommonPage} <fo:page-number/> + </fo:block> + </fo:static-content> + <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" + 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.ProductShipmentManifest} #${shipmentId}</fo:block> + <fo:block><fo:leader/></fo:block> + <fo:block space-after.optimum="10pt" font-size="10pt"> + <fo:table> + <fo:table-column column-width="150pt"/> + <fo:table-column column-width="150pt"/> + <fo:table-column column-width="150pt"/> + <fo:table-header> + <fo:table-row font-weight="bold"> + <fo:table-cell padding="2pt" background-color="#D4D0C8"> + <fo:block>${uiLabelMap.ProductRouteSegment}: ${shipmentRouteSegment.shipmentRouteSegmentId}</fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt" background-color="#D4D0C8"> + <#assign carrierParty = shipmentRouteSegment.getRelatedOne("CarrierParty")?if_exists> + <fo:block text-align="center">${uiLabelMap.ProductCarrier}: <#if carrierParty.description?has_content>${carrierParty.description}<#else>${carrierParty.partyId}</#if></fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt" background-color="#D4D0C8"> + <#assign shipmentMethodType = shipmentRouteSegment.getRelatedOne("ShipmentMethodType")?if_exists> + <fo:block text-align="right">${uiLabelMap.ProductShipmentMethod}: <#if shipmentMethodType?has_content>${shipmentMethodType.description}<#else>${uiLabelMap.CommonNA}</#if></fo:block> + </fo:table-cell> + </fo:table-row> + </fo:table-header> + <fo:table-body> + <fo:table-row> + <fo:table-cell padding="2pt"> + <fo:block> + <#if originPostalAddress?has_content> + <fo:block>${uiLabelMap.CommonFrom}: ${originPostalAddress.toName?if_exists}</fo:block> + <#if originPostalAddress.attnName?has_content> + <fo:block>${uiLabelMap.CommonAttn}: ${originPostalAddress.attnName?if_exists}</fo:block> + </#if> + <fo:block>${originPostalAddress.address1?if_exists}</fo:block> + <fo:block>${originPostalAddress.address2?if_exists}</fo:block> + <fo:block> + ${originPostalAddress.city?if_exists}<#if originPostalAddress.stateProvinceGeoId?has_content>, ${originPostalAddress.stateProvinceGeoId}</#if> + ${originPostalAddress.postalCode?if_exists} ${originPostalAddress.countryGeoId?if_exists} + </fo:block> + </#if> + </fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block text-align="center"> + <#if destinationPostalAddress?has_content> + <fo:block>${uiLabelMap.CommonTo}: ${destinationPostalAddress.toName?if_exists}</fo:block> + <#if destinationPostalAddress.attnName?has_content> + <fo:block>${uiLabelMap.CommonAttn}: ${destinationPostalAddress.attnName?if_exists}</fo:block> + </#if> + <fo:block>${destinationPostalAddress.address1?if_exists}</fo:block> + <fo:block>${destinationPostalAddress.address2?if_exists}</fo:block> + <fo:block> + ${destinationPostalAddress.city?if_exists}<#if destinationPostalAddress.stateProvinceGeoId?has_content>, ${destinationPostalAddress.stateProvinceGeoId}</#if> + ${destinationPostalAddress.postalCode?if_exists} ${destinationPostalAddress.countryGeoId?if_exists} + </fo:block> + </#if> + </fo:block> + </fo:table-cell> + </fo:table-row> + </fo:table-body> + </fo:table> + </fo:block> + <fo:block space-after.optimum="10pt" font-size="10pt"> + <fo:table> + <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"> + <#if shipmentPackage.weight?has_content && shipmentPackage.weightUomId?has_content> + <#assign weightUom = shipmentPackage.getRelatedOne("WeightUom")> + <fo:block text-align="center">${uiLabelMap.ProductWeight}: ${shipmentPackage.weight} ${weightUom.get("description",locale)}</fo:block> + </#if> + </fo:table-cell> + </fo:table-row> + </fo:table-body> + </fo:table> + </fo:block> + <fo:table> + <fo:table-column column-width="180pt"/> + <fo:table-column column-width="60pt"/> + <fo:table-column column-width="60pt"/> + <fo:table-column column-width="60pt"/> + <fo:table-column column-width="90pt"/> + <fo:table-header> + <fo:table-row font-weight="bold"> + <fo:table-cell padding="2pt" background-color="#D4D0C8"> + <fo:block>${uiLabelMap.ProductProductId}</fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt" background-color="#D4D0C8"> + <fo:block>${uiLabelMap.ProductQuantityShipped}</fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt" background-color="#D4D0C8"> + <fo:block>${uiLabelMap.ProductPackedQty}</fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt" background-color="#D4D0C8"> + <fo:block>${uiLabelMap.ProductIssuedQuantity}</fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt" background-color="#D4D0C8"> + <fo:block>${uiLabelMap.FormFieldTitle_orderItemSeqId}</fo:block> + </fo:table-cell> + </fo:table-row> + </fo:table-header> + <fo:table-body> + <#list shipmentItemsDatas as shipmentItemsData> + <#assign shipmentItem = shipmentItemsData.get("shipmentItem")> + <#assign shippedQuantity = shipmentItemsData.get("shippedQuantity")> + <#assign packageQuantity = shipmentItemsData.get("packageQuantity")> + <#assign product = shipmentItem.getRelatedOne("Product")> + <#assign itemIssuances = shipmentItem.getRelated("ItemIssuance")> + <fo:table-row> + <fo:table-cell padding="2pt"> + <fo:block>${product.internalName} [${shipmentItem.productId}]</fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block text-align="center">${shippedQuantity}</fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block text-align="center">${packageQuantity}</fo:block> + </fo:table-cell> + </fo:table-row> + <#list itemIssuances as itemIssuance> + <fo:table-row> + <fo:table-cell padding="2pt"> + <fo:block> </fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block> </fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block> </fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block text-align="center">${itemIssuance.quantity}</fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block>${itemIssuance.orderId}:${itemIssuance.orderItemSeqId}</fo:block> + </fo:table-cell> + </fo:table-row> + </#list> + </#list> + </fo:table-body> + </fo:table> + </fo:flow> + </fo:page-sequence> + </#list> + <#else> + <fo:block font-size="14pt"> + ${uiLabelMap.ProductFacilityViewPermissionError} + </fo:block> + </#if> +</fo:root> Propchange: incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipment.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipment.ftl?rev=426421&r1=426420&r2=426421&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipment.ftl (original) +++ incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipment.ftl Fri Jul 28 00:44:28 2006 @@ -17,7 +17,7 @@ <#if hasPermission> <#if shipmentId?has_content> - <div><a href="<@ofbizUrl>ShipmentManifestReport.pdf?shipmentId=${shipmentId}</@ofbizUrl>" class="buttontext" target="_blank">${uiLabelMap.ProductGenerateShipmentManifestReport}</a></div> + <div><a href="<@ofbizUrl>ShipmentManifest.pdf?shipmentId=${shipmentId}</@ofbizUrl>" class="buttontext" target="_blank">${uiLabelMap.ProductGenerateShipmentManifestReport}</a></div> </#if> <#else> Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl?rev=426421&r1=426420&r2=426421&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl (original) +++ incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl Fri Jul 28 00:44:28 2006 @@ -32,7 +32,7 @@ <td><div class="tabletext">${shipmentPackage.shipmentPackageSeqId}</div></td> <td><div class="tabletext">${(shipmentPackage.dateCreated.toString())?if_exists}</div></td> <td><span class="tabletext">${uiLabelMap.ProductWeight} : ${shipmentPackage.weight?if_exists}</span></td> - <td><span class="tabletext">${uiLabelMap.ProductWeightUnit} :${weightUom.description?default(shipmentPackage.weightUomId?if_exists)}</span></td> + <td><span class="tabletext">${uiLabelMap.ProductWeightUnit} : <#if weightUom?has_content>${weightUom.get("description",locale)}<#else>${shipmentPackage.weightUomId?if_exists}</#if></span></td> </tr> <#list shipmentPackageContents as shipmentPackageContent> <tr> Modified: incubator/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml?rev=426421&r1=426420&r2=426421&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml (original) +++ incubator/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml Fri Jul 28 00:44:28 2006 @@ -297,4 +297,22 @@ </widgets> </section> </screen> + + <screen name="ShipmentManifest.fo"> + <section> + <actions> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + + <set field="shipmentId" from-field="parameters.shipmentId"/> + <script location="component://product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.bsh"/> + <script location="component://product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.bsh"/> + </actions> + <widgets> + <platform-specific> + <html><html-template location="component://product/webapp/facility/shipment/ShipmentManifest.fo.ftl"/></html> + </platform-specific> + </widgets> + </section> + </screen> </screens> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |