Author: mor
Date: Wed Apr 22 14:25:48 2009
New Revision: 767537
URL: http://svn.apache.org/viewvc?rev=767537&view=rev
Log:
Misc improvements. Applied OFBIZ-2225-IMPROVED patch, part of OFBIZ-2225.
Thanks again Arun Patidar.
Modified:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PrintPickSheets.groovy
ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl
Modified:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PrintPickSheets.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PrintPickSheets.groovy?rev=767537&r1=767536&r2=767537&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PrintPickSheets.groovy
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PrintPickSheets.groovy
Wed Apr 22 14:25:48 2009
@@ -64,7 +64,7 @@
shippingAddress = delegator.findOne("PostalAddress",
[contactMechId : shippingContactMechId], false);
orderItemShipGroups.each { orderItemShipGroup ->
if (orderItemShipGroup.orderId == orderId) {
- orderMap.shipmentMethodTypeId =
orderItemShipGroup.shipmentMethodTypeId;
+ orderMap.shipmentMethodType =
EntityUtil.getFirst(orderItemShipGroup.getRelated("ShipmentMethodType")).description;
orderMap.carrierPartyId =
orderItemShipGroup.carrierPartyId;
orderMap.shipGroupSeqId =
orderItemShipGroup.shipGroupSeqId;
orderMap.carrierPartyId =
orderItemShipGroup.carrierPartyId;
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=767537&r1=767536&r2=767537&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl
Wed Apr 22 14:25:48 2009
@@ -39,7 +39,7 @@
<#assign orderDate = orderDetail.orderDate>
<#assign billAddress = orderDetail.billingAddress>
<#assign shipAddress = orderDetail.shippingAddress>
- <#assign shipmentMethodTypeId =
orderDetail.shipmentMethodTypeId>
+ <#assign shipmentMethodType =
orderDetail.shipmentMethodType>
<#assign carrierPartyId =
orderDetail.carrierPartyId>
<#assign shipGroupSeqId =
orderDetail.shipGroupSeqId>
@@ -76,7 +76,6 @@
<fo:block>
${shipAddress.city?if_exists}</fo:block>
<fo:block>
${shipAddress.countryGeoId?if_exists}</fo:block>
<fo:block>
${shipAddress.postalCode?if_exists}</fo:block>
- <fo:block>
${shipAddress.postalCodeGeoId?if_exists}</fo:block>
<fo:block>
${shipAddress.stateProvinceGeoId?if_exists}</fo:block>
</fo:table-cell>
<fo:table-cell>
@@ -91,7 +90,6 @@
<fo:block> ${billAddress.city?if_exists}</fo:block>
<fo:block> ${billAddress.countryGeoId?if_exists}</fo:block>
<fo:block> ${billAddress.postalCode?if_exists}</fo:block>
-
<fo:block> ${billAddress.postalCodeGeoId?if_exists}</fo:block>
<fo:block> ${billAddress.stateProvinceGeoId?if_exists}</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -123,7 +121,7 @@
<fo:block>${uiLabelMap.ProductShipmentMethod}:</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block
font-weight="bold">${carrierPartyId?if_exists}-${shipmentMethodTypeId?if_exists}</fo:block>
+ <fo:block
font-weight="bold">${carrierPartyId?if_exists}-${shipmentMethodType?if_exists}</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
@@ -178,7 +176,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">${inventoryItem.unitCost?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-row>
</#list>
</#if>
