svn commit: r610209 [1/2] - in /ofbiz/trunk/applications/order: webapp/ordermgr/return/ widget/ordermgr/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r610209 [1/2] - in /ofbiz/trunk/applications/order: webapp/ordermgr/return/ widget/ordermgr/

mrisaliti
Author: mrisaliti
Date: Tue Jan  8 14:47:08 2008
New Revision: 610209

URL: http://svn.apache.org/viewvc?rev=610209&view=rev
Log:
Return forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1545)

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl
    ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml?rev=610209&r1=610208&r2=610209&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml Tue Jan  8 14:47:08 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -21,7 +21,7 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <form name="EditReturn" type="single" target="updateReturnHeader"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="returnHeader==null" target="createReturnHeader"/>
         <auto-fields-service service-name="updateReturnHeader"/>
         <field use-when="returnHeader!=null" name="returnId" tooltip="This cannot be changed without re-creating the Return."><display/></field>
@@ -54,7 +54,7 @@
     </form>
     
     <form name="ReturnItems" type="multi" list-name="orderItems" target="createReturnItem"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-service service-name="createReturnItem"/>
         <field name="itemDescription"><display/></field>
         <field name="returnId"><hidden/></field>
@@ -64,7 +64,7 @@
     </form>
 
     <form name="FindReturns" type="single"  target="findreturn" title=""
-        default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="returnId" title="${uiLabelMap.OrderReturnId}"><text-find/></field>
         <field name="fromPartyId" title="${uiLabelMap.OrderReturnFromParty}">
             <lookup target-form-name="LookupPartyName"/>
@@ -89,8 +89,7 @@
     </form>
 
     <form name="ListReturns" type="list"  target="findreturn" title="" list-name="listIt"
-        default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"
-        paginate-target="findreturn">
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="findreturn">
         <actions>
             <service service-name="performFind"  result-map-name="result" result-map-list-name="listIt">
                 <field-map field-name="inputFields" env-name="requestParameters"/>
@@ -116,5 +115,4 @@
             <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
         </field>
     </form>
-
-</forms>
+</forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl?rev=610209&r1=610208&r2=610209&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl Tue Jan  8 14:47:08 2008
@@ -39,7 +39,7 @@
           <#include "returnItemInc.ftl"/>
           <hr/>
           <h3>${uiLabelMap.FormFieldTitle_paymentMethodId}:</h3>
-          <table cellspacing="1" cellpadding="2" width="100%">
+          <table cellspacing="0" class="basic-table">
             <tr><td>
               <#if creditCardList?exists || eftAccountList?exists>
                 <select name='paymentMethodId'>
@@ -64,14 +64,14 @@
               </#if>
             </td></tr>
           </table>
-          <table border="0" width="100%" cellpadding="2" cellspacing="0">
-            <tr><td colspan="8"><hr class="sepbar"></td></tr>
+          <table cellspacing="0" class="basic-table">
+            <tr><td colspan="8"><hr></td></tr>
             <tr>
-              <td colspan="8"><h3>${uiLabelMap.OrderReturnShipFromAddress}:</h3></td>
+              <td colspan="8"><h3>${uiLabelMap.OrderReturnShipFromAddress}</h3></td>
             </tr>
             <tr>
               <td colspan="8">
-                <table cellspacing="1" cellpadding="2" width="100%">
+                <table cellspacing="0" class="basic-table">
                   <#list shippingContactMechList as shippingContactMech>
                     <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
                     <tr>
@@ -79,9 +79,9 @@
                         <input type="radio" name="originContactMechId" value="${shippingAddress.contactMechId}"  <#if (shippingContactMechList?size == 1)>checked</#if>>
                       </td>
                       <td align="left" width="99%" valign="top" nowrap>
-                        <div class="tabletext">
-                          <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b>&nbsp;${shippingAddress.toName}<br/></#if>
-                          <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b>&nbsp;${shippingAddress.attnName}<br/></#if>
+                        <div>
+                          <#if shippingAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span>&nbsp;${shippingAddress.toName}<br/></#if>
+                          <#if shippingAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span></b>&nbsp;${shippingAddress.attnName}<br/></#if>
                           <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br/></#if>
                           <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br/></#if>
                           <#if shippingAddress.city?has_content>${shippingAddress.city}</#if>
@@ -99,5 +99,4 @@
           </table>
         </form>
     </div>
-</div>
-    
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl?rev=610209&r1=610208&r2=610209&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl Tue Jan  8 14:47:08 2008
@@ -16,11 +16,15 @@
 specific language governing permissions and limitations
 under the License.
 -->
+<#assign selected = tabButtonItem?default("void")>
 
 <#if returnHeader?exists>
-<div class='tabContainer'>
-    <a href="<@ofbizUrl>returnMain?returnId=${returnId?if_exists}</@ofbizUrl>" class="tabButtonSelected">${uiLabelMap.OrderReturnHeader}</a>  
-    <a href="<@ofbizUrl>returnItems?returnId=${returnId?if_exists}<#if requestParameters.orderId?exists>&orderId=${requestParameters.orderId}</#if></@ofbizUrl>" class="tabButton">${uiLabelMap.OrderReturnItems}</a>
+<div class="button-bar tab-bar">
+    <ul>
+        <li<#if selected="OrderReturnHeader"> class="selected"</#if>><a href="<@ofbizUrl>returnMain?returnId=${returnId?if_exists}</@ofbizUrl>">${uiLabelMap.OrderReturnHeader}</a></li>
+        <li<#if selected="OrderReturnItems"> class="selected"</#if>><a href="<@ofbizUrl>returnItems?returnId=${returnId?if_exists}<#if requestParameters.orderId?exists>&orderId=${requestParameters.orderId}</#if></@ofbizUrl>">${uiLabelMap.OrderReturnItems}</a></li>
+    </ul>
+    <br/>
 </div>
 <div>
     <a href="<@ofbizUrl>return.pdf?returnId=${returnId?if_exists}</@ofbizUrl>" class="buttontext">PDF</a>
@@ -36,251 +40,258 @@
   <br/>
 </#if>
 
