Author: ashish
Date: Fri Dec 4 12:39:39 2009
New Revision: 887173
URL: http://svn.apache.org/viewvc?rev=887173&view=rev
Log:
Applied patch from jira issue OFBIZ-3304 - Remove links for adjustments in
create return screen is not working.
Remove links for adjustment on return screen is not working.
Steps to regenerate issue:
1) Create an sales order and complete order by 'Quick Ship Entire Order' from
order detail page.
2) Clicks on Create return link on order detail page
3) Clicks on Select all checkbox and then click on 'Return Selected items'
4) On Return Items screen 'Remove' links for adjustment gives secure url error.
Thanks Arun for the contribution.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl?rev=887173&r1=887172&r2=887173&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl Fri
Dec 4 12:39:39 2009
@@ -56,12 +56,13 @@
</div>
</td>
<#if (adjEditable)>
- <td align='right'><a
href="<@ofbizUrl>removeReturnAdjustment?returnAdjustmentId=${returnAdjustment.returnAdjustmentId}&returnId=${returnAdjustment.returnId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonRemove}</a></td>
+ <td align='right'><a
href='javascript:document.removeReturnAdjustment_${rowCountForAdjRemove}.submit()'
class='buttontext'>${uiLabelMap.CommonRemove}</a></td>
<#else>
<td> </td>
</#if>
<#if (adjEditable)>
<#assign rowCount = rowCount + 1>
+ <#assign rowCountForAdjRemove = rowCountForAdjRemove + 1>
</#if>
<#assign returnTotal = returnTotal + returnAdjustment.amount?default(0)>
</tr>
@@ -139,6 +140,7 @@
</tr>
<#assign returnTotal = 0.0>
<#assign rowCount = 0>
+ <#assign rowCountForAdjRemove = 0>
<form method="post"
action="<@ofbizUrl>updateReturnItems</@ofbizUrl>">
<input type="hidden" name="_useRowSubmit" value="Y">
<#if returnItems?has_content>
@@ -322,6 +324,14 @@
</form>
</#list>
</#if>
+ <#if returnAdjustments?has_content>
+ <#list returnAdjustments as returnAdjustment>
+ <form name="removeReturnAdjustment_${returnAdjustment_index}"
method="post" action="<@ofbizUrl>removeReturnAdjustment</@ofbizUrl>">
+ <input type="hidden" name="returnId"
value="${returnAdjustment.returnId}"/>
+ <input type="hidden" name="returnAdjustmentId"
value="${returnAdjustment.returnAdjustmentId}"/>
+ </form>
+ </#list>
+ </#if>
<#if (returnHeader.statusId == "RETURN_REQUESTED" ||
returnHeader.statusId == "SUP_RETURN_REQUESTED") && (rowCount > 0)>
<br/>
<form name="acceptReturn" method="post"
action="<@ofbizUrl>/updateReturn</@ofbizUrl>">
