Changeset 717 for trunk

Timestamp:

Nov 24, 2010, 12:57:45 PM (14 years ago)

Author:

gav

Message:

Fix for ticket #91 - Purchasing - run order price update when invoice is updated.

Location:

trunk/grails-app

Files:

• controllers/InventoryItemPurchaseDetailedController.groovy (modified) (2 diffs)
• services/InventoryPurchaseService.groovy (modified) (3 diffs)

trunk/grails-app/controllers/InventoryItemPurchaseDetailedController.groovy

@@ -350 +350 @@
         }
 
+        // Prevent lazy initialization error.
+        result.inventoryItemPurchaseInstance.costCode.attach()
+
         render(view:'receive',
                         model:['inventoryItemPurchaseInstance': result.inventoryItemPurchaseInstance,
@@ -394 +397 @@
         }
 
+        // Prevent lazy initialization error.
+        result.inventoryItemPurchaseInstance.costCode.attach()
+
         render(view:'approveInvoicePayment',
                     model:['inventoryItemPurchaseInstance': result.inventoryItemPurchaseInstance,

trunk/grails-app/services/InventoryPurchaseService.groovy

@@ -9 +9 @@
     /**
     * Calulates the quantities for an inventoryItem and purchaseOrderNumber.
-    * @param order An inventory puchase that was the source of the order.
+    * @param order An inventory purchase that was the source of the order.
     * @returns A result map containing the totalOrdered, totalReceived, totalRemaining, thisOrderRemaining,
     *                 totalOrderedAmount, totalReceivedAmount, totalRemainingAmount, thisOrderRemainingAmount,
@@ -265 +265 @@
             }
 
+            def originalPaymentApprovedAmount = result.inventoryItemPurchaseInstance.orderValueAmount
+
             result.inventoryItemPurchaseInstance.properties = params
             result.inventoryItemPurchaseInstance.purchaseOrderNumber = result.inventoryItemPurchaseInstance.purchaseOrderNumber.trim()
+            result.inventoryItemPurchaseInstance.invoiceNumber = result.inventoryItemPurchaseInstance.invoiceNumber.trim()
             result.inventoryItemPurchaseInstance.lastUpdatedBy = authService.currentUser
+
+            // Fetch to prevent lazy initialization error.
+            result.inventoryItemPurchaseInstance.inventoryItem.unitOfMeasure
+
+            //  If processing an Invoice Approved.
+            if(result.inventoryItemPurchaseInstance.inventoryItemPurchaseType.id == 4L) {
+                if(!result.inventoryItemPurchaseInstance.invoiceNumber)
+                    return fail(field:"invoiceNumber", code:"inventoryItemPurchase.invoiceNumber.required")
+            }
 
             if(result.inventoryItemPurchaseInstance.hasErrors() || !result.inventoryItemPurchaseInstance.save())
                 return fail(code:"default.update.failure")
+
+            //  If processing an Invoice Approved.
+            if(result.inventoryItemPurchaseInstance.inventoryItemPurchaseType.id == 4L) {
+
+                def order = getOriginalOrder(result.inventoryItemPurchaseInstance)
+                if(!order)
+                    return fail(code:"default.not.found")
+
+                // Update orderValueAmount if receivedComplete.
+                if(order.receivedComplete) {
+
+                    def calcQuantities = calcQuantities(order)
+                    order.orderValueAmount = calcQuantities.totalPaymentApproved
+
+                    if(order.hasErrors() || !order.save())
+                        return fail(code:"default.create.failure")
+                }
+
+            }
 
             // Success.
@@ -281 +312 @@
         InventoryItemPurchase.withTransaction { status ->
             def result = [:]
+
             def fail = { Map m ->
                 status.setRollbackOnly()