You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/04/30 17:53:56 UTC
svn commit: r533779 - in /ofbiz/trunk/applications/product:
config/ProductUiLabels.properties
webapp/facility/WEB-INF/actions/returns/receiveReturn.bsh
webapp/facility/returns/receiveReturn.ftl
Author: jacopoc
Date: Mon Apr 30 08:53:55 2007
New Revision: 533779
URL: http://svn.apache.org/viewvc?view=rev&rev=533779
Log:
Fix for a fake error message that was appearing in the receive screen after a return was completely returned.
Modified:
ofbiz/trunk/applications/product/config/ProductUiLabels.properties
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/returns/receiveReturn.bsh
ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?view=diff&rev=533779&r1=533778&r2=533779
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Mon Apr 30 08:53:55 2007
@@ -1130,6 +1130,7 @@
ProductReserved=Reserved
ProductResetDate=Reset Date
ProductResultOfImageUpload=Result of image Upload
+ProductReturnCompletelyReceived=This return is completely received
ProductReturnNumber=Return Number
ProductReturnToEditProduct=Return to Edit Product
ProductReturnToEditProductFeatures=Return to Edit Product Features
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/returns/receiveReturn.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/returns/receiveReturn.bsh?view=diff&rev=533779&r1=533778&r2=533779
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/returns/receiveReturn.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/returns/receiveReturn.bsh Mon Apr 30 08:53:55 2007
@@ -37,14 +37,14 @@
if (returnHeader != null) {
if (returnHeader.getString("statusId").equals("RETURN_ACCEPTED")) {
returnItems = returnHeader.getRelated("ReturnItem");
- } 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 {
+ } else if (returnHeader.getString("statusId").equals("RETURN_REQUESTED")) {
uiLabelMap = UtilProperties.getResourceBundleMap("ProductErrorUiLabels", locale);
ProductReturnRequestedOK = uiLabelMap.get("ProductReturnRequestedOK");
request.setAttribute("_EVENT_MESSAGE_", ProductReturnRequestedOK + " (#" + returnId.toString() + ")" );
+ } else if (!returnHeader.getString("statusId").equals("RETURN_RECEIVED")) {
+ uiLabelMap = UtilProperties.getResourceBundleMap("ProductErrorUiLabels", locale);
+ ProductReturnNotYetAcceptedOrAlreadyReceived = uiLabelMap.get("ProductReturnNotYetAcceptedOrAlreadyReceived");
+ request.setAttribute("_ERROR_MESSAGE_", ProductReturnNotYetAcceptedOrAlreadyReceived + " (#" + returnId.toString() + ")" );
}
}
}
Modified: ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl?view=diff&rev=533779&r1=533778&r2=533779
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl Mon Apr 30 08:53:55 2007
@@ -24,9 +24,12 @@
<#-- Receiving Results -->
<#if receivedItems?has_content>
+ <h3>${uiLabelMap.ProductReceiptForReturn} <a href="/ordermgr/control/returnMain?returnId=${returnHeader.returnId}${externalKeyParam?if_exists}" class="buttontext">#${returnHeader.returnId}</a></h3>
+ <#if "RETURN_RECEIVED" == returnHeader.getString("statusId")>
+ <h3>${uiLabelMap.ProductReturnCompletelyReceived}</h3>
+ </#if>
+ <br/>
<table width="100%" border='0' cellpadding='2' cellspacing='0'>
- <tr><td colspan="7"><div class="head3">${uiLabelMap.ProductReceiptForReturn} <a href="/ordermgr/control/returnMain?returnId=${returnHeader.returnId}${externalKeyParam?if_exists}" class="buttontext">#${returnHeader.returnId}</a></div></td></tr>
- <tr><td colspan="7"><hr class="sepbar"></td></tr>
<tr>
<td><div class="tableheadtext">${uiLabelMap.ProductReceipt}</div></td>
<td><div class="tableheadtext">${uiLabelMap.CommonDate}</div></td>