svn commit: r1689266 - /ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java

[shijh]

Author: shijh
Date: Sun Jul  5 17:20:46 2015
New Revision: 1689266

URL: http://svn.apache.org/r1689266
Log:
OFBIZ-6542 as Gan Hong-Wai suggested, added EntityCondition.makeCondition("geoTypeId", "TERRITORY") in CommonWorkers.java of trunk.

Modified:
    ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java

Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java?rev=1689266&r1=1689265&r2=1689266&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java Sun Jul  5 17:20:46 2015
@@ -145,7 +145,7 @@ public class CommonWorkers {
                     EntityCondition.makeCondition("geoIdFrom", country),
                     EntityCondition.makeCondition("geoAssocTypeId", "REGIONS"),
                     EntityCondition.makeCondition(EntityOperator.OR, EntityCondition.makeCondition("geoTypeId", "STATE"), EntityCondition.makeCondition("geoTypeId", "PROVINCE"), EntityCondition.makeCondition("geoTypeId", "MUNICIPALITY"),
-                            EntityCondition.makeCondition("geoTypeId", "COUNTY")));
+                     EntityCondition.makeCondition("geoTypeId", "TERRITORY"), EntityCondition.makeCondition("geoTypeId", "COUNTY")));
             geoList.addAll(EntityQuery.use(delegator)
                                       .from("GeoAssocAndGeoToWithState")
                                       .where(stateProvinceFindCond)