-<#if returnHeader?exists>
-<form name="returnhead" method="post" action="<@ofbizUrl>updateReturn</@ofbizUrl>">
-<input type="hidden" name="returnId" value="${returnHeader.returnId}">
-<input type="hidden" name="returnHeaderTypeId" value="CUSTOMER_RETURN"/>
-<input type="hidden" name="currentStatusId" value="${returnHeader.statusId?if_exists}">
-<#else>
-<form name="returnhead" method="post" action="<@ofbizUrl>createReturn</@ofbizUrl>">
-<input type="hidden" name="returnHeaderTypeId" value="CUSTOMER_RETURN"/>
-</#if>
-
-<table border='0' cellpadding='2' cellspacing='0'>
-  <#if returnHeader?exists>
-  <tr>
-    <td width='14%'>&nbsp;</td>
-    <td width='6%' align='right' nowrap><div class="tabletext">${uiLabelMap.OrderReturnId}</div></td>
-    <td width='6%'>&nbsp;</td>
-    <td width='74%'>
-      <b>${returnHeader.returnId}</b>
-    </td>                
-  </tr>
-  </#if>
-  <tr>
-    <td width='14%'>&nbsp;</td>
-    <td width='6%' align='right' nowrap><div class="tabletext">${uiLabelMap.CommonCurrency}</div></td>
-    <td width='6%'>&nbsp;</td>
-    <td width='74%' class="tabletext">
-  <#if returnHeader?exists>
-      ${returnHeader.currencyUomId?if_exists}
-  <#else>
-     <select class="selectBox" name="currencyUomId">
-        <#if (orderHeader?has_content) && (orderHeader.currencyUom?has_content)>
-          <option value="${orderHeader.currencyUom}" selected>${orderHeader.getRelatedOne("Uom").getString("description",locale)}</option>
-          <option value="${orderHeader.currencyUom}">---</option>
-        <#elseif defaultCurrency?has_content>
-          <option value="${defaultCurrency.uomId}" selected>${defaultCurrency.getString("description")}</option>
-          <option value="${defaultCurrency.uomId}">---</option>
-        </#if>
-        <#if currencies?has_content>
-          <#list currencies as currency>
-            <option value="${currency.uomId}">${currency.get("description",locale)}</option>
-          </#list>
-        </#if>
-     </select>
-  </#if>
-    </td>                
-  </tr>
-  <tr>
-    <td width='14%'>&nbsp;</td>
-    <td width='6%' align='right' nowrap><div class="tabletext">${uiLabelMap.OrderEntryDate}</div></td>
-    <td width='6%'>&nbsp;</td>
-    <td width='74%'>
-      <#if returnInfo.entryDate?exists>
-        <#assign entryDate = returnInfo.get("entryDate").toString()>
-      </#if>
-      <input type='text' class='inputBox' size='25' name='entryDate' value='${entryDate?if_exists}'>
-      <a href="javascript:call_cal(document.returnhead.entryDate, '');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'></a>
-    </td>                
-  </tr>
-  <tr>
-    <td width='14%'>&nbsp;</td>
-    <td width='6%' align='right' nowrap><div class="tabletext">${uiLabelMap.OrderReturnFromParty}</div></td>
-    <td width='6%'>&nbsp;</td>
-    <td width='74%'>
-      <input type='text' class='inputBox' size='20' name='fromPartyId' value='${returnInfo.fromPartyId?if_exists}'>
-      <a href="javascript:call_fieldlookup2(document.returnhead.fromPartyId,'LookupPartyName');">
-        <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/>
-      </a>
-    </td>                
-  </tr>
-  <tr>
-    <td width='14%'>&nbsp;</td>
-    <td width='6%' align='right' nowrap><div class="tabletext">${uiLabelMap.OrderReturnToFacility}</div></td>
-    <td width='6%'>&nbsp;</td>
-    <td width='74%'>
-      <select name='destinationFacilityId' class='selectBox'>
-        <#if currentFacility?exists>
-          <option value="${currentFacility.facilityId}">${currentFacility.facilityName?default(currentFacility.facilityId)}</option>
-          <option value="${currentFacility.facilityId}">---</option>
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <ul>
+            <li class="head3">${uiLabelMap.PageTitleReturnHeader}</li>
+        </ul>
+        <br class="clear"/>
+    </div>
+    <div class="screenlet-body">
+        <#if returnHeader?exists>
+            <form name="returnhead" method="post" action="<@ofbizUrl>updateReturn</@ofbizUrl>">
+            <input type="hidden" name="returnId" value="${returnHeader.returnId}">
+            <input type="hidden" name="returnHeaderTypeId" value="CUSTOMER_RETURN"/>
+            <input type="hidden" name="currentStatusId" value="${returnHeader.statusId?if_exists}">
+        <#else>
+            <form name="returnhead" method="post" action="<@ofbizUrl>createReturn</@ofbizUrl>">
+            <input type="hidden" name="returnHeaderTypeId" value="CUSTOMER_RETURN"/>
         </#if>
-        <option value="">${uiLabelMap.FacilityNoFacility}</option>
-        <#list facilityList as facility>
-          <option value="${facility.facilityId}" <#if (facilityList?size == 1)>selected</#if>>${facility.facilityName?default(facility.facilityId)}</option>
-        </#list>
-    </td>                
-  </tr>  
-  <tr>
-    <td width='14%'>&nbsp;</td>
-    <td width='6%' align='right' nowrap><div class="tabletext">${uiLabelMap.AccountingBillingAccount}</div></td>
-    <td width='6%'>&nbsp;</td>
-    <td width='74%'>
-      <#if billingAccountList?has_content>
-        <select name='billingAccountId' class='selectBox'>
-          <#if currentAccount?exists>
-            <option value="${currentAccount.billingAccountId}">${currentAccount.billingAccountId}: ${currentAccount.description?if_exists}</option>
-            <option value="${currentAccount.billingAccountId}">---</option>
+    
+        <table cellspacing="0" class="basic-table">
+          <#if returnHeader?exists>
+          <tr>
+            <td width='14%'>&nbsp;</td>
+            <td width='6%' align='right' nowrap class="label">${uiLabelMap.OrderReturnId}</td>
+            <td width='6%'>&nbsp;</td>
+            <td width='74%' align='left'>${returnHeader.returnId}</td>                
+          </tr>
           </#if>
-          <option value="">${uiLabelMap.AccountingNewBillingAccount}</option>
-          <#list billingAccountList as ba>
-            <option value="${ba.billingAccountId}">${ba.billingAccountId}: ${ba.description?if_exists}</option>
-          </#list>
-        </select>
-      <#else>
-        <input type='text' class='inputBox' size='20' name='billingAccountId'>
-      </#if>
-    </td>                
-  </tr>
-  <tr>
-    <td width='14%'>&nbsp;</td>
-    <td width='6%' align='right' nowrap>${uiLabelMap.FormFieldTitle_paymentMethodId}</td>
-    <td width='6%'>&nbsp;</td>
-    <td width='74%'>
-      <#if creditCardList?exists || eftAccountList?exists>
-        <select name='paymentMethodId'>
-          <#if currentCreditCard?exists>
-            <option value="${currentCreditCard.paymentMethodId}">CC:&nbsp;${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(currentCreditCard)}</option>
+          <tr>
+            <td width='14%'>&nbsp;</td>
+            <td width='6%' align='right' nowrap class="label">${uiLabelMap.CommonCurrency}</td>
+            <td width='6%'>&nbsp;</td>
+            <td width='74%'>
+          <#if returnHeader?exists>
+              ${returnHeader.currencyUomId?if_exists}
+          <#else>
+             <select name="currencyUomId">
+                <#if (orderHeader?has_content) && (orderHeader.currencyUom?has_content)>
+                  <option value="${orderHeader.currencyUom}" selected>${orderHeader.getRelatedOne("Uom").getString("description",locale)}</option>
+                  <option value="${orderHeader.currencyUom}">---</option>
+                <#elseif defaultCurrency?has_content>
+                  <option value="${defaultCurrency.uomId}" selected>${defaultCurrency.getString("description")}</option>
+                  <option value="${defaultCurrency.uomId}">---</option>
+                </#if>
+                <#if currencies?has_content>
+                  <#list currencies as currency>
+                    <option value="${currency.uomId}">${currency.get("description",locale)}</option>
+                  </#list>
+                </#if>
+             </select>
           </#if>
