[OFBiz] SVN: r6730 - trunk/applications/order/webapp/ordermgr/return
sichen@svn.ofbiz.org
sichen at svn.ofbiz.org
Tue Feb 14 08:46:33 CST 2006
Author: sichen
Date: 2006-02-14 08:46:28 -0600 (Tue, 14 Feb 2006)
New Revision: 6730
Modified:
trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl
trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
Log:
Changes to return items screens to accomodate separate return adjustment lines
Modified: trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl 2006-02-14 14:40:31 UTC (rev 6729)
+++ trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl 2006-02-14 14:46:28 UTC (rev 6730)
@@ -111,132 +111,85 @@
</tr>
<#assign rowCount = rowCount + 1>
</#list>
+ <!-- final row count -->
+ <input type="hidden" name="_rowCount" value="${rowCount}"/>
- <tr><td colspan="9"><hr class="sepbar"></td></tr>
+ <tr><td colspan="9"><hr class="sepbar"></td></tr>
+ <tr>
+ <td colspan="9"><div class="head3">Return Order Adjustment(s) From Order #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</div></td>
+ </tr>
+ <tr><td colspan="9"><hr class="sepbar"></td></tr>
+ <#if orderHeaderAdjustments?has_content>
<tr>
- <td colspan="9"><div class="head3">Return Order Adjustment(s) From Order #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.CommonDescription}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.CommonAmount}</div></td>
+
+ <td align="right"><div class="tableheadtext">Include?</div></td>
</tr>
<tr><td colspan="9"><hr class="sepbar"></td></tr>
- <#if orderHeaderAdjustments?has_content>
+ <#assign rowCount = 0>
+ <#list orderHeaderAdjustments as adj>
+ <#assign returnAdjustmentType = returnItemTypeMap.get(adj.get("orderAdjustmentTypeId"))/>
+ <#assign adjustmentType = adj.getRelatedOne("OrderAdjustmentType")/>
+ <#assign description = adj.description?default(adjustmentType.description)/>
+
+ <input type="hidden" name="returnAdjustmentTypeId_o_${rowCount}_adj" value="${returnAdjustmentType}"/>
+ <input type="hidden" name="orderAdjustmentId_o_${rowCount}_adj" value="${adj.orderAdjustmentId}"/>
+ <input type="hidden" name="description_o_${rowCount}_adj" value="${description}"/>
<tr>
- <td><div class="tableheadtext">Description</div></td>
- <td><div class="tableheadtext">Order Qty</div></td>
- <td><div class="tableheadtext">Return Qty</div></td>
- <td><div class="tableheadtext">Unit Price</div></td>
- <td><div class="tableheadtext">Return Price</div></td>
- <td><div class="tableheadtext">Return Reason</div></td>
- <td><div class="tableheadtext">Return Type</div></td>
- <td><div class="tableheadtext">Item Status</div></td>
- <td align="right"><div class="tableheadtext">Include?</div></td>
+ <td>
+ <div class="tabletext">
+ ${description?default("N/A")}
+ </div>
+ </td>
+ <td>
+ <input type="text" class="inputBox" size="8" name="amount_o_${rowCount}_adj" value="${adj.amount?string("##0.00")}"/>
+ </td>
+
+ <td align="right">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}_adj" value="Y" onclick="javascript:checkToggle(this, 'returnAdjustments');"/>
+ </td>
</tr>
- <tr><td colspan="9"><hr class="sepbar"></td></tr>
- <#list orderHeaderAdjustments as adj>
- <#assign returnItemType = returnItemTypeMap.get(adj.get("orderAdjustmentTypeId"))/>
- <#assign adjustmentType = adj.getRelatedOne("OrderAdjustmentType")/>
- <#assign description = adj.description?default(adjustmentType.description)/>
-
- <input type="hidden" name="returnItemTypeId_o_${rowCount}" value="${returnItemType}"/>
- <input type="hidden" name="orderId_o_${rowCount}" value="${adj.orderId}"/>
- <input type="hidden" name="orderAdjustmentId_o_${rowCount}" value="${adj.orderAdjustmentId}"/>
- <input type="hidden" name="description_o_${rowCount}" value="${description}"/>
- <tr>
- <td>
- <div class="tabletext">
- ${description?default("N/A")}
- </div>
- </td>
-
- <td align='center'>
- <div class="tabletext">-</div>
- </td>
- <td>
- <div class="tabletext">-</div>
- <input type="hidden" name="returnQuantity_o_${rowCount}" value="1"/>
- </td>
- <td align='left'>
- <div class="tabletext"><@ofbizCurrency amount=adj.amount isoCode=orderHeader.currencyUom/></div>
- </td>
- <td>
- <input type="text" class="inputBox" size="8" name="returnPrice_o_${rowCount}" value="${adj.amount?string("##0.00")}"/>
- </td>
- <td align="center"><div class='tabletext'>-</div></td>
- <td>
- <select name="returnTypeId_o_${rowCount}" class="selectBox">
- <#list returnTypes as type>
- <option value="${type.returnTypeId}">${type.description?default(type.returnTypeId)}</option>
- </#list>
- </select>
- </td>
- <td align='center'>
- <div class="tabletext">-</div>
- </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">No adjustments on this order.</div></td></tr>
- </#if>
-
- <#assign manualAdjRowNum = rowCount/>
- <input type="hidden" name="returnItemTypeId_o_${rowCount}" value="RETURN_MAN_ADJ"/>
- <input type="hidden" name="orderId_o_${rowCount}" value="${orderId}"/>
-
- <tr><td colspan="9"><hr class="sepbar"></td></tr>
- <tr>
- <td colspan="9">
- <div class="head3">Manual Return Adjustment For Order #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</div></td></div>
- </td>
- </tr>
- <tr>
- <td>
- <input type="text" class="inputBox" size="30" name="description_o_${rowCount}">
- </td>
- <td align='center'>
- <div class="tabletext">-</div>
- </td>
- <td>
- <div class="tabletext">-</div>
- <input type="hidden" name="returnQuantity_o_${rowCount}" value="1"/>
- </td>
- <td align='left'>
- <div class="tabletext"><@ofbizCurrency amount=0.00 isoCode=orderHeader.currencyUom/></div>
- </td>
- <td>
- <input type="text" class="inputBox" size="8" name="returnPrice_o_${rowCount}" value="${0.00?string("##0.00")}"/>
- </td>
- <td align="center"><div class='tabletext'>-</div></td>
- <td>
- <select name="returnTypeId_o_${rowCount}" class="selectBox">
- <#list returnTypes as type>
- <option value="${type.returnTypeId}">${type.description?default(type.returnTypeId)}</option>
- </#list>
- </select>
- </td>
- <td align='center'>
- <div class="tabletext">-</div>
- </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"><hr class="sepbar"></td></tr>
- <tr>
- <td colspan="9" align="right">
- <a href="javascript:document.${selectAllFormName}.submit();" class="buttontext">Return Selected Item(s)</a>
- </td>
- </tr>
+ <#assign rowCount = rowCount + 1>
+ </#list>
<#else>
- <tr><td colspan="9"><div class="tabletext">No returnable items found for order #${orderId}</div></td></tr>
+ <tr><td colspan="9"><div class="tableheadtext">No adjustments on this order.</div></td></tr>
</#if>
+
+ <#assign manualAdjRowNum = rowCount/>
+ <input type="hidden" name="returnItemTypeId_o_${rowCount}_adj" value="RET_MAN_ADJ"/>
+ <tr><td colspan="9"><hr class="sepbar"></td></tr>
<tr>
- <td colspan="9"><div class="tabletext">*Price includes tax & adjustments</div></td>
+ <td colspan="9">
+ <div class="head3">Manual Return Adjustment For Order #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</div></td></div>
+ </td>
</tr>
- </table>
+ <tr>
+ <td>
+ <input type="text" class="inputBox" size="30" name="description_o_${rowCount}_adj">
+ </td>
+ <td>
+ <input type="text" class="inputBox" size="8" name="amount_o_${rowCount}_adj" value="${0.00?string("##0.00")}"/>
+ </td>
+ <td align="right">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}_adj" value="Y" onclick="javascript:checkToggle(this, '${selectAllFormName}');"/>
+ </td>
+ </tr>
+ <#assign rowCount = rowCount + 1>
+
+ <!-- final row count -->
+ <input type="hidden" name="_rowCount_adj" value="${rowCount}"/>
+
+ <tr>
+ <td colspan="9" align="right">
+ <a href="javascript:document.${selectAllFormName}.submit()" class="buttontext">Return Selected Item(s)</a>
+ </td>
+ </tr>
+ <#else>
+ <tr><td colspan="9"><div class="tabletext">No returnable items found for order #${orderId}</div></td></tr>
+ </#if>
+ <tr>
+ <td colspan="9"><div class="tabletext">*Price not includes tax & adjustments</div></td>
+ </tr>
+ </table>
+
Modified: trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/return/returnItems.ftl 2006-02-14 14:40:31 UTC (rev 6729)
+++ trunk/applications/order/webapp/ordermgr/return/returnItems.ftl 2006-02-14 14:46:28 UTC (rev 6730)
@@ -65,7 +65,6 @@
<#assign returnReason = item.getRelatedOne("ReturnReason")?if_exists>
<#assign returnType = item.getRelatedOne("ReturnType")?if_exists>
<#assign status = item.getRelatedOne("InventoryStatusItem")?if_exists>
- <#assign isSalesTax = item.get("returnItemTypeId").equals("RITM_SALES_TAX")>
<#if (item.get("returnQuantity")?exists && item.get("returnPrice")?exists)>
<#assign returnTotal = returnTotal + item.get("returnQuantity") * item.get("returnPrice") >
<#assign returnItemSubTotal = item.get("returnQuantity") * item.get("returnPrice") >
@@ -86,21 +85,21 @@
N/A
</#if></div></td>
<td><div class="tabletext">
- <#if readOnly || isSalesTax>
+ <#if readOnly>
${item.description?default("N/A")}
<#else>
<input name="description_o_${rowCount}" value="${item.description}" type="text" class='inputBox' size="15">
</#if>
</div></td>
<td><div class="tabletextright">
- <#if readOnly || isSalesTax>
+ <#if readOnly>
${item.returnQuantity?string.number}
<#else>
<input name="returnQuantity_o_${rowCount}" value="${item.returnQuantity}" type="text" class='inputBox' size="8" align="right">
</#if>
</div></td>
<td><div class="tabletextright">
- <#if readOnly || isSalesTax>
+ <#if readOnly>
<@ofbizCurrency amount=item.returnPrice isoCode=orderHeader.currencyUom/>
<#else>
<input name="returnPrice_o_${rowCount}" value="${item.returnPrice}" type="text" class='inputBox' size="8" align="right">
@@ -110,7 +109,7 @@
<#if returnItemSubTotal?exists><@ofbizCurrency amount=returnItemSubTotal isoCode=orderHeader.currencyUom/></#if>
</td>
<td><div class="tabletext">
- <#if readOnly || isSalesTax>
+ <#if readOnly>
${returnReason.description?default("N/A")}
<#else>
<select name="returnReasonId_o_${rowCount}" class='selectBox'>
@@ -125,7 +124,7 @@
</#if>
</div></td>
<td><div class="tabletext">
- <#if readOnly || isSalesTax>
+ <#if readOnly>
${status.description?default("N/A")}
<#else>
<select name="expectedItemStatus_o_${rowCount}" class='selectBox'>
@@ -140,7 +139,7 @@
</#if>
</div></td>
<td><div class="tabletext">
- <#if (readOnly || isSalesTax)>
+ <#if (readOnly)>
${returnType.description?default("N/A")}
<#else>
<select name="returnTypeId_o_${rowCount}" class="selectBox">
@@ -179,7 +178,41 @@
</tr>
<#assign rowCount = rowCount + 1>
</#list>
-
+ <input type="hidden" name="_rowCount" value="${rowCount}"/>
+
+<#if (returnAdjustments?has_content)>
+ <#assign rowCount = 0>
+ <tr><td colspan="9"><hr class="sepbar"></td></tr>
+ <tr>
+ <td colspan="9"><div class="head3">Return Order Adjustment(s) </div></td>
+ </tr>
+ <tr><td colspan="9"><hr class="sepbar"></td></tr>
+ <tr><td colspan="2"><div class="tableheadtext">${uiLabelMap.OrderReturnItems}</div></td>
+ <td colspan="3"><div class="tableheadtext">${uiLabelMap.CommonDescription}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.CommonAmount}</div></td>
+ <td align="center"><div class="tableheadtext">Source %</div></td>
+ <td colspan="2" align="center"><div class="tableheadtext">${uiLabelMap.CommonType}</div></td>
+ </tr>
+ <#list returnAdjustments as returnAdjustment>
+ <#assign returnHeader = returnAdjustment.getRelatedOne("ReturnHeader")>
+ <tr class="tabletext">
+ <td colspan="2"><div class="tabletext">${returnAdjustment.returnItemSeqId?default("N/A")}</div></td>
+ <td colspan="3"><div class="tabletext">${returnAdjustment.description?default("N/A")}</div></td>
+ <#if (!readOnly && !returnAdjustment.returnItemSeqId?has_content)>
+ <td>
+ <input type="text" class="inputBox" size="8" name="amount_o_${rowCount}_adj" value="${adj.amount?string("##0.00")}"/>
+ </td>
+ <#else>
+ <td><div class="tabletext"><@ofbizCurrency amount=returnAdjustment.amount isoCode=returnHeader.currencyUom/></div></td>
+ </#if>
+ <td align="right"><div class="tabletext">${returnAdjustment.sourcePercentage?default("N/A")}</div></td>
+ <td colspan="2" align="center"><div class="tabletext">${returnAdjustment.returnAdjustmentTypeId?default("N/A")}</div></td>
+ <#assign rowCount = rowCount + 1>
+ <#assign returnTotal = returnTotal + returnAdjustment.get("amount")>
+ </tr>
+ </#list>
+ <input name="_rowCount_adj" value="${rowCount}" type="hidden">
+ </#if>
<#-- show the return total -->
<tr><td colspan="5"></td><td><hr class="sepbar"/></td></tr>
<tr>
@@ -189,12 +222,12 @@
</tr>
<#if (!readOnly)>
<tr>
- <input name="_rowCount" value="${rowCount}" type="hidden">
+
<input name="returnId" value="${returnHeader.returnId}" type="hidden">
<td colspan="7" class="tabletext" align="center"><input type="submit" class="bottontext" value="${uiLabelMap.CommonUpdate}"></td>
</tr>
</form>
- </#if>
+ </#if>
<#else>
<tr>
<td colspan="9"><div class="tabletext">No item(s) in return.</div></td>
@@ -261,4 +294,5 @@
<input type="hidden" name="_useRowSubmit" value="Y">
<#include "returnItemInc.ftl"/>
</form>
+
</#if>
More information about the Svn
mailing list