Author: jacopoc
Date: Sat May 26 02:03:44 2007
New Revision: 541876
URL:
http://svn.apache.org/viewvc?view=rev&rev=541876Log:
Improved mkt pkg information in the picking list.
Modified:
ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl?view=diff&rev=541876&r1=541875&r2=541876==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl Sat May 26 02:03:44 2007
@@ -235,17 +235,21 @@
<#assign picklistItem = picklistItemInfo.picklistItem>
<#assign orderItem = picklistItemInfo.orderItem>
<#assign product = picklistItemInfo.product>
+ <#assign picklistItemProduct = picklistItemInfo.inventoryItemAndLocation.getRelatedOne("InventoryItem").getRelatedOne("Product")>
<#assign orderItemShipGrpInvRes = picklistItemInfo.orderItemShipGrpInvRes?if_exists>
<fo:table-row>
<fo:table-cell padding="2pt" background-color="${rowColor}">
<fo:block><#--${picklistItem.orderId}:${picklistItem.shipGroupSeqId}:-->${picklistItem.orderItemSeqId}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
+ <fo:block>
<#if product?has_content>
- <fo:block>${product.internalName?default("Internal Name Not Set!")} [${product.productId}]</fo:block>
- <#else/>
- <fo:block> </fo:block>
+ ${product.internalName?default("Internal Name Not Set!")} [${product.productId}]
</#if>
+ <#if picklistItemProduct?has_content && product?has_content && picklistItemProduct.productId != product.productId>
+ ${picklistItemProduct.internalName?default("Internal Name Not Set!")} [${picklistItemProduct.productId}]
+ </#if>
+ </fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
<fo:block>${picklistItem.quantity}</fo:block>