Author: sichen
Date: Fri Feb 16 08:22:08 2007
New Revision: 508473
URL: http://svn.apache.org/viewvc?view=rev&rev=508473
Log:
Updating order list screen and OrderListState class to be able to search for
held orders
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
ofbiz/trunk/framework/common/config/CommonUiLabels.properties
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java?view=diff&rev=508473&r1=508472&r2=508473
==============================================================================
---
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java
(original)
+++
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java
Fri Feb 16 08:22:08 2007
@@ -68,6 +68,7 @@
map.put("viewcreated", "ORDER_CREATED");
map.put("viewprocessing", "ORDER_PROCESSING");
map.put("viewsent", "ORDER_SENT");
+ map.put("viewhold", "ORDER_HOLD");
parameterToOrderStatusId = map;
map = FastMap.newInstance();
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl?view=diff&rev=508473&r1=508472&r2=508473
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl Fri Feb
16 08:22:08 2007
@@ -74,6 +74,7 @@
<input type="checkbox" name="viewcreated" value="Y" <#if
state.hasStatus('viewcreated')>checked="checked"</#if>
/>${uiLabelMap.CommonCreated}
<input type="checkbox" name="viewprocessing" value="Y"
<#if state.hasStatus('viewprocessing')>checked="checked"</#if>
/>${uiLabelMap.CommonProcessing}
<input type="checkbox" name="viewapproved" value="Y" <#if
state.hasStatus('viewapproved')>checked="checked"</#if>
/>${uiLabelMap.CommonApproved}
+ <input type="checkbox" name="viewhold" value="Y" <#if
state.hasStatus('viewhold')>checked="checked"</#if> />${uiLabelMap.CommonHeld}
<input type="checkbox" name="viewcompleted" value="Y" <#if
state.hasStatus('viewcompleted')>checked="checked"</#if>
/>${uiLabelMap.CommonCompleted}
<input type="checkbox" name="viewsent" value="Y" <#if
state.hasStatus('viewsent')>checked="checked"</#if> />${uiLabelMap.CommonSent}
<input type="checkbox" name="viewrejected" value="Y" <#if
state.hasStatus('viewrejected')>checked="checked"</#if>
/>${uiLabelMap.CommonRejected}
Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.properties?view=diff&rev=508473&r1=508472&r2=508473
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.properties (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.properties Fri Feb 16
08:22:08 2007
@@ -185,6 +185,7 @@
CommonGotoParent=Go To Parent
CommonGroup=Group
CommonHeight=Height
+CommonHeld=Held
CommonHideFields=Hide Fields
CommonHour=Hour
CommonHourly=Hourly