-          <#if currentEftAccount?exists>
-            <option value="${currentEftAccount.paymentMethodId}">EFT:&nbsp;${currentEftAccount.nameOnAccount?if_exists}, ${currentEftAccount.accountNumber?if_exists}</option>
-          </#if>
-          <option value=""></option>
-          <#if creditCardList?has_content>
-            <#list creditCardList as creditCardPm>
-              <#assign creditCard = creditCardPm.getRelatedOne("CreditCard")>
-              <option value="${creditCard.paymentMethodId}">CC:&nbsp;${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</option>
-            </#list>
-          </#if>
-          <#if eftAccountList?has_content>
-            <#list eftAccountList as eftAccount>
-              <option value="${eftAccount.paymentMethodId}">EFT:&nbsp;${eftAccount.nameOnAccount?if_exists}, ${eftAccount.accountNumber?if_exists}</option>
-            </#list>
-          </#if>
-        </select>
-      <#else>
-        <input type='text' size='20' name='paymentMethodId'>
-      </#if>
-      <#if (returnHeader.fromPartyId)?has_content>
-        <a href="/partymgr/control/editcreditcard?partyId=${returnHeader.fromPartyId}${externalKeyParam}" target="partymgr" class="smallSubmit">${uiLabelMap.AccountingCreateNewCreditCard}</a>
-      </#if>
-    </td>
-  </tr>
-  <tr>
-    <td width='14%'>&nbsp;</td>
-    <td width='6%' align='right' nowrap><div class="tabletext">${uiLabelMap.OrderReturnNeedsAutoReceive}</div></td>
-    <td width='6%'>&nbsp;</td>
-    <td width='74%'>
-      <select name='needsInventoryReceive' class='selectBox'>
-        <#if needsInventoryReceive?exists>
-          <option>${needsInventoryReceive}</option>
-          <option value="${needsInventoryReceive}">---</option>
-        </#if>
-        <option>Y</option>
-        <option>N</option>
-      </select>
-    </td>
-  </tr>
-  <#if returnHeader?has_content>
-    <tr>
-      <td width='14%'>&nbsp;</td>
-      <td width='6%' align='right' nowrap><div class="tabletext">${uiLabelMap.CommonReturnStatus}</div></td>
-      <td width='6%'>&nbsp;</td>
-      <td width='74%'>
-        <select name="statusId" class="selectBox">
-          <#if currentStatus?exists>
-            <option value="${currentStatus.statusId}">${currentStatus.get("description",locale)}</option>
-            <option value="${currentStatus.statusId}">---</option>
-          </#if>
-          <#list returnStatus as status>
-            <option value="${status.statusIdTo}">${status.get("transitionName",locale)}</option>
-          </#list>
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <td width='14%'>&nbsp;</td>
-      <td width='6%' align='right' nowrap><div class="tabletext">${uiLabelMap.FormFieldTitle_createdBy}</div></td>
-      <td width='6%'>&nbsp;</td>
-      <td width='74%'>
-        <b>${returnHeader.createdBy?default("Unknown")}</b>
-      </td>
-    </tr>
-    <tr>
-      <td width='14%'>&nbsp;</td>
-      <td width='6%' align='right' valign='top' nowrap><div class="tabletext">${uiLabelMap.OrderReturnFromAddress}</div></td>
-      <td width='6%'>&nbsp;</td>
-      <td width='74%'><div class='tabletext'>
-        <#if (addressEditable)>
-          <#list addresses as address >
-            <@displayAddress postalAddress = address.postalAddress editable = true/>
-          </#list>            
-          <input type='radio' name="originContactMechId" value="" <#if (!postalAddressFrom?has_content)> checked="checked"</#if>>${uiLabelMap.CommonNoAddress}
+            </td>                
+          </tr>
+          <tr>
+            <td width='14%'>&nbsp;</td>
+            <td width='6%' align='right' nowrap class="label">${uiLabelMap.OrderEntryDate}</td>
+            <td width='6%'>&nbsp;</td>
+            <td width='74%'>
+              <#if returnInfo.entryDate?exists>
+                <#assign entryDate = returnInfo.get("entryDate").toString()>
+              </#if>
+              <input type='text' size='25' name='entryDate' value='${entryDate?if_exists}'>
+              <a href="javascript:call_cal(document.returnhead.entryDate, '');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'></a>
+            </td>                
+          </tr>
+          <tr>
+            <td width='14%'>&nbsp;</td>
+            <td width='6%' align='right' nowrap class="label">${uiLabelMap.OrderReturnFromParty}</td>
+            <td width='6%'>&nbsp;</td>
+            <td width='74%'>
+              <input type='text' size='20' name='fromPartyId' value='${returnInfo.fromPartyId?if_exists}'>
+              <a href="javascript:call_fieldlookup2(document.returnhead.fromPartyId,'LookupPartyName');">
+                <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/>
+              </a>
+            </td>                
+          </tr>
+          <tr>
+            <td width='14%'>&nbsp;</td>
+            <td width='6%' align='right' nowrap class="label">${uiLabelMap.OrderReturnToFacility}</td>
+            <td width='6%'>&nbsp;</td>
+            <td width='74%'>
+              <select name='destinationFacilityId'>
+                <#if currentFacility?exists>
+                  <option value="${currentFacility.facilityId}">${currentFacility.facilityName?default(currentFacility.facilityId)}</option>
+                  <option value="${currentFacility.facilityId}">---</option>
+                </#if>
+                <option value="">${uiLabelMap.FacilityNoFacility}</option>
+                <#list facilityList as facility>
+                  <option value="${facility.facilityId}" <#if (facilityList?size == 1)>selected</#if>>${facility.facilityName?default(facility.facilityId)}</option>
+                </#list>
+            </td>                
+          </tr>  
+          <tr>
+            <td width='14%'>&nbsp;</td>
+            <td width='6%' align='right' nowrap class="label">${uiLabelMap.AccountingBillingAccount}</td>
+            <td width='6%'>&nbsp;</td>
+            <td width='74%'>
+              <#if billingAccountList?has_content>
+                <select name='billingAccountId'>
+                  <#if currentAccount?exists>
+                    <option value="${currentAccount.billingAccountId}">${currentAccount.billingAccountId}: ${currentAccount.description?if_exists}</option>
+                    <option value="${currentAccount.billingAccountId}">---</option>
+                  </#if>
+                  <option value="">${uiLabelMap.AccountingNewBillingAccount}</option>
+                  <#list billingAccountList as ba>
+                    <option value="${ba.billingAccountId}">${ba.billingAccountId}: ${ba.description?if_exists}</option>
+                  </#list>
+                </select>
+              <#else>
+                <input type='text' size='20' name='billingAccountId'>
+              </#if>
+            </td>                
+          </tr>
+          <tr>
+            <td width='14%'>&nbsp;</td>
+            <td width='6%' align='right' nowrap class="label">${uiLabelMap.FormFieldTitle_paymentMethodId}</td>
+            <td width='6%'>&nbsp;</td>
+            <td width='74%'>
+              <#if creditCardList?exists || eftAccountList?exists>
+                <select name='paymentMethodId'>
+                  <#if currentCreditCard?exists>
+                    <option value="${currentCreditCard.paymentMethodId}">CC:&nbsp;${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(currentCreditCard)}</option>
+                  </#if>
+                  <#if currentEftAccount?exists>
+                    <option value="${currentEftAccount.paymentMethodId}">EFT:&nbsp;${currentEftAccount.nameOnAccount?if_exists}, ${currentEftAccount.accountNumber?if_exists}</option>
+                  </#if>
+                  <option value=""></option>
+                  <#if creditCardList?has_content>
+                    <#list creditCardList as creditCardPm>
+                      <#assign creditCard = creditCardPm.getRelatedOne("CreditCard")>
+                      <option value="${creditCard.paymentMethodId}">CC:&nbsp;${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</option>
+                    </#list>
+                  </#if>
+                  <#if eftAccountList?has_content>
+                    <#list eftAccountList as eftAccount>
+                      <option value="${eftAccount.paymentMethodId}">EFT:&nbsp;${eftAccount.nameOnAccount?if_exists}, ${eftAccount.accountNumber?if_exists}</option>
+                    </#list>
+                  </#if>
+                </select>
+              <#else>
+                <input type='text' size='20' name='paymentMethodId'>
+              </#if>
+              <#if (returnHeader.fromPartyId)?has_content>
+                <a href="/partymgr/control/editcreditcard?partyId=${returnHeader.fromPartyId}${externalKeyParam}" target="partymgr" class="smallSubmit">${uiLabelMap.AccountingCreateNewCreditCard}</a>
+              </#if>
+            </td>
+          </tr>
+          <tr>
+            <td width='14%'>&nbsp;</td>
+            <td width='6%' align='right' nowrap class="label">${uiLabelMap.OrderReturnNeedsAutoReceive}</td>
+            <td width='6%'>&nbsp;</td>
+            <td width='74%'>
+              <select name='needsInventoryReceive'>
+                <#if needsInventoryReceive?exists>
+                  <option>${needsInventoryReceive}</option>
+                  <option value="${needsInventoryReceive}">---</option>
+                </#if>
+                <option>${uiLabelMap.CommonYes}</option>
+                <option>${uiLabelMap.CommonNo}</option>
+              </select>
+            </td>
+          </tr>
+        <#if returnHeader?has_content>
+          <tr>
+            <td width='14%'>&nbsp;</td>
+            <td width='6%' align='right' nowrap class="label">${uiLabelMap.CommonReturnStatus}</td>
+            <td width='6%'>&nbsp;</td>
+            <td width='74%'>
+              <select name="statusId">
+                <#if currentStatus?exists>
+                  <option value="${currentStatus.statusId}">${currentStatus.get("description",locale)}</option>
+                  <option value="${currentStatus.statusId}">---</option>
+                </#if>
+                <#list returnStatus as status>
+                  <option value="${status.statusIdTo}">${status.get("transitionName",locale)}</option>
+                </#list>
+              </select>
+            </td>
+          </tr>
+          <tr>
+            <td width='14%'>&nbsp;</td>
+            <td width='6%' align='right' nowrap class="label">${uiLabelMap.FormFieldTitle_createdBy}</td>
+            <td width='6%'>&nbsp;</td>
+            <td width='74%'>${returnHeader.createdBy?default("Unknown")}</td>
+          </tr>
+          <tr>
+            <td width='14%'>&nbsp;</td>
+            <td width='6%' align='right' valign='top' nowrap class="label">${uiLabelMap.OrderReturnFromAddress}</td>
+            <td width='6%'>&nbsp;</td>
+            <td width='74%'>
+              <div>
+              <#if (addressEditable)>
+                <#list addresses as address >
+                  <@displayAddress postalAddress = address.postalAddress editable = true/>
+                </#list>            
+                <input type='radio' name="originContactMechId" value="" <#if (!postalAddressFrom?has_content)> checked="checked"</#if>>${uiLabelMap.CommonNoAddress}
+              <#else>
+                 <#if (postalAddressFrom?has_content)>
+                   <@displayAddress postalAddress = postalAddressFrom editable = false />  
+                 <#else>
+                   ${uiLabelMap.CommonNoAddress}
+                 </#if>
+              </#if>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td width='14%'>&nbsp;</td>
+            <td width='6%' align='right' valign='top' nowrap class="label">${uiLabelMap.OrderReturnToAddress}</td>
+            <td width='6%'>&nbsp;</td>
+            <td width='74%'>
+              <#if (postalAddressTo?has_content)>
+                <@displayAddress postalAddress = postalAddressTo editable=false />
+              </#if>
+            </td>
+          </tr>    
+          <tr>
+            <td width='14%'>&nbsp;</td>
+            <td width='6%'>&nbsp;</td>
+            <td width='6%'>&nbsp;</td>  
+            <td width='74%'>
+              <input type="submit" value="${uiLabelMap.CommonUpdate}"/>
+            </td>
+          </tr>    
         <#else>
-            <#if (postalAddressFrom?has_content)>
-              <@displayAddress postalAddress = postalAddressFrom editable = false />  
-            <#else>
-              ${uiLabelMap.CommonNoAddress}
-            </#if>
+          <input type="hidden" name="statusId" value="RETURN_REQUESTED">
+          <tr>
+            <td width='14%'>&nbsp;</td>
+            <td width='6%'>&nbsp;</td>
+            <td width='6%'>&nbsp;</td>  
+            <td width='74%'>
+              <input type="submit" value="${uiLabelMap.CommonCreateNew}"/>
+            </td>
+          </tr>    
         </#if>
-      </div>
-      </td>
-    </tr>
-     <tr>
-      <td width='14%'>&nbsp;</td>
-      <td width='6%' align='right' valign='top' nowrap><div class="tabletext">${uiLabelMap.OrderReturnToAddress}</div></td>
-      <td width='6%'>&nbsp;</td>
-      <td width='74%'>
-      <#if (postalAddressTo?has_content)>
-        <@displayAddress postalAddress = postalAddressTo editable=false />
-      </#if>
-      </td>
-    </tr>    
-    <tr>
-      <td width='14%'>&nbsp;</td>
-      <td width='6%'>&nbsp;</td>
-      <td width='6%'>&nbsp;</td>  
-      <td width='74%'>
-        <input type="submit" value="${uiLabelMap.CommonUpdate}"/>
-      </td>
-    </tr>    
-  <#else>
-  <input type="hidden" name="statusId" value="RETURN_REQUESTED">
-  <tr>
-    <td width='14%'>&nbsp;</td>
-    <td width='6%'>&nbsp;</td>
-    <td width='6%'>&nbsp;</td>  
-    <td width='74%'>
-      <input type="submit" value="${uiLabelMap.CommonCreateNew}"/>
-    </td>
-  </tr>    
-  </#if>
-</table>
-<#macro displayAddress postalAddress editable>
-    <#if postalAddress?has_content>
-            <div class="tabletext">
-              <#if (editable)>
-                <input type='radio' name="originContactMechId" value="${postalAddress.contactMechId?if_exists}"
-                  <#if ( postalAddressFrom?has_content && postalAddressFrom.contactMechId?default("") == postalAddress.contactMechId)>checked="checked"</#if>>        
-              </#if>              
-              <#if postalAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b>&nbsp;${postalAddress.toName}<br/></#if>
-              <#if postalAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b>&nbsp;${postalAddress.attnName}<br/></#if>
-              <#if postalAddress.address1?has_content>&nbsp;&nbsp;&nbsp;&nbsp;${postalAddress.address1}<br/></#if>
-              <#if postalAddress.address2?has_content>&nbsp;&nbsp;&nbsp;&nbsp;${postalAddress.address2}<br/></#if>
-              <#if postalAddress.city?has_content>&nbsp;&nbsp;&nbsp;&nbsp;${postalAddress.city}</#if>
-              <#if postalAddress.stateProvinceGeoId?has_content>&nbsp;${postalAddress.stateProvinceGeoId}</#if>
-              <#if postalAddress.postalCode?has_content>&nbsp;${postalAddress.postalCode}</#if>
-              <#if postalAddress.countryGeoId?has_content><br/>&nbsp;&nbsp;&nbsp;&nbsp;${postalAddress.countryGeoId}</#if>
-            </div>
-    </#if>
-</#macro>
+        </table>
+        <#macro displayAddress postalAddress editable>
+            <#if postalAddress?has_content>
+                    <div>
+                      <#if (editable)>
+                        <input type='radio' name="originContactMechId" value="${postalAddress.contactMechId?if_exists}"
+                          <#if ( postalAddressFrom?has_content && postalAddressFrom.contactMechId?default("") == postalAddress.contactMechId)>checked="checked"</#if>>        
+                      </#if>              
+                      <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span>&nbsp;${postalAddress.toName}<br/></#if>
+                      <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span>&nbsp;${postalAddress.attnName}<br/></#if>
+                      <#if postalAddress.address1?has_content>&nbsp;&nbsp;&nbsp;&nbsp;${postalAddress.address1}<br/></#if>
+                      <#if postalAddress.address2?has_content>&nbsp;&nbsp;&nbsp;&nbsp;${postalAddress.address2}<br/></#if>
+                      <#if postalAddress.city?has_content>&nbsp;&nbsp;&nbsp;&nbsp;${postalAddress.city}</#if>
+                      <#if postalAddress.stateProvinceGeoId?has_content>&nbsp;${postalAddress.stateProvinceGeoId}</#if>
+                      <#if postalAddress.postalCode?has_content>&nbsp;${postalAddress.postalCode}</#if>
+                      <#if postalAddress.countryGeoId?has_content><br/>&nbsp;&nbsp;&nbsp;&nbsp;${postalAddress.countryGeoId}</#if>
+                    </div>
+            </#if>
+        </#macro>
+    </div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl?rev=610209&r1=610208&r2=610209&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl Tue Jan  8 14:47:08 2008
@@ -16,241 +16,236 @@
 specific language governing permissions and limitations
 under the License.
 -->
-
-
-          <table border="0" width="100%" cellpadding="2" cellspacing="0">
-            <tr>
-              <td colspan="8"><h3>${uiLabelMap.OrderReturnFromOrder} #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</h3></td>
+<table cellspacing="0" class="basic-table">
+    <tr>
+      <td colspan="7"><h3>${uiLabelMap.OrderReturnFromOrder} #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</h3></td>
+      <td colspan="2" align="right">
+        <span>${uiLabelMap.CommonSelectAll}</span>&nbsp;
+        <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, '${selectAllFormName}');"/>
+      </td>
+    </tr>
+
+    <#-- information about orders and amount refunded/credited on past returns -->
+    <#if orh?exists>
+    <tr><td colspan="10">
+        <table cellspacing="0" class="basic-table">
+          <tr>
+            <td class="label" width="25%">${uiLabelMap.OrderOrderTotal}</td>
+            <td><@ofbizCurrency amount=orh.getOrderGrandTotal() isoCode=orh.getCurrency()/></td>
+          </tr>  
+          <tr>
+            <td class="label" width="25%">${uiLabelMap.OrderAmountAlreadyCredited}</td>
+            <td><@ofbizCurrency amount=orh.getOrderReturnedCreditTotalBd() isoCode=orh.getCurrency()/></td>
+          </tr>  
+          <tr>
+            <td class="label" width="25%">${uiLabelMap.OrderAmountAlreadyRefunded}</td>
+            <td><@ofbizCurrency amount=orh.getOrderReturnedRefundTotalBd() isoCode=orh.getCurrency()/></td>
+          </tr>  
+        </table>  
+    </td></tr>
+    </#if>
+    <tr class="header-row">
+      <td>${uiLabelMap.CommonDescription}</td>
+      <td>${uiLabelMap.OrderOrderQty}</td>
+      <td>${uiLabelMap.OrderReturnQty}</td>
+      <td>${uiLabelMap.OrderUnitPrice}</td>
+      <td>${uiLabelMap.OrderReturnPrice}*</td>
+      <td>${uiLabelMap.OrderReturnReason}</td>
+      <td>${uiLabelMap.OrderReturnType}</td>
+      <td>${uiLabelMap.OrderItemStatus}</td>
+      <td align="right">${uiLabelMap.OrderOrderInclude}?</td>
+    </tr>
+    <#if returnableItems?has_content>
+      <#assign rowCount = 0>
+      <#assign alt_row = false>
+      <#list returnableItems.keySet() as orderItem>
+        <#if orderItem.orderAdjustmentId?has_content>
+            <#-- this is an order item adjustment -->
+            <#assign returnAdjustmentType = returnItemTypeMap.get(orderItem.get("orderAdjustmentTypeId"))/>
+            <#assign adjustmentType = orderItem.getRelatedOne("OrderAdjustmentType")/>
+            <#assign description = orderItem.description?default(adjustmentType.get("description",locale))/>
+
+            <input type="hidden" name="returnAdjustmentTypeId_o_${rowCount}" value="${returnAdjustmentType}"/>                
+            <input type="hidden" name="orderAdjustmentId_o_${rowCount}" value="${orderItem.orderAdjustmentId}"/>
+            <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+              <td colspan="4">
+                ${description?default("N/A")}
+              </td>
+              <td>
+                ${orderItem.amount?string("##0.00")}
+                <#--<input type="text" size="8" name="amount_o_${rowCount}" <#if orderItem.amount?has_content>value="${orderItem.amount?string("##0.00")}"</#if>/>-->
+              </td>
+              <td></td>
+              <td>
+                <select name="returnTypeId_o_${rowCount}">
+                  <#list returnTypes as type>
+                  <option value="${type.returnTypeId}" <#if type.returnTypeId == "RTN_REFUND">selected</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
+                  </#list>
+                </select>
+              </td>
+              <td></td>
               <td align="right">
-                <span class="tableheadtext">${uiLabelMap.CommonSelectAll}</span>&nbsp;
-                <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, '${selectAllFormName}');"/>
+                <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, '${selectAllFormName}');"/>
               </td>
             </tr>
