Author: jacopoc Date: Tue Sep 19 03:24:43 2006 New Revision: 447798 URL: http://svn.apache.org/viewvc?view=rev&rev=447798 Log: Added packages box type drop down box to the edit shipment package screen.
Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.bsh incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.bsh URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.bsh?view=diff&rev=447798&r1=447797&r2=447798 ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.bsh (original) +++ incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.bsh Tue Sep 19 03:24:43 2006 @@ -50,12 +50,14 @@ shipmentItems = shipment.getRelated("ShipmentItem", null, UtilMisc.toList("shipmentItemSeqId")); shipmentRouteSegments = shipment.getRelated("ShipmentRouteSegment", null, UtilMisc.toList("shipmentRouteSegmentId")); weightUoms = delegator.findByAnd("Uom", UtilMisc.toMap("uomTypeId", "WEIGHT_MEASURE"), UtilMisc.toList("description")); + boxTypes = delegator.findAll("ShipmentBoxType"); context.put("shipment", shipment); context.put("shipmentPackageDatas", shipmentPackageDatas); context.put("shipmentItems", shipmentItems); context.put("shipmentRouteSegments", shipmentRouteSegments); context.put("weightUoms", weightUoms); + context.put("boxTypes", boxTypes); } context.put("shipmentId", shipmentId); Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl?view=diff&rev=447798&r1=447797&r2=447798 ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl (original) +++ incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl Tue Sep 19 03:24:43 2006 @@ -49,6 +49,13 @@ <option value="${weightUomOption.uomId}">${weightUomOption.get("description",locale)} [${weightUomOption.abbreviation}]</option> </#list> </select> + <span class="tabletext">${uiLabelMap.ShipmentBoxType}:</span> + <select name="shipmentBoxTypeId" class="selectBox"> + <option value=""> </option> + <#list boxTypes as boxType> + <option value="${boxType.shipmentBoxTypeId}" <#if shipmentPackage.shipmentBoxTypeId?exists && shipmentPackage.shipmentBoxTypeId == boxType.shipmentBoxTypeId>selected</#if>>${boxType.get("description",locale)}</option> + </#list> + </select> </td> <td><a href="javascript:document.updateShipmentPackageForm${shipmentPackageData_index}.submit();" class="buttontext">${uiLabelMap.CommonUpdate}</a></td> <td><div class="tabletext"><a href="<@ofbizUrl>deleteShipmentPackage?shipmentId=${shipmentId}&shipmentPackageSeqId=${shipmentPackage.shipmentPackageSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></div></td>