Changeset 891 for branches/features

Timestamp:

Apr 21, 2011, 3:29:47 PM (14 years ago)

Author:

gav

Message:

Purchase Order first draft as per ticket #30, by John Yesberg.

Location:

branches/features/purchaseOrders

Files:

• grails-app/controllers/InventoryItemPurchaseDetailedController.groovy (modified) (2 diffs)
• grails-app/domain/InventoryItemPurchase.groovy (modified) (3 diffs)
• grails-app/domain/PurchaseOrder.groovy (added)
• grails-app/domain/PurchaseOrderNumber.groovy (added)
• grails-app/services/CreateDataService.groovy (modified) (3 diffs)
• grails-app/services/InventoryItemService.groovy (modified) (1 diff)
• grails-app/services/InventoryPurchaseService.groovy (modified) (7 diffs)
• grails-app/services/PurchaseOrderService.groovy (added)
• grails-app/views/inventoryItemPurchaseDetailed/create.gsp (modified) (1 diff)
• test/unit/PurchaseOrderNumberTests.groovy (added)
• test/unit/PurchaseOrderServiceTests.groovy (added)

branches/features/purchaseOrders/grails-app/controllers/InventoryItemPurchaseDetailedController.groovy

@@ -11 +11 @@
     def dateUtilService
     def inventoryPurchaseService
+    def purchaseOrderService
 
     def index = {
@@ -280 +281 @@
         def costCodes = inventoryPurchaseService.getCostCodesByPerson()
 
+        def purchaseOrderNumbers = [purchaseOrderService.findNextUnusedPurchaseOrderNumber()]
+        purchaseOrderNumbers += purchaseOrderService.findDraftPurchaseOrderNumbers()
+
         return ['inventoryItemPurchaseInstance': inventoryItemPurchaseInstance,
-                        'costCodes': costCodes]
+                        'costCodes': costCodes, purchaseOrderNumbers:purchaseOrderNumbers]
     }
 

branches/features/purchaseOrders/grails-app/domain/InventoryItemPurchase.groovy

@@ -14 +14 @@
 
     Integer quantity
-    String purchaseOrderNumber = ''
+    PurchaseOrder purchaseOrder
     BigDecimal orderValueAmount
     Currency orderValueCurrency
@@ -25 +25 @@
 //     hasMany = []
 
-    static belongsTo = [InventoryItem]
+    static belongsTo = [InventoryItem, PurchaseOrder]
 
     static constraints = {
         quantity(min:0)
-        purchaseOrderNumber(blank:false, maxSize:50, validator: {val, obj ->
-            // For orders the purchaseOrderNumber must be unique for an inventoryItem.
-            if(obj.inventoryItemPurchaseType.id == 1L) {
-                def list = InventoryItemPurchase.withCriteria {
-                    eq('inventoryItem', obj.inventoryItem)
-                    eq('purchaseOrderNumber', obj.purchaseOrderNumber)
-                    eq('inventoryItemPurchaseType', obj.inventoryItemPurchaseType)
-                    if(obj.id)
-                        notEqual('id', obj.id)
-                }
-                if(list.size() > 0)
-                    return 'not.unique.for.inventory.item.order'
-            }
-            // Success.
-            return true
-        })
+//        purchaseOrderNumber(blank:false, maxSize:50, validator: {val, obj ->
+//            // For orders the purchaseOrderNumber must be unique for an inventoryItem.
+//            if(obj.inventoryItemPurchaseType.id == 1L) {
+//                def list = InventoryItemPurchase.withCriteria {
+//                    eq('inventoryItem', obj.inventoryItem)
+//                    eq('purchaseOrderNumber', obj.purchaseOrderNumber)
+//                    eq('inventoryItemPurchaseType', obj.inventoryItemPurchaseType)
+//                    if(obj.id)
+//                        notEqual('id', obj.id)
+//                }
+//                if(list.size() > 0)
+//                    return 'not.unique.for.inventory.item.order'
+//            }
+//            // Success.
+//            return true
+//        })
         invoiceNumber(maxSize:50)
         orderValueAmount(max: new BigDecimal(1000000000000))
@@ -56 +56 @@
     }
 
+    static transients = [ 'purchaseOrderNumber' ]
+
+    String getPurchaseOrderNumber() {
+        return purchaseOrder?.purchaseOrderNumber?.value
+    }
 }

branches/features/purchaseOrders/grails-app/services/CreateDataService.groovy

@@ -89 +89 @@
         createBaseEntryTypes()
 
+
         // Record that data has been created.
         appConfigService.set("baseDataCreated")
@@ -144 +145 @@
 //         createDemoMaintenanceActions()
         createDemoTaskRecurringSchedules()
+
+        // PurchaseOrderNumbers
+        createDemoPurchaseOrderNumbers()
 
         // Record that data has been created.
@@ -1736 +1740 @@
     }
 
