Changeset 406 for trunk

Timestamp:

Feb 23, 2010, 10:19:44 PM (15 years ago)

Author:

gav

Message:

Fix a bug in inventory movement when no task present.

Location:

trunk/grails-app

Files:

• controllers/InventoryMovementDetailedController.groovy (modified) (1 diff)
• services/InventoryMovementService.groovy (modified) (3 diffs)

trunk/grails-app/controllers/InventoryMovementDetailedController.groovy

@@ -54 +54 @@
         if(!result.error) {
             flash.message = "InventoryMovement ${params.id} deleted"
-            redirect(controller:"taskDetailed", action:"show", id:result.taskId)
+            if(result.taskId)
+                redirect(controller:"taskDetailed", action:"show", id:result.taskId)
+            redirect(controller:"inventoryItemDetailed", action:"show", id:result.inventoryItemInstance?.id)
         }
         else {

trunk/grails-app/services/InventoryMovementService.groovy

@@ -30 +30 @@
                 }
 
-                def inventoryItem = InventoryItem.lock(result.inventoryMovementInstance.inventoryItem.id)
+                result.inventoryItemInstance = InventoryItem.lock(result.inventoryMovementInstance.inventoryItem.id)
                 result.taskId = result.inventoryMovementInstance.task?.id
 
-                if(!inventoryItem) {
+                if(!result.inventoryItemInstance) {
                         status.setRollbackOnly()
                         result.inventoryMovementInstance.errors.rejectValue('inventoryItem', "inventoryMovement.inventoryItem.notFound")
@@ -40 +40 @@
                 }
 
-                if(result.inventoryMovementInstance.task.taskStatus.id == 3) {
-                    status.setRollbackOnly()
-                    result.inventoryMovementInstance.errors.rejectValue('task', "task.operationNotPermittedOnCompleteTask")
-                    result.error = true
-                    return result
-                }
-
                 // Reverse the movement of inventory.
                 if(!result.inventoryMovementInstance.inventoryMovementType.incrementsInventory) {
-                    inventoryItem.unitsInStock += result.inventoryMovementInstance.quantity
+                    result.inventoryItemInstance.unitsInStock += result.inventoryMovementInstance.quantity
                 }
                 else {
-                    if(inventoryItem.unitsInStock >= result.inventoryMovementInstance.quantity) {
-                        inventoryItem.unitsInStock -= result.inventoryMovementInstance.quantity
+                    if(result.inventoryItemInstance.unitsInStock >= result.inventoryMovementInstance.quantity) {
+                        result.inventoryItemInstance.unitsInStock -= result.inventoryMovementInstance.quantity
                     }
                     else {
@@ -63 +56 @@
                 }
 
-                if(inventoryItem.save() ) {
+                if(result.inventoryItemInstance.save() ) {
                     // All went well if we get to this point.
                     result.inventoryMovementInstance.delete()