Changeset 670 for trunk/grails-app

Timestamp:

Oct 3, 2010, 9:54:30 PM (14 years ago)

Author:

gav

Message:

Improvements to Inventory Value report.

File:

• trunk/grails-app/services/InventoryReportService.groovy (modified) (1 diff)

trunk/grails-app/services/InventoryReportService.groovy

@@ -183 +183 @@
 
         result.site = Site.get(params.site.id.toLong())
-        result.inventoryTypes = params.inventoryTypes.collect { InventoryType.get(it.toInteger()) }
-        result.inventoryGroups = params.inventoryGroups.collect { InventoryGroup.get(it.toInteger()) }
+
+        if(params.inventoryTypes) {
+            result.inventoryTypes = params.inventoryTypes.collect { InventoryType.get(it.toInteger()) }
+        }
+        else
+            result.inventoryTypes = InventoryType.findAllByIsActive(true, [max:254, sort:'name'])
+
+        if(params.inventoryGroups) {
+            result.inventoryGroups = params.inventoryGroups.collect { InventoryGroup.get(it.toInteger()) }
+        }
+        else
+            result.inventoryGroups = InventoryGroup.findAllByIsActive(true, [max:254, sort:'name'])
 
         def fail = { Map m ->