+    def createDemoPurchaseOrderNumbers() {
+        for (int i=10000; i<10100; i++) {
+            saveAndTest(new PurchaseOrderNumber(value:"P${i}"))
+        }
+    }
+
     /**
     * SearchableIndex and mirroring is disabled at startup.

branches/features/purchaseOrders/grails-app/services/InventoryItemService.groovy

@@ -63 +63 @@
                 }
                 else {
-                    order('purchaseOrderNumber', 'desc')
+                    order('purchaseOrder', 'desc')
                     order('id', 'asc')
                 }

branches/features/purchaseOrders/grails-app/services/InventoryPurchaseService.groovy

@@ -6 +6 @@
     def dateUtilService
     def inventoryMovementService
+    def purchaseOrderService
 
     /**
@@ -23 +24 @@
         result.totalReceivedAmount = 0
         result.totalPaymentApproved = 0
-        InventoryItemPurchase.withCriteria {
-            eq("inventoryItem", order.inventoryItem)
-            eq("purchaseOrderNumber", order.purchaseOrderNumber)
-        }.each() {
+        def purchaseOrder = order.purchaseOrder
+        def relevantLineItems = purchaseOrder.inventoryItemPurchases.findAll{it.inventoryItem == order.inventoryItem}
+//        InventoryItemPurchase.withCriteria {
+//            eq("inventoryItem", order.inventoryItem)
+//            eq("purchaseOrderNumber", order.purchaseOrderNumber)
+//        }.each() {
+        relevantLineItems.each {
             if(it.inventoryItemPurchaseType.id == 1L) { // Orders.
                 result.totalOrdered += it.quantity
@@ -77 +81 @@
 
         namedParams.inventoryItem = inventoryItemPurchase.inventoryItem
-        namedParams.purchaseOrderNumber = inventoryItemPurchase.purchaseOrderNumber
+        namedParams.purchaseOrder = inventoryItemPurchase.purchaseOrder
         namedParams.orderPlaced = InventoryItemPurchaseType.read(1)
 
         def order = InventoryItemPurchase.find("from InventoryItemPurchase as p \
                                                                                 where( p.inventoryItem = :inventoryItem \
-                                                                                            and p.purchaseOrderNumber = :purchaseOrderNumber \
+                                                                                            and p.purchaseOrder = :purchaseOrder \
                                                                                             and p.inventoryItemPurchaseType = :orderPlaced )",
                                                                             namedParams)
@@ -322 +326 @@
 
             result.inventoryItemPurchaseInstance = new InventoryItemPurchase(params)
-            result.inventoryItemPurchaseInstance.purchaseOrderNumber = result.inventoryItemPurchaseInstance.purchaseOrderNumber.trim()
+            result.inventoryItemPurchaseInstance.purchaseOrder = purchaseOrderService.getOrCreatePurchaseOrder(params)
             result.inventoryItemPurchaseInstance.enteredBy = authService.currentUser
             result.inventoryItemPurchaseInstance.inventoryItemPurchaseType = InventoryItemPurchaseType.read(1) // Order
@@ -344 +348 @@
 
         } // end withTransaction
-    } // save()
+    }  // save()
 
     def receiveSave(params) {
@@ -363 +367 @@
             result.orderId = order.id
 
+            def purchaseOrderNumber = PurchaseOrderNumber.findByValue(order.purchaseOrderNumber)
+            def purchaseOrder = purchaseOrderNumber.purchaseOrder
+
             result.inventoryItemPurchaseInstance = new InventoryItemPurchase(params)
             result.inventoryItemPurchaseInstance.enteredBy = authService.currentUser
-            result.inventoryItemPurchaseInstance.purchaseOrderNumber = order.purchaseOrderNumber
+            result.inventoryItemPurchaseInstance.purchaseOrder = purchaseOrder
             result.inventoryItemPurchaseInstance.costCode = order.costCode
             result.inventoryItemPurchaseInstance.orderValueCurrency = order.orderValueCurrency
@@ -438 +445 @@
             result.inventoryItemPurchaseInstance = new InventoryItemPurchase(params)
             result.inventoryItemPurchaseInstance.enteredBy = authService.currentUser
-            result.inventoryItemPurchaseInstance.purchaseOrderNumber = order.purchaseOrderNumber
+            result.inventoryItemPurchaseInstance.purchaseOrder = order.purchaseOrder
             result.inventoryItemPurchaseInstance.costCode = order.costCode
             result.inventoryItemPurchaseInstance.orderValueCurrency = order.orderValueCurrency

branches/features/purchaseOrders/grails-app/views/inventoryItemPurchaseDetailed/create.gsp

@@ -48 +48 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="purchaseOrderNumber">Purchase Order #:</label>
+                                    <label for="purchaseOrderNumber.id">Purchase Order #:</label>
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'purchaseOrderNumber','errors')}">
-                                    <input type="text" maxlength="50" id="purchaseOrderNumber" name="purchaseOrderNumber" value="${fieldValue(bean:inventoryItemPurchaseInstance,field:'purchaseOrderNumber')}"/>
+                                  <g:select from="${purchaseOrderNumbers}"
+                                            optionKey="id"
+                                            optionValue="description"
+                                            name="purchaseOrderNumber.id"
+                                            value="${inventoryItemPurchaseInstance?.purchaseOrder?.purchaseOrderNumber?.id}"
+                                            noSelection="['null':/${g.message(code:'default.please.select.text')}/]">
+                                  </g:select>
                                     <g:helpBalloon code="inventoryItemPurchase.purchaseOrderNumber" />
                                 </td>