svn commit: r533956 - /ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java

[lektran]

Author: lektran
Date: Tue May  1 00:15:15 2007
New Revision: 533956

URL: http://svn.apache.org/viewvc?view=rev&rev=533956
Log:
Applied fix from trunk for revision: 533388

Modified:
    ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java

Modified: ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?view=diff&rev=533956&r1=533955&r2=533956
==============================================================================
--- ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original)
+++ ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Tue May  1 00:15:15 2007
@@ -455,7 +455,7 @@
                         }
                         if (product != null) {
                             itemTypeKey = product.getString("productTypeId");
-                        } else if (item != null) {
+                        } else if (item != null && item.getString("orderItemTypeId") != null) {
                             itemTypeKey = item.getString("orderItemTypeId");
                         }
                         returnInfo.put("itemTypeKey", itemTypeKey);