svn commit: r1337669 [3/3] - in /ofbiz/trunk/applications/orde
Locked
svn commit: r1337669 [3/3] - in /ofbiz/trunk/applications/orde
 
|
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=1337669&r1=1337668&r2=1337669&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 Sat May 12 21:19:35 2012 @@ -57,7 +57,7 @@ orderItems = null; orderAdjustments = null; if (orderId) { - orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId : orderId]); + orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false); } if (orderHeader) { @@ -372,10 +372,10 @@ context.paramString = paramString; workEffortStatus = null; if (workEffortId && assignPartyId && assignRoleTypeId && fromDate) { fields = [workEffortId : workEffortId, partyId : assignPartyId, roleTypeId : assignRoleTypeId, fromDate : fromDate]; - wepa = delegator.findByPrimaryKey("WorkEffortPartyAssignment", fields); + wepa = delegator.findOne("WorkEffortPartyAssignment", fields, false); if ("CAL_ACCEPTED".equals(wepa?.statusId)) { - workEffort = delegator.findByPrimaryKey("WorkEffort", [workEffortId : workEffortId]); + workEffort = delegator.findOne("WorkEffort", [workEffortId : workEffortId], false); workEffortStatus = workEffort.currentStatusId; if (workEffortStatus) { context.workEffortStatus = workEffortStatus; @@ -386,7 +386,7 @@ if (workEffortId && assignPartyId && ass if (workEffort) { if ("true".equals(delegate) || "WF_RUNNING".equals(workEffortStatus)) { actFields = [packageId : workEffort.workflowPackageId, packageVersion : workEffort.workflowPackageVersion, processId : workEffort.workflowProcessId, processVersion : workEffort.workflowProcessVersion, activityId : workEffort.workflowActivityId]; - activity = delegator.findByPrimaryKey("WorkflowActivity", actFields); + activity = delegator.findOne("WorkflowActivity", actFields, false); if (activity) { transitions = activity.getRelated("FromWorkflowTransition", null, ["-transitionId"]); context.wfTransitions = transitions; @@ -398,7 +398,7 @@ if (workEffortId && assignPartyId && ass if (orderHeader) { // list to find all the POSTAL_ADDRESS for the shipment party. - orderParty = delegator.findByPrimaryKey("Party", [partyId : partyId]); + orderParty = delegator.findOne("Party", [partyId : partyId], false); shippingContactMechList = ContactHelper.getContactMech(orderParty, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false); context.shippingContactMechList = shippingContactMechList; @@ -434,7 +434,7 @@ if (orderHeader) { if (orderHeader) { // list to find all the POSTAL_ADDRESS for the party. - orderParty = delegator.findByPrimaryKey("Party", [partyId : partyId]); + orderParty = delegator.findOne("Party", [partyId : partyId], false); postalContactMechList = ContactHelper.getContactMechByType(orderParty,"POSTAL_ADDRESS", false); context.postalContactMechList = postalContactMechList; Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/SendConfirmationEmail.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/SendConfirmationEmail.groovy?rev=1337669&r1=1337668&r2=1337669&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/SendConfirmationEmail.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/SendConfirmationEmail.groovy Sat May 12 21:19:35 2012 @@ -35,9 +35,9 @@ donePage = request.getParameter("DONE_PA context.donePage = donePage; // Provide the correct order confirmation ProductStoreEmailSetting, if one exists -orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId : orderId]); +orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false); if (orderHeader.productStoreId) { - productStoreEmailSetting = delegator.findByPrimaryKeyCache("ProductStoreEmailSetting", [productStoreId : orderHeader.productStoreId, emailType : emailType]); + productStoreEmailSetting = delegator.findOne("ProductStoreEmailSetting", [productStoreId : orderHeader.productStoreId, emailType : emailType], true); if (productStoreEmailSetting) { context.productStoreEmailSetting = productStoreEmailSetting; } Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/ViewImage.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/ViewImage.groovy?rev=1337669&r1=1337668&r2=1337669&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/ViewImage.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/ViewImage.groovy Sat May 12 21:19:35 2012 @@ -26,10 +26,10 @@ orderContentTypeId = request.getParamete order = null; if (orderId && !orderItemSeqId) { - order = delegator.findByPrimaryKey("OrderHeader", [orderId : orderId]); + order = delegator.findOne("OrderHeader", [orderId : orderId], false); } if (orderId && orderItemSeqId) { - order = delegator.findByPrimaryKey("OrderItem", [orderId : orderId, orderItemSeqId : orderItemSeqId]); + order = delegator.findOne("OrderItem", [orderId : orderId, orderItemSeqId : orderItemSeqId], false); } wrapper = OrderContentWrapper.makeOrderContentWrapper(order, request); Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.groovy?rev=1337669&r1=1337668&r2=1337669&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.groovy Sat May 12 21:19:35 2012 @@ -46,7 +46,7 @@ if (thruOrderDate) { if (productStoreId) { conditions.add(EntityCondition.makeCondition("productStoreId", EntityOperator.EQUALS, productStoreId)); // for generating a title (given product store) - context.productStore = delegator.findByPrimaryKeyCache("ProductStore", [productStoreId : productStoreId]); + context.productStore = delegator.findOne("ProductStore", [productStoreId : productStoreId], true); } else { // for generating a title (all stores) TODO: use UtilProperties to internationalize context.productStore = [storeName : "All Stores"]; 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=1337669&r1=1337668&r2=1337669&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 Sat May 12 21:19:35 2012 @@ -36,7 +36,7 @@ if (partyId) { if (("VENDOR_RETURN").equals(returnHeaderTypeId)) { context.toPartyId = partyId; } - party = delegator.findByPrimaryKey("Party", [partyId : partyId]); + party = delegator.findOne("Party", [partyId : partyId], false); context.party = party; } @@ -45,7 +45,7 @@ context.returnHeaders = returnHeaders; // put in the return to party information from the order header if (orderId) { - order = delegator.findByPrimaryKey("OrderHeader", [orderId : orderId]); + order = delegator.findOne("OrderHeader", [orderId : orderId], false); productStore = order.getRelatedOne("ProductStore"); if (productStore) { if (("VENDOR_RETURN").equals(returnHeaderTypeId)) { @@ -94,7 +94,7 @@ context.returnItemTypeMap = typeMap; if (orderId) { returnRes = dispatcher.runSync("getReturnableItems", [orderId : orderId]); context.returnableItems = returnRes.returnableItems; - orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId : orderId]); + orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false); context.orderHeader = orderHeader; } 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=1337669&r1=1337668&r2=1337669&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 Sat May 12 21:19:35 2012 @@ -40,7 +40,7 @@ if (parameters.returnHeader) { returnId = parameters.returnId; } if (returnId) { - returnHeader = delegator.findByPrimaryKey("ReturnHeader", [returnId : returnId]); + returnHeader = delegator.findOne("ReturnHeader", [returnId : returnId], false); if (returnHeader) { partyId = returnHeader.fromPartyId; toPartyId = parameters.toPartyId; @@ -97,7 +97,7 @@ orderHeader = null; if (orderId) { orderRoles = delegator.findByAnd("OrderRole", [orderId : orderId, roleTypeId : "BILL_TO_CUSTOMER"]); orderRole = EntityUtil.getFirst(orderRoles); - orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId : orderId]); + orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false); } context.orderRole = orderRole; context.orderHeader = orderHeader; 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=1337669&r1=1337668&r2=1337669&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 Sat May 12 21:19:35 2012 @@ -31,7 +31,7 @@ context.returnId = returnId; orderId = parameters.orderId; context.orderId = orderId; -returnHeader = delegator.findByPrimaryKey("ReturnHeader", [returnId : returnId]); +returnHeader = delegator.findOne("ReturnHeader", [returnId : returnId], false); context.returnHeader = returnHeader; returnHeaderTypeId = returnHeader.returnHeaderTypeId; @@ -64,7 +64,7 @@ returnItemTypeMap.each { value -> context.returnItemTypeMap = typeMap; if (orderId) { - order = delegator.findByPrimaryKey("OrderHeader", [orderId : orderId]); + order = delegator.findOne("OrderHeader", [orderId : orderId], false); returnRes = dispatcher.runSync("getReturnableItems", [orderId : orderId]); context.returnableItems = returnRes.returnableItems; Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/PaymentSetup.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/PaymentSetup.groovy?rev=1337669&r1=1337668&r2=1337669&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/PaymentSetup.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/PaymentSetup.groovy Sat May 12 21:19:35 2012 @@ -28,7 +28,7 @@ paymentMethodTypeId = parameters.payment webSitePayment = null; if (webSiteId && paymentMethodTypeId) { - webSitePayment = delegator.findByPrimaryKey("WebSitePaymentSettingView", [webSiteId : webSiteId, paymentMethodTypeId : paymentMethodTypeId]); + webSitePayment = delegator.findOne("WebSitePaymentSettingView", [webSiteId : webSiteId, paymentMethodTypeId : paymentMethodTypeId], false); } context.webSitePayment = webSitePayment; 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=1337669&r1=1337668&r2=1337669&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 Sat May 12 21:19:35 2012 @@ -51,7 +51,7 @@ context.partyTasks = partyTasks; // Build a map of orderId and currency orderCurrencyMap = [:]; partyTasks.each { ptItem -> - orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId : ptItem.orderId]); + orderHeader = delegator.findOne("OrderHeader", [orderId : ptItem.orderId], false); orderCurrencyMap[ptItem.orderId] = orderHeader.currencyUom; } @@ -81,7 +81,7 @@ context.roleTasks = roleTasks; // Add to the map of orderId and currency roleTasks.each { rtItem -> - orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId : rtItem.orderId]); + orderHeader = delegator.findOne("OrderHeader", [orderId : rtItem.orderId], false); orderCurrencyMap[rtItem.orderId] = orderHeader.currencyUom; } context.orderCurrencyMap = orderCurrencyMap; Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl?rev=1337669&r1=1337668&r2=1337669&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl Sat May 12 21:19:35 2012 @@ -30,7 +30,7 @@ under the License. <td> <#list 1..shoppingCart.getShipGroupSize() as currIndex> <#assign shipGroupIndex = currIndex - 1> - <#assign supplier = delegator.findByPrimaryKey("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", shoppingCart.getSupplierPartyId(shipGroupIndex)))?if_exists /> + <#assign supplier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", shoppingCart.getSupplierPartyId(shipGroupIndex)), false)?if_exists /> <table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0"> <tr> <td colspan="2"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=1337669&r1=1337668&r2=1337669&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Sat May 12 21:19:35 2012 @@ -238,7 +238,7 @@ under the License. <#-- Show alternate gifts if there are any... --> <div>${uiLabelMap.OrderChooseFollowingForGift}:</div> <#list cartLine.getAlternativeOptionProductIds() as alternativeOptionProductId> - <#assign alternativeOptionProduct = delegator.findByPrimaryKeyCache("Product", Static["org.ofbiz.base.util.UtilMisc"].toMap("productId", alternativeOptionProductId))> + <#assign alternativeOptionProduct = delegator.findOne("Product", Static["org.ofbiz.base.util.UtilMisc"].toMap("productId", alternativeOptionProductId), true)> <#assign alternativeOptionName = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(alternativeOptionProduct, "PRODUCT_NAME", locale, dispatcher)?if_exists> <div><a href="<@ofbizUrl>setDesiredAlternateGwpProductId?alternateGwpProductId=${alternativeOptionProductId}&alternateGwpLine=${cartLineIndex}</@ofbizUrl>" class="buttontext">Select: ${alternativeOptionName?default(alternativeOptionProductId)}</a></div> </#list> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl?rev=1337669&r1=1337668&r2=1337669&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl Sat May 12 21:19:35 2012 @@ -53,7 +53,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 align="right" valign="middle"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl?rev=1337669&r1=1337668&r2=1337669&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl Sat May 12 21:19:35 2012 @@ -145,7 +145,7 @@ ${virtualJavaScript?if_exists} <input type="hidden" name="mainSubmitted" value="Y"/> <a href="javascript:document.the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}defaultform.submit()" class="buttontext">${uiLabelMap.CommonAddDefault}(${prodCatMem.quantity?string.number}) ${uiLabelMap.OrderToCart}</a> </form> - <#assign productCategory = delegator.findByPrimaryKey("ProductCategory", Static["org.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", prodCatMem.productCategoryId))/> + <#assign productCategory = delegator.findOne("ProductCategory", Static["org.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", prodCatMem.productCategoryId), false)/> <#if productCategory.productCategoryTypeId != "BEST_SELL_CATEGORY"> <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}defaultform" style="margin: 0;"> <input type="hidden" name="add_product_id" value="${prodCatMem.productId?if_exists}"/> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl?rev=1337669&r1=1337668&r2=1337669&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl Sat May 12 21:19:35 2012 @@ -29,7 +29,7 @@ under the License. <option value='${productCategory.productCategoryId}'>${productCategory.categoryName?if_exists}</option> <option value='${productCategory.productCategoryId}'>--</option> <#list quickAddCats as quickAddCatalogId> - <#assign loopCategory = delegator.findByPrimaryKeyCache("ProductCategory", Static["org.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", quickAddCatalogId))> + <#assign loopCategory = delegator.findOne("ProductCategory", Static["org.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", quickAddCatalogId), true)> <#if loopCategory?has_content> <option value='${quickAddCatalogId}'>${loopCategory.categoryName?if_exists}</option> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl?rev=1337669&r1=1337668&r2=1337669&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl Sat May 12 21:19:35 2012 @@ -56,7 +56,7 @@ under the License. <#assign chosenShippingMethod = cart.getShipmentMethodTypeId(shipGroupIndex) + '@' + cart.getCarrierPartyId(shipGroupIndex)> </#if> <#assign supplierPartyId = cart.getSupplierPartyId(shipGroupIndex)?if_exists> -<#assign supplier = delegator.findByPrimaryKey("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", supplierPartyId))?if_exists /> +<#assign supplier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", supplierPartyId), false)?if_exists /> <table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0"> <tr><td colspan="2"><hr /></td></tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl?rev=1337669&r1=1337668&r2=1337669&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl Sat May 12 21:19:35 2012 @@ -63,7 +63,7 @@ standard order confirmation page and to <#-- address destination column (spans a number of rows = number of cart items in it) --> <td rowspan="${numberOfItems}"> - <#assign contactMech = delegator.findByPrimaryKey("ContactMech", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechId", cartShipInfo.contactMechId))?if_exists /> + <#assign contactMech = delegator.findOne("ContactMech", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechId", cartShipInfo.contactMechId), false)?if_exists /> <#if contactMech?has_content> <#assign address = contactMech.getRelatedOne("PostalAddress")?if_exists /> </#if> @@ -82,15 +82,15 @@ standard order confirmation page and to <#-- supplier id (for drop shipments) (also spans rows = number of items) --> <td rowspan="${numberOfItems}" valign="top"> - <#assign supplier = delegator.findByPrimaryKey("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", cartShipInfo.getSupplierPartyId()))?if_exists /> + <#assign supplier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", cartShipInfo.getSupplierPartyId()), false)?if_exists /> <#if supplier?has_content>${supplier.groupName?default(supplier.partyId)}</#if> </td> <#-- carrier column (also spans rows = number of items) --> <td rowspan="${numberOfItems}" valign="top"> - <#assign carrier = delegator.findByPrimaryKey("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", cartShipInfo.getCarrierPartyId()))?if_exists /> - <#assign method = delegator.findByPrimaryKey("ShipmentMethodType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentMethodTypeId", cartShipInfo.getShipmentMethodTypeId()))?if_exists /> + <#assign carrier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", cartShipInfo.getCarrierPartyId()), false)?if_exists /> + <#assign method = delegator.findOne("ShipmentMethodType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentMethodTypeId", cartShipInfo.getShipmentMethodTypeId()), false)?if_exists /> <#if carrier?has_content>${carrier.groupName?default(carrier.partyId)}</#if> <#if method?has_content>${method.description?default(method.shipmentMethodTypeId)}</#if> </td> 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=1337669&r1=1337668&r2=1337669&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Sat May 12 21:19:35 2012 @@ -330,7 +330,7 @@ under the License. <a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortId}&externalLoginKey=${externalLoginKey}" class="buttontext">${workEffort.workEffortId}</a> ${uiLabelMap.OrderCurrentStatus} - ${(delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId"))).get("description",locale))?if_exists} + ${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists} <#else> ${uiLabelMap.CommonFrom} : <#if workEffort.estimatedStartDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(workEffort.estimatedStartDate, "", locale, timeZone)!}</#if> ${uiLabelMap.CommonTo} 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=1337669&r1=1337668&r2=1337669&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Sat May 12 21:19:35 2012 @@ -368,7 +368,7 @@ under the License. </script> <table width="100%" border="0" cellpadding="1" cellspacing="0"> <#if shipGroup.supplierPartyId?has_content> - <#assign supplier = delegator.findByPrimaryKey("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", shipGroup.supplierPartyId))?if_exists /> + <#assign supplier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", shipGroup.supplierPartyId), false)?if_exists /> <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=1337669&r1=1337668&r2=1337669&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl Sat May 12 21:19:35 2012 @@ -103,7 +103,7 @@ under the License. <td align="right" valign="top"><@ofbizCurrency amount=totalQuoteItemAmount isoCode=quote.currencyUomId/></td> </tr> <#list quoteTerms as quoteTerm> - <#assign termDescription = delegator.findByPrimaryKey("TermType",{"termTypeId":quoteTerm.termTypeId})> + <#assign termDescription = delegator.findOne("TermType",{"termTypeId":quoteTerm.termTypeId}, false)> <tr <#if alt_row>class="alternate-row" </#if>> <td valign="top"> ${termDescription.description?if_exists}</td> <td valign="top"> ${quoteTerm.termValue?if_exists}</td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign?rev=1337669&r1=1337668&r2=1337669&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign Sat May 12 21:19:35 2012 @@ -151,7 +151,7 @@ if (couponSalesOrders) { userLogin = null; input = FastMap.newInstance(); 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/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign?rev=1337669&r1=1337668&r2=1337669&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign Sat May 12 21:19:35 2012 @@ -215,7 +215,7 @@ module = "Last3MonthsSalesReport.rptdesi <method name="open"><![CDATA[salesOrderItemStarSchemas = null; userLogin = null; try { - userLogin = delegator.findByPrimaryKey("UserLogin",UtilMisc.toMap("userLoginId","admin")); + userLogin = delegator.findOne("UserLogin",UtilMisc.toMap("userLoginId","admin"), false); months = FastList.newInstance(); thisMonth = 0; thisMonth = UtilDateTime.getMonth(UtilDateTime.nowTimestamp(), TimeZone.getDefault(), Locale.getDefault())+1; @@ -298,7 +298,7 @@ price = 0; internalName = "None"; input = FastMap.newInstance(); try { - product = delegator.findByPrimaryKey("Product",UtilMisc.toMap("productId", salesOrderItemStarSchema.getString("productProductId"))); + product = delegator.findOne("Product",UtilMisc.toMap("productId", salesOrderItemStarSchema.getString("productProductId")), false); input.put("product", product); input.put("userLogin", userLogin); result = dispatcher.runSync("calculateProductPrice", input); Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign?rev=1337669&r1=1337668&r2=1337669&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign Sat May 12 21:19:35 2012 @@ -110,7 +110,7 @@ module = "OrderDiscountCodeReport.rptdes <method name="open"><![CDATA[orders = 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,""); } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |