You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2009/06/04 12:24:10 UTC
svn commit: r781701 -
/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
Author: ashish
Date: Thu Jun 4 10:24:09 2009
New Revision: 781701
URL: http://svn.apache.org/viewvc?rev=781701&view=rev
Log:
Applied patch from jira issue OFBIZ-2516 (Approved Sales Order -> Edit Items -> Cancel All Items).
Thanks Arun Patidar for your patch and Vince Clark for reporting this bug.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=781701&r1=781700&r2=781701&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Thu Jun 4 10:24:09 2009
@@ -41,7 +41,7 @@
<li class="h3"> ${uiLabelMap.OrderOrderItems}</li>
<#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) || security.hasRolePermission("ORDERMGR", "_UPDATE", "", "", session)>
<#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED">
- <li><a href="javascript:document.updateItemInfo.action='<@o...@ofbizUrl>';document.updateItemInfo.submit()">${uiLabelMap.OrderCancelAllItems}</a></li>
+ <li><a href="javascript:document.updateItemInfo.action='<@o...@ofbizUrl>';document.updateItemInfo.submit()">${uiLabelMap.OrderCancelAllItems}</a></li>
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderViewOrder}</a></li>
</#if>
</#if>
@@ -54,6 +54,8 @@
<#else>
<form name="updateItemInfo" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderId}"/>
+ <input type="hidden" name="orderItemSeqId" value=""/>
+ <input type="hidden" name="shipGroupSeqId" value=""/>
<#if (orderHeader.orderTypeId == 'PURCHASE_ORDER')>
<input type="hidden" name="supplierPartyId" value="${partyId}"/>
<input type="hidden" name="orderTypeId" value="PURCHASE_ORDER"/>
@@ -168,7 +170,7 @@
<td> </td>
<td>
<#if ("Y" != orderItem.isPromo?if_exists) && ((security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED") || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && orderHeader.statusId != "ORDER_SENT"))>
- <a href="javascript:document.updateItemInfo.action='<@o...@ofbizUrl>';document.updateItemInfo.submit()" class="buttontext">${uiLabelMap.CommonCancelAll}</a>
+ <a href="javascript:document.updateItemInfo.action='<@o...@ofbizUrl>';document.updateItemInfo.submit()" class="buttontext">${uiLabelMap.CommonCancelAll}</a>
<#else>
</#if>
@@ -249,7 +251,7 @@
<td>
<#assign itemStatusOkay = (orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && (shipGroupAssoc.cancelQuantity?default(0) < shipGroupAssoc.quantity?default(0)) && ("Y" != orderItem.isPromo?if_exists))>
<#if (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && itemStatusOkay) || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && itemStatusOkay && orderHeader.statusId != "ORDER_SENT")>
- <a href="javascript:document.updateItemInfo.action='<@o...@ofbizUrl>';document.updateItemInfo.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a>
+ <a href="javascript:document.updateItemInfo.action='<@o...@ofbizUrl>';document.updateItemInfo.orderItemSeqId.value='${orderItem.orderItemSeqId}';document.updateItemInfo.shipGroupSeqId.value='${shipGroup.shipGroupSeqId}';document.updateItemInfo.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a>
<#else>
</#if>