Index: trunk/grails-app/services/AssetService.groovy
===================================================================
--- trunk/grails-app/services/AssetService.groovy	(revision 688)
+++ trunk/grails-app/services/AssetService.groovy	(revision 689)
@@ -246,14 +246,14 @@
 
         def assets = Asset.list()
-        def locationDescription = ExtendedAttributeType.get(5)
-        def ecr = ExtendedAttributeType.get(9)
-        def assetNumber = ExtendedAttributeType.get(17)
-        def assetCondition = ExtendedAttributeType.get(16)
-        def maintenancePercentComplete = ExtendedAttributeType.get(13)
-        def registrationRequired = ExtendedAttributeType.get(14)
-        def registrationExpiryDate =  ExtendedAttributeType.get(15)
-        def regulatoryRequirement = ExtendedAttributeType.get(12)
-        def riskLevel = ExtendedAttributeType.get(10)
-        def safeWorkProcedure = ExtendedAttributeType.get(11)
+        def locationDescription = ExtendedAttributeType.findByName("Location Description")
+        def ecr = ExtendedAttributeType.findByName("ecr")
+        def assetNumber = ExtendedAttributeType.findByName("Asset Number")
+        def assetCondition = ExtendedAttributeType.findByName("Asset Condition")
+        def maintenancePercentComplete = ExtendedAttributeType.findByName("Maintenance % Completion")
+        def registrationRequired = ExtendedAttributeType.findByName("Registration Required")
+        def registrationExpiryDate =  ExtendedAttributeType.findByName("Registration Expiry Date")
+        def regulatoryRequirement = ExtendedAttributeType.findByName("Regulatory Requirement")
+        def riskLevel = ExtendedAttributeType.findByName("Risk Level")
+        def safeWorkProcedure = ExtendedAttributeType.findByName("Safe Work Procedure")
 
         for(asset in assets) {
Index: trunk/grails-app/services/AssetSubItemService.groovy
===================================================================
--- trunk/grails-app/services/AssetSubItemService.groovy	(revision 688)
+++ trunk/grails-app/services/AssetSubItemService.groovy	(revision 689)
@@ -150,8 +150,8 @@
         def assetSubItems = getLevel1AssetSubItems()
 
-        def manufacturer = ExtendedAttributeType.get(8)
-        def modelNumber = ExtendedAttributeType.get(1)
-        def serialNumber = ExtendedAttributeType.get(3)
-        def manufacturedDate = ExtendedAttributeType.get(4)
+        def manufacturer = ExtendedAttributeType.findByName("Manufacturer")
+        def modelNumber = ExtendedAttributeType.findByName("Model Number")
+        def serialNumber = ExtendedAttributeType.findByName("Serial Number")
+        def manufacturedDate = ExtendedAttributeType.findByName("Manufactured Date")
 
         for(assetSubItem in assetSubItems) {