svn commit: r930188 - in /ofbiz/trunk/applications/order/webapp/ordermgr: WEB-INF/actions/return/ReturnItems.groovy return/returnItems.ftl

[mor-2]

Author: mor
Date: Fri Apr  2 08:52:52 2010
New Revision: 930188

URL: http://svn.apache.org/viewvc?rev=930188&view=rev
Log:
Removed an unnecessary assignment in the template and moved it to the script.

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy
    ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy?rev=930188&r1=930187&r2=930188&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy Fri Apr  2 08:52:52 2010
@@ -85,6 +85,7 @@ if (returnHeaderTypeId == "VENDOR_RETURN
 }
 partyOrders = delegator.findByAnd("OrderHeaderAndRoles", [roleTypeId : roleTypeId, partyId : partyId], ["orderId"]);
 context.partyOrders = partyOrders;
+context.partyId = partyId;
 
 // get the list of return shipments associated to the return
 findOptions = new EntityFindOptions();

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=930188&r1=930187&r2=930188&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl Fri Apr  2 08:52:52 2010
@@ -337,10 +337,8 @@ under the License.
         <form name="acceptReturn" method="post" action="<@ofbizUrl>/updateReturn</@ofbizUrl>">
           <#if "CUSTOMER_RETURN" == returnHeader.returnHeaderTypeId>
             <#assign statusId = "RETURN_ACCEPTED">
-            <#assign partyId = returnHeader.fromPartyId>
           <#else>
             <#assign statusId = "SUP_RETURN_ACCEPTED">
-            <#assign partyId = returnHeader.toPartyId>
           </#if>
           <input type="hidden" name="returnId" value="${returnId}">
           <input type="hidden" name="statusId" value="${statusId}">