Author: lektran
Date: Sat Sep 15 23:20:34 2007
New Revision: 576041
URL:
http://svn.apache.org/viewvc?rev=576041&view=revLog:
Removed deprecated getItemShippedQuantity() and renamed getItemShippedQuantityBd()
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java?rev=576041&r1=576040&r2=576041&view=diff==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java Sat Sep 15 23:20:34 2007
@@ -2017,7 +2017,7 @@
return quantityPicked.setScale(scale, rounding);
}
- public BigDecimal getItemShippedQuantityBd(GenericValue orderItem) {
+ public BigDecimal getItemShippedQuantity(GenericValue orderItem) {
BigDecimal quantityShipped = ZERO;
List issuance = getOrderItemIssuances(orderItem);
if (issuance != null) {
@@ -2031,11 +2031,6 @@
}
}
return quantityShipped.setScale(scale, rounding);
- }
-
- /** @deprecated */
- public double getItemShippedQuantity(GenericValue orderItem) {
- return getItemShippedQuantityBd(orderItem).doubleValue();
}
public BigDecimal getItemReservedQuantityBd(GenericValue orderItem) {
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=576041&r1=576040&r2=576041&view=diff==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl Sat Sep 15 23:20:34 2007
@@ -232,7 +232,7 @@
<#list itemInfos as itemInfo>
<#-- <#list itemInfos as orderItem> -->
<#assign orderItem = itemInfo.orderItem/>
- <#assign shippedQuantity = orderReadHelper.getItemShippedQuantityBd(orderItem)?if_exists>
+ <#assign shippedQuantity = orderReadHelper.getItemShippedQuantity(orderItem)?if_exists>
<#assign orderItemQuantity = itemInfo.quantity/>
<#assign orderProduct = orderItem.getRelatedOne("Product")?if_exists/>
<#assign product = Static["org.ofbiz.product.product.ProductWorker"].findProduct(delegator, itemInfo.productId)?if_exists/>