You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2009/12/04 15:53:37 UTC
svn commit: r887218 -
/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
Author: ashish
Date: Fri Dec 4 14:53:35 2009
New Revision: 887218
URL: http://svn.apache.org/viewvc?rev=887218&view=rev
Log:
Shown Description (If description exist otherwise shown shipmentMethodTypeId) instead of shipmentMethodTypeId on Packing Slip Pdf.
Patch from Akash Jain (Thanks!)
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?rev=887218&r1=887217&r2=887218&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl Fri Dec 4 14:53:35 2009
@@ -72,7 +72,9 @@
<#if carrier != "_NA_">
${carrier}
</#if>
- ${shipGroup.shipmentMethodTypeId?default("??")}
+ <#if (shipGroup.shipmentMethodTypeId)?exists>
+ ${(shipGroup.getRelatedOne("ShipmentMethodType").get("description", locale))?default(shipGroup.shipmentMethodTypeId)}
+ </#if>
</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt">