Changeset 964

Timestamp:

Jul 19, 2012, 1:35:38 PM (12 years ago)

Author:

gav

Message:

Fix for ticket #105 - InventoryItemPurchase?'s can't be deleted when order quantity = 0 and allows the order to be deleted.

Location:

trunk/grails-app

Files:

• i18n/messages.properties (modified) (1 diff)
• services/InventoryMovementService.groovy (modified) (2 diffs)
• services/InventoryPurchaseService.groovy (modified) (2 diffs)

trunk/grails-app/i18n/messages.properties

@@ -323 +323 @@
 inventoryItemPurchase.delete.failure.received.exists=Could not delete, items have been received.
 inventoryItemPurchase.delete.failure.payment.approved=Could not delete, payment has been approved.
+inventoryItemPurchase.delete.failure.reverse.move=Could not delete, associated movement could not be reversed, insufficient items in stock perhaps?
 inventoryItemPurchase.operation.not.permitted.on.inactive.or.obsolete.item=This operation is not permitted on an inactive or obsolete inventory item.
 inventoryItemPurchase.costCodes.not.found=No cost codes found, a person needs to be assigned to a purchasing group that has cost codes.

trunk/grails-app/services/InventoryMovementService.groovy

@@ -9 +9 @@
         InventoryMovement.withTransaction { status ->
             def result = [:]
+            params =  params ?: [:]
 
             def fail = { Map m ->
@@ -20 +21 @@
             result.inventoryMovementInstance = InventoryMovement.lock(params.id)
 
-             if(!result.inventoryMovementInstance)
+            if(!result.inventoryMovementInstance)
                 fail(code:"default.not.found")
 

trunk/grails-app/services/InventoryPurchaseService.groovy

@@ -194 +194 @@
                 }
 
-                def movementResult = inventoryMovementService.reverseMove(inventoryMovements[0])
-                if(movementResult.error)
-                    return fail(code:"inventoryMovement.quantity.insufficientItemsInStock")
+                if(inventoryMovements[0]) {
+                    def movementResult = inventoryMovementService.reverseMove(inventoryMovements[0])
+                    if(movementResult.error)
+                        return fail(code:"inventoryItemPurchase.delete.failure.reverse.move")
+                }
 
                 InventoryItemPurchase.withCriteria {
@@ -213 +215 @@
             // Deletion of received already requires payment approved to be deleted.
             if(purchaseTypeId == 1) {
+
                 def calcQuantities = calcQuantities(result.inventoryItemPurchaseInstance)
                 if(calcQuantities.totalReceived > 0)
+                    return fail(code:"inventoryItemPurchase.delete.failure.received.exists")
+
+                // Cover the case of 0 ordered and received.
+                // Only possible to have Received Complete (3L) in this case and not B/order (2L).
+                def receivedExists = InventoryItemPurchase.withCriteria {
+                    eq("inventoryItem", result.inventoryItemPurchaseInstance.inventoryItem)
+                    eq("purchaseOrderNumber", result.inventoryItemPurchaseInstance.purchaseOrderNumber)
+                    inventoryItemPurchaseType {
+                            eq("id", 3L) // Received Complete.
+                    }
+                }
+
+                if(receivedExists)
                     return fail(code:"inventoryItemPurchase.delete.failure.received.exists")
             }