Author: ashish
Date: Sat Oct 9 18:51:48 2010
New Revision: 1006211
URL: http://svn.apache.org/viewvc?rev=1006211&view=rev
Log:
Reverting my previous changes. Here is the right patch. By default find order
search will not include ship to country selection enabled. It is working fine
on trunk.
Modified:
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/findOrders.ftl
Modified:
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/findOrders.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=1006211&r1=1006210&r2=1006211&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/findOrders.ftl
(original)
+++
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/findOrders.ftl
Sat Oct 9 18:51:48 2010
@@ -444,6 +444,8 @@ function toggleOrderIdList() {
<#assign geo = delegator.findOne("Geo",
Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId", countryGeoId), true)>
<option
value="${countryGeoId}">${geo.geoName?if_exists}</option>
<option value="${countryGeoId}">---</option>
+ <#else>
+ <option value="">---</option>
</#if>
${screens.render("component://common/widget/CommonScreens.xml#countries")}
</select>
@@ -452,11 +454,9 @@ function toggleOrderIdList() {
<#assign includeCountry =
requestParameters.includeCountry>
<option value="${includeCountry}"><#if "Y" ==
includeCountry>${uiLabelMap.OrderOnlyInclude}<#elseif "N" ==
includeCountry>${uiLabelMap.OrderDoNotInclude}</#if></option>
<option value="${includeCountry}">---</option>
- <#else>
- <option value="">---</option>
</#if>
- <option value="N">${uiLabelMap.OrderDoNotInclude}</option>
<option value="Y">${uiLabelMap.OrderOnlyInclude}</option>
+ <option value="N">${uiLabelMap.OrderDoNotInclude}</option>
</select>
</td>
</tr>
