svn commit: r1343517 [2/2] - in /ofbiz/trunk/applications/prod
Locked
svn commit: r1343517 [2/2] - in /ofbiz/trunk/applications/prod
 
|
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy?rev=1343517&r1=1343516&r2=1343517&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy Tue May 29 04:19:07 2012 @@ -30,12 +30,12 @@ if (!shipment) { } // get the packages related to this shipment in order of packages -shipmentPackages = shipment.getRelated("ShipmentPackage", ['shipmentPackageSeqId']); +shipmentPackages = shipment.getRelated("ShipmentPackage", null, ['shipmentPackageSeqId'], false); // first we scan the shipment items and count the quantity of each product that is being shipped quantityShippedByProduct = [:]; quantityInShipmentByProduct = [:]; -shipmentItems = shipment.getRelated("ShipmentItem"); +shipmentItems = shipment.getRelated("ShipmentItem", null, null, false); shipmentItems.each { shipmentItem -> productId = shipmentItem.productId; shipped = quantityShippedByProduct.get(productId); @@ -60,7 +60,7 @@ previousShipmentIter = delegator.find("S while (previousShipmentItem = previousShipmentIter.next()) { if (!previousShipmentItem.shipmentId.equals(shipment.shipmentId)) { - previousShipmentItems = previousShipmentItem.getRelated("ShipmentItem"); + previousShipmentItems = previousShipmentItem.getRelated("ShipmentItem", null, null, false); previousShipmentItems.each { shipmentItem -> productId = shipmentItem.productId; shipped = quantityShippedByProduct.get(productId); @@ -78,7 +78,7 @@ previousShipmentIter.close(); quantityRequestedByProduct = [:]; countedOrderItems = [:]; // this map is only used to keep track of the order items already counted order = shipment.getRelatedOne("PrimaryOrderHeader", false); -issuances = order.getRelated("ItemIssuance"); +issuances = order.getRelated("ItemIssuance", null, null, false); issuances.each { issuance -> orderItem = issuance.getRelatedOne("OrderItem", false); productId = orderItem.productId; @@ -98,7 +98,7 @@ issuances.each { issuance -> // for each package, we want to list the quantities and details of each product packages = []; // note we assume that the package number is simply the index + 1 of this list shipmentPackages.each { shipmentPackage -> - contents = shipmentPackage.getRelated("ShipmentPackageContent", ['shipmentItemSeqId']); + contents = shipmentPackage.getRelated("ShipmentPackageContent", null, ['shipmentItemSeqId'], false); // each line is one logical Product and the quantities associated with it lines = []; 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=1343517&r1=1343516&r2=1343517&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 Tue May 29 04:19:07 2012 @@ -68,7 +68,7 @@ if (toPrintOrders) { shippingAddress = delegator.findOne("PostalAddress", [contactMechId : shippingContactMechId], false); orderItemShipGroups.each { orderItemShipGroup -> if (orderItemShipGroup.orderId == orderId) { - orderMap.shipmentMethodType = EntityUtil.getFirst(orderItemShipGroup.getRelated("ShipmentMethodType")).description; + orderMap.shipmentMethodType = EntityUtil.getFirst(orderItemShipGroup.getRelated("ShipmentMethodType", null, null, false)).description; orderMap.carrierPartyId = orderItemShipGroup.carrierPartyId; orderMap.shipGroupSeqId = orderItemShipGroup.shipGroupSeqId; orderMap.carrierPartyId = orderItemShipGroup.carrierPartyId; Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy?rev=1343517&r1=1343516&r2=1343517&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy Tue May 29 04:19:07 2012 @@ -59,8 +59,8 @@ if (shipmentId) { context.destinationFacility = shipment.getRelatedOne("DestinationFacility", false); context.originPostalAddress = shipment.getRelatedOne("OriginPostalAddress", false); context.destinationPostalAddress = shipment.getRelatedOne("DestinationPostalAddress", false); - context.shipmentPackages = shipment.getRelated("ShipmentPackage", null, ['shipmentPackageSeqId']); - context.shipmentRoutes = shipment.getRelated("ShipmentRouteSegment", null, ['shipmentRouteSegmentId']); + context.shipmentPackages = shipment.getRelated("ShipmentPackage", null, ['shipmentPackageSeqId'], false); + context.shipmentRoutes = shipment.getRelated("ShipmentRouteSegment", null, ['shipmentRouteSegmentId'], false); context.shipment = shipment; context.shipmentId = shipmentId; Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy?rev=1343517&r1=1343516&r2=1343517&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy Tue May 29 04:19:07 2012 @@ -116,7 +116,7 @@ orderItemDatas = [:] as TreeMap; totalAvailableToReceive = 0; // Populate the order item data for the FTL -orderItems = orderHeader.getRelated("OrderItemAndShipGroupAssoc", oiasgaLimitMap, ['shipGroupSeqId', 'orderItemSeqId']); +orderItems = orderHeader.getRelated("OrderItemAndShipGroupAssoc", oiasgaLimitMap, ['shipGroupSeqId', 'orderItemSeqId'], false); orderItems.each { orderItemAndShipGroupAssoc -> product = orderItemAndShipGroupAssoc.getRelatedOne("Product", false); Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy?rev=1343517&r1=1343516&r2=1343517&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy Tue May 29 04:19:07 2012 @@ -25,16 +25,16 @@ shipmentId = request.getParameter("shipm shipment = delegator.findOne("Shipment", [shipmentId : shipmentId], false); if (shipment) { - shipmentPackageRouteSegs = shipment.getRelated("ShipmentPackageRouteSeg", null, ['shipmentRouteSegmentId', 'shipmentPackageSeqId']); + shipmentPackageRouteSegs = shipment.getRelated("ShipmentPackageRouteSeg", null, ['shipmentRouteSegmentId', 'shipmentPackageSeqId'], false); shipmentPackageDatas = [] as LinkedList; if (shipmentPackageRouteSegs) { shipmentPackageRouteSegs.each { shipmentPackageRouteSeg -> - shipmentPackages = shipmentPackageRouteSeg.getRelated("ShipmentPackage", null, ['shipmentPackageSeqId']); + shipmentPackages = shipmentPackageRouteSeg.getRelated("ShipmentPackage", null, ['shipmentPackageSeqId'], false); shipmentRouteSegment = shipmentPackageRouteSeg.getRelatedOne("ShipmentRouteSegment", false); if (shipmentPackages) { shipmentPackages.each { shipmentPackage -> shipmentItemsDatas = [] as LinkedList; - shipmentPackageContents = shipmentPackage.getRelated("ShipmentPackageContent", null, ['shipmentItemSeqId']); + shipmentPackageContents = shipmentPackage.getRelated("ShipmentPackageContent", null, ['shipmentItemSeqId'], false); if (shipmentPackageContents) { shipmentPackageContents.each { shipmentPackageContent -> shipmentItemsData = [:]; 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=1343517&r1=1343516&r2=1343517&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 Tue May 29 04:19:07 2012 @@ -41,7 +41,7 @@ if (shipmentId) { context.orderId = null; shipment = delegator.findOne("Shipment", [shipmentId : shipmentId], false); if (shipment) { - shipmentItemBillingList = shipment.getRelated("ShipmentItemBilling"); + shipmentItemBillingList = shipment.getRelated("ShipmentItemBilling", null, null, false); invoiceIds = EntityUtil.getFieldListFromEntityList(shipmentItemBillingList, "invoiceId", true); if (invoiceIds) { context.invoiceIds = invoiceIds; 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=1343517&r1=1343516&r2=1343517&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl Tue May 29 04:19:07 2012 @@ -167,7 +167,7 @@ under the License. </#if> <#assign orderItem = orderItemShipGrpInvRes.getRelatedOne("OrderItem", false)> <#assign product = orderItem.getRelatedOne("Product", false)> - <#assign supplierProduct = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(product.getRelated("SupplierProduct"))?if_exists> + <#assign supplierProduct = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(product.getRelated("SupplierProduct", null, null, false))?if_exists> <#assign inventoryItem = infoItem.inventoryItem> <#if (quantityToPick > 0)> <fo:table-row background-color="${rowColor}"> @@ -197,7 +197,7 @@ under the License. </fo:block> </fo:table-cell> </fo:table-row> - <#assign workOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment")> + <#assign workOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment", null, null, false)> <#if workOrderItemFulfillments?has_content> <#assign workOrderItemFulfillment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(workOrderItemFulfillments)/> <#if workOrderItemFulfillment?has_content> @@ -205,7 +205,7 @@ under the License. <#if workEffort?has_content> <#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")/> + <#assign workEffortInventoryAssigns = workEffortTask.getRelated("WorkEffortInventoryAssign", null, null, false)/> <#if workEffortInventoryAssigns?has_content> <#list workEffortInventoryAssigns as workEffortInventoryAssign> <#assign inventoryItem = workEffortInventoryAssign.getRelatedOne("InventoryItem", false)/> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl?rev=1343517&r1=1343516&r2=1343517&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl Tue May 29 04:19:07 2012 @@ -23,7 +23,7 @@ under the License. <#assign index = 0> <#list labelTypes as labelType> <#assign index = index + 1> - <#assign labels = labelType.getRelated("InventoryItemLabel", Static["org.ofbiz.base.util.UtilMisc"].toList("inventoryItemLabelId"))> + <#assign labels = labelType.getRelated("InventoryItemLabel", null, Static["org.ofbiz.base.util.UtilMisc"].toList("inventoryItemLabelId"), false)> <tr> <td> <div> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl?rev=1343517&r1=1343516&r2=1343517&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl Tue May 29 04:19:07 2012 @@ -135,7 +135,7 @@ under the License. <#assign shippedQuantity = shipmentItemsData.get("shippedQuantity")> <#assign packageQuantity = shipmentItemsData.get("packageQuantity")> <#assign product = shipmentItem.getRelatedOne("Product", false)> - <#assign itemIssuances = shipmentItem.getRelated("ItemIssuance")> + <#assign itemIssuances = shipmentItem.getRelated("ItemIssuance", null, null, false)> <fo:table-row> <fo:table-cell padding="2pt"> <fo:block>${product.internalName} [${shipmentItem.productId}]</fo:block> 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=1343517&r1=1343516&r2=1343517&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl Tue May 29 04:19:07 2012 @@ -261,7 +261,7 @@ under the License. <input type="hidden" name="prd_${rowKey}" value="${(orderItem.productId)?if_exists}"/> <input type="hidden" name="ite_${rowKey}" value="${(orderItem.orderItemSeqId)?if_exists}"/> </tr> - <#assign workOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment")/> + <#assign workOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment", null, null, false)/> <#if workOrderItemFulfillments?has_content> <#assign workOrderItemFulfillment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(workOrderItemFulfillments)/> <#if workOrderItemFulfillment?has_content> @@ -269,7 +269,7 @@ under the License. <#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), null, false))/> <#if workEffortTask?has_content> - <#assign workEffortInventoryAssigns = workEffortTask.getRelated("WorkEffortInventoryAssign")/> + <#assign workEffortInventoryAssigns = workEffortTask.getRelated("WorkEffortInventoryAssign", null, null, false)/> <#if workEffortInventoryAssigns?has_content> <tr> <th colspan="8"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |