Author: mrisaliti
Date: Tue Jan 25 20:01:45 2011
New Revision: 1063433
URL: http://svn.apache.org/viewvc?rev=1063433&view=rev
Log:
Internationalization of java services for oasgis component, fix a bug
introduced by me for the wrong return code (OFBIZ-4091)
Modified:
ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
Modified:
ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java?rev=1063433&r1=1063432&r2=1063433&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
(original)
+++
ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
Tue Jan 25 20:01:45 2011
@@ -722,7 +722,7 @@ public class OagisShipmentServices {
List<String> validStores =
StringUtil.split(UtilProperties.getPropertyValue("oagis.properties",
"Oagis.Order.ValidProductStores"), ",");
if (UtilValidate.isNotEmpty(validStores)) {
if
(!validStores.contains(orderHeader.getString("productStoreId"))) {
- return
ServiceUtil.returnError(UtilProperties.getMessage(resource,
"OagisOrderIdNotValidStore", UtilMisc.toMap("orderId", orderId), locale));
+ return
ServiceUtil.returnSuccess(UtilProperties.getMessage(resource,
"OagisOrderIdNotValidStore", UtilMisc.toMap("orderId", orderId), locale));
}
}
String orderStatusId = orderHeader.getString("statusId");
@@ -730,7 +730,7 @@ public class OagisShipmentServices {
return
ServiceUtil.returnSuccess(UtilProperties.getMessage(resource,
"OagisOrderIdNotInApprovedStatus", UtilMisc.toMap("orderId", orderId,
"orderStatusId", orderStatusId), locale));
}
if (!"SALES_ORDER".equals(orderHeader.getString("orderTypeId"))) {
- return
ServiceUtil.returnSuccess(UtilProperties.getMessage(resource,
"OagisOrderIdNotASalesOrder", UtilMisc.toMap("orderId", orderId), locale));
+ return
ServiceUtil.returnError(UtilProperties.getMessage(resource,
"OagisOrderIdNotASalesOrder", UtilMisc.toMap("orderId", orderId), locale));
}
// first check some things...