+        <#else>
+            <#-- this is an order item -->
+            <#assign returnItemType = (returnItemTypeMap.get(returnableItems.get(orderItem).get("itemTypeKey")))?if_exists/>
+            <input type="hidden" name="returnItemTypeId_o_${rowCount}" value="${returnItemType}"/>
+            <input type="hidden" name="orderId_o_${rowCount}" value="${orderItem.orderId}"/>
+            <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/>
+            <input type="hidden" name="description_o_${rowCount}" value="${orderItem.itemDescription?if_exists}"/>
+
+            <#-- need some order item information -->
+            <#assign orderHeader = orderItem.getRelatedOne("OrderHeader")>
+            <#assign itemCount = orderItem.quantity>
+            <#assign itemPrice = orderItem.unitPrice>
+            <#-- end of order item information -->
 
-            <#-- information about orders and amount refunded/credited on past returns -->
-            <#if orh?exists>
-            <tr><td colspan="10">
-                <table border='0' width='100%' cellpadding='2' cellspacing='0'>
-                  <tr>
-                    <td class="tabletext" width="25%">${uiLabelMap.OrderOrderTotal}</td>
-                    <td class="tabletext"><@ofbizCurrency amount=orh.getOrderGrandTotal() isoCode=orh.getCurrency()/></td>
-                  </tr>  
-                  <tr>
-                    <td class="tabletext" width="25%">${uiLabelMap.OrderAmountAlreadyCredited}</td>
-                    <td class="tabletext"><@ofbizCurrency amount=orh.getOrderReturnedCreditTotalBd() isoCode=orh.getCurrency()/></td>
-                  </tr>  
-                  <tr>
-                    <td class="tabletext" width="25%">${uiLabelMap.OrderAmountAlreadyRefunded}</td>
-                    <td class="tabletext"><@ofbizCurrency amount=orh.getOrderReturnedRefundTotalBd() isoCode=orh.getCurrency()/></td>
-                  </tr>  
-                </table>  
-            </td></tr>
-            </#if>
-            <tr>
-              <td><div class="tableheadtext">${uiLabelMap.CommonDescription}</div></td>
-              <td><div class="tableheadtext">${uiLabelMap.OrderOrderQty}</div></td>
-              <td><div class="tableheadtext">${uiLabelMap.OrderReturnQty}</div></td>
-              <td><div class="tableheadtext">${uiLabelMap.OrderUnitPrice}</div></td>
-              <td><div class="tableheadtext">${uiLabelMap.OrderReturnPrice}*</div></td>
-              <td><div class="tableheadtext">${uiLabelMap.OrderReturnReason}</div></td>
-              <td><div class="tableheadtext">${uiLabelMap.OrderReturnType}</div></td>
-              <td><div class="tableheadtext">${uiLabelMap.OrderItemStatus}</div></td>
-              <td align="right"><div class="tableheadtext">${uiLabelMap.OrderOrderInclude}?</div></td>
-            </tr>
-            <tr><td colspan="9"><hr class="sepbar"></td></tr>
-            <#if returnableItems?has_content>
-              <#assign rowCount = 0>
-              <#list returnableItems.keySet() as orderItem>
-                <#if orderItem.orderAdjustmentId?has_content>
-                    <#-- this is an order item adjustment -->
-                    <#assign returnAdjustmentType = returnItemTypeMap.get(orderItem.get("orderAdjustmentTypeId"))/>
-                    <#assign adjustmentType = orderItem.getRelatedOne("OrderAdjustmentType")/>
-                    <#assign description = orderItem.description?default(adjustmentType.get("description",locale))/>
-
-                    <input type="hidden" name="returnAdjustmentTypeId_o_${rowCount}" value="${returnAdjustmentType}"/>                
-                    <input type="hidden" name="orderAdjustmentId_o_${rowCount}" value="${orderItem.orderAdjustmentId}"/>
-                    <tr>
-                      <td colspan="4">
-                        ${description?default("N/A")}
-                      </td>
-                      <td>
-                        ${orderItem.amount?string("##0.00")}
-                        <#--<input type="text" class="inputBox" size="8" name="amount_o_${rowCount}" <#if orderItem.amount?has_content>value="${orderItem.amount?string("##0.00")}"</#if>/>-->
-                      </td>
-                      <td></td>
-                      <td>
-                        <select name="returnTypeId_o_${rowCount}" class="selectBox">
-                          <#list returnTypes as type>
-                          <option value="${type.returnTypeId}" <#if type.returnTypeId == "RTN_REFUND">selected</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
-                          </#list>
-                        </select>
-                      </td>
-                      <td></td>
-                      <td align="right">
-                        <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, '${selectAllFormName}');"/>
-                      </td>
-                    </tr>
-                <#else>
-                    <#-- this is an order item -->
-                    <#assign returnItemType = (returnItemTypeMap.get(returnableItems.get(orderItem).get("itemTypeKey")))?if_exists/>
-                    <input type="hidden" name="returnItemTypeId_o_${rowCount}" value="${returnItemType}"/>
-                    <input type="hidden" name="orderId_o_${rowCount}" value="${orderItem.orderId}"/>
-                    <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/>
-                    <input type="hidden" name="description_o_${rowCount}" value="${orderItem.itemDescription?if_exists}"/>
-
-                    <#-- need some order item information -->
-                    <#assign orderHeader = orderItem.getRelatedOne("OrderHeader")>
-                    <#assign itemCount = orderItem.quantity>
-                    <#assign itemPrice = orderItem.unitPrice>
-                    <#-- end of order item information -->
-
-                    <tr>
-                      <td>
-                        <div class="tabletext">
-                          <#if orderItem.productId?exists>
-                          <b>${orderItem.productId}</b>:&nbsp;
-                          <input type="hidden" name="productId_o_${rowCount}" value="${orderItem.productId}">
-                          </#if>
-                          ${orderItem.itemDescription}
-                        </div>
-                      </td>
-                      <td align='center'>
-                        <div class="tabletext">${orderItem.quantity?string.number}</div>
-                      </td>
-                      <td>
-                        <input type="text" class="inputBox" size="6" name="returnQuantity_o_${rowCount}" value="${returnableItems.get(orderItem).get("returnableQuantity")}"/>
-                      </td>
-                      <td align='left'>
-                        <div class="tabletext"><@ofbizCurrency amount=orderItem.unitPrice isoCode=orderHeader.currencyUom/></div>
-                      </td>
-                      <td>
-                        <input type="text" class="inputBox" size="8" name="returnPrice_o_${rowCount}" value="${returnableItems.get(orderItem).get("returnablePrice")?string("##0.00")}"/>
-                      </td>
-                      <td>
-                        <select name="returnReasonId_o_${rowCount}" class="selectBox">
-                          <#list returnReasons as reason>
-                          <option value="${reason.returnReasonId}">${reason.get("description",locale)?default(reason.returnReasonId)}</option>
-                          </#list>
-                        </select>
-                      </td>
-                      <td>
-                        <select name="returnTypeId_o_${rowCount}" class="selectBox">
-                          <#list returnTypes as type>
-                          <option value="${type.returnTypeId}" <#if type.returnTypeId=="RTN_REFUND">selected</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
-                          </#list>
-                        </select>
-                      </td>
-                      <td>
-                        <select name="expectedItemStatus_o_${rowCount}" class="selectBox">
-                          <option value="INV_RETURNED">${uiLabelMap.OrderReturned}</option>
-                          <option value="INV_RETURNED">---</option>
-                          <#list itemStts as status>
-                            <option value="${status.statusId}">${status.get("description",locale)}</option>
-                          </#list>
-                        </select>
-                      </td>
-                      <td align="right">
-                        <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, '${selectAllFormName}');"/>
-                      </td>
-                    </tr>
-                </#if>
-                <#assign rowCount = rowCount + 1>
-              </#list>
-                    
-
-             <tr><td colspan="9"><hr class="sepbar"></td></tr>
-            <tr>
-              <td colspan="9"><h3>${uiLabelMap.OrderReturnAdjustments} #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</h3></td>
-            </tr>
-            <tr><td colspan="9"><hr class="sepbar"></td></tr>
-            <#if orderHeaderAdjustments?has_content>
-              <tr>
-                    <td><div class="tableheadtext">${uiLabelMap.CommonDescription}</div></td>
-                    <td><div class="tableheadtext">${uiLabelMap.CommonAmount}</div></td>                                                
-                    <td><div class="tableheadtext">${uiLabelMap.OrderReturnType}</div></td>
-
-                <td align="right"><div class="tableheadtext">${uiLabelMap.OrderOrderInclude}?</div></td>
-              </tr>
-              <tr><td colspan="9"><hr class="sepbar"></td></tr>
-              <#list orderHeaderAdjustments as adj>
-                <#assign returnAdjustmentType = returnItemTypeMap.get(adj.get("orderAdjustmentTypeId"))/>
-                <#assign adjustmentType = adj.getRelatedOne("OrderAdjustmentType")/>
-                <#assign description = adj.description?default(adjustmentType.get("description",locale))/>
-
-                <input type="hidden" name="returnAdjustmentTypeId_o_${rowCount}" value="${returnAdjustmentType}"/>                
-                <input type="hidden" name="orderAdjustmentId_o_${rowCount}" value="${adj.orderAdjustmentId}"/>
-                <input type="hidden" name="returnItemSeqId_o_${rowCount}" value="_NA_"/>
-                <input type="hidden" name="description_o_${rowCount}" value="${description}"/>
-                <tr>
-                  <td>
-                    <div class="tabletext">
-                      ${description?default("N/A")}
-                    </div>
-                  </td>                                    
-                  <td>
-                    <input type="text" class="inputBox" size="8" name="amount_o_${rowCount}" <#if adj.amount?has_content>value="${adj.amount?string("##0.00")}"</#if>/>
-                  </td>
-                  <td>
-                    <select name="returnTypeId_o_${rowCount}" class="selectBox">
-                      <#list returnTypes as type>
-                      <option value="${type.returnTypeId}" <#if type.returnTypeId == "RTN_REFUND">selected</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
-                      </#list>
-                    </select>
-                  </td>
-
-                  <td align="right">
-                    <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, '${selectAllFormName}');"/>
-                  </td>
-                </tr>
-                <#assign rowCount = rowCount + 1>
-              </#list>
-            <#else>
-              <tr><td colspan="9"><div class="tableheadtext">${uiLabelMap.OrderNoOrderAdjustments}</div></td></tr>
-            </#if>
-
-            <#assign manualAdjRowNum = rowCount/>
-            <input type="hidden" name="returnItemTypeId_o_${rowCount}" value="RET_MAN_ADJ"/>
-            <input type="hidden" name="returnItemSeqId_o_${rowCount}" value="_NA_"/>
-            <tr><td colspan="9"><hr class="sepbar"></td></tr>
-            <tr>
-              <td colspan="9">
-                <h3>${uiLabelMap.OrderReturnManualAdjustment} #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</h3></td></div>
+            <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+              <td>
+                <div>
+                  <#if orderItem.productId?exists>
+                    ${orderItem.productId}&nbsp;
+                    <input type="hidden" name="productId_o_${rowCount}" value="${orderItem.productId}">
+                  </#if>
+                  ${orderItem.itemDescription}
+                </div>
+              </td>
+              <td align='center'>
+                <div>${orderItem.quantity?string.number}</div>
               </td>
