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/14 23:01:20 UTC
svn commit: r1338409 [2/2] - in /ofbiz/trunk/applications/order:
src/org/ofbiz/order/ src/org/ofbiz/order/finaccount/
src/org/ofbiz/order/order/ src/org/ofbiz/order/shoppingcart/
src/org/ofbiz/order/shoppingcart/product/ src/org/ofbiz/order/shoppinglis...
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java Mon May 14 21:01:18 2012
@@ -272,7 +272,7 @@ public class ZipSalesServices {
}
// lookup the records
- List<GenericValue> zipLookup = delegator.findByAnd("ZipSalesTaxLookup", UtilMisc.toMap("zipCode", zipCode), UtilMisc.toList("-fromDate"));
+ List<GenericValue> zipLookup = delegator.findByAnd("ZipSalesTaxLookup", UtilMisc.toMap("zipCode", zipCode), UtilMisc.toList("-fromDate"), false);
if (UtilValidate.isEmpty(zipLookup)) {
throw new GeneralException("The zip code entered is not valid.");
}
@@ -346,7 +346,7 @@ public class ZipSalesServices {
// look up the rules
List<GenericValue> ruleLookup = null;
try {
- ruleLookup = delegator.findByAnd("ZipSalesRuleLookup", UtilMisc.toMap("stateCode", stateCode), UtilMisc.toList("-fromDate"));
+ ruleLookup = delegator.findByAnd("ZipSalesRuleLookup", UtilMisc.toMap("stateCode", stateCode), UtilMisc.toList("-fromDate"), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy Mon May 14 21:01:18 2012
@@ -40,16 +40,16 @@ if (productStore) {
shoppingCart = session.getAttribute("shoppingCart");
context.shoppingCart = shoppingCart;
-salesChannels = delegator.findByAndCache("Enumeration", [enumTypeId : "ORDER_SALES_CHANNEL"], ["sequenceId"]);
+salesChannels = delegator.findByAnd("Enumeration", [enumTypeId : "ORDER_SALES_CHANNEL"], ["sequenceId"], true);
context.salesChannels = salesChannels;
productStores = delegator.findList("ProductStore", null, null, ["productStoreId", "storeName"], null, true);
context.productStores = productStores;
-suppliers = delegator.findByAnd("PartyRoleAndPartyDetail", [roleTypeId : "SUPPLIER"], ["groupName", "partyId"]);
+suppliers = delegator.findByAnd("PartyRoleAndPartyDetail", [roleTypeId : "SUPPLIER"], ["groupName", "partyId"], false);
context.suppliers = suppliers;
-organizations = delegator.findByAnd("PartyRole", [roleTypeId : "INTERNAL_ORGANIZATIO"]);
+organizations = delegator.findByAnd("PartyRole", [roleTypeId : "INTERNAL_ORGANIZATIO"], null, false);
context.organizations = organizations;
// Set Shipping From the Party
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy Mon May 14 21:01:18 2012
@@ -40,7 +40,7 @@ if (cart) {
}
}
-finAccounts = delegator.findByAnd("FinAccountAndRole", [partyId : partyId, roleTypeId : "OWNER"]);
+finAccounts = delegator.findByAnd("FinAccountAndRole", [partyId : partyId, roleTypeId : "OWNER"], null, false);
finAccounts = EntityUtil.filterByDate(finAccounts, UtilDateTime.nowTimestamp(), "roleFromDate", "roleThruDate", true);
finAccounts = EntityUtil.filterByDate(finAccounts);
context.finAccounts = finAccounts;
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OptionSettings.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OptionSettings.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OptionSettings.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OptionSettings.groovy Mon May 14 21:01:18 2012
@@ -30,7 +30,7 @@ context.cart = cart;
productStore = ProductStoreWorker.getProductStore(request);
if (productStore) {
context.productStore = productStore;
- context.carrierShipmentMethodList = delegator.findByAndCache('ProductStoreShipmentMethView', [productStoreId: productStore.productStoreId], ['sequenceNumber']);
+ context.carrierShipmentMethodList = delegator.findByAnd('ProductStoreShipmentMethView', [productStoreId: productStore.productStoreId], ['sequenceNumber'], true);
}
// nuke the event messages
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderAgreements.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderAgreements.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderAgreements.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderAgreements.groovy Mon May 14 21:01:18 2012
@@ -92,5 +92,5 @@ if (catalogCol) {
}
// currencies and shopping cart currency
-context.currencies = delegator.findByAndCache('Uom', [uomTypeId: 'CURRENCY_MEASURE']);
+context.currencies = delegator.findByAnd('Uom', [uomTypeId: 'CURRENCY_MEASURE'], null, true);
context.currencyUomId = shoppingCart.getCurrency();
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SetAdditionalParty.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SetAdditionalParty.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SetAdditionalParty.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SetAdditionalParty.groovy Mon May 14 21:01:18 2012
@@ -32,7 +32,7 @@ if (!request.getParameterValues("additio
additionalPartyId = request.getParameter("additionalPartyId");
context.additionalPartyId = additionalPartyId;
- roles = delegator.findByAnd("PartyRole", [partyId : additionalPartyId]);
+ roles = delegator.findByAnd("PartyRole", [partyId : additionalPartyId], null, false);
roleData = [];
roles.each { role ->
roleData.add(role.getRelatedOne("RoleType"));
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy Mon May 14 21:01:18 2012
@@ -65,11 +65,11 @@ if ("SALES_ORDER".equals(cart.getOrderTy
}
}
// suppliers for the drop-ship select box
- suppliers = delegator.findByAnd("PartyRole", [roleTypeId : "SUPPLIER"]);
+ suppliers = delegator.findByAnd("PartyRole", [roleTypeId : "SUPPLIER"], null, false);
context.suppliers = suppliers;
// facilities used to reserve the items per ship group
- productStoreFacilities = delegator.findByAnd("ProductStoreFacility", [productStoreId : cart.getProductStoreId()]);
+ productStoreFacilities = delegator.findByAnd("ProductStoreFacility", [productStoreId : cart.getProductStoreId()], null, false);
context.productStoreFacilities = productStoreFacilities;
} else {
// Purchase order
@@ -85,14 +85,14 @@ if ("SALES_ORDER".equals(cart.getOrderTy
companyId = cart.getBillToCustomerPartyId();
if (companyId) {
facilityMaps = FastList.newInstance();
- facilities = delegator.findByAndCache("Facility", [ownerPartyId : companyId]);
+ facilities = delegator.findByAnd("Facility", [ownerPartyId : companyId], null, true);
// if facilites is null then check the PartyRelationship where there is a relationship set for Parent & Child organization. Then also fetch the value of companyId from there.
if (UtilValidate.isEmpty(facilities)) {
partyRelationship = EntityUtil.getFirst(delegator.findList("PartyRelationship", EntityCondition.makeCondition(["roleTypeIdFrom": "PARENT_ORGANIZATION", "partyIdTo": companyId]), null, null, null, false));
if (UtilValidate.isNotEmpty(partyRelationship)) {
companyId = partyRelationship.partyIdFrom;
- facilities = delegator.findByAndCache("Facility", [ownerPartyId : companyId]);
+ facilities = delegator.findByAnd("Facility", [ownerPartyId : companyId], null, true);
}
}
facilities.each { facility ->
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShoppingList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShoppingList.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShoppingList.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShoppingList.groovy Mon May 14 21:01:18 2012
@@ -28,7 +28,7 @@ shoppingCart = session.getAttribute("sho
partyId = shoppingCart.getPartyId();
// Get the party's collection of Shopping Lists
-shoppingLists = delegator.findByAndCache("ShoppingList", [partyId : partyId]);
+shoppingLists = delegator.findByAnd("ShoppingList", [partyId : partyId], null, true);
if (shoppingLists) {
context.shoppingLists = shoppingLists;
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy Mon May 14 21:01:18 2012
@@ -53,7 +53,7 @@ context.currencyUomId = shoppingCart.get
context.orderType = shoppingCart.getOrderType();
// get all the possible gift wrap options
-allgiftWraps = delegator.findByAnd("ProductFeature", [productFeatureTypeId : "GIFT_WRAP"], ["defaultSequenceNum"]);
+allgiftWraps = delegator.findByAnd("ProductFeature", [productFeatureTypeId : "GIFT_WRAP"], ["defaultSequenceNum"], false);
context.allgiftWraps = allgiftWraps;
context.contentPathPrefix = CatalogWorker.getContentPathPrefix(request);
@@ -82,7 +82,7 @@ context.defaultComment = defaultComment;
// get all party shopping lists
if (partyId) {
- shoppingLists = delegator.findByAnd("ShoppingList", [partyId : partyId]);
+ shoppingLists = delegator.findByAnd("ShoppingList", [partyId : partyId], null, false);
context.shoppingLists = shoppingLists;
}
@@ -101,5 +101,5 @@ context.mktgPkgATPMap = inventorySummary
context.mktgPkgQOHMap = inventorySummary.mktgPkgQOHMap;
// get purchase order item types
-purchaseOrderItemTypeList = delegator.findByAndCache("OrderItemType", [parentTypeId : "PURCHASE_SPECIFIC"]);
+purchaseOrderItemTypeList = delegator.findByAnd("OrderItemType", [parentTypeId : "PURCHASE_SPECIFIC"], null, true);
context.purchaseOrderItemTypeList = purchaseOrderItemTypeList;
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy Mon May 14 21:01:18 2012
@@ -86,9 +86,9 @@ for (supplierProduct in supplierProducts
String facilityId = parameters.facilityId;
if (facilityId) {
- productFacilityList = delegator.findByAndCache("ProductFacility", ["productId": productId, "facilityId" : facilityId]);
+ productFacilityList = delegator.findByAnd("ProductFacility", ["productId": productId, "facilityId" : facilityId], null, true);
} else {
- productFacilityList = delegator.findByAndCache("ProductFacility", ["productId": productId]);
+ productFacilityList = delegator.findByAnd("ProductFacility", ["productId": productId], null, true);
}
if (newProductList.size() >= maxRows) {
// We've got enough results to display, keep going to get the result size but skip the heavy stuff
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy Mon May 14 21:01:18 2012
@@ -27,7 +27,7 @@ productPromo = delegator.findOne("Produc
promoAutoDescription = ProductPromoWorker.makeAutoDescription(productPromo, delegator, locale);
-productPromoCategoryList = delegator.findByAndCache("ProductPromoCategory", [productPromoId : productPromoId]);
+productPromoCategoryList = delegator.findByAnd("ProductPromoCategory", [productPromoId : productPromoId], null, true);
productPromoCategoryIncludeList = EntityUtil.filterByAnd(productPromoCategoryList, [productPromoApplEnumId : "PPPA_INCLUDE"]);
productPromoCategoryExcludeList = EntityUtil.filterByAnd(productPromoCategoryList, [productPromoApplEnumId : "PPPA_EXCLUDE"]);
productPromoCategoryAlwaysList = EntityUtil.filterByAnd(productPromoCategoryList, [productPromoApplEnumId : "PPPA_ALWAYS"]);
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy Mon May 14 21:01:18 2012
@@ -62,15 +62,15 @@ if (category) {
if (category.detailScreen) {
detailScreen = category.detailScreen;
}
- categoryPageTitle = delegator.findByAndCache("ProductCategoryContentAndInfo", [productCategoryId : productCategoryId, prodCatContentTypeId : "PAGE_TITLE"]);
+ categoryPageTitle = delegator.findByAnd("ProductCategoryContentAndInfo", [productCategoryId : productCategoryId, prodCatContentTypeId : "PAGE_TITLE"], null, true);
if (categoryPageTitle) {
pageTitle = delegator.findOne("ElectronicText", [dataResourceId : categoryPageTitle.get(0).dataResourceId], true);
}
- categoryMetaDescription = delegator.findByAndCache("ProductCategoryContentAndInfo", [productCategoryId : productCategoryId, prodCatContentTypeId : "META_DESCRIPTION"]);
+ categoryMetaDescription = delegator.findByAnd("ProductCategoryContentAndInfo", [productCategoryId : productCategoryId, prodCatContentTypeId : "META_DESCRIPTION"], null, true);
if (categoryMetaDescription) {
metaDescription = delegator.findOne("ElectronicText", [dataResourceId : categoryMetaDescription.get(0).dataResourceId], true);
}
- categoryMetaKeywords = delegator.findByAndCache("ProductCategoryContentAndInfo", [productCategoryId : productCategoryId, prodCatContentTypeId : "META_KEYWORD"]);
+ categoryMetaKeywords = delegator.findByAnd("ProductCategoryContentAndInfo", [productCategoryId : productCategoryId, prodCatContentTypeId : "META_KEYWORD"], null, true);
if (categoryMetaKeywords) {
metaKeywords = delegator.findOne("ElectronicText", [dataResourceId : categoryMetaKeywords.get(0).dataResourceId], true);
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy Mon May 14 21:01:18 2012
@@ -46,7 +46,7 @@ if (productId) {
if (product) {
// first make sure this isn't a virtual-variant that has an associated virtual product, if it does show that instead of the variant
if("Y".equals(product.isVirtual) && "Y".equals(product.isVariant)){
- virtualVariantProductAssocs = delegator.findByAndCache("ProductAssoc", ["productId": productId, "productAssocTypeId": "ALTERNATIVE_PACKAGE"], ["-fromDate"]);
+ virtualVariantProductAssocs = delegator.findByAnd("ProductAssoc", ["productId": productId, "productAssocTypeId": "ALTERNATIVE_PACKAGE"], ["-fromDate"], true);
virtualVariantProductAssocs = EntityUtil.filterByDate(virtualVariantProductAssocs);
if (virtualVariantProductAssocs) {
productAssoc = EntityUtil.getFirst(virtualVariantProductAssocs);
@@ -62,15 +62,15 @@ if (productId) {
product = delegator.findOne("Product", [productId : productId], true);
}
- productPageTitle = delegator.findByAndCache("ProductContentAndInfo", [productId : productId, productContentTypeId : "PAGE_TITLE"]);
+ productPageTitle = delegator.findByAnd("ProductContentAndInfo", [productId : productId, productContentTypeId : "PAGE_TITLE"], null, true);
if (productPageTitle) {
pageTitle = delegator.findOne("ElectronicText", [dataResourceId : productPageTitle.get(0).dataResourceId], true);
}
- productMetaDescription = delegator.findByAndCache("ProductContentAndInfo", [productId : productId, productContentTypeId : "META_DESCRIPTION"]);
+ productMetaDescription = delegator.findByAnd("ProductContentAndInfo", [productId : productId, productContentTypeId : "META_DESCRIPTION"], null, true);
if (productMetaDescription) {
metaDescription = delegator.findOne("ElectronicText", [dataResourceId : productMetaDescription.get(0).dataResourceId], true);
}
- productMetaKeywords = delegator.findByAndCache("ProductContentAndInfo", [productId : productId, productContentTypeId : "META_KEYWORD"]);
+ productMetaKeywords = delegator.findByAnd("ProductContentAndInfo", [productId : productId, productContentTypeId : "META_KEYWORD"], null, true);
if (productMetaKeywords) {
metaKeywords = delegator.findOne("ElectronicText", [dataResourceId : productMetaKeywords.get(0).dataResourceId], true);
}
@@ -110,7 +110,7 @@ if (productId) {
keywords = [];
keywords.add(contentWrapper.get("PRODUCT_NAME"));
keywords.add(catalogName);
- members = delegator.findByAndCache("ProductCategoryMember", [productId : productId]);
+ members = delegator.findByAnd("ProductCategoryMember", [productId : productId], null, true);
members.each { member ->
category = member.getRelatedOneCache("ProductCategory");
if (category.description) {
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy Mon May 14 21:01:18 2012
@@ -220,7 +220,7 @@ if (product) {
context.daysToShip = productFacility?.daysToShip
}
} else {
- supplierProducts = delegator.findByAndCache("SupplierProduct", [productId : productId], ["-availableFromDate"]);
+ supplierProducts = delegator.findByAnd("SupplierProduct", [productId : productId], ["-availableFromDate"], true);
supplierProduct = EntityUtil.getFirst(supplierProducts);
if (supplierProduct?.standardLeadTimeDays) {
standardLeadTimeDays = supplierProduct.standardLeadTimeDays;
@@ -235,7 +235,7 @@ if (product) {
context.disFeatureList = disFeatureList;
// an example of getting features of a certain type to show
- sizeProductFeatureAndAppls = delegator.findByAnd("ProductFeatureAndAppl", [productId : productId, productFeatureTypeId : "SIZE"], ["sequenceNum", "defaultSequenceNum"]);
+ sizeProductFeatureAndAppls = delegator.findByAnd("ProductFeatureAndAppl", [productId : productId, productFeatureTypeId : "SIZE"], ["sequenceNum", "defaultSequenceNum"], false);
context.sizeProductFeatureAndAppls = sizeProductFeatureAndAppls;
// get product variant for Box/Case/Each
@@ -243,7 +243,7 @@ if (product) {
boolean isAlternativePacking = ProductWorker.isAlternativePacking(delegator, product.productId, null);
mainProducts = [];
if(isAlternativePacking){
- productVirtualVariants = delegator.findByAndCache("ProductAssoc", UtilMisc.toMap("productIdTo", product.productId , "productAssocTypeId", "ALTERNATIVE_PACKAGE"));
+ productVirtualVariants = delegator.findByAnd("ProductAssoc", UtilMisc.toMap("productIdTo", product.productId , "productAssocTypeId", "ALTERNATIVE_PACKAGE"), null, true);
if(productVirtualVariants){
productVirtualVariants.each { virtualVariantKey ->
mainProductMap = [:];
@@ -594,7 +594,7 @@ if (product) {
// get other cross-sell information: product with a common feature
commonProductFeatureId = "SYMPTOM";
// does this product have that feature?
- commonProductFeatureAndAppls = delegator.findByAnd("ProductFeatureAndAppl", [productId : productId, productFeatureTypeId : commonProductFeatureId], ["sequenceNum", "defaultSequenceNum"]);
+ commonProductFeatureAndAppls = delegator.findByAnd("ProductFeatureAndAppl", [productId : productId, productFeatureTypeId : commonProductFeatureId], ["sequenceNum", "defaultSequenceNum"], false);
if (commonProductFeatureAndAppls) {
commonProductFeatureIds = EntityUtil.getFieldListFromEntityList(commonProductFeatureAndAppls, "productFeatureId", true);
@@ -631,7 +631,7 @@ if (product) {
}
// get the DIGITAL_DOWNLOAD related Content records to show the contentName/description
- downloadProductContentAndInfoList = delegator.findByAndCache("ProductContentAndInfo", [productId : productId, productContentTypeId : "DIGITAL_DOWNLOAD"]);
+ downloadProductContentAndInfoList = delegator.findByAnd("ProductContentAndInfo", [productId : productId, productContentTypeId : "DIGITAL_DOWNLOAD"], null, true);
context.downloadProductContentAndInfoList = downloadProductContentAndInfoList;
// not the best to save info in an action, but this is probably the best place to count a view; it is done async
@@ -639,10 +639,10 @@ if (product) {
//get product image from image management
productImageList = [];
- productContentAndInfoImageManamentList = delegator.findByAnd("ProductContentAndInfo", ["productId": productId, productContentTypeId : "IMAGE", "statusId" : "IM_APPROVED", "drIsPublic" : "Y"], ["sequenceNum"]);
+ productContentAndInfoImageManamentList = delegator.findByAnd("ProductContentAndInfo", ["productId": productId, productContentTypeId : "IMAGE", "statusId" : "IM_APPROVED", "drIsPublic" : "Y"], ["sequenceNum"], false);
if(productContentAndInfoImageManamentList) {
productContentAndInfoImageManamentList.each { productContentAndInfoImageManament ->
- contentAssocThumbList = delegator.findByAnd("ContentAssoc", [contentId : productContentAndInfoImageManament.contentId, contentAssocTypeId : "IMAGE_THUMBNAIL"]);
+ contentAssocThumbList = delegator.findByAnd("ContentAssoc", [contentId : productContentAndInfoImageManament.contentId, contentAssocTypeId : "IMAGE_THUMBNAIL"], null, false);
contentAssocThumb = EntityUtil.getFirst(contentAssocThumbList);
if(contentAssocThumb) {
imageContentThumb = delegator.findOne("Content", [contentId : contentAssocThumb.contentIdTo], false);
@@ -664,7 +664,7 @@ if (product) {
}
// get product tags
- productKeywords = delegator.findByAnd("ProductKeyword", ["productId": productId, "keywordTypeId" : "KWT_TAG", "statusId" : "KW_APPROVED"]);
+ productKeywords = delegator.findByAnd("ProductKeyword", ["productId": productId, "keywordTypeId" : "KWT_TAG", "statusId" : "KW_APPROVED"], null, false);
keywordMap = [:];
if (productKeywords) {
for (productKeyword in productKeywords) {
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy Mon May 14 21:01:18 2012
@@ -75,7 +75,7 @@ if (product) {
}
}
} else {
- supplierProducts = delegator.findByAndCache("SupplierProduct", [productId : product.productId], ["-availableFromDate"]);
+ supplierProducts = delegator.findByAnd("SupplierProduct", [productId : product.productId], ["-availableFromDate"], true);
supplierProduct = EntityUtil.getFirst(supplierProducts);
if (supplierProduct?.standardLeadTimeDays != null) {
standardLeadTimeDays = supplierProduct.standardLeadTimeDays;
@@ -133,7 +133,7 @@ if (product) {
boolean isAlternativePacking = ProductWorker.isAlternativePacking(delegator, product.productId, null);
mainProducts = [];
if(isAlternativePacking){
- productVirtualVariants = delegator.findByAndCache("ProductAssoc", UtilMisc.toMap("productIdTo", product.productId , "productAssocTypeId", "ALTERNATIVE_PACKAGE"));
+ productVirtualVariants = delegator.findByAnd("ProductAssoc", UtilMisc.toMap("productIdTo", product.productId , "productAssocTypeId", "ALTERNATIVE_PACKAGE"), true);
if(productVirtualVariants){
productVirtualVariants.each { virtualVariantKey ->
mainProductMap = [:];
@@ -214,7 +214,7 @@ if (reviews) {
}
// an example of getting features of a certain type to show
-sizeProductFeatureAndAppls = delegator.findByAndCache("ProductFeatureAndAppl", [productId : productId, productFeatureTypeId : "SIZE"], ["sequenceNum", "defaultSequenceNum"]);
+sizeProductFeatureAndAppls = delegator.findByAnd("ProductFeatureAndAppl", [productId : productId, productFeatureTypeId : "SIZE"], ["sequenceNum", "defaultSequenceNum"], true);
context.product = product;
context.categoryId = categoryId;
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy Mon May 14 21:01:18 2012
@@ -21,7 +21,7 @@ import org.ofbiz.base.util.*;
product = delegator.findOne("Product", UtilMisc.toMap("productId", parameters.productId), false);
if (product) {
- productVirtualVariants = delegator.findByAndCache("ProductAssoc", UtilMisc.toMap("productIdTo", product.productId , "productAssocTypeId", "ALTERNATIVE_PACKAGE"));
+ productVirtualVariants = delegator.findByAnd("ProductAssoc", UtilMisc.toMap("productIdTo", product.productId , "productAssocTypeId", "ALTERNATIVE_PACKAGE"), null, true);
if(productVirtualVariants){
def mainProducts = [];
productVirtualVariants.each { virtualVariantKey ->
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy Mon May 14 21:01:18 2012
@@ -36,7 +36,7 @@ if (productId != null) {
products.each { product ->
if (product != null) {
String productIdTo = product.getString("productIdTo");
- prodAssocRecord = delegator.findByAnd("Product", [productId : productIdTo]);
+ prodAssocRecord = delegator.findByAnd("Product", [productId : productIdTo], null, false);
productList.add(EntityUtil.getFirst(prodAssocRecord));
}
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy Mon May 14 21:01:18 2012
@@ -140,7 +140,7 @@ if (partyGroup?.groupName) {
context.companyName = companyName;
// the address
-addresses = delegator.findByAnd("PartyContactMechPurpose", [partyId : partyId, contactMechPurposeTypeId : "GENERAL_LOCATION"]);
+addresses = delegator.findByAnd("PartyContactMechPurpose", [partyId : partyId, contactMechPurposeTypeId : "GENERAL_LOCATION"], null, false);
selAddresses = EntityUtil.filterByDate(addresses, nowTimestamp, "fromDate", "thruDate", true);
address = null;
if (selAddresses) {
@@ -160,26 +160,26 @@ if (address) {
context.postalAddress = address;
//telephone
-phones = delegator.findByAnd("PartyContactMechPurpose", [partyId : partyId, contactMechPurposeTypeId : "PRIMARY_PHONE"]);
+phones = delegator.findByAnd("PartyContactMechPurpose", [partyId : partyId, contactMechPurposeTypeId : "PRIMARY_PHONE"], null, false);
selPhones = EntityUtil.filterByDate(phones, nowTimestamp, "fromDate", "thruDate", true);
if (selPhones) {
context.phone = delegator.findOne("TelecomNumber", [contactMechId : selPhones[0].contactMechId], false);
}
// Fax
-faxNumbers = delegator.findByAnd("PartyContactMechPurpose", [partyId : partyId, contactMechPurposeTypeId : "FAX_NUMBER"]);
+faxNumbers = delegator.findByAnd("PartyContactMechPurpose", [partyId : partyId, contactMechPurposeTypeId : "FAX_NUMBER"], null, false);
faxNumbers = EntityUtil.filterByDate(faxNumbers, nowTimestamp, null, null, true);
if (faxNumbers) {
context.fax = delegator.findOne("TelecomNumber", [contactMechId : faxNumbers[0].contactMechId], false);
}
//Email
-emails = delegator.findByAnd("PartyContactMechPurpose", [partyId : partyId, contactMechPurposeTypeId : "PRIMARY_EMAIL"]);
+emails = delegator.findByAnd("PartyContactMechPurpose", [partyId : partyId, contactMechPurposeTypeId : "PRIMARY_EMAIL"], null, false);
selEmails = EntityUtil.filterByDate(emails, nowTimestamp, "fromDate", "thruDate", true);
if (selEmails) {
context.email = delegator.findOne("ContactMech", [contactMechId : selEmails[0].contactMechId], false);
} else { //get email address from party contact mech
- contacts = delegator.findByAnd("PartyContactMech", [partyId : partyId]);
+ contacts = delegator.findByAnd("PartyContactMech", [partyId : partyId], null, false);
selContacts = EntityUtil.filterByDate(contacts, nowTimestamp, "fromDate", "thruDate", true);
if (selContacts) {
i = selContacts.iterator();
@@ -194,12 +194,12 @@ if (selEmails) {
}
// website
-websiteUrls = EntityUtil.filterByDate(delegator.findByAnd("PartyContactMechPurpose", [partyId : partyId, contactMechPurposeTypeId : "PRIMARY_WEB_URL"]));
+websiteUrls = EntityUtil.filterByDate(delegator.findByAnd("PartyContactMechPurpose", [partyId : partyId, contactMechPurposeTypeId : "PRIMARY_WEB_URL"], null, false));
if (websiteUrls) {
websiteUrl = EntityUtil.getFirst(websiteUrls);
context.website = delegator.findOne("ContactMech", [contactMechId : websiteUrl.contactMechId], false);
} else { //get web address from party contact mech
-contacts = delegator.findByAnd("PartyContactMech", [partyId : partyId]);
+contacts = delegator.findByAnd("PartyContactMech", [partyId : partyId], null, false);
selContacts = EntityUtil.filterByDate(contacts, nowTimestamp, "fromDate", "thruDate", true);
if (selContacts) {
Iterator i = selContacts.iterator();
@@ -214,14 +214,14 @@ if (selContacts) {
}
//Bank account
-paymentMethods = delegator.findByAnd("PaymentMethod", [partyId : partyId, paymentMethodTypeId : "EFT_ACCOUNT"]);
+paymentMethods = delegator.findByAnd("PaymentMethod", [partyId : partyId, paymentMethodTypeId : "EFT_ACCOUNT"], null, false);
selPayments = EntityUtil.filterByDate(paymentMethods, nowTimestamp, "fromDate", "thruDate", true);
if (selPayments) {
context.eftAccount = delegator.findOne("EftAccount", [paymentMethodId : selPayments[0].paymentMethodId], false);
}
// Tax ID Info
-partyTaxAuthInfoList = delegator.findByAnd("PartyTaxAuthInfo", [partyId : partyId]);
+partyTaxAuthInfoList = delegator.findByAnd("PartyTaxAuthInfo", [partyId : partyId], null, false);
if (partyTaxAuthInfoList) {
if (address.countryGeoId) {
// if we have an address with country filter by that
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy Mon May 14 21:01:18 2012
@@ -33,7 +33,7 @@ roleTypes = delegator.findList("RoleType
context.roleTypes = roleTypes;
// get the order statuses
-orderStatuses = delegator.findByAnd("StatusItem", [statusTypeId : "ORDER_STATUS"], ["sequenceId", "description"]);
+orderStatuses = delegator.findByAnd("StatusItem", [statusTypeId : "ORDER_STATUS"], ["sequenceId", "description"], false);
context.orderStatuses = orderStatuses;
// get websites
@@ -45,7 +45,7 @@ stores = delegator.findList("ProductStor
context.productStores = stores;
// get the channels
-channels = delegator.findByAnd("Enumeration", [enumTypeId : "ORDER_SALES_CHANNEL"], ["sequenceId"]);
+channels = delegator.findByAnd("Enumeration", [enumTypeId : "ORDER_SALES_CHANNEL"], ["sequenceId"], false);
context.salesChannels = channels;
// get the Shipping Methods
@@ -53,7 +53,7 @@ carrierShipmentMethods = delegator.findL
context.carrierShipmentMethods = carrierShipmentMethods;
// get the Payment Status
-paymentStatusList = delegator.findByAnd("StatusItem", [statusTypeId : "PAYMENT_PREF_STATUS"], ["description"]);
+paymentStatusList = delegator.findByAnd("StatusItem", [statusTypeId : "PAYMENT_PREF_STATUS"], ["description"], false);
context.paymentStatusList = paymentStatusList;
// current role type
@@ -96,7 +96,7 @@ if (shipmentMethod) {
carrierPartyId = shipmentMethod.substring(0, shipmentMethod.indexOf("@"));
shipmentMethodTypeId = shipmentMethod.substring(shipmentMethod.indexOf("@")+1);
if (carrierPartyId && shipmentMethodTypeId) {
- currentCarrierShipmentMethod = delegator.findByAnd("CarrierShipmentMethod", [partyId : carrierPartyId, shipmentMethodTypeId : shipmentMethodTypeId]);
+ currentCarrierShipmentMethod = delegator.findByAnd("CarrierShipmentMethod", [partyId : carrierPartyId, shipmentMethodTypeId : shipmentMethodTypeId], null, false);
context.currentCarrierShipmentMethod = currentCarrierShipmentMethod;
}
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderStats.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderStats.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderStats.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderStats.groovy Mon May 14 21:01:18 2012
@@ -238,11 +238,11 @@ context.yearItemTotalPaid = yearItemTota
context.yearItemCountPaid = yearItemCountPaid;
// order state report
-waitingPayment = delegator.findByAnd("OrderHeader", [statusId : "ORDER_CREATED", orderTypeId : "SALES_ORDER"]);
+waitingPayment = delegator.findByAnd("OrderHeader", [statusId : "ORDER_CREATED", orderTypeId : "SALES_ORDER"], null, false);
context.waitingPayment = waitingPayment.size();
-waitingApproval = delegator.findByAnd("OrderHeader", [statusId : "ORDER_PROCESSING", orderTypeId : "SALES_ORDER"]);
+waitingApproval = delegator.findByAnd("OrderHeader", [statusId : "ORDER_PROCESSING", orderTypeId : "SALES_ORDER"], null, false);
context.waitingApproval = waitingApproval.size();
-waitingComplete = delegator.findByAnd("OrderHeader", [statusId : "ORDER_APPROVED", orderTypeId : "SALES_ORDER"]);
+waitingComplete = delegator.findByAnd("OrderHeader", [statusId : "ORDER_APPROVED", orderTypeId : "SALES_ORDER"], null, false);
context.waitingComplete = waitingComplete.size();
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy Mon May 14 21:01:18 2012
@@ -170,7 +170,7 @@ if (orderHeader) {
context.itemIssuancesPerItem = itemIssuancesPerItem;
// get a list of all invoices
- orderBilling = delegator.findByAnd("OrderItemBilling", [orderId : orderId], ["invoiceId"]);
+ orderBilling = delegator.findByAnd("OrderItemBilling", [orderId : orderId], ["invoiceId"], false);
context.invoices = orderBilling*.invoiceId.unique();
ecl = EntityCondition.makeCondition([
@@ -181,7 +181,7 @@ if (orderHeader) {
context.orderPaymentPreferences = orderPaymentPreferences;
// ship groups
- shipGroups = delegator.findByAnd("OrderItemShipGroup", [orderId : orderId], ["shipGroupSeqId"]);
+ shipGroups = delegator.findByAnd("OrderItemShipGroup", [orderId : orderId], ["shipGroupSeqId"], false);
context.shipGroups = shipGroups;
// get Shipment tracking info
@@ -202,7 +202,7 @@ if (orderHeader) {
}
context.customerPoNumber = customerPoNumber;
- statusChange = delegator.findByAnd("StatusValidChange", [statusId : orderHeader.statusId]);
+ statusChange = delegator.findByAnd("StatusValidChange", [statusId : orderHeader.statusId], null, false);
context.statusChange = statusChange;
currentStatus = orderHeader.getRelatedOne("StatusItem");
@@ -214,7 +214,7 @@ if (orderHeader) {
adjustmentTypes = delegator.findList("OrderAdjustmentType", null, null, ["description"], null, false);
context.orderAdjustmentTypes = adjustmentTypes;
- notes = delegator.findByAnd("OrderHeaderNoteView", [orderId : orderId], ["-noteDateTime"]);
+ notes = delegator.findByAnd("OrderHeaderNoteView", [orderId : orderId], ["-noteDateTime"], false);
context.orderNotes = notes;
showNoteHeadingOnPDF = false;
@@ -226,7 +226,7 @@ if (orderHeader) {
cmvm = ContactMechWorker.getOrderContactMechValueMaps(delegator, orderId);
context.orderContactMechValueMaps = cmvm;
- orderItemChangeReasons = delegator.findByAnd("Enumeration", [enumTypeId : "ODR_ITM_CH_REASON"], ["sequenceId"]);
+ orderItemChangeReasons = delegator.findByAnd("Enumeration", [enumTypeId : "ODR_ITM_CH_REASON"], ["sequenceId"], false);
context.orderItemChangeReasons = orderItemChangeReasons;
if ("PURCHASE_ORDER".equals(orderType)) {
@@ -251,7 +251,7 @@ if (orderHeader) {
}
}
// get purchase order item types
- purchaseOrderItemTypeList = delegator.findByAndCache("OrderItemType", [parentTypeId : "PURCHASE_SPECIFIC"]);
+ purchaseOrderItemTypeList = delegator.findByAnd("OrderItemType", [parentTypeId : "PURCHASE_SPECIFIC"], null, true);
context.purchaseOrderItemTypeList = purchaseOrderItemTypeList;
}
@@ -297,7 +297,7 @@ if (orderHeader) {
if (shipGroup.contactMechId) {
lookupMap.contactMechId = shipGroup.contactMechId;
}
- facilities = delegator.findByAndCache("FacilityAndContactMech", lookupMap);
+ facilities = delegator.findByAnd("FacilityAndContactMech", lookupMap, null, true);
facilitiesForShipGroup[shipGroup.shipGroupSeqId] = facilities;
facilities.each { facility ->
ownedFacilities[facility.facilityId] = facility;
@@ -404,7 +404,7 @@ if (orderHeader) {
// list to find all the shipmentMethods from the view named "ProductStoreShipmentMethView".
if (productStore) {
- context.productStoreShipmentMethList = delegator.findByAndCache('ProductStoreShipmentMethView', [productStoreId: productStore.productStoreId], ['sequenceNumber']);
+ context.productStoreShipmentMethList = delegator.findByAnd('ProductStoreShipmentMethView', [productStoreId: productStore.productStoreId], ['sequenceNumber'], true);
}
// Get a map of returnable items
@@ -474,7 +474,7 @@ if (orderItems) {
shippingMethodAndRate = [:];
serviceCodes = shippingRate.keySet();
serviceCodes.each { serviceCode ->
- carrierShipmentMethod = EntityUtil.getFirst(delegator.findByAnd("CarrierShipmentMethod", [partyId : "UPS", carrierServiceCode : serviceCode]));
+ carrierShipmentMethod = EntityUtil.getFirst(delegator.findByAnd("CarrierShipmentMethod", [partyId : "UPS", carrierServiceCode : serviceCode], null, false));
shipmentMethodTypeId = carrierShipmentMethod.shipmentMethodTypeId;
rate = shippingRate.get(serviceCode);
shipmentMethodDescription = EntityUtil.getFirst(carrierShipmentMethod.getRelated("ShipmentMethodType")).description;
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy Mon May 14 21:01:18 2012
@@ -33,7 +33,7 @@ shipGroupSeqId = parameters.shipGroupSeq
findMap = [orderId: orderId];
if (shipGroupSeqId) findMap.shipGroupSeqId = shipGroupSeqId;
-shipGroups = delegator.findByAnd("OrderItemShipGroup", findMap, ["shipGroupSeqId"]);
+shipGroups = delegator.findByAnd("OrderItemShipGroup", findMap, ["shipGroupSeqId"], false);
context.shipGroups = shipGroups;
// method to expand the marketing packages
@@ -90,7 +90,7 @@ shipGroups.each { shipGroup ->
// the quantity shipped
quantityShipped = 0.0;
- issuances = delegator.findByAnd("ItemIssuance", [orderId : orderItem.orderId, orderItemSeqId : orderItem.orderItemSeqId, shipGroupSeqId : orderItemAssoc.shipGroupSeqId]);
+ issuances = delegator.findByAnd("ItemIssuance", [orderId : orderItem.orderId, orderItemSeqId : orderItem.orderItemSeqId, shipGroupSeqId : orderItemAssoc.shipGroupSeqId], null, false);
issuances.each { issuance ->
quantityShipped += issuance.quantity;
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/ManageQuotePrices.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/ManageQuotePrices.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/ManageQuotePrices.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/ManageQuotePrices.groovy Mon May 14 21:01:18 2012
@@ -52,7 +52,7 @@ quoteItems.each { quoteItem ->
try {
if (currency && quoteItem.productId) {
- productPrices = delegator.findByAnd("ProductPrice", [productId : quoteItem.productId, currencyUomId : currency, productPriceTypeId : "AVERAGE_COST"]);
+ productPrices = delegator.findByAnd("ProductPrice", [productId : quoteItem.productId, currencyUomId : currency, productPriceTypeId : "AVERAGE_COST"], null, false);
productPrices = EntityUtil.filterByDate(productPrices);
productPrice = EntityUtil.getFirst(productPrices);
if (productPrice?.price != null) {
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/ViewQuoteProfit.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/ViewQuoteProfit.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/ViewQuoteProfit.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/ViewQuoteProfit.groovy Mon May 14 21:01:18 2012
@@ -55,7 +55,7 @@ quoteItems.each { quoteItem ->
if (currency && quoteItem.productId) {
productPrices = delegator.findByAnd("ProductPrice", [productId : quoteItem.productId,
currencyUomId : currency,
- productPriceTypeId : "AVERAGE_COST"]);
+ productPriceTypeId : "AVERAGE_COST"], null, false);
productPrices = EntityUtil.filterByDate(productPrices, issueDate);
productPrice = EntityUtil.getFirst(productPrices);
if (productPrice?.price != null) {
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/RequestItemNotes.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/RequestItemNotes.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/RequestItemNotes.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/RequestItemNotes.groovy Mon May 14 21:01:18 2012
@@ -29,7 +29,7 @@ fields = [custRequestId : custRequestId]
if (showAll.equals("false")) {
fields.custRequestItemSeqId = custRequestItemSeqId;
}
-notes = delegator.findByAnd("CustRequestItemNoteView", fields, ["-noteDateTime"]);
+notes = delegator.findByAnd("CustRequestItemNoteView", fields, ["-noteDateTime"], false);
if (notes) {
context.notes = notes;
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/SetRequestQuote.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/SetRequestQuote.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/SetRequestQuote.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/SetRequestQuote.groovy Mon May 14 21:01:18 2012
@@ -22,7 +22,7 @@ import org.ofbiz.entity.util.EntityUtil;
custRequestId = parameters.custRequestId;
if (custRequestId) {
- requestQuotes = delegator.findByAnd("QuoteItem", [custRequestId : custRequestId]);
+ requestQuotes = delegator.findByAnd("QuoteItem", [custRequestId : custRequestId], null, false);
requestQuote = EntityUtil.getFirst(requestQuotes);
if (requestQuote) {
context.quoteId = requestQuote.quoteId;
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy Mon May 14 21:01:18 2012
@@ -40,7 +40,7 @@ if (partyId) {
context.party = party;
}
-returnHeaders = delegator.findByAnd("ReturnHeader", [statusId : "RETURN_REQUESTED"], ["entryDate"]);
+returnHeaders = delegator.findByAnd("ReturnHeader", [statusId : "RETURN_REQUESTED"], ["entryDate"], false);
context.returnHeaders = returnHeaders;
// put in the return to party information from the order header
@@ -64,11 +64,11 @@ if (orderId) {
// payment method info
if (partyId) {
- creditCardList = EntityUtil.filterByDate(delegator.findByAnd("PaymentMethodAndCreditCard", [partyId : partyId]));
+ creditCardList = EntityUtil.filterByDate(delegator.findByAnd("PaymentMethodAndCreditCard", [partyId : partyId], null, false));
if (creditCardList) {
context.creditCardList = creditCardList;
}
- eftAccountList = EntityUtil.filterByDate(delegator.findByAnd("PaymentMethodAndEftAccount", [partyId : partyId]));
+ eftAccountList = EntityUtil.filterByDate(delegator.findByAnd("PaymentMethodAndEftAccount", [partyId : partyId], null, false));
if (eftAccountList) {
context.eftAccountList = eftAccountList;
}
@@ -81,11 +81,11 @@ context.returnTypes = returnTypes;
returnReasons = delegator.findList("ReturnReason", null, null, ["sequenceId"], null, false);
context.returnReasons = returnReasons;
-itemStts = delegator.findByAnd("StatusItem", [statusTypeId : "INV_SERIALIZED_STTS"], ["sequenceId"]);
+itemStts = delegator.findByAnd("StatusItem", [statusTypeId : "INV_SERIALIZED_STTS"], ["sequenceId"], false);
context.itemStts = itemStts;
typeMap = [:];
-returnItemTypeMap = delegator.findByAnd("ReturnItemTypeMap", [returnHeaderTypeId : returnHeaderTypeId]);
+returnItemTypeMap = delegator.findByAnd("ReturnItemTypeMap", [returnHeaderTypeId : returnHeaderTypeId], null, false);
returnItemTypeMap.each { value ->
typeMap[value.returnItemMapKey] = value.returnItemTypeId;
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy Mon May 14 21:01:18 2012
@@ -69,7 +69,7 @@ context.returnId = returnId;
//fin account info
finAccounts = null;
if (partyId) {
- finAccounts = delegator.findByAnd("FinAccountAndRole", [partyId: partyId, finAccountTypeId: "STORE_CREDIT_ACCT", roleTypeId: "OWNER", statusId: "FNACT_ACTIVE"]);
+ finAccounts = delegator.findByAnd("FinAccountAndRole", [partyId: partyId, finAccountTypeId: "STORE_CREDIT_ACCT", roleTypeId: "OWNER", statusId: "FNACT_ACTIVE"], null, false);
finAccounts = EntityUtil.filterByDate(finAccounts);
}
context.finAccounts = finAccounts;
@@ -77,7 +77,7 @@ context.finAccounts = finAccounts;
// billing account info
billingAccountList = null;
if (partyId) {
- billingAccountList = delegator.findByAnd("BillingAccountAndRole", [partyId : partyId]);
+ billingAccountList = delegator.findByAnd("BillingAccountAndRole", [partyId : partyId], null, false);
billingAccountList = EntityUtil.filterByDate(billingAccountList);
}
context.billingAccountList = billingAccountList;
@@ -86,8 +86,8 @@ context.billingAccountList = billingAcco
List creditCardList = null;
List eftAccountList = null;
if (partyId) {
- creditCardList = EntityUtil.filterByDate(delegator.findByAnd("PaymentMethodAndCreditCard", [partyId : partyId]));
- eftAccountList = EntityUtil.filterByDate(delegator.findByAnd("PaymentMethodAndEftAccount", [partyId : partyId]));
+ creditCardList = EntityUtil.filterByDate(delegator.findByAnd("PaymentMethodAndCreditCard", [partyId : partyId], null, false));
+ eftAccountList = EntityUtil.filterByDate(delegator.findByAnd("PaymentMethodAndEftAccount", [partyId : partyId], null, false));
}
context.creditCardList = creditCardList;
context.eftAccountList = eftAccountList;
@@ -95,7 +95,7 @@ context.eftAccountList = eftAccountList;
orderRole = null;
orderHeader = null;
if (orderId) {
- orderRoles = delegator.findByAnd("OrderRole", [orderId : orderId, roleTypeId : "BILL_TO_CUSTOMER"]);
+ orderRoles = delegator.findByAnd("OrderRole", [orderId : orderId, roleTypeId : "BILL_TO_CUSTOMER"], null, false);
orderRole = EntityUtil.getFirst(orderRoles);
orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false);
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy Mon May 14 21:01:18 2012
@@ -37,26 +37,26 @@ context.returnHeader = returnHeader;
returnHeaderTypeId = returnHeader.returnHeaderTypeId;
context.toPartyId = returnHeader.toPartyId;
-returnItems = delegator.findByAnd("ReturnItem", [returnId : returnId]);
+returnItems = delegator.findByAnd("ReturnItem", [returnId : returnId], null, false);
context.returnItems = returnItems;
// these are just the adjustments not associated directly with a return item--the rest are gotten with a .getRelated on the returnItems in the .FTL
-returnAdjustments = delegator.findByAnd("ReturnAdjustment", [returnId : returnId, returnItemSeqId : "_NA_"], ["returnItemSeqId", "returnAdjustmentTypeId"]);
+returnAdjustments = delegator.findByAnd("ReturnAdjustment", [returnId : returnId, returnItemSeqId : "_NA_"], ["returnItemSeqId", "returnAdjustmentTypeId"], false);
context.returnAdjustments = returnAdjustments;
returnTypes = delegator.findList("ReturnType", null, null, ["sequenceId"], null, false);
context.returnTypes = returnTypes;
-itemStatus = delegator.findByAnd("StatusItem", [statusTypeId : "INV_SERIALIZED_STTS"], ["statusId", "description"]);
+itemStatus = delegator.findByAnd("StatusItem", [statusTypeId : "INV_SERIALIZED_STTS"], ["statusId", "description"], false);
context.itemStatus = itemStatus;
returnReasons = delegator.findList("ReturnReason", null, null, ["sequenceId"], null, false);
context.returnReasons = returnReasons;
-itemStts = delegator.findByAnd("StatusItem", [statusTypeId : "INV_SERIALIZED_STTS"], ["sequenceId"]);
+itemStts = delegator.findByAnd("StatusItem", [statusTypeId : "INV_SERIALIZED_STTS"], ["sequenceId"], false);
context.itemStts = itemStts;
-returnItemTypeMap = delegator.findByAnd("ReturnItemTypeMap", [returnHeaderTypeId : returnHeaderTypeId]);
+returnItemTypeMap = delegator.findByAnd("ReturnItemTypeMap", [returnHeaderTypeId : returnHeaderTypeId], null, false);
typeMap = [:];
returnItemTypeMap.each { value ->
typeMap[value.returnItemMapKey] = value.returnItemTypeId;
@@ -83,7 +83,7 @@ if (returnHeaderTypeId == "VENDOR_RETURN
roleTypeId = "BILL_FROM_VENDOR";
partyId = returnHeader.toPartyId;
}
-partyOrders = delegator.findByAnd("OrderHeaderAndRoles", [roleTypeId : roleTypeId, partyId : partyId], ["orderId"]);
+partyOrders = delegator.findByAnd("OrderHeaderAndRoles", [roleTypeId : roleTypeId, partyId : partyId], ["orderId"], false);
context.partyOrders = partyOrders;
context.partyId = partyId;
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/OrderTaskList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/OrderTaskList.groovy?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/OrderTaskList.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/OrderTaskList.groovy Mon May 14 21:01:18 2012
@@ -56,7 +56,7 @@ partyTasks.each { ptItem ->
}
// get this user's roles
-partyRoles = delegator.findByAnd("PartyRole", [partyId : userLogin.partyId]);
+partyRoles = delegator.findByAnd("PartyRole", [partyId : userLogin.partyId], null, false);
// build the role list
pRolesList = [];
@@ -89,7 +89,7 @@ context.orderCurrencyMap = orderCurrency
context.now = nowTimestamp;
// purchase order schedule
-poList = delegator.findByAnd("OrderHeaderAndRoles", [partyId : userLogin.partyId, orderTypeId : "PURCHASE_ORDER"]);
+poList = delegator.findByAnd("OrderHeaderAndRoles", [partyId : userLogin.partyId, orderTypeId : "PURCHASE_ORDER"], null, false);
poIter = poList.iterator();
listedPoIds = new HashSet();
while (poIter.hasNext()) {
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Mon May 14 21:01:18 2012
@@ -137,7 +137,7 @@ under the License.
</td>
<td class="align-text" valign="top" nowrap="nowrap">
<#assign shippedQuantity = orderReadHelper.getItemShippedQuantity(orderItem)>
- <#assign shipmentReceipts = delegator.findByAnd("ShipmentReceipt", {"orderId" : orderHeader.getString("orderId"), "orderItemSeqId" : orderItem.orderItemSeqId})/>
+ <#assign shipmentReceipts = delegator.findByAnd("ShipmentReceipt", {"orderId" : orderHeader.getString("orderId"), "orderItemSeqId" : orderItem.orderItemSeqId}, null, false)/>
<#assign totalReceived = 0.0>
<#if shipmentReceipts?exists && shipmentReceipts?has_content>
<#list shipmentReceipts as shipmentReceipt>
@@ -283,7 +283,7 @@ under the License.
<#assign productPromoCodeId = ''>
<#if adjustmentType.get("orderAdjustmentTypeId") == "PROMOTION_ADJUSTMENT" && orderHeaderAdjustment.get("productPromoId")?has_content>
<#assign productPromo = orderHeaderAdjustment.getRelatedOne("ProductPromo")>
- <#assign productPromoCodes = delegator.findByAnd("ProductPromoCode", {"productPromoId":productPromo.productPromoId})>
+ <#assign productPromoCodes = delegator.findByAnd("ProductPromoCode", {"productPromoId":productPromo.productPromoId}, null, false)>
<#assign orderProductPromoCode = ''>
<#list productPromoCodes as productPromoCode>
<#if !(orderProductPromoCode?has_content)>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Mon May 14 21:01:18 2012
@@ -222,7 +222,7 @@ under the License.
<table>
<tr valign="top">
<#assign shippedQuantity = orderReadHelper.getItemShippedQuantity(orderItem)>
- <#assign shipmentReceipts = delegator.findByAnd("ShipmentReceipt", {"orderId" : orderHeader.getString("orderId"), "orderItemSeqId" : orderItem.orderItemSeqId})/>
+ <#assign shipmentReceipts = delegator.findByAnd("ShipmentReceipt", {"orderId" : orderHeader.getString("orderId"), "orderItemSeqId" : orderItem.orderItemSeqId}, null, false)/>
<#assign totalReceived = 0.0>
<#if shipmentReceipts?exists && shipmentReceipts?has_content>
<#list shipmentReceipts as shipmentReceipt>
@@ -343,8 +343,8 @@ under the License.
</#list>
</#if>
<#-- show linked order lines -->
- <#assign linkedOrderItemsTo = delegator.findByAnd("OrderItemAssoc", Static["org.ofbiz.base.util.UtilMisc"].toMap("orderId", orderItem.getString("orderId"), "orderItemSeqId", orderItem.getString("orderItemSeqId")))>
- <#assign linkedOrderItemsFrom = delegator.findByAnd("OrderItemAssoc", Static["org.ofbiz.base.util.UtilMisc"].toMap("toOrderId", orderItem.getString("orderId"), "toOrderItemSeqId", orderItem.getString("orderItemSeqId")))>
+ <#assign linkedOrderItemsTo = delegator.findByAnd("OrderItemAssoc", Static["org.ofbiz.base.util.UtilMisc"].toMap("orderId", orderItem.getString("orderId"), "orderItemSeqId", orderItem.getString("orderItemSeqId")), null, false)>
+ <#assign linkedOrderItemsFrom = delegator.findByAnd("OrderItemAssoc", Static["org.ofbiz.base.util.UtilMisc"].toMap("toOrderId", orderItem.getString("orderId"), "toOrderItemSeqId", orderItem.getString("orderItemSeqId")), null, false)>
<#if linkedOrderItemsTo?has_content>
<#list linkedOrderItemsTo as linkedOrderItem>
<#assign linkedOrderId = linkedOrderItem.toOrderId>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Mon May 14 21:01:18 2012
@@ -578,7 +578,7 @@ under the License.
${uiLabelMap.CommonNbr}<a href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${shipment.shipmentId}</a>
<a target="_BLANK" href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductPackingSlip}</a>
<#if "SALES_ORDER" == orderHeader.orderTypeId && "ORDER_COMPLETED" == orderHeader.statusId>
- <#assign shipmentRouteSegments = delegator.findByAnd("ShipmentRouteSegment", {"shipmentId" : shipment.shipmentId})>
+ <#assign shipmentRouteSegments = delegator.findByAnd("ShipmentRouteSegment", {"shipmentId" : shipment.shipmentId}, null, false)>
<#if shipmentRouteSegments?has_content>
<#assign shipmentRouteSegment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentRouteSegments)>
<#if "UPS" == (shipmentRouteSegment.carrierPartyId)?if_exists>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign Mon May 14 21:01:18 2012
@@ -255,7 +255,7 @@ module = "OrdersByChannel.rptdesign";]]>
<method name="open"><![CDATA[salesOrderItemFacts = null;
try {
if(params["saleChannel"] != "null"){
- salesOrderItemFacts = delegator.findByAnd("SalesOrderItemFact", UtilMisc.toMap("saleChannel", params["saleChannel"]));
+ salesOrderItemFacts = delegator.findByAnd("SalesOrderItemFact", UtilMisc.toMap("saleChannel", params["saleChannel"]), null, false);
}else{
salesOrderItemFacts = delegator.findList("SalesOrderItemFact", null, null, null, null, false);
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl?rev=1338409&r1=1338408&r2=1338409&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl Mon May 14 21:01:18 2012
@@ -37,22 +37,22 @@ under the License.
<ul>
<li><a href="<@o...@ofbizUrl>">PDF</a></li>
<#if returnId?exists>
- <#assign returnItems = delegator.findByAnd("ReturnItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("returnId", returnId, "returnTypeId", "RTN_REFUND"))/>
+ <#assign returnItems = delegator.findByAnd("ReturnItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("returnId", returnId, "returnTypeId", "RTN_REFUND"), null, false)/>
<#if returnItems?has_content>
<#assign orderId = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(returnItems)).getString("orderId")/>
<#assign partyId = "${(returnHeader.fromPartyId)?if_exists}"/>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateExchangeOrder} ${uiLabelMap.CommonFor} ${orderId?if_exists}</a>
</#if>
<#if "RETURN_ACCEPTED" == returnHeader.statusId>
- <#assign returnItems = delegator.findByAnd("ReturnItem", {"returnId" : returnId})/>
+ <#assign returnItems = delegator.findByAnd("ReturnItem", {"returnId" : returnId}, null, false)/>
<#if returnItems?has_content>
<#assign orderId = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(returnItems)).getString("orderId")/>
- <#assign shipGroupAssoc = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("OrderItemShipGroupAssoc", {"orderId" : orderId}))/>
+ <#assign shipGroupAssoc = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("OrderItemShipGroupAssoc", {"orderId" : orderId}, null, false))/>
<#assign shipGroup = delegator.findOne("OrderItemShipGroup", {"orderId" : orderId, "shipGroupSeqId" : shipGroupAssoc.shipGroupSeqId}, false)>
<#if shipGroup?exists && shipGroup.shipmentMethodTypeId != "NO_SHIPPING">
- <#assign shipGroupShipment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("Shipment", {"primaryOrderId" : shipGroup.orderId, "primaryShipGroupSeqId" : shipGroup.shipGroupSeqId}))/>
+ <#assign shipGroupShipment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("Shipment", {"primaryOrderId" : shipGroup.orderId, "primaryShipGroupSeqId" : shipGroup.shipGroupSeqId}, null, false))/>
<#if shipGroupShipment?exists>
- <#assign shipmentRouteSegment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("ShipmentRouteSegment", {"shipmentId" : shipGroupShipment.shipmentId}))>
+ <#assign shipmentRouteSegment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("ShipmentRouteSegment", {"shipmentId" : shipGroupShipment.shipmentId}, null, false))>
<#if shipmentRouteSegment?exists>
<#if "UPS" == shipmentRouteSegment.carrierPartyId>
<li><a href="javascript:document.upsEmailReturnLabel.submit();" class="buttontext">${uiLabelMap.ProductEmailReturnShippingLabelUPS}</a></li>