You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2012/05/12 23:20:15 UTC
svn commit: r1337671 [2/2] - in /ofbiz/trunk/applications/product:
src/org/ofbiz/product/catalog/ src/org/ofbiz/product/category/
src/org/ofbiz/product/config/ src/org/ofbiz/product/feature/
src/org/ofbiz/product/imagemanagement/ src/org/ofbiz/product/...
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java Sat May 12 21:20:13 2012
@@ -74,7 +74,7 @@ public class ShipmentServices {
GenericValue productStoreShipMeth = null;
try {
- productStoreShipMeth = delegator.findByPrimaryKey("ProductStoreShipmentMeth", UtilMisc.toMap("productStoreShipMethId", productStoreShipMethId));
+ productStoreShipMeth = delegator.findOne("ProductStoreShipmentMeth", UtilMisc.toMap("productStoreShipMethId", productStoreShipMethId), false);
} catch (GenericEntityException e) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
"ProductStoreShipmentMethodCannotRetrieve",
@@ -148,7 +148,7 @@ public class ShipmentServices {
GenericValue estimate = null;
try {
- estimate = delegator.findByPrimaryKey("ShipmentCostEstimate", UtilMisc.toMap("shipmentCostEstimateId", shipmentCostEstimateId));
+ estimate = delegator.findOne("ShipmentCostEstimate", UtilMisc.toMap("shipmentCostEstimateId", shipmentCostEstimateId), false);
estimate.remove();
} catch (GenericEntityException e) {
Debug.logError(e, module);
@@ -293,7 +293,7 @@ public class ShipmentServices {
GenericValue shipAddress = null;
if (shippingContactMechId != null) {
try {
- shipAddress = delegator.findByPrimaryKey("PostalAddress", UtilMisc.toMap("contactMechId", shippingContactMechId));
+ shipAddress = delegator.findOne("PostalAddress", UtilMisc.toMap("contactMechId", shippingContactMechId), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
@@ -618,7 +618,7 @@ public class ShipmentServices {
GenericValue shipment = null;
if (shipmentId != null) {
try {
- shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap("shipmentId", shipmentId));
+ shipment = delegator.findOne("Shipment", UtilMisc.toMap("shipmentId", shipmentId), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.getMessage());
@@ -734,15 +734,15 @@ public class ShipmentServices {
String shipmentId = pkgInfo.getString("shipmentId");
// locate the shipment package
- GenericValue shipmentPackage = delegator.findByPrimaryKey("ShipmentPackage",
- UtilMisc.toMap("shipmentId", shipmentId, "shipmentPackageSeqId", packageSeqId));
+ GenericValue shipmentPackage = delegator.findOne("ShipmentPackage",
+ UtilMisc.toMap("shipmentId", shipmentId, "shipmentPackageSeqId", packageSeqId), false);
if (shipmentPackage != null) {
if ("00001".equals(packageSeqId)) {
// only need to do this for the first package
GenericValue rtSeg = null;
try {
- rtSeg = delegator.findByPrimaryKey("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", "00001"));
+ rtSeg = delegator.findOne("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", "00001"), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.getMessage());
@@ -777,7 +777,7 @@ public class ShipmentServices {
// first update the weight of the package
GenericValue pkg = null;
try {
- pkg = delegator.findByPrimaryKey("ShipmentPackage", pkgCtx);
+ pkg = delegator.findOne("ShipmentPackage", pkgCtx, false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.getMessage());
@@ -802,7 +802,7 @@ public class ShipmentServices {
pkgCtx.put("shipmentRouteSegmentId", "00001");
GenericValue pkgRtSeg = null;
try {
- pkgRtSeg = delegator.findByPrimaryKey("ShipmentPackageRouteSeg", pkgCtx);
+ pkgRtSeg = delegator.findOne("ShipmentPackageRouteSeg", pkgCtx, false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.getMessage());
@@ -914,7 +914,7 @@ public class ShipmentServices {
if (shipmentReceipts.size() == 0) return ServiceUtil.returnSuccess();
// If there are shipment receipts, the shipment must have been shipped, so set the shipment status to PURCH_SHIP_SHIPPED if it's only PURCH_SHIP_CREATED
- GenericValue shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap("shipmentId", shipmentId));
+ GenericValue shipment = delegator.findOne("Shipment", UtilMisc.toMap("shipmentId", shipmentId), false);
if ((! UtilValidate.isEmpty(shipment)) && "PURCH_SHIP_CREATED".equals(shipment.getString("statusId"))) {
Map<String, Object> updateShipmentMap = dispatcher.runSync("updateShipment", UtilMisc.<String, Object>toMap("shipmentId", shipmentId, "statusId", "PURCH_SHIP_SHIPPED", "userLogin", userLogin));
if (ServiceUtil.isError(updateShipmentMap)) {
@@ -973,7 +973,7 @@ public class ShipmentServices {
Map<String, Object> results = ServiceUtil.returnSuccess();
try {
- GenericValue shipmentRouteSeg = delegator.findByPrimaryKey("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId));
+ GenericValue shipmentRouteSeg = delegator.findOne("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId), false);
if (shipmentRouteSeg == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
"ProductShipmentRouteSegmentNotFound",
@@ -1018,8 +1018,8 @@ public class ShipmentServices {
// get the carrierPartyId
try {
- GenericValue shipmentRouteSegment = delegator.findByPrimaryKeyCache("ShipmentRouteSegment",
- UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId));
+ GenericValue shipmentRouteSegment = delegator.findOne("ShipmentRouteSegment",
+ UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId), true);
carrierPartyId = shipmentRouteSegment.getString("carrierPartyId");
} catch (GenericEntityException e) {
Debug.logError(e, module);
@@ -1069,14 +1069,14 @@ public class ShipmentServices {
GenericValue shipmentPackage = null;
try {
- shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap("shipmentId", shipmentId));
+ shipment = delegator.findOne("Shipment", UtilMisc.toMap("shipmentId", shipmentId), false);
if (UtilValidate.isEmpty(shipment)) {
String errorMessage = UtilProperties.getMessage(resource, "ProductShipmentNotFoundId", locale);
Debug.logError(errorMessage, module);
return ServiceUtil.returnError(errorMessage);
}
- shipmentPackage = delegator.findByPrimaryKey("ShipmentPackage", UtilMisc.toMap("shipmentId", shipmentId, "shipmentPackageSeqId", shipmentPackageSeqId));
+ shipmentPackage = delegator.findOne("ShipmentPackage", UtilMisc.toMap("shipmentId", shipmentId, "shipmentPackageSeqId", shipmentPackageSeqId), false);
if (UtilValidate.isEmpty(shipmentPackage)) {
String errorMessage = UtilProperties.getMessage(resource, "ProductShipmentPackageNotFound", context, locale);
Debug.logError(errorMessage, module);
@@ -1141,14 +1141,14 @@ public class ShipmentServices {
GenericValue shipment = null ;
GenericValue orderHeader = null;
try {
- shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap("shipmentId", shipmentId));
- orderHeader = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", shipment.getString("primaryOrderId")));
+ shipment = delegator.findOne("Shipment", UtilMisc.toMap("shipmentId", shipmentId), false);
+ orderHeader = delegator.findOne("OrderHeader", UtilMisc.toMap("orderId", shipment.getString("primaryOrderId")), false);
} catch (GenericEntityException e) {
Debug.logError(e, "Problem getting info from database", module);
}
GenericValue productStoreEmail = null;
try {
- productStoreEmail = delegator.findByPrimaryKey("ProductStoreEmailSetting", UtilMisc.toMap("productStoreId", orderHeader.get("productStoreId"), "emailType", "PRDS_ODR_SHIP_COMPLT"));
+ productStoreEmail = delegator.findOne("ProductStoreEmailSetting", UtilMisc.toMap("productStoreId", orderHeader.get("productStoreId"), "emailType", "PRDS_ODR_SHIP_COMPLT"), false);
} catch (GenericEntityException e) {
Debug.logError(e, "Problem getting the ProductStoreEmailSetting for productStoreId =" + orderHeader.get("productStoreId") + " and emailType = PRDS_ODR_SHIP_COMPLT", module);
}
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java Sat May 12 21:20:13 2012
@@ -41,7 +41,7 @@ public class IssuanceTest extends OFBizT
@Override
protected void setUp() throws Exception {
- userLogin = delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", "system"));
+ userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", "system"), false);
}
@Override
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java Sat May 12 21:20:13 2012
@@ -169,8 +169,8 @@ public class DhlServices {
// translate shipmentMethodTypeId to DHL service code
String dhlShipmentDetailCode = null;
try {
- GenericValue carrierShipmentMethod = delegator.findByPrimaryKey("CarrierShipmentMethod", UtilMisc.toMap("shipmentMethodTypeId", shipmentMethodTypeId,
- "partyId", carrierPartyId, "roleTypeId", "CARRIER"));
+ GenericValue carrierShipmentMethod = delegator.findOne("CarrierShipmentMethod", UtilMisc.toMap("shipmentMethodTypeId", shipmentMethodTypeId,
+ "partyId", carrierPartyId, "roleTypeId", "CARRIER"), false);
if (carrierShipmentMethod == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentDhlNoCarrierShipmentMethod",
@@ -198,7 +198,7 @@ public class DhlServices {
GenericValue shipToAddress = null;
if (shippingContactMechId != null) {
try {
- shipToAddress = delegator.findByPrimaryKey("PostalAddress", UtilMisc.toMap("contactMechId", shippingContactMechId));
+ shipToAddress = delegator.findOne("PostalAddress", UtilMisc.toMap("contactMechId", shippingContactMechId), false);
if (shipToAddress == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentUnableFoundShipToAddresss", locale));
@@ -522,12 +522,12 @@ public class DhlServices {
String shipmentConfirmResponseString = null;
try {
- GenericValue shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap("shipmentId", shipmentId));
+ GenericValue shipment = delegator.findOne("Shipment", UtilMisc.toMap("shipmentId", shipmentId), false);
if (shipment == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"ProductShipmentNotFoundId", locale) + shipmentId);
}
- GenericValue shipmentRouteSegment = delegator.findByPrimaryKey("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId));
+ GenericValue shipmentRouteSegment = delegator.findOne("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId), false);
if (shipmentRouteSegment == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"ProductShipmentRouteSegmentNotFound",
@@ -710,8 +710,8 @@ public class DhlServices {
// translate shipmentMethodTypeId to DHL service code
String shipmentMethodTypeId = shipmentRouteSegment.getString("shipmentMethodTypeId");
String dhlShipmentDetailCode = null;
- GenericValue carrierShipmentMethod = delegator.findByPrimaryKey("CarrierShipmentMethod", UtilMisc.toMap("shipmentMethodTypeId", shipmentMethodTypeId,
- "partyId", "DHL", "roleTypeId", "CARRIER"));
+ GenericValue carrierShipmentMethod = delegator.findOne("CarrierShipmentMethod", UtilMisc.toMap("shipmentMethodTypeId", shipmentMethodTypeId,
+ "partyId", "DHL", "roleTypeId", "CARRIER"), false);
if (carrierShipmentMethod == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentDhlNoCarrierShipmentMethod",
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java Sat May 12 21:20:13 2012
@@ -182,7 +182,7 @@ public class FedexServices {
String emailAddress = null;
try {
// Make sure the company exists
- GenericValue companyParty = delegator.findByPrimaryKeyCache("Party", UtilMisc.toMap("partyId", companyPartyId));
+ GenericValue companyParty = delegator.findOne("Party", UtilMisc.toMap("partyId", companyPartyId), true);
if (companyParty == null) {
String errorMessage = "Party with partyId " + companyPartyId + " does not exist";
Debug.logError(errorMessage, module);
@@ -237,12 +237,12 @@ public class FedexServices {
"FacilityShipmentFedexCompanyPartyHasNotPostalAddress",
UtilMisc.toMap("companyPartyId", companyPartyId), locale));
}
- GenericValue countryGeo = delegator.findByPrimaryKeyCache("Geo", UtilMisc.toMap("geoId", postalAddress.getString("countryGeoId")));
+ GenericValue countryGeo = delegator.findOne("Geo", UtilMisc.toMap("geoId", postalAddress.getString("countryGeoId")), true);
String countryCode = countryGeo.getString("geoCode");
String stateOrProvinceCode = null;
// Only add the StateOrProvinceCode element if the address is in USA or Canada
if (countryCode.equals("CA") || countryCode.equals("US")) {
- GenericValue stateProvinceGeo = delegator.findByPrimaryKeyCache("Geo", UtilMisc.toMap("geoId", postalAddress.getString("stateProvinceGeoId")));
+ GenericValue stateProvinceGeo = delegator.findOne("Geo", UtilMisc.toMap("geoId", postalAddress.getString("stateProvinceGeoId")), true);
stateOrProvinceCode = stateProvinceGeo.getString("geoCode");
}
@@ -470,12 +470,12 @@ public class FedexServices {
Map<String, Object> shipRequestContext = FastMap.newInstance();
// Get the shipment and the shipmentRouteSegment
- GenericValue shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap("shipmentId", shipmentId));
+ GenericValue shipment = delegator.findOne("Shipment", UtilMisc.toMap("shipmentId", shipmentId), false);
if (UtilValidate.isEmpty(shipment)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"ProductShipmentNotFoundId", locale) + shipmentId);
}
- GenericValue shipmentRouteSegment = delegator.findByPrimaryKey("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId));
+ GenericValue shipmentRouteSegment = delegator.findOne("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId), false);
if (UtilValidate.isEmpty(shipmentRouteSegment)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"ProductShipmentRouteSegmentNotFound",
@@ -499,7 +499,7 @@ public class FedexServices {
// Translate shipmentMethodTypeId to Fedex service code and carrier code
String shipmentMethodTypeId = shipmentRouteSegment.getString("shipmentMethodTypeId");
- GenericValue carrierShipmentMethod = delegator.findByPrimaryKey("CarrierShipmentMethod", UtilMisc.toMap("shipmentMethodTypeId", shipmentMethodTypeId, "partyId", "FEDEX", "roleTypeId", "CARRIER"));
+ GenericValue carrierShipmentMethod = delegator.findOne("CarrierShipmentMethod", UtilMisc.toMap("shipmentMethodTypeId", shipmentMethodTypeId, "partyId", "FEDEX", "roleTypeId", "CARRIER"), false);
if (UtilValidate.isEmpty(carrierShipmentMethod)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentFedexRouteSegmentCarrierShipmentMethodNotFound",
@@ -558,7 +558,7 @@ public class FedexServices {
UtilMisc.toMap("contactMechId", originPostalAddress.getString("contactMechId"),
"shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId), locale));
}
- GenericValue stateProvinceGeo = delegator.findByPrimaryKeyCache("Geo", UtilMisc.toMap("geoId", originPostalAddress.getString("stateProvinceGeoId")));
+ GenericValue stateProvinceGeo = delegator.findOne("Geo", UtilMisc.toMap("geoId", originPostalAddress.getString("stateProvinceGeoId")), true);
originAddressStateOrProvinceCode = stateProvinceGeo.getString("geoCode");
}
@@ -633,7 +633,7 @@ public class FedexServices {
UtilMisc.toMap("contactMechId", destinationPostalAddress.getString("contactMechId"),
"shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId), locale));
}
- GenericValue stateProvinceGeo = delegator.findByPrimaryKeyCache("Geo", UtilMisc.toMap("geoId", destinationPostalAddress.getString("stateProvinceGeoId")));
+ GenericValue stateProvinceGeo = delegator.findOne("Geo", UtilMisc.toMap("geoId", destinationPostalAddress.getString("stateProvinceGeoId")), true);
destinationAddressStateOrProvinceCode = stateProvinceGeo.getString("geoCode");
}
@@ -659,7 +659,7 @@ public class FedexServices {
"FacilityShipmentFedexPartyToRequired",
UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId), locale));
}
- GenericValue partyTo = delegator.findByPrimaryKey("Party", UtilMisc.toMap("partyId", destinationPartyId));
+ GenericValue partyTo = delegator.findOne("Party", UtilMisc.toMap("partyId", destinationPartyId), false);
String destinationContactKey = "PERSON".equals(partyTo.getString("partyTypeId")) ? "DestinationContactPersonName" : "DestinationContactCompanyName";
String destinationContactName = PartyHelper.getPartyName(partyTo, false);
if (UtilValidate.isEmpty(destinationContactName)) {
@@ -795,7 +795,7 @@ public class FedexServices {
}
// Make sure that the packaging type is valid for FedEx
- GenericValue carrierShipmentBoxType = delegator.findByPrimaryKey("CarrierShipmentBoxType", UtilMisc.toMap("partyId", "FEDEX", "shipmentBoxTypeId", packaging));
+ GenericValue carrierShipmentBoxType = delegator.findOne("CarrierShipmentBoxType", UtilMisc.toMap("partyId", "FEDEX", "shipmentBoxTypeId", packaging), false);
if (UtilValidate.isEmpty(carrierShipmentBoxType)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentFedexPackingTypeInvalid",
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java Sat May 12 21:20:13 2012
@@ -122,11 +122,11 @@ public class UpsServices {
String shipmentConfirmResponseString = null;
try {
- GenericValue shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap("shipmentId", shipmentId));
+ GenericValue shipment = delegator.findOne("Shipment", UtilMisc.toMap("shipmentId", shipmentId), false);
if (shipment == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "ProductShipmentNotFoundId", locale) + " " + shipmentId);
}
- GenericValue shipmentRouteSegment = delegator.findByPrimaryKey("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId));
+ GenericValue shipmentRouteSegment = delegator.findOne("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId), false);
if (shipmentRouteSegment == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "ProductShipmentRouteSegmentNotFound",
UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId), locale));
@@ -201,7 +201,7 @@ public class UpsServices {
}
Map<String, Object> findCarrierShipmentMethodMap = UtilMisc.toMap("partyId", shipmentRouteSegment.get("carrierPartyId"), "roleTypeId", "CARRIER", "shipmentMethodTypeId", shipmentRouteSegment.get("shipmentMethodTypeId"));
- GenericValue carrierShipmentMethod = delegator.findByPrimaryKey("CarrierShipmentMethod", findCarrierShipmentMethodMap);
+ GenericValue carrierShipmentMethod = delegator.findOne("CarrierShipmentMethod", findCarrierShipmentMethodMap, false);
if (carrierShipmentMethod == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "FacilityShipmentUpsRouteSegmentCarrierShipmentMethodNotFound",
UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId, "carrierPartyId", shipmentRouteSegment.get("carrierPartyId"), "shipmentMethodTypeId", shipmentRouteSegment.get("shipmentMethodTypeId")), locale));
@@ -846,8 +846,8 @@ public class UpsServices {
String shipmentAcceptResponseString = null;
try {
- //GenericValue shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap("shipmentId", shipmentId));
- GenericValue shipmentRouteSegment = delegator.findByPrimaryKey("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId));
+ //GenericValue shipment = delegator.findOne("Shipment", UtilMisc.toMap("shipmentId", shipmentId), false);
+ GenericValue shipmentRouteSegment = delegator.findOne("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId), false);
if (!"UPS".equals(shipmentRouteSegment.getString("carrierPartyId"))) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "FacilityShipmentUpsNotRouteSegmentCarrier", UtilMisc.toMap("shipmentRouteSegmentId", shipmentRouteSegmentId, "shipmentId", shipmentId), locale));
@@ -1283,8 +1283,8 @@ public class UpsServices {
String voidShipmentResponseString = null;
try {
- //GenericValue shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap("shipmentId", shipmentId));
- GenericValue shipmentRouteSegment = delegator.findByPrimaryKey("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId));
+ //GenericValue shipment = delegator.findOne("Shipment", UtilMisc.toMap("shipmentId", shipmentId), false);
+ GenericValue shipmentRouteSegment = delegator.findOne("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId), false);
if (!"UPS".equals(shipmentRouteSegment.getString("carrierPartyId"))) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "FacilityShipmentUpsNotRouteSegmentCarrier", UtilMisc.toMap("shipmentRouteSegmentId", shipmentRouteSegmentId, "shipmentId", shipmentId), locale));
@@ -1488,8 +1488,8 @@ public class UpsServices {
String trackResponseString = null;
try {
- //GenericValue shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap("shipmentId", shipmentId));
- GenericValue shipmentRouteSegment = delegator.findByPrimaryKey("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId));
+ //GenericValue shipment = delegator.findOne("Shipment", UtilMisc.toMap("shipmentId", shipmentId), false);
+ GenericValue shipmentRouteSegment = delegator.findOne("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId), false);
if (!"UPS".equals(shipmentRouteSegment.getString("carrierPartyId"))) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "FacilityShipmentUpsNotRouteSegmentCarrier", UtilMisc.toMap("shipmentRouteSegmentId", shipmentRouteSegmentId, "shipmentId", shipmentId), locale));
@@ -1716,7 +1716,7 @@ public class UpsServices {
GenericValue shipToAddress = null;
if (shippingContactMechId != null) {
try {
- shipToAddress = delegator.findByPrimaryKey("PostalAddress", UtilMisc.toMap("contactMechId", shippingContactMechId));
+ shipToAddress = delegator.findOne("PostalAddress", UtilMisc.toMap("contactMechId", shippingContactMechId), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
@@ -1729,7 +1729,7 @@ public class UpsServices {
GenericValue shipFromAddress = null;
if (shippingOriginContactMechId != null) {
try {
- shipFromAddress = delegator.findByPrimaryKey("PostalAddress", UtilMisc.toMap("contactMechId", shippingOriginContactMechId));
+ shipFromAddress = delegator.findOne("PostalAddress", UtilMisc.toMap("contactMechId", shippingOriginContactMechId), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "FacilityShipmentUnableFoundShipToAddresssForDropShipping", locale));
@@ -2060,7 +2060,7 @@ public class UpsServices {
GenericValue facilityContactMech = ContactMechWorker.getFacilityContactMechByPurpose(delegator, productStore.getString("inventoryFacilityId"), UtilMisc.toList("SHIP_ORIG_LOCATION", "PRIMARY_LOCATION"));
if (facilityContactMech != null) {
try {
- shipFromAddress = delegator.findByPrimaryKey("PostalAddress", UtilMisc.toMap("contactMechId", facilityContactMech.getString("contactMechId")));
+ shipFromAddress = delegator.findOne("PostalAddress", UtilMisc.toMap("contactMechId", facilityContactMech.getString("contactMechId")), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
@@ -2077,8 +2077,8 @@ public class UpsServices {
// locate the CarrierShipmentMethod record
GenericValue carrierShipmentMethod = null;
try {
- carrierShipmentMethod = delegator.findByPrimaryKey("CarrierShipmentMethod", UtilMisc.toMap("shipmentMethodTypeId",
- shipmentMethodTypeId, "partyId", carrierPartyId, "roleTypeId", carrierRoleTypeId));
+ carrierShipmentMethod = delegator.findOne("CarrierShipmentMethod", UtilMisc.toMap("shipmentMethodTypeId",
+ shipmentMethodTypeId, "partyId", carrierPartyId, "roleTypeId", carrierRoleTypeId), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
@@ -2411,11 +2411,11 @@ public class UpsServices {
String shipmentConfirmResponseString = null;
try {
- GenericValue shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap("shipmentId", shipmentId));
+ GenericValue shipment = delegator.findOne("Shipment", UtilMisc.toMap("shipmentId", shipmentId), false);
if (shipment == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "ProductShipmentNotFoundId", locale) + " " + shipmentId);
}
- GenericValue shipmentRouteSegment = delegator.findByPrimaryKey("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId));
+ GenericValue shipmentRouteSegment = delegator.findOne("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId), false);
if (shipmentRouteSegment == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "ProductShipmentRouteSegmentNotFound",
UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId), locale));
@@ -2481,7 +2481,7 @@ public class UpsServices {
}
Map<String, Object> findCarrierShipmentMethodMap = UtilMisc.toMap("partyId", shipmentRouteSegment.get("carrierPartyId"), "roleTypeId", "CARRIER", "shipmentMethodTypeId", shipmentRouteSegment.get("shipmentMethodTypeId"));
- GenericValue carrierShipmentMethod = delegator.findByPrimaryKey("CarrierShipmentMethod", findCarrierShipmentMethodMap);
+ GenericValue carrierShipmentMethod = delegator.findOne("CarrierShipmentMethod", findCarrierShipmentMethodMap, false);
if (carrierShipmentMethod == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "FacilityShipmentUpsRouteSegmentCarrierShipmentMethodNotFound",
UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId, "carrierPartyId", shipmentRouteSegment.get("carrierPartyId"), "shipmentMethodTypeId", shipmentRouteSegment.get("shipmentMethodTypeId")), locale));
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java Sat May 12 21:20:13 2012
@@ -105,8 +105,8 @@ public class UspsServices {
GenericValue facilityContactMech = ContactMechWorker.getFacilityContactMechByPurpose(delegator, productStore.getString("inventoryFacilityId"), UtilMisc.toList("SHIP_ORIG_LOCATION", "PRIMARY_LOCATION"));
if (facilityContactMech != null) {
try {
- GenericValue shipFromAddress = delegator.findByPrimaryKey("PostalAddress",
- UtilMisc.toMap("contactMechId", facilityContactMech.getString("contactMechId")));
+ GenericValue shipFromAddress = delegator.findOne("PostalAddress",
+ UtilMisc.toMap("contactMechId", facilityContactMech.getString("contactMechId")), false);
if (shipFromAddress != null) {
originationZip = shipFromAddress.getString("postalCode");
}
@@ -125,7 +125,7 @@ public class UspsServices {
String shippingContactMechId = (String) context.get("shippingContactMechId");
if (UtilValidate.isNotEmpty(shippingContactMechId)) {
try {
- GenericValue shipToAddress = delegator.findByPrimaryKey("PostalAddress", UtilMisc.toMap("contactMechId", shippingContactMechId));
+ GenericValue shipToAddress = delegator.findOne("PostalAddress", UtilMisc.toMap("contactMechId", shippingContactMechId), false);
if (shipToAddress != null) {
if (!domesticCountries.contains(shipToAddress.getString("countryGeoId"))) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
@@ -145,9 +145,9 @@ public class UspsServices {
// get the service code
String serviceCode = null;
try {
- GenericValue carrierShipmentMethod = delegator.findByPrimaryKey("CarrierShipmentMethod",
+ GenericValue carrierShipmentMethod = delegator.findOne("CarrierShipmentMethod",
UtilMisc.toMap("shipmentMethodTypeId", (String) context.get("shipmentMethodTypeId"),
- "partyId", (String) context.get("carrierPartyId"), "roleTypeId", (String) context.get("carrierRoleTypeId")));
+ "partyId", (String) context.get("carrierPartyId"), "roleTypeId", (String) context.get("carrierRoleTypeId")), false);
if (carrierShipmentMethod != null) {
serviceCode = carrierShipmentMethod.getString("carrierServiceCode").toUpperCase();
}
@@ -292,7 +292,7 @@ public class UspsServices {
String shippingContactMechId = (String) context.get("shippingContactMechId");
if (UtilValidate.isNotEmpty(shippingContactMechId)) {
try {
- GenericValue shipToAddress = delegator.findByPrimaryKey("PostalAddress", UtilMisc.toMap("contactMechId", shippingContactMechId));
+ GenericValue shipToAddress = delegator.findOne("PostalAddress", UtilMisc.toMap("contactMechId", shippingContactMechId), false);
if (domesticCountries.contains(shipToAddress.get("countryGeoId"))) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentUspsRateInternationCannotBeUsedForUsDestinations", locale));
@@ -314,9 +314,9 @@ public class UspsServices {
// get the service code
String serviceCode = null;
try {
- GenericValue carrierShipmentMethod = delegator.findByPrimaryKey("CarrierShipmentMethod",
+ GenericValue carrierShipmentMethod = delegator.findOne("CarrierShipmentMethod",
UtilMisc.toMap("shipmentMethodTypeId", (String) context.get("shipmentMethodTypeId"),
- "partyId", (String) context.get("carrierPartyId"), "roleTypeId", (String) context.get("carrierRoleTypeId")));
+ "partyId", (String) context.get("carrierPartyId"), "roleTypeId", (String) context.get("carrierRoleTypeId")), false);
if (carrierShipmentMethod != null) {
serviceCode = carrierShipmentMethod.getString("carrierServiceCode");
}
@@ -933,8 +933,8 @@ public class UspsServices {
}
try {
- GenericValue shipmentRouteSegment = delegator.findByPrimaryKey("ShipmentRouteSegment",
- UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId));
+ GenericValue shipmentRouteSegment = delegator.findOne("ShipmentRouteSegment",
+ UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId), false);
if (shipmentRouteSegment == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"ProductShipmentRouteSegmentNotFound",
@@ -990,8 +990,8 @@ public class UspsServices {
String shipmentMethodTypeId = shipmentRouteSegment.getString("shipmentMethodTypeId");
String partyId = shipmentRouteSegment.getString("carrierPartyId");
- GenericValue carrierShipmentMethod = delegator.findByPrimaryKey("CarrierShipmentMethod",
- UtilMisc.toMap("partyId", partyId, "roleTypeId", "CARRIER", "shipmentMethodTypeId", shipmentMethodTypeId));
+ GenericValue carrierShipmentMethod = delegator.findOne("CarrierShipmentMethod",
+ UtilMisc.toMap("partyId", partyId, "roleTypeId", "CARRIER", "shipmentMethodTypeId", shipmentMethodTypeId), false);
if (carrierShipmentMethod == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentUspsNoCarrierShipmentMethod",
@@ -1236,14 +1236,14 @@ public class UspsServices {
}
try {
- GenericValue shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap("shipmentId", shipmentId));
+ GenericValue shipment = delegator.findOne("Shipment", UtilMisc.toMap("shipmentId", shipmentId), false);
if (shipment == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"ProductShipmentNotFoundId", locale) + shipmentId);
}
- GenericValue shipmentRouteSegment = delegator.findByPrimaryKey("ShipmentRouteSegment",
- UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId));
+ GenericValue shipmentRouteSegment = delegator.findOne("ShipmentRouteSegment",
+ UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId), false);
if (shipmentRouteSegment == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"ProductShipmentRouteSegmentNotFound",
@@ -1287,8 +1287,8 @@ public class UspsServices {
String shipmentMethodTypeId = shipmentRouteSegment.getString("shipmentMethodTypeId");
String partyId = shipmentRouteSegment.getString("carrierPartyId");
- GenericValue carrierShipmentMethod = delegator.findByPrimaryKey("CarrierShipmentMethod",
- UtilMisc.toMap("partyId", partyId, "roleTypeId", "CARRIER", "shipmentMethodTypeId", shipmentMethodTypeId));
+ GenericValue carrierShipmentMethod = delegator.findOne("CarrierShipmentMethod",
+ UtilMisc.toMap("partyId", partyId, "roleTypeId", "CARRIER", "shipmentMethodTypeId", shipmentMethodTypeId), false);
if (carrierShipmentMethod == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentUspsNoCarrierShipmentMethod",
@@ -1371,8 +1371,8 @@ public class UspsServices {
}
if (!"WT_oz".equals(weightUomId)) {
// attempt a conversion to pounds
- GenericValue uomConversion = delegator.findByPrimaryKey("UomConversion",
- UtilMisc.toMap("uomId", weightUomId, "uomIdTo", "WT_oz"));
+ GenericValue uomConversion = delegator.findOne("UomConversion",
+ UtilMisc.toMap("uomId", weightUomId, "uomIdTo", "WT_oz"), false);
if (uomConversion == null || UtilValidate.isEmpty(uomConversion.getString("conversionFactor"))) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentUspsWeightUnsupported",
@@ -1445,8 +1445,8 @@ public class UspsServices {
String shipmentId = (String) context.get("shipmentId");
String shipmentRouteSegmentId = (String) context.get("shipmentRouteSegmentId");
- GenericValue shipmentRouteSegment = delegator.findByPrimaryKey("ShipmentRouteSegment",
- UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId));
+ GenericValue shipmentRouteSegment = delegator.findOne("ShipmentRouteSegment",
+ UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId), false);
List<GenericValue> shipmentPackageRouteSegList = shipmentRouteSegment.getRelated("ShipmentPackageRouteSeg", null,
UtilMisc.toList("+shipmentPackageSeqId"));
Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/CreateProductInCategoryCheckExisting.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/CreateProductInCategoryCheckExisting.groovy?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/CreateProductInCategoryCheckExisting.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/CreateProductInCategoryCheckExisting.groovy Sat May 12 21:20:13 2012
@@ -36,14 +36,14 @@ productIds = ProductSearch.parametricKey
// get the product for each ID
products = new ArrayList(productIds.size());
productIds.each { productId ->
- product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
+ product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), true);
products.add(product);
}
productFeatureAndTypeDatas = new ArrayList(featureIdByType.size());
featureIdByType.each { featureIdByTypeEntry ->
- productFeatureType = delegator.findByPrimaryKeyCache("ProductFeatureType", UtilMisc.toMap("productFeatureTypeId", featureIdByTypeEntry.key));
- productFeature = delegator.findByPrimaryKeyCache("ProductFeature", UtilMisc.toMap("productFeatureId", featureIdByTypeEntry.value));
+ productFeatureType = delegator.findOne("ProductFeatureType", UtilMisc.toMap("productFeatureTypeId", featureIdByTypeEntry.key), true);
+ productFeature = delegator.findOne("ProductFeature", UtilMisc.toMap("productFeatureId", featureIdByTypeEntry.value), true);
productFeatureAndTypeData = [:];
productFeatureAndTypeData.productFeatureType = productFeatureType;
productFeatureAndTypeData.productFeature = productFeature;
Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageGallery.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageGallery.groovy?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageGallery.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageGallery.groovy Sat May 12 21:20:13 2012
@@ -34,9 +34,9 @@ if(productContentAndInfoImageManamentLis
contentAssocThumbList = delegator.findByAnd("ContentAssoc", [contentId : productContentAndInfoImageManament.contentId, contentAssocTypeId : "IMAGE_THUMBNAIL"]);
contentAssocThumb = EntityUtil.getFirst(contentAssocThumbList);
if(contentAssocThumb) {
- imageContentThumb = delegator.findByPrimaryKey("Content", [contentId : contentAssocThumb.contentIdTo]);
+ imageContentThumb = delegator.findOne("Content", [contentId : contentAssocThumb.contentIdTo], false);
if(imageContentThumb) {
- productImageThumb = delegator.findByPrimaryKey("ContentDataResourceView", [contentId : imageContentThumb.contentId, drDataResourceId : imageContentThumb.dataResourceId]);
+ productImageThumb = delegator.findOne("ContentDataResourceView", [contentId : imageContentThumb.contentId, drDataResourceId : imageContentThumb.dataResourceId], false);
productImageMap = [:];
productImageMap.contentId = productContentAndInfoImageManament.contentId;
productImageMap.dataResourceId = productContentAndInfoImageManament.dataResourceId;
Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy Sat May 12 21:20:13 2012
@@ -59,7 +59,7 @@ context.imageNameOriginal = imageUrlPref
// Start ProductContent stuff
if (productId) {
- product = delegator.findByPrimaryKey("Product",["productId" : productId]);
+ product = delegator.findOne("Product",["productId" : productId], false);
context.productId = productId;
}
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl Sat May 12 21:20:13 2012
@@ -32,7 +32,7 @@ under the License.
<table cellspacing="0" class="basic-table">
<#list productFeaturesByTypeMap.keySet() as productFeatureTypeId>
<#assign findPftMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("productFeatureTypeId", productFeatureTypeId)>
- <#assign productFeatureType = delegator.findByPrimaryKeyCache("ProductFeatureType", findPftMap)>
+ <#assign productFeatureType = delegator.findOne("ProductFeatureType", findPftMap, true)>
<#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]>
<tr>
<td width="15%">${productFeatureType.description}:</td>
Modified: ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl Sat May 12 21:20:13 2012
@@ -200,7 +200,7 @@ under the License.
</tr>
<#list productFeatureTypeIdsOrdered as productFeatureTypeId>
<#assign findPftMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("productFeatureTypeId", productFeatureTypeId)>
- <#assign productFeatureType = delegator.findByPrimaryKeyCache("ProductFeatureType", findPftMap)>
+ <#assign productFeatureType = delegator.findOne("ProductFeatureType", findPftMap, true)>
<#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]>
<tr>
<td class="label" align="right" valign="middle">
Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl Sat May 12 21:20:13 2012
@@ -114,7 +114,7 @@ under the License.
<#assign listIndex = lowIndex>
<#assign rowClass = "2">
<#list productIds as productId><#-- note that there is no boundary range because that is being done before the list is put in the content -->
- <#assign product = delegator.findByPrimaryKey("Product", Static["org.ofbiz.base.util.UtilMisc"].toMap("productId", productId))>
+ <#assign product = delegator.findOne("Product", Static["org.ofbiz.base.util.UtilMisc"].toMap("productId", productId), false)>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<td>
<input type="checkbox" name="selectResult" value="${productId}" onchange="checkProductToBagTextArea(this, '${productId}');"/>
Modified: ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl Sat May 12 21:20:13 2012
@@ -40,7 +40,7 @@ jQuery(document).ready(function(){
<table>
<#assign userLoginApprovers = delegator.findByAnd("UserLogin",Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", partyRole.partyId))/>
<#assign userLoginApprover = userLoginApprovers[0]>
- <#assign userLoginAndPartyDetails = delegator.findByPrimaryKey("UserLoginAndPartyDetails", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", userLoginApprover.partyId, "userLoginId", userLoginApprover.userLoginId))?if_exists>
+ <#assign userLoginAndPartyDetails = delegator.findOne("UserLoginAndPartyDetails", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", userLoginApprover.partyId, "userLoginId", userLoginApprover.userLoginId), false)?if_exists>
<#if userLoginAndPartyDetails != null && userLoginAndPartyDetails?has_content>
<#assign partyContentDetail = delegator.findByAnd("ContentApproval",Static["org.ofbiz.base.util.UtilMisc"].toMap("roleTypeId", "IMAGEAPPROVER", "approvalStatusId", "IM_PENDING", "partyId", userLoginAndPartyDetails.partyId))/>
<#assign imageApproveSize = partyContentDetail.size()>
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl Sat May 12 21:20:13 2012
@@ -45,7 +45,7 @@ under the License.
<td>
<select name="PRODUCT_ASSOC_TYPE_ID" size="1">
<#if productAssocTypeId?has_content>
- <#assign curAssocType = delegator.findByPrimaryKey("ProductAssocType", Static["org.ofbiz.base.util.UtilMisc"].toMap("productAssocTypeId", productAssocTypeId))>
+ <#assign curAssocType = delegator.findOne("ProductAssocType", Static["org.ofbiz.base.util.UtilMisc"].toMap("productAssocTypeId", productAssocTypeId), false)>
<#if curAssocType?exists>
<option selected="selected" value="${(curAssocType.productAssocTypeId)?if_exists}">${(curAssocType.get("description",locale))?if_exists}</option>
<option value="${(curAssocType.productAssocTypeId)?if_exists}"></option>
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl Sat May 12 21:20:13 2012
@@ -25,7 +25,7 @@ under the License.
<tr class="header-row">
<td>${uiLabelMap.ProductProductId}</td>
<#list featureTypeIds as featureTypeId>
- <#assign featureType = delegator.findByPrimaryKey("ProductFeatureType", Static["org.ofbiz.base.util.UtilMisc"].toMap("productFeatureTypeId", featureTypeId))>
+ <#assign featureType = delegator.findOne("ProductFeatureType", Static["org.ofbiz.base.util.UtilMisc"].toMap("productFeatureTypeId", featureTypeId), false)>
<td>${featureType.description} </td>
</#list>
<td>${uiLabelMap.ProductQoh}</td>
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl Sat May 12 21:20:13 2012
@@ -44,7 +44,7 @@ under the License.
<#list quantitySummaryByFacility.values() as quantitySummary>
<#if quantitySummary.facilityId?exists>
<#assign facilityId = quantitySummary.facilityId>
- <#assign facility = delegator.findByPrimaryKey("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId))>
+ <#assign facility = delegator.findOne("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId), false)>
<#assign manufacturingInQuantitySummary = manufacturingInQuantitySummaryByFacility.get(facilityId)?if_exists>
<#assign manufacturingOutQuantitySummary = manufacturingOutQuantitySummaryByFacility.get(facilityId)?if_exists>
<#assign totalQuantityOnHand = quantitySummary.totalQuantityOnHand?if_exists>
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy Sat May 12 21:20:13 2012
@@ -33,7 +33,7 @@ inventoryItemProducts = EntityUtil.getFi
inventoryAverageCosts = FastList.newInstance();
inventoryItemProducts.each { productId ->
- productFacility = delegator.findByPrimaryKey("ProductFacility", UtilMisc.toMap("productId", productId, "facilityId", facilityId));
+ productFacility = delegator.findOne("ProductFacility", UtilMisc.toMap("productId", productId, "facilityId", facilityId), false);
if (UtilValidate.isNotEmpty(productFacility)) {
result = dispatcher.runSync("calculateProductAverageCost", UtilMisc.toMap("productId", productId, "facilityId", facilityId, "userLogin", userLogin));
totalQuantityOnHand = result.get("totalQuantityOnHand");
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/LookupInventoryItems.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/LookupInventoryItems.groovy?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/LookupInventoryItems.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/LookupInventoryItems.groovy Sat May 12 21:20:13 2012
@@ -42,6 +42,6 @@ if (productId) {
inventoryItems = delegator.findByAnd("InventoryItem", [productId : productId]);
context.inventoryItemsForProduct = inventoryItems;
context.productId = productId;
- product = delegator.findByPrimaryKey("Product", [productId : productId]);
+ product = delegator.findOne("Product", [productId : productId], false);
context.internalName = product.internalName;
}
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl Sat May 12 21:20:13 2012
@@ -197,7 +197,7 @@ under the License.
<#assign defaultCountryGeoId = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "country.geo.id.default")>
</#if>
<option selected="selected" value="${defaultCountryGeoId}">
- <#assign countryGeo = delegator.findByPrimaryKey("Geo",Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId",defaultCountryGeoId))>
+ <#assign countryGeo = delegator.findOne("Geo",Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId",defaultCountryGeoId), false)>
${countryGeo.get("geoName",locale)}
</option>
</select>
Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl Sat May 12 21:20:13 2012
@@ -201,7 +201,7 @@ under the License.
<td width="14%"> </td>
<td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductToFacilityContainer}</span></td>
<td width="6%"> </td>
- <#assign fac = delegator.findByPrimaryKey("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", inventoryTransfer.facilityIdTo))>
+ <#assign fac = delegator.findOne("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", inventoryTransfer.facilityIdTo), false)>
<td width="74%">${(fac.facilityName)?default(" ")}</td>
</tr>
<tr>
Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/report/InventoryReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/report/InventoryReport.rptdesign?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/report/InventoryReport.rptdesign (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/report/InventoryReport.rptdesign Sat May 12 21:20:13 2012
@@ -174,7 +174,7 @@ module = "InventoryReport.rptdesign";]]>
<method name="open"><![CDATA[inventories = null;
userLogin = null;
try {
- userLogin = delegator.findByPrimaryKey("UserLogin",UtilMisc.toMap("userLoginId","admin"));
+ userLogin = delegator.findOne("UserLogin",UtilMisc.toMap("userLoginId","admin"), false);
} catch(e) {
Debug.logError(e,"");
}
@@ -277,7 +277,7 @@ if(inventory = inventories.next()){
<method name="open"><![CDATA[inputOrder = FastMap.newInstance();
userLogin = null;
try {
- userLogin = delegator.findByPrimaryKey("UserLogin",UtilMisc.toMap("userLoginId","admin"));
+ userLogin = delegator.findOne("UserLogin",UtilMisc.toMap("userLoginId","admin"), false);
} catch(e) {
Debug.logError(e,"");
}
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl Sat May 12 21:20:13 2012
@@ -185,10 +185,10 @@ function lookupShipments() {
<#if shipmentList?has_content>
<#assign alt_row = false>
<#list shipmentList as shipment>
- <#assign originFacility = delegator.findByPrimaryKeyCache("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", shipment.originFacilityId))?if_exists />
- <#assign destinationFacility = delegator.findByPrimaryKeyCache("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", shipment.destinationFacilityId))?if_exists />
- <#assign statusItem = delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", shipment.statusId))?if_exists/>
- <#assign shipmentType = delegator.findByPrimaryKeyCache("ShipmentType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentTypeId", shipment.shipmentTypeId))?if_exists/>
+ <#assign originFacility = delegator.findOne("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", shipment.originFacilityId), true)?if_exists />
+ <#assign destinationFacility = delegator.findOne("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", shipment.destinationFacilityId), true)?if_exists />
+ <#assign statusItem = delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", shipment.statusId), true)?if_exists/>
+ <#assign shipmentType = delegator.findOne("ShipmentType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentTypeId", shipment.shipmentTypeId), true)?if_exists/>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>" class="buttontext">${shipment.shipmentId}</a></td>
<td>${(shipmentType.get("description",locale))?default(shipmentType.shipmentTypeId?default(""))}</td>
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl?rev=1337671&r1=1337670&r2=1337671&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl Sat May 12 21:20:13 2012
@@ -132,7 +132,7 @@ under the License.
<td>
<div>
<#assign upcaLookup = Static["org.ofbiz.base.util.UtilMisc"].toMap("productId", product.productId, "goodIdentificationTypeId", "UPCA")/>
- <#assign upca = delegator.findByPrimaryKeyCache("GoodIdentification", upcaLookup)?if_exists/>
+ <#assign upca = delegator.findOne("GoodIdentification", upcaLookup, true)?if_exists/>
<#if upca?has_content>
${upca.idValue?if_exists}
</#if>