svn commit: r984399 [10/16] - in /ofbiz/branches/jquery: ./ applications/accounting/config
Locked
svn commit: r984399 [10/16] - in /ofbiz/branches/jquery: ./ applications/accounting/config
 
|
Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacilityLocation.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacilityLocation.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacilityLocation.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacilityLocation.groovy Wed Aug 11 13:22:40 2010 @@ -52,4 +52,4 @@ context.locationSeqId = locationSeqId; context.facility = facility; context.facilityLocation = facilityLocation; context.locationTypeEnums = locationTypeEnums; -context.productFacilityLocations = productFacilityLocations; \ No newline at end of file +context.productFacilityLocations = productFacilityLocations; Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/FacilityLocationGeoLocation.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/FacilityLocationGeoLocation.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/FacilityLocationGeoLocation.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/FacilityLocationGeoLocation.groovy Wed Aug 11 13:22:40 2010 @@ -45,4 +45,4 @@ if (facilityId && locationSeqId) { elevationUom = delegator.findOne("Uom", [uomId : latestGeoPoint.elevationUomId], false); context.elevationUomAbbr = elevationUom.abbreviation; } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityLocation.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityLocation.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityLocation.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityLocation.groovy Wed Aug 11 13:22:40 2010 @@ -50,4 +50,4 @@ if (lookup) { if (foundLocations) { context.foundLocations = foundLocations; } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityTransfers.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityTransfers.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityTransfers.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityTransfers.groovy Wed Aug 11 13:22:40 2010 @@ -61,4 +61,4 @@ ecl = EntityCondition.makeCondition(expr fromTransfers = delegator.findList("InventoryTransfer", ecl, null, ['sendDate'], null, false); if (fromTransfers) { context.fromTransfers = fromTransfers; -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/FindInventoryItemsByLabels.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/FindInventoryItemsByLabels.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/FindInventoryItemsByLabels.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/FindInventoryItemsByLabels.groovy Wed Aug 11 13:22:40 2010 @@ -99,4 +99,4 @@ if (andCondition.size() > 1) { TransactionUtil.commit(beganTransaction); } } -context.inventoryItems = inventoryItems; \ No newline at end of file +context.inventoryItems = inventoryItems; Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/ViewContactMechs.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/ViewContactMechs.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/ViewContactMechs.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/facility/ViewContactMechs.groovy Wed Aug 11 13:22:40 2010 @@ -38,4 +38,4 @@ context.facilityId = facilityId; showOld = "true".equals(request.getParameter("SHOW_OLD")); context.showOld = new Boolean(showOld); -context.contactMeches = ContactMechWorker.getFacilityContactMechValueMaps(delegator, facilityId, showOld, null); \ No newline at end of file +context.contactMeches = ContactMechWorker.getFacilityContactMechValueMaps(delegator, facilityId, showOld, null); Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/FindFacilityPhysicalInventory.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/FindFacilityPhysicalInventory.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/FindFacilityPhysicalInventory.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/FindFacilityPhysicalInventory.groovy Wed Aug 11 13:22:40 2010 @@ -69,4 +69,4 @@ if (conditions.size() > 2) { physicalInventoryCombined.add(row); } context.physicalInventory = physicalInventoryCombined; -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy Wed Aug 11 13:22:40 2010 @@ -48,4 +48,4 @@ inventoryItemProducts.each { productId - } } -context.inventoryAverageCosts = inventoryAverageCosts; \ No newline at end of file +context.inventoryAverageCosts = inventoryAverageCosts; Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy Wed Aug 11 13:22:40 2010 @@ -109,4 +109,4 @@ inventoryItemGrandTotals.add([qohGrandTo totalCostPriceGrandTotal : totalCostPriceGrandTotal, totalRetailPriceGrandTotal : totalRetailPriceGrandTotal]); context.inventoryItemTotals = inventoryItemTotals; -context.inventoryItemGrandTotals = inventoryItemGrandTotals; \ No newline at end of file +context.inventoryItemGrandTotals = inventoryItemGrandTotals; Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/LookupInventoryItems.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/LookupInventoryItems.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/LookupInventoryItems.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/LookupInventoryItems.groovy Wed Aug 11 13:22:40 2010 @@ -44,4 +44,4 @@ if (productId) { context.productId = productId; product = delegator.findByPrimaryKey("Product", [productId : productId]); context.internalName = product.internalName; -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/PhysicalInventoryVariance.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/PhysicalInventoryVariance.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/PhysicalInventoryVariance.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/PhysicalInventoryVariance.groovy Wed Aug 11 13:22:40 2010 @@ -33,4 +33,4 @@ if (inventoryItem && "NON_SERIAL_INV_ITE physicalInventoryAndVarianceData.partyGroup = physicalInventoryAndVariance.getRelatedOne("PartyGroup"); } context.physicalInventoryAndVarianceDatas = physicalInventoryAndVarianceDatas; -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy Wed Aug 11 13:22:40 2010 @@ -259,4 +259,4 @@ context.salesOrderItems = salesOrderItem context.rejectReasons = rejectReasons; context.inventoryItemTypes = inventoryItemTypes; context.facilities = facilities; -context.standardCosts = standardCosts; \ No newline at end of file +context.standardCosts = standardCosts; Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.groovy Wed Aug 11 13:22:40 2010 @@ -96,4 +96,4 @@ if (inventoryTransfer && inventoryTransf if (statusItems) { context.statusItems = statusItems; } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/returns/ReceiveReturn.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/returns/ReceiveReturn.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/returns/ReceiveReturn.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/returns/ReceiveReturn.groovy Wed Aug 11 13:22:40 2010 @@ -86,4 +86,4 @@ context.returnHeader = returnHeader; context.returnItems = returnItems; context.receivedQuantities = receivedQuantities; context.facilities = facilities; -context.inventoryItemTypes = inventoryItemTypes; \ No newline at end of file +context.inventoryItemTypes = inventoryItemTypes; Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy Wed Aug 11 13:22:40 2010 @@ -60,4 +60,4 @@ shipmentItems.each { shipmentItem -> ]); } context.shipmentId = shipmentId; -context.items = items; \ No newline at end of file +context.items = items; Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromOrder.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromOrder.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromOrder.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromOrder.groovy Wed Aug 11 13:22:40 2010 @@ -210,4 +210,4 @@ if (shipment && selectFromShipmentPlan) context.shipmentId = shipmentId; context.shipment = shipment; context.orderId = orderId; -context.shipGroupSeqId = shipGroupSeqId; \ No newline at end of file +context.shipGroupSeqId = shipGroupSeqId; Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy Wed Aug 11 13:22:40 2010 @@ -96,4 +96,4 @@ if (shipment) { pfc = delegator.findList("ProductStoreFacility", null, null, null, null, false); fac = delegator.findList("ProductStoreFacilityByOrder", EntityCondition.makeCondition([orderId : primaryOrderId]), null, null, null, false); } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.groovy Wed Aug 11 13:22:40 2010 @@ -65,4 +65,4 @@ if (shipment) { context.shipmentItemDatas = shipmentItemDatas; context.shipmentPackages = shipmentPackages; } -context.shipmentId = shipmentId; \ No newline at end of file +context.shipmentId = shipmentId; Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.groovy Wed Aug 11 13:22:40 2010 @@ -55,4 +55,4 @@ if (shipment) { context.weightUoms = weightUoms; context.boxTypes = boxTypes; } -context.shipmentId = shipmentId; \ No newline at end of file +context.shipmentId = shipmentId; Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy Wed Aug 11 13:22:40 2010 @@ -285,4 +285,4 @@ context.rowCount = addRows.size(); context.shipmentId = shipmentId; context.shipment = shipment; context.totWeight = totWeight; -context.totVolume = totVolume; \ No newline at end of file +context.totVolume = totVolume; Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy Wed Aug 11 13:22:40 2010 @@ -86,4 +86,4 @@ if (shipment) { context.carrierPartyDatas = carrierPartyDatas; } context.shipmentId = shipmentId; -context.nowTimestampString = UtilDateTime.nowTimestamp().toString(); \ No newline at end of file +context.nowTimestampString = UtilDateTime.nowTimestamp().toString(); Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy Wed Aug 11 13:22:40 2010 @@ -184,4 +184,4 @@ toCal.set(Calendar.SECOND, toCal.getActu toCal.set(Calendar.MILLISECOND, toCal.getActualMaximum(Calendar.MILLISECOND)); toTs = new Timestamp(toCal.getTimeInMillis()); toStr = toTs.toString(); -context.thruDateStr = toStr; \ No newline at end of file +context.thruDateStr = toStr; Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy Wed Aug 11 13:22:40 2010 @@ -174,4 +174,4 @@ if (facility) { if (!defaultWeightUomId) { defaultWeightUomId = UtilProperties.getPropertyValue("shipment.properties", "shipment.default.weight.uom", "WT_kg"); } -context.defaultWeightUomId = defaultWeightUomId; \ No newline at end of file +context.defaultWeightUomId = defaultWeightUomId; Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy Wed Aug 11 13:22:40 2010 @@ -20,8 +20,8 @@ // This script gets shipment items grouped by package for use in the packing slip PDF or any screens that require by-package layout import org.ofbiz.base.util.*; -import org.ofbiz.common.CommonWorkers; import org.ofbiz.entity.condition.*; +import org.ofbiz.entity.util.EntityTypeUtil // Since this script is run after ViewShipment, we will re-use the shipment in the context shipment = context.shipment; @@ -111,15 +111,15 @@ shipmentPackages.each { shipmentPackage line.product = product; line.quantityRequested = quantityRequestedByProduct.get(product.productId); line.quantityInPackage = content.quantity; - if (CommonWorkers.hasParentType(delegator, "ProductType", "productTypeId", productTypeId, "parentTypeId", "MARKETING_PKG_PICK") && line.quantityInPackage > line.quantityRequested) { + if (EntityTypeUtil.hasParentType(delegator, "ProductType", "productTypeId", productTypeId, "parentTypeId", "MARKETING_PKG_PICK") && line.quantityInPackage > line.quantityRequested) { line.quantityInPackage = line.quantityRequested; } line.quantityInShipment = quantityInShipmentByProduct.get(product.productId); - if (CommonWorkers.hasParentType(delegator, "ProductType", "productTypeId", productTypeId, "parentTypeId", "MARKETING_PKG_PICK") && line.quantityInShipment > line.quantityRequested) { + if (EntityTypeUtil.hasParentType(delegator, "ProductType", "productTypeId", productTypeId, "parentTypeId", "MARKETING_PKG_PICK") && line.quantityInShipment > line.quantityRequested) { line.quantityInShipment = line.quantityRequested; } line.quantityShipped = quantityShippedByProduct.get(product.productId); - if (CommonWorkers.hasParentType(delegator, "ProductType", "productTypeId", productTypeId, "parentTypeId", "MARKETING_PKG_PICK") && line.quantityShipped > line.quantityRequested) { + if (EntityTypeUtil.hasParentType(delegator, "ProductType", "productTypeId", productTypeId, "parentTypeId", "MARKETING_PKG_PICK") && line.quantityShipped > line.quantityRequested) { line.quantityShipped = line.quantityRequested; } lines.add(line); Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/PrintPickSheets.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/PrintPickSheets.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/PrintPickSheets.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/PrintPickSheets.groovy Wed Aug 11 13:22:40 2010 @@ -126,4 +126,4 @@ if (toPrintOrders) { } } } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy Wed Aug 11 13:22:40 2010 @@ -74,4 +74,4 @@ if (shipmentId) { } context.weightUomList = weightUoms; } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy Wed Aug 11 13:22:40 2010 @@ -270,4 +270,4 @@ if (productIdToReceive) { // Put the tracking map back into the session, in case it has been reconstructed session.setAttribute("purchaseOrderItemQuantitiesToReceive", itemQuantitiesToReceive); context.itemQuantitiesToReceive = itemQuantitiesToReceive; -context.totalAvailableToReceive = totalAvailableToReceive; \ No newline at end of file +context.totalAvailableToReceive = totalAvailableToReceive; Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy Wed Aug 11 13:22:40 2010 @@ -39,4 +39,4 @@ orderHeaders.each { orderHeader -> orders.add([orderId : orderHeader.orderId, pickSheetPrintedDate : dateFormat.format(orderHeader.pickSheetPrintedDate), isVerified : "N"]); } } -context.orders = orders; \ No newline at end of file +context.orders = orders; Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy Wed Aug 11 13:22:40 2010 @@ -61,4 +61,4 @@ if (shipment) { context.shipmentPackageDatas = shipmentPackageDatas; } context.shipmentId = shipmentId; -context.shipment = shipment; \ No newline at end of file +context.shipment = shipment; Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy Wed Aug 11 13:22:40 2010 @@ -115,4 +115,4 @@ if (orderId) { request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage("OrderErrorUiLabels", "OrderErrorOrderIdNotFound", [orderId : orderId], locale)); } } -context.verifyPickSession = verifyPickSession; \ No newline at end of file +context.verifyPickSession = verifyPickSession; Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.groovy Wed Aug 11 13:22:40 2010 @@ -58,4 +58,4 @@ if (security.hasEntityPermission("FACILI } } } -context.hasPermission = hasPermission; \ No newline at end of file +context.hasPermission = hasPermission; Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy Wed Aug 11 13:22:40 2010 @@ -199,4 +199,4 @@ if (facility) { if (!defaultWeightUomId) { defaultWeightUomId = UtilProperties.getPropertyValue("shipment.properties", "shipment.default.weight.uom", "WT_kg"); } -context.defaultWeightUomId = defaultWeightUomId; \ No newline at end of file +context.defaultWeightUomId = defaultWeightUomId; Modified: ofbiz/branches/jquery/applications/product/widget/catalog/CatalogMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/CatalogMenus.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/CatalogMenus.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/CatalogMenus.xml Wed Aug 11 13:22:40 2010 @@ -466,4 +466,4 @@ under the License. <menu-item name="EditWebAnalyticsType" title="${uiLabelMap.CommonNew}"><link target="EditWebAnalyticsType"/></menu-item> </menu> -</menus> \ No newline at end of file +</menus> Modified: ofbiz/branches/jquery/applications/product/widget/catalog/CatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/CatalogScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/CatalogScreens.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/CatalogScreens.xml Wed Aug 11 13:22:40 2010 @@ -178,4 +178,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/product/widget/catalog/CategoryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/CategoryScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/CategoryScreens.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/CategoryScreens.xml Wed Aug 11 13:22:40 2010 @@ -450,4 +450,4 @@ under the License. </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/product/widget/catalog/PriceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/PriceForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/PriceForms.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/PriceForms.xml Wed Aug 11 13:22:40 2010 @@ -51,4 +51,4 @@ <field name="ruleName" title="${uiLabelMap.ProductName}"><text size="30"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/product/widget/catalog/StoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/StoreScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/StoreScreens.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/StoreScreens.xml Wed Aug 11 13:22:40 2010 @@ -314,6 +314,10 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.ProductNewShipmentEstimate}"> + <container style="button-bar"> + <link target="javascript:expandAll(true);" text="${uiLabelMap.CommonExpandAll}" style="buttontext expand-all" url-mode="plain"/> + <link target="javascript:expandAll(false);" text="${uiLabelMap.CommonCollapseAll}" style="buttontext collapse-all" url-mode="plain"/> + </container> <include-form name="AddShipmentCostEstimate" location="component://product/widget/catalog/ProductStoreForms.xml"/> </screenlet> </widgets> Modified: ofbiz/branches/jquery/applications/product/widget/catalog/WebAnalyticsForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/WebAnalyticsForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/WebAnalyticsForms.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/WebAnalyticsForms.xml Wed Aug 11 13:22:40 2010 @@ -170,4 +170,4 @@ under the License. <field use-when="webAnalyticsType==null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> </forms> - \ No newline at end of file + Modified: ofbiz/branches/jquery/applications/product/widget/catalog/WebAnalyticsScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/WebAnalyticsScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/WebAnalyticsScreens.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/WebAnalyticsScreens.xml Wed Aug 11 13:22:40 2010 @@ -129,4 +129,4 @@ under the License. </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/product/widget/facility/FacilityGroupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/facility/FacilityGroupForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/facility/FacilityGroupForms.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/facility/FacilityGroupForms.xml Wed Aug 11 13:22:40 2010 @@ -195,4 +195,4 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/product/widget/facility/FacilityGroupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/facility/FacilityGroupScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/facility/FacilityGroupScreens.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/facility/FacilityGroupScreens.xml Wed Aug 11 13:22:40 2010 @@ -173,4 +173,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/product/widget/facility/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/facility/FieldLookupForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/facility/FieldLookupForms.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/facility/FieldLookupForms.xml Wed Aug 11 13:22:40 2010 @@ -147,4 +147,4 @@ under the License. <field name="quantityOnHandTotal" title="${uiLabelMap.ProductQoh}"><display/></field> <field name="availableToPromiseTotal" title="${uiLabelMap.ProductAtp}"><display/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/product/widget/facility/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/facility/ReportScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/facility/ReportScreens.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/facility/ReportScreens.xml Wed Aug 11 13:22:40 2010 @@ -69,4 +69,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/product/widget/facility/ShipmentGatewayConfigForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/facility/ShipmentGatewayConfigForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/facility/ShipmentGatewayConfigForms.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/facility/ShipmentGatewayConfigForms.xml Wed Aug 11 13:22:40 2010 @@ -338,4 +338,4 @@ under the License. <submit button-type="button"/> </field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml Wed Aug 11 13:22:40 2010 @@ -201,4 +201,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/securityext/script/org/ofbiz/securityext/login/LoginMapProcs.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/securityext/script/org/ofbiz/securityext/login/LoginMapProcs.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/securityext/script/org/ofbiz/securityext/login/LoginMapProcs.xml (original) +++ ofbiz/branches/jquery/applications/securityext/script/org/ofbiz/securityext/login/LoginMapProcs.xml Wed Aug 11 13:22:40 2010 @@ -56,4 +56,4 @@ under the License. </process> <process field="passwordHint"><copy/></process> </simple-map-processor> -</simple-map-processors> \ No newline at end of file +</simple-map-processors> Modified: ofbiz/branches/jquery/applications/securityext/testdef/da/DynamicAccessTest.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/securityext/testdef/da/DynamicAccessTest.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/securityext/testdef/da/DynamicAccessTest.xml (original) +++ ofbiz/branches/jquery/applications/securityext/testdef/da/DynamicAccessTest.xml Wed Aug 11 13:22:40 2010 @@ -40,4 +40,4 @@ under the License. </if-has-permission> <field-to-result field="permissionGranted"/> </simple-method> -</simple-methods> \ No newline at end of file +</simple-methods> Modified: ofbiz/branches/jquery/applications/securityext/testdef/data/SecurityTestData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/securityext/testdef/data/SecurityTestData.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/securityext/testdef/data/SecurityTestData.xml (original) +++ ofbiz/branches/jquery/applications/securityext/testdef/data/SecurityTestData.xml Wed Aug 11 13:22:40 2010 @@ -25,4 +25,4 @@ under the License. <SecurityPermission permissionId="test:recursion" dynamicAccess="service:dynamicAccessRecursiveTest"/> <SecurityPermission permissionId="test:autogranted" dynamicAccess=""/> <SecurityPermissionAutoGrant permissionId="test:groovy1" grantPermission="test:autogranted"/> -</entity-engine-xml> \ No newline at end of file +</entity-engine-xml> Modified: ofbiz/branches/jquery/applications/securityext/testdef/securitytests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/securityext/testdef/securitytests.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/securityext/testdef/securitytests.xml (original) +++ ofbiz/branches/jquery/applications/securityext/testdef/securitytests.xml Wed Aug 11 13:22:40 2010 @@ -26,4 +26,4 @@ <test-case case-name="security-tests"> <junit-test-suite class-name="org.ofbiz.securityext.test.AuthorizationTests"/> </test-case> -</test-suite> \ No newline at end of file +</test-suite> Modified: ofbiz/branches/jquery/applications/workeffort/config/WorkEffortUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/config/WorkEffortUiLabels.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/config/WorkEffortUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/config/WorkEffortUiLabels.xml Wed Aug 11 13:22:40 2010 @@ -95,6 +95,10 @@ <value xml:lang="it">Disponibilità </value> <value xml:lang="zh">æææ§</value> </property> + <property key="FormFieldTitle_calendarType"> + <value xml:lang="en">Calendar Type</value> + <value xml:lang="fr">Type de calendrier</value> + </property> <property key="FormFieldTitle_clientPartyId"> <value xml:lang="de">Klienten Akteur ID</value> <value xml:lang="en">Client Party Id</value> @@ -164,6 +168,10 @@ <value xml:lang="th">วัà¸à¹à¸§à¸¥à¸²à¸à¸µà¹à¹à¸ªà¸£à¹à¸</value> <value xml:lang="zh">å®ææ¥ææ¶é´</value> </property> + <property key="FormFieldTitle_hideEvents"> + <value xml:lang="fr">Cacher les évènements</value> + <value xml:lang="en">Hide events</value> + </property> <property key="FormFieldTitle_hours"> <value xml:lang="de">Stunden</value> <value xml:lang="en">Hours</value> Modified: ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Wed Aug 11 13:22:40 2010 @@ -208,10 +208,7 @@ under the License. <condition> <or> <if-empty field="oldRateAmount"/> - <and> - <not><if-empty field="OldRateAmount"/></not> - <if-compare-field field="rateAmount" operator="not-equals" to-field="oldRateAmount"/> - </and> + <if-compare-field field="rateAmount" operator="not-equals" to-field="oldRateAmount"/> </or> </condition> <then> @@ -263,9 +260,9 @@ under the License. <set field="updTimeEntry.invoiceId" from-field="invoiceItemMap.invoiceId"/> <set field="updTimeEntry.invoiceItemSeqId" from-field="invoiceItemMap.invoiceItemSeqId"/> <call-service service-name="updateTimeEntry" in-map-name="updTimeEntry"/> - <else> + <!-- else> <log level="info" message="Timeentry: ${timeEntry.timeEntryId} already connected to invoiceId: ${timeEntry.invoiceId}...not added to invoiceItem"/> - </else> + </else--> </if-empty> <else> <set field="errMsg" value="Invoice ${invoiceId} should have the status 'in progress', the status is however: ${invoice.statusId}"/> @@ -388,13 +385,16 @@ under the License. </simple-method> <!-- subroutines --> - <simple-method method-name="checkTimesheetStatus" short-description="Check access and if the timesheet is in progress"> + <simple-method method-name="checkTimesheetStatus" short-description="Check access and if the timesheet is in progress, however do allow invoiceId to be updated when completed (need to invoice completed timesheets)"> <if> <condition> - <or> - <not><if-empty field="parameters.timesheetId"/></not> - <not><if-empty field="lookedUpValue.timesheetId"/></not> - </or> + <and> + <or> + <not><if-empty field="parameters.timesheetId"/></not> + <not><if-empty field="lookedUpValue.timesheetId"/></not> + </or> + <if-empty field="parameters.invoiceId"/> + </and> </condition> <then> <if-empty field="parameters.timesheetId"> Modified: ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/workeffort/UpgradeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/workeffort/UpgradeServices.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/workeffort/UpgradeServices.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/workeffort/UpgradeServices.xml Wed Aug 11 13:22:40 2010 @@ -32,4 +32,4 @@ under the License. <create-value value-field="workEffortContactMech"/> </iterate> </simple-method> -</simple-methods> \ No newline at end of file +</simple-methods> Modified: ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Wed Aug 11 13:22:40 2010 @@ -715,7 +715,7 @@ under the License. <add-error><fail-message message="ERROR: CustRequestWorkEffort [${parameters.custRequestId}][${parameters.workEffortId}] does not exist."/></add-error> <check-errors/> </if-empty> - <remove-value value-field="lookupMap"/> + <remove-value value-field="custRequestWorkEffort"/> </simple-method> <!-- CustRequestItem workeffort --> Modified: ofbiz/branches/jquery/applications/workeffort/servicedef/services_upgrade.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/servicedef/services_upgrade.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/servicedef/services_upgrade.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/servicedef/services_upgrade.xml Wed Aug 11 13:22:40 2010 @@ -32,4 +32,4 @@ under the License. WorkEffortContactMech entity. </description> </service> -</services> \ No newline at end of file +</services> Modified: ofbiz/branches/jquery/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java (original) +++ ofbiz/branches/jquery/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java Wed Aug 11 13:22:40 2010 @@ -26,7 +26,6 @@ import javolution.util.FastList; import javolution.util.FastSet; import org.ofbiz.base.util.Debug; -import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; Modified: ofbiz/branches/jquery/applications/workeffort/testdef/workefforttests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/testdef/workefforttests.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/testdef/workefforttests.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/testdef/workefforttests.xml Wed Aug 11 13:22:40 2010 @@ -27,4 +27,4 @@ <test-case case-name="testCreateProjectService Direct Simple Method"> <simple-method-test location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" name="testCreateProjectService"/> </test-case> -</test-suite> \ No newline at end of file +</test-suite> Modified: ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/WEB-INF/actions/content/WorkEffortContentWrapper.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/WEB-INF/actions/content/WorkEffortContentWrapper.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/WEB-INF/actions/content/WorkEffortContentWrapper.groovy (original) +++ ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/WEB-INF/actions/content/WorkEffortContentWrapper.groovy Wed Aug 11 13:22:40 2010 @@ -30,4 +30,4 @@ if (workEffort != null) { wrapper = WorkEffortContentWrapper.makeWorkEffortContentWrapper(workEffort, request); context.put("workEffortContentWrapper", wrapper); - } \ No newline at end of file + } Modified: ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/WEB-INF/actions/find/WorkEffortSearchOptions.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/WEB-INF/actions/find/WorkEffortSearchOptions.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/WEB-INF/actions/find/WorkEffortSearchOptions.groovy (original) +++ ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/WEB-INF/actions/find/WorkEffortSearchOptions.groovy Wed Aug 11 13:22:40 2010 @@ -60,4 +60,4 @@ context.put("searchOperator", searchOper context.put("searchConstraintStrings", searchConstraintStrings); context.put("searchSortOrderString", searchSortOrderString); context.put("workEffortAssocTypes", workEffortAssocTypes); -context.put("roleTypes", roleTypes); \ No newline at end of file +context.put("roleTypes", roleTypes); Modified: ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl (original) +++ ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl Wed Aug 11 13:22:40 2010 @@ -34,7 +34,7 @@ under the License. </#list> </#if> <#elseif workEffort.workEffortTypeId == "PROD_ORDER_TASK"> - <a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortId}" class="event"> + <a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortParentId}" class="event"> ${workEffort.workEffortParentId} / ${workEffort.workEffortId} </a> ${workEffort.workEffortName?default("Undefined")}<#if workEffort.reservPersons?exists> Persons:${workEffort.reservPersons}</#if> Modified: ofbiz/branches/jquery/applications/workeffort/widget/CalendarForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/widget/CalendarForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/widget/CalendarForms.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/widget/CalendarForms.xml Wed Aug 11 13:22:40 2010 @@ -103,8 +103,8 @@ under the License. </entity-options> </drop-down> </field> - <field name="estimatedStartDate"><date-time input-method="time-dropdown" /></field> - <field name="estimatedCompletionDate"><date-time input-method="time-dropdown"/></field> + <field name="estimatedStartDate"><date-time input-method="time-dropdown" default-value="${workEffort.estimatedStartDate}" /></field> + <field name="estimatedCompletionDate"><date-time input-method="time-dropdown" default-value="${workEffort.estimatedCompletionDate}"/></field> <field name="actualStartDate" use-when="parentWorkEffortId!=null"><display type="date-time"/></field> <field name="actualCompletionDate" use-when="parentWorkEffortId!=null"><display type="date-time"/></field> <field name="addButton" use-when="workEffort==null"><submit/></field> @@ -167,4 +167,4 @@ under the License. <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/workeffort/widget/CalendarScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/widget/CalendarScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/widget/CalendarScreens.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/widget/CalendarScreens.xml Wed Aug 11 13:22:40 2010 @@ -238,4 +238,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/workeffort/widget/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/widget/CustRequestScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/widget/CustRequestScreens.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/widget/CustRequestScreens.xml Wed Aug 11 13:22:40 2010 @@ -44,4 +44,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/workeffort/widget/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/widget/LookupForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/widget/LookupForms.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/widget/LookupForms.xml Wed Aug 11 13:22:40 2010 @@ -180,4 +180,4 @@ under the License. <field name="partyId"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field> <field name="clientPartyId"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/workeffort/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/widget/LookupScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/widget/LookupScreens.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/widget/LookupScreens.xml Wed Aug 11 13:22:40 2010 @@ -100,4 +100,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/workeffort/widget/TimesheetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/widget/TimesheetForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/widget/TimesheetForms.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/widget/TimesheetForms.xml Wed Aug 11 13:22:40 2010 @@ -266,4 +266,4 @@ under the License. <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortCommEventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortCommEventForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortCommEventForms.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortCommEventForms.xml Wed Aug 11 13:22:40 2010 @@ -63,4 +63,4 @@ under the License. <sort-field name="description"/> </sort-order> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml Wed Aug 11 13:22:40 2010 @@ -52,4 +52,4 @@ under the License. <field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortQuoteForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortQuoteForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortQuoteForms.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortQuoteForms.xml Wed Aug 11 13:22:40 2010 @@ -91,4 +91,4 @@ under the License. <field name="quoteItemSeqId"><lookup target-form-name="LookupQuoteItem" target-parameter="quoteId"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortRequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortRequestForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortRequestForms.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortRequestForms.xml Wed Aug 11 13:22:40 2010 @@ -85,4 +85,4 @@ under the License. <field name="custRequestItemSeqId"><lookup target-form-name="LookupCustRequestItem" target-parameter="custRequestId"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortRequirementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortRequirementForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortRequirementForms.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortRequirementForms.xml Wed Aug 11 13:22:40 2010 @@ -63,4 +63,4 @@ under the License. <sort-field name="workReqFulfTypeId"/> </sort-order> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortShopListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortShopListForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortShopListForms.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/widget/WorkEffortShopListForms.xml Wed Aug 11 13:22:40 2010 @@ -50,4 +50,4 @@ under the License. <field name="shoppingListId" ><lookup target-form-name="LookupShoppingList"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/build.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/build.xml (original) +++ ofbiz/branches/jquery/build.xml Wed Aug 11 13:22:40 2010 @@ -555,6 +555,12 @@ under the License. </fileset> </classpath> </taskdef> + <cobertura-merge datafile="runtime/logs/cobertura.dat"> + <fileset dir="runtime/logs"> + <include name="cobertura-base.dat"/> + <include name="cobertura-components.dat"/> + </fileset> + </cobertura-merge> <cobertura-report datafile="runtime/logs/cobertura.dat" destdir="runtime/logs/cobertura-report"> <dirset dir="."> <include name="*/*/src"/> Modified: ofbiz/branches/jquery/debian/ofbiz-framework.ofbiz.init URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/debian/ofbiz-framework.ofbiz.init?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/debian/ofbiz-framework.ofbiz.init (original) +++ ofbiz/branches/jquery/debian/ofbiz-framework.ofbiz.init Wed Aug 11 13:22:40 2010 @@ -53,6 +53,7 @@ fi if [ -e "$DEFAULT" ]; then . "$DEFAULT" fi +umask $UMASK PATH=/bin:/usr/bin:/sbin:/usr/sbin Modified: ofbiz/branches/jquery/framework/appserver/templates/jboss422/application.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/appserver/templates/jboss422/application.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/appserver/templates/jboss422/application.xml (original) +++ ofbiz/branches/jquery/framework/appserver/templates/jboss422/application.xml Wed Aug 11 13:22:40 2010 @@ -15,4 +15,4 @@ </web> </module> </#list> -</application> \ No newline at end of file +</application> Modified: ofbiz/branches/jquery/framework/base/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/build.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/build.xml (original) +++ ofbiz/branches/jquery/framework/base/build.xml Wed Aug 11 13:22:40 2010 @@ -48,8 +48,10 @@ under the License. <file name="org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java"/> <file name="org/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java"/> <file name="org/ofbiz/base/util/test/TimeDurationTests.java"/> + <file name="org/ofbiz/base/util/test/StringUtilTests.java"/> <file name="org/ofbiz/base/util/cache/test/UtilCacheTests.java"/> <file name="org/ofbiz/base/json/test/JSONTests.java"/> + <file name="org/ofbiz/base/conversion/test/TestBooleanConverters.java"/> <file name="org/ofbiz/base/conversion/test/DateTimeTests.java"/> <file name="org/ofbiz/base/conversion/test/MiscTests.java"/> <file name="org/ofbiz/base/util/test/UtilIOTests.java"/> Modified: ofbiz/branches/jquery/framework/base/config/test-containers.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/config/test-containers.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/config/test-containers.xml (original) +++ ofbiz/branches/jquery/framework/base/config/test-containers.xml Wed Aug 11 13:22:40 2010 @@ -23,7 +23,7 @@ under the License. <!-- load the ofbiz component container (always first) --> <container name="component-container" class="org.ofbiz.base.container.ComponentContainer"> <property name="ofbiz.instrumenterClassName" value="org.ofbiz.base.config.CoberturaInstrumenter"/> - <property name="ofbiz.instrumenterFile" value="runtime/logs/cobertura.dat"/> + <property name="ofbiz.instrumenterFile" value="runtime/logs/cobertura-components.dat"/> </container> <!-- load the cached classloader container (always second) --> Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/component/ComponentConfig.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/component/ComponentConfig.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/component/ComponentConfig.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/component/ComponentConfig.java Wed Aug 11 13:22:40 2010 @@ -350,7 +350,7 @@ public class ComponentConfig { this.rootLocation = rootLocation.replace('\\', '/'); File rootLocationDir = new File(rootLocation); - if (rootLocationDir == null) { + if (!rootLocationDir.exists()) { throw new ComponentException("The given component root location is does not exist: " + rootLocation); } if (!rootLocationDir.isDirectory()) { Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/DependencyPool.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/DependencyPool.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/DependencyPool.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/DependencyPool.java Wed Aug 11 13:22:40 2010 @@ -5,12 +5,10 @@ import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import java.util.Queue; import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executor; import java.util.concurrent.Future; Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/TTLObject.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/TTLObject.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/TTLObject.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/TTLObject.java Wed Aug 11 13:22:40 2010 @@ -18,8 +18,6 @@ *******************************************************************************/ package org.ofbiz.base.concurrent; -import java.io.IOException; -import java.lang.management.ManagementFactory; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; @@ -29,9 +27,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; -import org.ofbiz.base.lang.SourceMonitored; import org.ofbiz.base.lang.ObjectWrapper; -import org.ofbiz.base.util.UtilIO; +import org.ofbiz.base.lang.SourceMonitored; @SourceMonitored public abstract class TTLObject<T> implements ObjectWrapper<T> { Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/AsyncTTLObjectTest.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/AsyncTTLObjectTest.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/AsyncTTLObjectTest.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/AsyncTTLObjectTest.java Wed Aug 11 13:22:40 2010 @@ -23,7 +23,6 @@ import java.util.concurrent.Future; import org.ofbiz.base.concurrent.TTLObject; import org.ofbiz.base.lang.SourceMonitored; -import org.ofbiz.base.test.GenericTestCaseBase; @SourceMonitored public class AsyncTTLObjectTest extends TTLObjectTest { Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/DependencyPoolTests.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/DependencyPoolTests.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/DependencyPoolTests.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/DependencyPoolTests.java Wed Aug 11 13:22:40 2010 @@ -3,16 +3,12 @@ package org.ofbiz.base.concurrent.test; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.Future; -import java.util.concurrent.FutureTask; import java.util.concurrent.ScheduledExecutorService; import org.ofbiz.base.concurrent.DependencyPool; import org.ofbiz.base.concurrent.ExecutionPool; import org.ofbiz.base.lang.SourceMonitored; import org.ofbiz.base.test.GenericTestCaseBase; -import org.ofbiz.base.util.UtilMisc; @SourceMonitored public class DependencyPoolTests extends GenericTestCaseBase { Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/SyncTTLObjectTest.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/SyncTTLObjectTest.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/SyncTTLObjectTest.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/SyncTTLObjectTest.java Wed Aug 11 13:22:40 2010 @@ -22,9 +22,8 @@ import java.util.concurrent.Callable; import java.util.concurrent.Future; import org.ofbiz.base.concurrent.TTLObject; -import org.ofbiz.base.lang.SourceMonitored; import org.ofbiz.base.lang.ObjectWrapper; -import org.ofbiz.base.test.GenericTestCaseBase; +import org.ofbiz.base.lang.SourceMonitored; @SourceMonitored public class SyncTTLObjectTest extends TTLObjectTest { Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/TTLObjectTest.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/TTLObjectTest.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/TTLObjectTest.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/TTLObjectTest.java Wed Aug 11 13:22:40 2010 @@ -20,7 +20,6 @@ package org.ofbiz.base.concurrent.test; import java.util.List; import java.util.concurrent.Callable; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/config/JNDIConfigUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/config/JNDIConfigUtil.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/config/JNDIConfigUtil.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/config/JNDIConfigUtil.java Wed Aug 11 13:22:40 2010 @@ -18,14 +18,12 @@ *******************************************************************************/ package org.ofbiz.base.config; -import java.util.Map; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - import javolution.util.FastMap; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilXml; +import org.w3c.dom.Document; +import org.w3c.dom.Element; /** * JNDIConfigUtil Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/BooleanConverters.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/BooleanConverters.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/BooleanConverters.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/BooleanConverters.java Wed Aug 11 13:22:40 2010 @@ -18,11 +18,6 @@ *******************************************************************************/ package org.ofbiz.base.conversion; -import java.util.List; -import java.util.Set; - -import javolution.util.FastList; -import javolution.util.FastSet; /** Boolean Converter classes. */ public class BooleanConverters implements ConverterLoader { Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/CollectionConverters.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/CollectionConverters.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/CollectionConverters.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/CollectionConverters.java Wed Aug 11 13:22:40 2010 @@ -29,7 +29,6 @@ import javolution.util.FastSet; import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilGenerics; -import org.ofbiz.base.util.UtilValidate; /** Collection Converter classes. */ public class CollectionConverters implements ConverterLoader { Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java Wed Aug 11 13:22:40 2010 @@ -137,7 +137,7 @@ public class MiscConverters implements C } } - public static class EnumToString extends AbstractConverter<Enum, String> { + public static class EnumToString extends AbstractConverter<Enum<?>, String> { public EnumToString() { super(Enum.class, String.class); } @@ -146,35 +146,31 @@ public class MiscConverters implements C return Enum.class.isAssignableFrom(sourceClass) && String.class.isAssignableFrom(targetClass); } - public String convert(Enum obj) throws ConversionException { + public String convert(Enum<?> obj) throws ConversionException { return obj.name(); } - public String convert(Class<? extends String> targetClass, Enum obj) throws ConversionException { + public String convert(Class<? extends String> targetClass, Enum<?> obj) throws ConversionException { return convert(obj); } - public Class<? super Enum> getSourceClass() { + public Class<? super Enum<?>> getSourceClass() { return null; } } - public static class StringToEnumConverterCreator implements ConverterCreator, ConverterLoader { + public static class StringToEnumConverterCreator<E extends Enum<E>> implements ConverterCreator, ConverterLoader { public void loadConverters() { Converters.registerCreator(this); } public <S, T> Converter<S, T> createConverter(Class<S> sourceClass, Class<T> targetClass) { if (String.class == sourceClass && Enum.class.isAssignableFrom(targetClass)) { - return UtilGenerics.cast(new StringToEnum()); + return UtilGenerics.cast(new StringToEnum<E>()); } else { return null; } } - - private <E extends Enum<E>> StringToEnum<E> createConverter(Class<Enum<E>> targetClass) { - return new StringToEnum<E>(); - } } private static class StringToEnum<E extends Enum<E>> extends AbstractConverter<String, E> { @@ -194,7 +190,7 @@ public class MiscConverters implements C return Enum.valueOf(UtilGenerics.<Class<E>>cast(targetClass), obj); } - public Class<? super Enum> getTargetClass() { + public Class<? super Enum<?>> getTargetClass() { return null; } } Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/test/DateTimeTests.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/test/DateTimeTests.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/test/DateTimeTests.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/test/DateTimeTests.java Wed Aug 11 13:22:40 2010 @@ -22,7 +22,6 @@ import org.ofbiz.base.conversion.Convert import org.ofbiz.base.conversion.DateTimeConverters; import org.ofbiz.base.lang.SourceMonitored; import org.ofbiz.base.test.GenericTestCaseBase; -import org.ofbiz.base.util.UtilGenerics; @SourceMonitored public class DateTimeTests extends GenericTestCaseBase { Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/test/MiscTests.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/test/MiscTests.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/test/MiscTests.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/test/MiscTests.java Wed Aug 11 13:22:40 2010 @@ -20,18 +20,15 @@ package org.ofbiz.base.conversion.test; import java.math.BigDecimal; import java.net.URL; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.concurrent.Callable; -import java.util.concurrent.Future; import javolution.util.FastList; import javolution.util.FastMap; -import org.ofbiz.base.concurrent.TTLObject; import org.ofbiz.base.conversion.Converter; import org.ofbiz.base.conversion.ConverterLoader; import org.ofbiz.base.conversion.Converters; Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/json/JSONWriter.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/json/JSONWriter.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/json/JSONWriter.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/json/JSONWriter.java Wed Aug 11 13:22:40 2010 @@ -19,7 +19,6 @@ package org.ofbiz.base.json; import java.io.IOException; -import java.io.StringWriter; import java.io.Writer; import java.util.Collection; import java.util.Iterator; Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/ComparableRange.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/ComparableRange.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/ComparableRange.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/ComparableRange.java Wed Aug 11 13:22:40 2010 @@ -20,6 +20,7 @@ package org.ofbiz.base.lang; /** An immutable range of values. */ @SourceMonitored +@ThreadSafe public class ComparableRange<T extends Comparable<T>> implements Range<T>, Comparable<ComparableRange<T>> { protected final T start; @@ -71,7 +72,7 @@ public class ComparableRange<T extends C return true; } try { - ComparableRange that = (ComparableRange) obj; + ComparableRange<?> that = (ComparableRange<?>) obj; return this.start.equals(that.start()) && this.end.equals(that.end()); } catch (Exception e) {} return false; Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/LockedBy.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/LockedBy.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/LockedBy.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/LockedBy.java Wed Aug 11 13:22:40 2010 @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.ofbiz.base.lang; import java.lang.annotation.Documented; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |