Changeset 964 for trunk/grails-app/services/InventoryPurchaseService.groovy

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.

File:

• trunk/grails-app/services/InventoryPurchaseService.groovy (modified) (2 diffs)

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")
             }