You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/09/07 17:30:09 UTC
svn commit: r812192 -
/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java
Author: jleroux
Date: Mon Sep 7 15:30:07 2009
New Revision: 812192
URL: http://svn.apache.org/viewvc?rev=812192&view=rev
Log:
>From Scott's comment in dev ML, removed 2 lines commited with r812159 (billingAccountId is already n OrderHeader)
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java
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?rev=812192&r1=812191&r2=812192&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java Mon Sep 7 15:30:07 2009
@@ -426,9 +426,6 @@
// search by billing account ID
if (UtilValidate.isNotEmpty(billingAccountId)) {
- dve.addMemberEntity("BL", "BillingAccount");
- dve.addAlias("BL", "billingAccountId");
- dve.addViewLink("OH", "BL", Boolean.FALSE, UtilMisc.toList(new ModelKeyMap("billingAccountId", "billingAccountId")));
paramList.add("billingAccountId=" + billingAccountId);
conditions.add(makeExpr("billingAccountId", billingAccountId));
}
@@ -532,7 +529,7 @@
dve.addAlias("PA", "countryGeoId");
dve.addViewLink("OH", "OCM", Boolean.FALSE, ModelKeyMap.makeKeyMapList("orderId"));
dve.addViewLink("OCM", "PA", Boolean.FALSE, ModelKeyMap.makeKeyMapList("contactMechId"));
-
+
EntityConditionList exprs = null;
if ("Y".equals(includeCountry)) {
exprs = EntityCondition.makeCondition(UtilMisc.toList(
@@ -554,7 +551,7 @@
if (conditions.size() > 0 || showAll.equalsIgnoreCase("Y")) {
cond = EntityCondition.makeCondition(conditions, EntityOperator.AND);
}
-
+
if (Debug.verboseOn()) {
Debug.log("Find order query: " + cond.toString());
}