Changeset 690 for trunk

Timestamp:

Oct 11, 2010, 11:57:58 AM (14 years ago)

Author:

gav

Message:

Fix for ticket #85, Null pointer bug on inventory reports.

File:

• trunk/grails-app/services/InventoryReportService.groovy (modified) (3 diffs)

trunk/grails-app/services/InventoryReportService.groovy

@@ -184 +184 @@
         result.site = Site.get(params.site.id.toLong())
 
-        if(params.inventoryTypes) {
+        result.inventoryTypes = []
+        if(params.inventoryTypes instanceof String)
+            result.inventoryTypes << InventoryType.get(params.inventoryTypes.toInteger())
+        else 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 = []
+        if(params.inventoryGroups instanceof String)
+            result.inventoryGroups << InventoryGroup.get(params.inventoryGroups.toInteger())
+        else if(params.inventoryGroups)
             result.inventoryGroups = params.inventoryGroups.collect { InventoryGroup.get(it.toInteger()) }
-        }
         else
             result.inventoryGroups = InventoryGroup.findAllByIsActive(true, [max:254, sort:'name'])
@@ -267 +271 @@
         result.site = Site.get(params.site.id.toLong())
 
-        if(params.inventoryTypes)
+        result.inventoryTypes = []
+        if(params.inventoryTypes instanceof String)
+            result.inventoryTypes << InventoryType.get(params.inventoryTypes.toInteger())
+        else 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 = []
+        if(params.inventoryGroups instanceof String)
+            result.inventoryGroups << InventoryGroup.get(params.inventoryGroups.toInteger())
+        else if(params.inventoryGroups)
             result.inventoryGroups = params.inventoryGroups.collect { InventoryGroup.get(it.toInteger()) }
         else
@@ -345 +355 @@
 
         // Check all currency is the same.
-        if(currencyCount != 1)
+        if(currencyCount > 1)
             fail(code:'report.error.multiple.currency.found') // No return, populate errors but continue report.