-            </tr>
-            <tr>
               <td>
-                <input type="text" class="inputBox" size="30" name="description_o_${rowCount}">
+                <input type="text" size="6" name="returnQuantity_o_${rowCount}" value="${returnableItems.get(orderItem).get("returnableQuantity")}"/>
+              </td>
+              <td align='left'>
+                <div><@ofbizCurrency amount=orderItem.unitPrice isoCode=orderHeader.currencyUom/></div>
               </td>
               <td>
-                <input type="text" class="inputBox" size="8" name="amount_o_${rowCount}" value="${0.00?string("##0.00")}"/>
+                <input type="text" size="8" name="returnPrice_o_${rowCount}" value="${returnableItems.get(orderItem).get("returnablePrice")?string("##0.00")}"/>
               </td>
               <td>
-                <select name="returnTypeId_o_${rowCount}" class="selectBox">
+                <select name="returnReasonId_o_${rowCount}">
+                  <#list returnReasons as reason>
+                  <option value="${reason.returnReasonId}">${reason.get("description",locale)?default(reason.returnReasonId)}</option>
+                  </#list>
+                </select>
+              </td>
+              <td>
+                <select name="returnTypeId_o_${rowCount}">
                   <#list returnTypes as type>
-                  <option value="${type.returnTypeId}" <#if type.returnTypeId == "RTN_REFUND">selected</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
+                  <option value="${type.returnTypeId}" <#if type.returnTypeId=="RTN_REFUND">selected</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
+                  </#list>
+                </select>
+              </td>
+              <td>
+                <select name="expectedItemStatus_o_${rowCount}">
+                  <option value="INV_RETURNED">${uiLabelMap.OrderReturned}</option>
+                  <option value="INV_RETURNED">---</option>
+                  <#list itemStts as status>
+                    <option value="${status.statusId}">${status.get("description",locale)}</option>
                   </#list>
                 </select>
               </td>
