Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PrintPickSheets.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PrintPickSheets.groovy?rev=1338411&r1=1338410&r2=1338411&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PrintPickSheets.groovy (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PrintPickSheets.groovy Mon May 14 21:02:02 2012 @@ -59,12 +59,12 @@ if (toPrintOrders) { orderMap.orderId = orderId; orderMap.orderDate = orderHeader.orderDate; billingOrderContactMechs = []; - billingOrderContactMechs = delegator.findByAnd("OrderContactMech", [orderId : orderId, contactMechPurposeTypeId : "BILLING_LOCATION"]); + billingOrderContactMechs = delegator.findByAnd("OrderContactMech", [orderId : orderId, contactMechPurposeTypeId : "BILLING_LOCATION"], null, false); if (billingOrderContactMechs.size() > 0) { billingContactMechId = EntityUtil.getFirst(billingOrderContactMechs).contactMechId; billingAddress = delegator.findOne("PostalAddress", [contactMechId : billingContactMechId], false); } - shippingContactMechId = EntityUtil.getFirst(delegator.findByAnd("OrderContactMech", [orderId : orderId, contactMechPurposeTypeId : "SHIPPING_LOCATION"])).contactMechId; + shippingContactMechId = EntityUtil.getFirst(delegator.findByAnd("OrderContactMech", [orderId : orderId, contactMechPurposeTypeId : "SHIPPING_LOCATION"], null, false)).contactMechId; shippingAddress = delegator.findOne("PostalAddress", [contactMechId : shippingContactMechId], false); orderItemShipGroups.each { orderItemShipGroup -> if (orderItemShipGroup.orderId == orderId) {
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy?rev=1338411&r1=1338410&r2=1338411&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy Mon May 14 21:02:02 2012 @@ -32,7 +32,7 @@ orderHeaders = delegator.findList("Order orders = []; SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'/'K:mm a"); orderHeaders.each { orderHeader -> - itemIssuanceList = delegator.findByAnd("ItemIssuance", [orderId : orderHeader.orderId]); + itemIssuanceList = delegator.findByAnd("ItemIssuance", [orderId : orderHeader.orderId], null, false); if (itemIssuanceList) { orders.add([orderId : orderHeader.orderId, pickSheetPrintedDate : dateFormat.format(orderHeader.pickSheetPrintedDate), isVerified : "Y"]); } else { Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy?rev=1338411&r1=1338410&r2=1338411&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy Mon May 14 21:02:02 2012 @@ -78,7 +78,7 @@ if (picklistBinId) { } if (orderId && !picklistBinId) { - picklistBin = EntityUtil.getFirst(delegator.findByAnd("PicklistBin", [primaryOrderId : orderId])); + picklistBin = EntityUtil.getFirst(delegator.findByAnd("PicklistBin", [primaryOrderId : orderId], null, false)); if (picklistBin) { picklistBinId = picklistBin.picklistBinId; verifyPickSession.setPicklistBinId(picklistBinId); @@ -108,7 +108,7 @@ if (orderId) { if (shipGroupSeqId) { productStoreId = orh.getProductStoreId(); context.productStoreId = productStoreId; - shipments = delegator.findByAnd("Shipment", [primaryOrderId : orderId, statusId : "SHIPMENT_PICKED"]); + shipments = delegator.findByAnd("Shipment", [primaryOrderId : orderId, statusId : "SHIPMENT_PICKED"], null, false); if (shipments) { request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage("OrderErrorUiLabels", "OrderErrorAllItemsOfOrderAreAlreadyVerified", [orderId : orderId], locale)); } Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy?rev=1338411&r1=1338410&r2=1338411&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy Mon May 14 21:02:02 2012 @@ -43,20 +43,20 @@ context.showWarningForm = showWarningFor orderId = parameters.orderId; shipGroupSeqId = parameters.shipGroupSeqId; -shipment = EntityUtil.getFirst(delegator.findByAnd("Shipment", [primaryOrderId : orderId, statusId : "SHIPMENT_PICKED"])); +shipment = EntityUtil.getFirst(delegator.findByAnd("Shipment", [primaryOrderId : orderId, statusId : "SHIPMENT_PICKED"], null, false)); context.shipment = shipment; if (shipment) { - invoice = EntityUtil.getFirst(delegator.findByAnd("ShipmentItemBilling", [shipmentId : shipment.shipmentId])); + invoice = EntityUtil.getFirst(delegator.findByAnd("ShipmentItemBilling", [shipmentId : shipment.shipmentId], null, false)); context.invoice = invoice; } else { context.invoice = null; } actualCost = null; if (shipment) { - shipmentRouteSegment = EntityUtil.getFirst(delegator.findByAnd("ShipmentRouteSegment", [shipmentId : shipment.shipmentId])); + shipmentRouteSegment = EntityUtil.getFirst(delegator.findByAnd("ShipmentRouteSegment", [shipmentId : shipment.shipmentId], null, false)); actualCost = shipmentRouteSegment.actualCost; if (actualCost) { - context.shipmentPackages = delegator.findByAnd("ShipmentPackage", [shipmentId : shipment.shipmentId]); + context.shipmentPackages = delegator.findByAnd("ShipmentPackage", [shipmentId : shipment.shipmentId], null, false); } } @@ -107,7 +107,7 @@ if (shipmentId) { if (shipment.statusId && "SHIPMENT_PACKED" == shipment.statusId) { orderId = null; } - shipmentPackageRouteSegs = delegator.findByAnd("ShipmentPackageRouteSeg", [shipmentId : shipmentId]); + shipmentPackageRouteSegs = delegator.findByAnd("ShipmentPackageRouteSeg", [shipmentId : shipmentId], null, false); shipmentPackageRouteSegList = []; shipmentPackageRouteSegs.each { shipmentPackageRouteSeg -> if (shipmentPackageRouteSeg.labelImage) { @@ -172,7 +172,7 @@ context.shipGroupSeqId = shipGroupSeqId; context.picklistBinId = picklistBinId; if (carrierPartyId) { - carrierShipmentBoxTypes = delegator.findByAnd("CarrierShipmentBoxType", [partyId : carrierPartyId]); + carrierShipmentBoxTypes = delegator.findByAnd("CarrierShipmentBoxType", [partyId : carrierPartyId], null, false); shipmentBoxTypes = []; carrierShipmentBoxTypes.each { carrierShipmentBoxType -> shipmentBoxTypes.add(delegator.findOne("ShipmentBoxType", [shipmentBoxTypeId : carrierShipmentBoxType.shipmentBoxTypeId], false)); Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl?rev=1338411&r1=1338410&r2=1338411&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl Mon May 14 21:02:02 2012 @@ -203,7 +203,7 @@ under the License. <#if workOrderItemFulfillment?has_content> <#assign workEffort = workOrderItemFulfillment.getRelatedOne("WorkEffort")/> <#if workEffort?has_content> - <#assign workEffortTask = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("WorkEffort", {"workEffortParentId" : workEffort.workEffortId}))/> + <#assign workEffortTask = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("WorkEffort", {"workEffortParentId" : workEffort.workEffortId}, null, false))/> <#if workEffortTask?has_content> <#assign workEffortInventoryAssigns = workEffortTask.getRelated("WorkEffortInventoryAssign")/> <#if workEffortInventoryAssigns?has_content> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl?rev=1338411&r1=1338410&r2=1338411&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl Mon May 14 21:02:02 2012 @@ -208,10 +208,10 @@ under the License. <#assign readyToVerify = verifyPickSession.getReadyToVerifyQuantity(orderId,orderItemSeqId)> <#assign orderItemQuantity = orderItem.getBigDecimal("quantity")> <#assign verifiedQuantity = 0.000000> - <#assign shipments = delegator.findByAnd("Shipment", Static["org.ofbiz.base.util.UtilMisc"].toMap("primaryOrderId", orderItem.getString("orderId"), "statusId", "SHIPMENT_PICKED"))/> + <#assign shipments = delegator.findByAnd("Shipment", Static["org.ofbiz.base.util.UtilMisc"].toMap("primaryOrderId", orderItem.getString("orderId"), "statusId", "SHIPMENT_PICKED"), null, false)/> <#if (shipments?has_content)> <#list shipments as shipment> - <#assign itemIssuances = delegator.findByAnd("ItemIssuance", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentId", shipment.getString("shipmentId"), "orderItemSeqId", orderItemSeqId))/> + <#assign itemIssuances = delegator.findByAnd("ItemIssuance", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentId", shipment.getString("shipmentId"), "orderItemSeqId", orderItemSeqId), null, false)/> <#if itemIssuances?has_content> <#list itemIssuances as itemIssuance> <#assign verifiedQuantity = verifiedQuantity + itemIssuance.getBigDecimal("quantity")> @@ -267,7 +267,7 @@ under the License. <#if workOrderItemFulfillment?has_content> <#assign workEffort = workOrderItemFulfillment.getRelatedOne("WorkEffort")/> <#if workEffort?has_content> - <#assign workEffortTask = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("WorkEffort", Static["org.ofbiz.base.util.UtilMisc"].toMap("workEffortParentId", workEffort.workEffortId)))/> + <#assign workEffortTask = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("WorkEffort", Static["org.ofbiz.base.util.UtilMisc"].toMap("workEffortParentId", workEffort.workEffortId), null, false))/> <#if workEffortTask?has_content> <#assign workEffortInventoryAssigns = workEffortTask.getRelated("WorkEffortInventoryAssign")/> <#if workEffortInventoryAssigns?has_content> Modified: ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml?rev=1338411&r1=1338410&r2=1338411&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml Mon May 14 21:02:02 2012 @@ -56,7 +56,7 @@ under the License. </actions> <row-actions> - <set field="hasVariants" value="${groovy: org.ofbiz.entity.util.EntityUtil.filterByDate(delegator.findByAndCache('ProductAssoc', org.ofbiz.base.util.UtilMisc.toMap('productId', productId, 'productAssocTypeId', 'PRODUCT_VARIANT'))).size() > 0}" type="Boolean"/> + <set field="hasVariants" value="${groovy: org.ofbiz.entity.util.EntityUtil.filterByDate(delegator.findByAnd('ProductAssoc', org.ofbiz.base.util.UtilMisc.toMap('productId', productId, 'productAssocTypeId', 'PRODUCT_VARIANT'), null, true)).size() > 0}" type="Boolean"/> </row-actions> <field name="productId" title="${uiLabelMap.ProductProductId}" widget-style="buttontext"> <hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_value('${productId}')"/> @@ -186,7 +186,7 @@ under the License. </service> </actions> <row-actions> - <set field="hasVariants" value="${groovy: delegator.findByAndCache('ProductAssoc', org.ofbiz.base.util.UtilMisc.toMap('productId', productId, 'productAssocTypeId', 'PRODUCT_VARIANT')).size() > 0}" type="Boolean"/> + <set field="hasVariants" value="${groovy: delegator.findByAnd('ProductAssoc', org.ofbiz.base.util.UtilMisc.toMap('productId', productId, 'productAssocTypeId', 'PRODUCT_VARIANT'), null, true).size() > 0}" type="Boolean"/> </row-actions> <!-- <field name="productId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="isVirtual==null||"${isVirtual}".equals("N")">
