Author: rayb
Date: Mon Apr 30 09:54:38 2007
New Revision: 533801
URL: http://svn.apache.org/viewvc?view=rev&rev=533801
Log:
Bug fixes for the findorders screen and new underlying service, hopefully all
sorted now including links in from other screens. OFBIZ-933
Modified:
ofbiz/trunk/applications/order/servicedef/services.xml
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/findOrders.bsh
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
Modified: ofbiz/trunk/applications/order/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services.xml?view=diff&rev=533801&r1=533800&r2=533801
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services.xml Mon Apr 30 09:54:38
2007
@@ -700,6 +700,7 @@
<attribute name="useEntryDate" type="String" mode="IN"
optional="true"/> <!-- Y/N use entryDate instead of orderDate -->
<attribute name="minDate" type="String" mode="IN" optional="true"/>
<!-- converted to Timestamp -->
<attribute name="maxDate" type="String" mode="IN" optional="true"/>
<!-- converted to Timestamp -->
+ <attribute name="hasBackOrders" type="String" mode="IN"
optional="true"/> <!-- Y to only show orders with items on backorder -->
<!-- order role fields -->
<attribute name="userLoginId" type="String" mode="IN" optional="true"/>
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java?view=diff&rev=533801&r1=533800&r2=533801
==============================================================================
---
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java
(original)
+++
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java
Mon Apr 30 09:54:38 2007
@@ -113,6 +113,7 @@
orExprs.add(new EntityExpr("orderTypeId",
EntityOperator.EQUALS, orderTypeId));
}
}
+ conditions.add(new EntityConditionList(orExprs,
EntityOperator.OR));
}
String orderName = (String) context.get("orderName");
@@ -225,7 +226,7 @@
}
String maxDate = (String) context.get("maxDate");
- if (UtilValidate.isNotEmpty(minDate) && maxDate.length() > 8) {
+ if (UtilValidate.isNotEmpty(maxDate) && maxDate.length() > 8) {
maxDate = maxDate.trim();
if (maxDate.length() < 14) maxDate = maxDate + " " +
"23:59:59.999";
paramList.add("maxDate=" + maxDate);
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/findOrders.bsh
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/findOrders.bsh?view=diff&rev=533801&r1=533800&r2=533801
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/findOrders.bsh
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/findOrders.bsh
Mon Apr 30 09:54:38 2007
@@ -150,6 +150,11 @@
orderListSize = request.getAttribute("orderListSize");
context.put("orderListSize", orderListSize);
+context.put("filterInventoryProblems",
request.getAttribute("filterInventoryProblemsList"));
+context.put("filterPOsWithRejectedItems",
request.getAttribute("filterPOsWithRejectedItemsList"));
+context.put("filterPOsOpenPastTheirETA",
request.getAttribute("filterPOsOpenPastTheirETAList"));
+context.put("filterPartiallyReceivedPOs",
request.getAttribute("filterPartiallyReceivedPOsList"));
+
lowIndex = request.getAttribute("lowIndex");
context.put("lowIndex", lowIndex);
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl?view=diff&rev=533801&r1=533800&r2=533801
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
Mon Apr 30 09:54:38 2007
@@ -55,7 +55,7 @@
<span> (<a href="${customerDetailLink}${partyId}"
target="partymgr" class="buttontext">${partyId}</a>)</span>
<span>
<a
href="<@ofbizUrl>/orderentry?partyId=${partyId}&orderTypeId=${orderHeader.orderTypeId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderNewOrder}</a>
- <a
href="<@ofbizUrl>/findorders?lookupFlag=Y&hideFields=Y&partyId=${partyId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderOtherOrders}</a>
+ <a
href="<@ofbizUrl>/searchorders?lookupFlag=Y&hideFields=Y&partyId=${partyId}&viewIndex=0&viewSize=10</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderOtherOrders}</a>
</span>
</#if>
</div>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl?view=diff&rev=533801&r1=533800&r2=533801
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Mon Apr
30 09:54:38 2007
@@ -246,7 +246,7 @@
<td class="button-col align-float">
<a
href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${uiLabelMap.CommonDetails}</a>
<#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "",
session)>
- <a
href="/ordermgr/control/findorders?lookupFlag=Y&hideFields=Y&partyId=${partyRow.partyId
+ externalKeyParam}">${uiLabelMap.OrderOrders}</a>
+ <a
href="/ordermgr/control/searchorders?lookupFlag=Y&hideFields=Y&partyId=${partyRow.partyId
+
externalKeyParam}&viewIndex=0&viewSize=10">${uiLabelMap.OrderOrders}</a>
<a
href="/ordermgr/control/FindQuote?partyId=${partyRow.partyId +
externalKeyParam}">${uiLabelMap.OrderOrderQuotes}</a>
</#if>
<#if security.hasEntityPermission("ORDERMGR", "_CREATE",
session)>
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?view=diff&rev=533801&r1=533800&r2=533801
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Mon Apr 30
09:54:38 2007
@@ -76,7 +76,7 @@
<section>
<condition><if-has-permission
permission="ORDERMGR" action="_VIEW"/></condition>
<widgets>
- <link
target="/ordermgr/control/findorders?lookupFlag=Y&hideFields=Y&partyId=${partyId}&externalLoginKey=${externalLoginKey}"
url-mode="inter-app"
+ <link
target="/ordermgr/control/searchorders?lookupFlag=Y&hideFields=Y&partyId=${partyId}&externalLoginKey=${externalLoginKey}&viewIndex=0&viewSize=10"
url-mode="inter-app"
text="${uiLabelMap.OrderOrders}"/>
<link
target="/ordermgr/control/FindQuote?partyId=${partyId}&externalLoginKey=${externalLoginKey}"
url-mode="inter-app"
text="${uiLabelMap.OrderOrderQuotes}" style="buttontext"/>
@@ -224,7 +224,7 @@
<section>
<condition><if-has-permission
permission="ORDERMGR" action="_VIEW"/></condition>
<widgets>
- <link
target="/ordermgr/control/findorders?lookupFlag=Y&hideFields=Y&partyId=${partyId}"
url-mode="inter-app"
+ <link
target="/ordermgr/control/searchorders?lookupFlag=Y&hideFields=Y&partyId=${partyId}&viewIndex=0&viewSize=10"
url-mode="inter-app"
text="${uiLabelMap.OrderOrders}"/>
</widgets>
</section>