-
               <td align="right">
                 <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, '${selectAllFormName}');"/>
               </td>
             </tr>
-            <#assign rowCount = rowCount + 1>
-
-            <!-- final row count -->
-            <input type="hidden" name="_rowCount" value="${rowCount}"/>
-        
-             <tr>
-               <td colspan="9" align="right">
-                 <a href="javascript:document.${selectAllFormName}.submit()" class="buttontext">${uiLabelMap.OrderReturnSelectedItems}</a>                
-               </td>
-             </tr>
-           <#else>
-             <tr><td colspan="9"><div class="tabletext">${uiLabelMap.OrderReturnNoReturnableItems} #${orderId}</div></td></tr>
-           </#if>
-           <tr>
-             <td colspan="9"><div class="tabletext">*${uiLabelMap.OrderReturnPriceNotIncludeTax}</div></td>
-           </tr>
-           </table>
-
+        </#if>
+        <#assign rowCount = rowCount + 1>
+        <#-- toggle the row color -->
+        <#assign alt_row = !alt_row>
+      </#list>
+    <tr><td colspan="9"><hr></td></tr>
+    <tr>
+      <td colspan="9"><h3>${uiLabelMap.OrderReturnAdjustments} #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</h3></td>
+    </tr>
+    <tr><td colspan="9"><br/></td></tr>
+    <#if orderHeaderAdjustments?has_content>
+      <tr class="header-row">
+        <td>${uiLabelMap.CommonDescription}</td>
+        <td>${uiLabelMap.CommonAmount}</td>                                                
+        <td>${uiLabelMap.OrderReturnType}</td>
+        <td align="right">${uiLabelMap.OrderOrderInclude}?</td>
+      </tr>
+      <#list orderHeaderAdjustments as adj>
+        <#assign returnAdjustmentType = returnItemTypeMap.get(adj.get("orderAdjustmentTypeId"))/>
+        <#assign adjustmentType = adj.getRelatedOne("OrderAdjustmentType")/>
+        <#assign description = adj.description?default(adjustmentType.get("description",locale))/>
+
+        <input type="hidden" name="returnAdjustmentTypeId_o_${rowCount}" value="${returnAdjustmentType}"/>                
+        <input type="hidden" name="orderAdjustmentId_o_${rowCount}" value="${adj.orderAdjustmentId}"/>
+        <input type="hidden" name="returnItemSeqId_o_${rowCount}" value="_NA_"/>
+        <input type="hidden" name="description_o_${rowCount}" value="${description}"/>
+        <tr>
+          <td>
+            <div>
+              ${description?default("N/A")}
+            </div>
+          </td>                                    
+          <td>
+            <input type="text" size="8" name="amount_o_${rowCount}" <#if adj.amount?has_content>value="${adj.amount?string("##0.00")}"</#if>/>
+          </td>
+          <td>
+            <select name="returnTypeId_o_${rowCount}">
+              <#list returnTypes as type>
+              <option value="${type.returnTypeId}" <#if type.returnTypeId == "RTN_REFUND">selected</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
+              </#list>
+            </select>
+          </td>
+          <td align="right">
+            <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, '${selectAllFormName}');"/>
+          </td>
+        </tr>
+        <#assign rowCount = rowCount + 1>
+      </#list>
+    <#else>
+      <tr><td colspan="9">${uiLabelMap.OrderNoOrderAdjustments}</td></tr>
+    </#if>
+
+    <#assign manualAdjRowNum = rowCount/>
+    <input type="hidden" name="returnItemTypeId_o_${rowCount}" value="RET_MAN_ADJ"/>
+    <input type="hidden" name="returnItemSeqId_o_${rowCount}" value="_NA_"/>
+    <tr><td colspan="9"><hr></td></tr>
+    <tr>
+      <td colspan="9">
+        <h3>${uiLabelMap.OrderReturnManualAdjustment} #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</h3></td></div>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <input type="text" size="30" name="description_o_${rowCount}">
+      </td>
+      <td>
+        <input type="text" size="8" name="amount_o_${rowCount}" value="${0.00?string("##0.00")}"/>
+      </td>
+      <td>
+        <select name="returnTypeId_o_${rowCount}">
+          <#list returnTypes as type>
+          <option value="${type.returnTypeId}" <#if type.returnTypeId == "RTN_REFUND">selected</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
+          </#list>
+        </select>
+      </td>
+      <td align="right">
+        <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, '${selectAllFormName}');"/>
+      </td>
+    </tr>
+    <#assign rowCount = rowCount + 1>
+
+    <!-- final row count -->
+    <input type="hidden" name="_rowCount" value="${rowCount}"/>
+    <tr>
+      <td colspan="9" align="right">
+        <a href="javascript:document.${selectAllFormName}.submit()" class="buttontext">${uiLabelMap.OrderReturnSelectedItems}</a>                
+      </td>
+    </tr>
+    <#else>
+    <tr>
+      <td colspan="9" align="left" class="label">${uiLabelMap.OrderReturnNoReturnableItems} #${orderId}</td>
+    </tr>
+    </#if>
+    <tr>
+      <td colspan="3" align="left" class="tooltip">*${uiLabelMap.OrderReturnPriceNotIncludeTax}</td>
+      <td colspan="6">&nbsp;</td>
+    </tr>
+</table>
\ No newline at end of file