Author: mor
Date: Tue May 4 13:56:19 2010
New Revision: 940858
URL: http://svn.apache.org/viewvc?rev=940858&view=rev
Log:
No functional change. Only formatting changes.
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=940858&r1=940857&r2=940858&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
(original)
+++
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
Tue May 4 13:56:19 2010
@@ -493,19 +493,18 @@ public class OrderReturnServices {
// items not issued/shipped are considered as returnable
only if they are
// not physical items
if
("SALES_ORDER".equals(orderHeader.getString("orderTypeId"))) {
- BigDecimal quantityIssued =
orderItemQuantityIssued.getBigDecimal("quantityIssued");
- if (UtilValidate.isEmpty(quantityIssued) ||
quantityIssued.compareTo(BigDecimal.ZERO) == 0) {
- try {
- GenericValue itemProduct =
item.getRelatedOne("Product");
- if (ProductWorker.isPhysical(itemProduct)) {
- continue;
+ BigDecimal quantityIssued =
orderItemQuantityIssued.getBigDecimal("quantityIssued");
+ if (UtilValidate.isEmpty(quantityIssued) ||
quantityIssued.compareTo(BigDecimal.ZERO) == 0) {
+ try {
+ GenericValue itemProduct =
item.getRelatedOne("Product");
+ if (ProductWorker.isPhysical(itemProduct)) {
+ continue;
+ }
+ } catch (GenericEntityException e) {
+ Debug.logError(e, "Problems looking up
returnable product type information", module);
+ return
ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderErrorUnableToGetTheItemReturnableProduct",
locale));
}
- } catch (GenericEntityException e) {
- Debug.logError(e, "Problems looking up returnable
product type information", module);
- return
ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderErrorUnableToGetTheItemReturnableProduct",
locale));
}
-
- }
}
Map serviceResult = null;
try {
