You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2009/05/27 19:45:47 UTC
svn commit: r779256 -
/ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl
Author: mor
Date: Wed May 27 17:45:46 2009
New Revision: 779256
URL: http://svn.apache.org/viewvc?rev=779256&view=rev
Log:
Minor fix to the item price in pick sheet pdf
Modified:
ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl?rev=779256&r1=779255&r2=779256&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl Wed May 27 17:45:46 2009
@@ -157,8 +157,9 @@
<#list infoItems as infoItem>
<fo:table-row>
<#assign orderItemShipGrpInvRes = infoItem.orderItemShipGrpInvRes>
- <#assign orderProduct = orderItemShipGrpInvRes.getRelatedOne("OrderItem").getRelatedOne("Product")?if_exists>
- <#assign supplierProduct = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(orderProduct.getRelated("SupplierProduct"))?if_exists>
+ <#assign orderItem = orderItemShipGrpInvRes.getRelatedOne("OrderItem")>
+ <#assign product = orderItem.getRelatedOne("Product")>
+ <#assign supplierProduct = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(product.getRelated("SupplierProduct"))?if_exists>
<#assign inventoryItem = infoItem.inventoryItem>
<#if infoItem.facilityLocation?has_content>
<#assign facilityLocation = infoItem.facilityLocation>
@@ -166,8 +167,8 @@
<#else>
<fo:table-cell><fo:block> </fo:block></fo:table-cell>
</#if>
- <fo:table-cell><fo:block font-size="10pt">${orderProduct.productId} </fo:block></fo:table-cell>
- <fo:table-cell><fo:block font-size="10pt">${orderProduct.internalName?if_exists} </fo:block></fo:table-cell>
+ <fo:table-cell><fo:block font-size="10pt">${product.productId} </fo:block></fo:table-cell>
+ <fo:table-cell><fo:block font-size="10pt">${product.internalName?if_exists} </fo:block></fo:table-cell>
<#if supplierProduct?has_content >
<fo:table-cell><fo:block font-size="10pt">${supplierProduct.supplierProductId?if_exists} </fo:block></fo:table-cell>
<#else>
@@ -176,7 +177,7 @@
<#assign quantity = Static["java.lang.Integer"].parseInt("${orderItemShipGrpInvRes.quantity}")/>
<#assign totalQty = totalQty + quantity>
<fo:table-cell><fo:block font-size="10pt">${orderItemShipGrpInvRes.quantity?if_exists} </fo:block></fo:table-cell>
- <fo:table-cell><fo:block font-size="10pt"><@ofbizCurrency amount=inventoryItem.unitCost isoCode=currencyUomId/></fo:block></fo:table-cell>
+ <fo:table-cell><fo:block font-size="10pt"><@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/></fo:block></fo:table-cell>
</fo:table-row>
</#list>
</#if>