svn commit: r489476 - in /incubator/ofbiz/trunk/applications/product: config/ProductErrorUiLabels.properties config/ProductErrorUiLabels_fr.properties webapp/facility/WEB-INF/actions/returns/receiveReturn.bsh

Author: jleroux
Date: Thu Dec 21 14:09:40 2006
New Revision: 489476

URL: http://svn.apache.org/viewvc?view=rev&rev=489476
Log:
Corrects "False message in receive return" (https://issues.apache.org/jira/browse/OFBIZ-550)

Added:
    incubator/ofbiz/trunk/applications/product/config/ProductErrorUiLabels.properties   (with props)
    incubator/ofbiz/trunk/applications/product/config/ProductErrorUiLabels_fr.properties   (with props)
Modified:
    incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/returns/receiveReturn.bsh

Added: incubator/ofbiz/trunk/applications/product/config/ProductErrorUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductErrorUiLabels.properties?view=auto&rev=489476
==============================================================================
--- incubator/ofbiz/trunk/applications/product/config/ProductErrorUiLabels.properties (added)
+++ incubator/ofbiz/trunk/applications/product/config/ProductErrorUiLabels.properties Thu Dec 21 14:09:40 2006
@@ -0,0 +1,17 @@
+#####################################################################
+# Copyright 2001-2006 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#####################################################################
+ProductReturnNotYetAcceptedOrAlreadyReceived=This return is not yet accepted or already received.
+ProductReturnRequestedOK=The return is requested.

Propchange: incubator/ofbiz/trunk/applications/product/config/ProductErrorUiLabels.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/ofbiz/trunk/applications/product/config/ProductErrorUiLabels.properties
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: incubator/ofbiz/trunk/applications/product/config/ProductErrorUiLabels.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/ofbiz/trunk/applications/product/config/ProductErrorUiLabels_fr.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductErrorUiLabels_fr.properties?view=auto&rev=489476
==============================================================================
--- incubator/ofbiz/trunk/applications/product/config/ProductErrorUiLabels_fr.properties (added)
+++ incubator/ofbiz/trunk/applications/product/config/ProductErrorUiLabels_fr.properties Thu Dec 21 14:09:40 2006
@@ -0,0 +1,17 @@
+#####################################################################
+# Copyright 2001-2006 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#####################################################################
+ProductReturnNotYetAcceptedOrAlreadyReceived=Ce retour n'est pas encore accept\u00E9 ou d\u00E9j\u00E0 re\u00E7u.
+ProductReturnRequestedOK=Le retour est demand\u00E9.

Propchange: incubator/ofbiz/trunk/applications/product/config/ProductErrorUiLabels_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/ofbiz/trunk/applications/product/config/ProductErrorUiLabels_fr.properties
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: incubator/ofbiz/trunk/applications/product/config/ProductErrorUiLabels_fr.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/returns/receiveReturn.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/returns/receiveReturn.bsh?view=diff&rev=489476&r1=489475&r2=489476
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/returns/receiveReturn.bsh (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/returns/receiveReturn.bsh Thu Dec 21 14:09:40 2006
@@ -35,8 +35,14 @@
     if (returnHeader != null) {
         if (returnHeader.getString("statusId").equals("RETURN_ACCEPTED")) {
             returnItems = returnHeader.getRelated("ReturnItem");
-        } else {
-            request.setAttribute("_ERROR_MESSAGE_", "<li>This return is not yet accepted or already received.");
+        } else if (!returnHeader.getString("statusId").equals("RETURN_REQUESTED")) {
+            uiLabelMap = UtilProperties.getResourceBundleMap("ProductErrorUiLabels", locale);
+            ProductReturnNotYetAcceptedOrAlreadyReceived = uiLabelMap.get("ProductReturnNotYetAcceptedOrAlreadyReceived");
+            request.setAttribute("_ERROR_MESSAGE_", ProductReturnNotYetAcceptedOrAlreadyReceived + " (#" + returnId.toString() + ")" );
+        }  else {
+            uiLabelMap = UtilProperties.getResourceBundleMap("ProductErrorUiLabels", locale);
+            ProductReturnRequestedOK = uiLabelMap.get("ProductReturnRequestedOK");
+            request.setAttribute("_EVENT_MESSAGE_", ProductReturnRequestedOK + " (#" + returnId.toString() + ")" );
         }
     }
 }