[OFBiz] SVN: r5930 - in trunk/applications/order/webapp/ordermgr:
WEB-INF/actions/order order
jacopo at svn.ofbiz.org
jacopo at svn.ofbiz.org
Sat Oct 8 04:15:20 EDT 2005
Author: jacopo
Date: 2005-10-08 03:15:10 -0500 (Sat, 08 Oct 2005)
New Revision: 5930
Modified:
trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderlist.bsh
trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
Log:
When viewing the new order list screen the default was to show all orders.
Changed the default to show only created, processing and approved.
Thanks to Ray Barlow for the patch (OFBIZ-512).
Also some misc formatting changes.
Modified: trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderlist.bsh
===================================================================
--- trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderlist.bsh 2005-10-08 04:27:53 UTC (rev 5929)
+++ trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderlist.bsh 2005-10-08 08:15:10 UTC (rev 5930)
@@ -26,7 +26,9 @@
// if no status is selected, choose viewall by default
if ((viewcompleted == null) && (viewcancelled == null) && (viewrejected == null) && (viewapproved == null) && (viewcreated == null) && (viewprocessing == null) && (viewsent == null)) {
- viewall = "Y";
+ viewcreated = "Y";
+ viewprocessing = "Y";
+ viewapproved = "Y";
}
// put back in context for pre-checking checkboxes
Modified: trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/order/orderlist.ftl 2005-10-08 04:27:53 UTC (rev 5929)
+++ trunk/applications/order/webapp/ordermgr/order/orderlist.ftl 2005-10-08 08:15:10 UTC (rev 5930)
@@ -4,38 +4,38 @@
<form method="post" name="findorder" action="<@ofbizUrl>orderlist</@ofbizUrl>">
<table border=0 cellspacing='0' cellpadding='0' class='boxbottom'>
<tr>
- <td><div class="tableheadtext">Status:</div></td>
- <td> </td>
+ <td><div class="tableheadtext">Status:</div></td>
+ <td> </td>
<td nowrap>
<div class="tabletext">
- <input type="checkbox" name="viewall" value="Y" <#if viewall?exists>CHECKED</#if> />${uiLabelMap.CommonAll}
- <input type="checkbox" name="viewcreated" value="Y" <#if viewcreated?exists>CHECKED</#if> />${uiLabelMap.CommonCreated}
- <input type="checkbox" name="viewprocessing" value="Y" <#if viewprocessing?exists>CHECKED</#if> />${uiLabelMap.CommonProcessing}
- <input type="checkbox" name="viewapproved" value="Y" <#if viewapproved?exists>CHECKED</#if> />${uiLabelMap.CommonApproved}
- <input type="checkbox" name="viewcompleted" value="Y" <#if viewcompleted?exists>CHECKED</#if> />${uiLabelMap.CommonCompleted}
- <input type="checkbox" name="viewsent" value="Y" <#if viewsent?exists>CHECKED</#if> />${uiLabelMap.CommonSent}
- <input type="checkbox" name="viewrejected" value="Y" <#if viewrejected?exists>CHECKED</#if> />${uiLabelMap.CommonRejected}
- <input type="checkbox" name="viewcancelled" value="Y" <#if viewcancelled?exists>CHECKED</#if> />${uiLabelMap.CommonCancelled}
+ <input type="checkbox" name="viewall" value="Y" <#if viewall?exists>CHECKED</#if> />${uiLabelMap.CommonAll}
+ <input type="checkbox" name="viewcreated" value="Y" <#if viewcreated?exists>CHECKED</#if> />${uiLabelMap.CommonCreated}
+ <input type="checkbox" name="viewprocessing" value="Y" <#if viewprocessing?exists>CHECKED</#if> />${uiLabelMap.CommonProcessing}
+ <input type="checkbox" name="viewapproved" value="Y" <#if viewapproved?exists>CHECKED</#if> />${uiLabelMap.CommonApproved}
+ <input type="checkbox" name="viewcompleted" value="Y" <#if viewcompleted?exists>CHECKED</#if> />${uiLabelMap.CommonCompleted}
+ <input type="checkbox" name="viewsent" value="Y" <#if viewsent?exists>CHECKED</#if> />${uiLabelMap.CommonSent}
+ <input type="checkbox" name="viewrejected" value="Y" <#if viewrejected?exists>CHECKED</#if> />${uiLabelMap.CommonRejected}
+ <input type="checkbox" name="viewcancelled" value="Y" <#if viewcancelled?exists>CHECKED</#if> />${uiLabelMap.CommonCancelled}
</div>
- </td>
+ </td>
<td rowspan="2"> </td>
<td rowspan="2">
<a href="javascript:document.findorder.submit()" class="buttontext"><nobr>${uiLabelMap.CommonSubmit}</nobr></a><br/>
</td>
</tr>
<tr>
- <td><div class="tableheadtext">Type:</div></td>
- <td> </td>
+ <td><div class="tableheadtext">Type:</div></td>
+ <td> </td>
<td nowrap>
<div class="tabletext">
- <input type="checkbox" name="view_SALES_ORDER" value="Y" <#if view_SALES_ORDER?exists>CHECKED</#if> />
- ${descr_SALES_ORDER}
- <input type="checkbox" name="view_PURCHASE_ORDER" value="Y" <#if view_PURCHASE_ORDER?exists>CHECKED</#if> />
- ${descr_PURCHASE_ORDER}
- <input type="checkbox" name="view_WORK_ORDER" value="Y" <#if view_WORK_ORDER?exists>CHECKED</#if> />
- ${descr_WORK_ORDER}
+ <input type="checkbox" name="view_SALES_ORDER" value="Y" <#if view_SALES_ORDER?exists>CHECKED</#if> />
+ ${descr_SALES_ORDER}
+ <input type="checkbox" name="view_PURCHASE_ORDER" value="Y" <#if view_PURCHASE_ORDER?exists>CHECKED</#if> />
+ ${descr_PURCHASE_ORDER}
+ <input type="checkbox" name="view_WORK_ORDER" value="Y" <#if view_WORK_ORDER?exists>CHECKED</#if> />
+ ${descr_WORK_ORDER}
</div>
- </td>
+ </td>
</tr>
</table>
<br>
@@ -124,9 +124,9 @@
<#assign trackingCodes = orderHeader.getRelated("TrackingCodeOrder")>
<#list trackingCodes as trackingCode>
<div class="tabletext">
- <#if trackingCode?has_content>
- <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br/>
- </#if>
+ <#if trackingCode?has_content>
+ <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br/>
+ </#if>
</div>
</#list>
</td>
More information about the Svn
mailing list