Index: trunk/grails-app/domain/InventoryItem.groovy
===================================================================
--- trunk/grails-app/domain/InventoryItem.groovy	(revision 168)
+++ trunk/grails-app/domain/InventoryItem.groovy	(revision 175)
@@ -3,8 +3,11 @@
     InventoryType inventoryType
     UnitOfMeasure unitOfMeasure
+    InventoryLocation inventoryLocation
+    Period averageDeliveryPeriod
     String name
     String description = ""
     String manufacturersPartNumber
     String suppliersPartNumber
+    Integer unitsInStock = 0
     Integer reorderPoint
     Integer recommendedReorderPoint
@@ -16,5 +19,4 @@
     static hasMany = [alternateItems: InventoryItem,
                                     spareFor: Asset,
-                                    storedItems: StoredItem,
                                     inventoryMovements: InventoryMovement,
                                     manufacturers: Manufacturer,
@@ -24,17 +26,19 @@
 
     static constraints = {
-        name(unique:true, blank:false, maxSize:75)
+        name(unique:true, blank:false, maxSize:50)
         description()
+        unitsInStock(min:0)
+        unitOfMeasure()
         reorderPoint()
         enableReorder()
+        recommendedReorderPoint(nullable:true)
         isActive()
         isObsolete()
         inventoryGroup()
         inventoryType()
-        unitOfMeasure()
         manufacturersPartNumber(blank:true, nullable:true)
         suppliersPartNumber(blank:true, nullable:true)
-        recommendedReorderPoint(nullable:true)
         averageDeliveryTime(nullable:true)
+        averageDeliveryPeriod(nullable:true)
     }
 
Index: trunk/grails-app/domain/InventoryLocation.groovy
===================================================================
--- trunk/grails-app/domain/InventoryLocation.groovy	(revision 175)
+++ trunk/grails-app/domain/InventoryLocation.groovy	(revision 175)
@@ -0,0 +1,18 @@
+class InventoryLocation {
+
+    InventoryStore inventoryStore
+    String name
+    Boolean isActive = true
+
+    static hasMany = [inventoryItems: InventoryItem]
+
+//     static belongsTo = [InventoryStore]
+
+    static constraints = {
+        name(maxSize:50)
+    }
+
+    String toString() {
+        "${this.name}"
+    }
+}
Index: trunk/grails-app/domain/InventoryMovement.groovy
===================================================================
--- trunk/grails-app/domain/InventoryMovement.groovy	(revision 168)
+++ trunk/grails-app/domain/InventoryMovement.groovy	(revision 175)
@@ -1,14 +1,16 @@
+import java.text.SimpleDateFormat
+
 class InventoryMovement {
     InventoryItem inventoryItem
     InventoryMovementType inventoryMovementType
     Task task
-    String quantity
+    Integer quantity
     Date date = new Date()
 
-    static belongsTo = [InventoryItem]
+//     static belongsTo = [inventoryItem]
 
     static constraints = {
         inventoryItem()
-        quantity()
+        quantity(min:1)
         inventoryMovementType()
         task(nullable:true)
@@ -16,4 +18,7 @@
     }
 
-    String toString() {"${this.quantity}"}
+    String toString() {
+        def date = new SimpleDateFormat("EEE, dd-MMM-yyyy").format(this.date)
+        "${this.quantity} ${inventoryMovementType.name} on ${date}"
+    }
 }
Index: trunk/grails-app/domain/InventoryStore.groovy
===================================================================
--- trunk/grails-app/domain/InventoryStore.groovy	(revision 168)
+++ trunk/grails-app/domain/InventoryStore.groovy	(revision 175)
@@ -6,5 +6,5 @@
     Boolean isActive = true
 
-    static hasMany = [storeLocations: StoreLocation]
+    static hasMany = [inventoryLocations: InventoryLocation]
 
     static belongsTo = [Site]
Index: trunk/grails-app/domain/StoreLocation.groovy
===================================================================
--- trunk/grails-app/domain/StoreLocation.groovy	(revision 168)
+++ 	(revision )
@@ -1,18 +1,0 @@
-class StoreLocation {
-
-    InventoryStore inventoryStore
-    String bin
-    Boolean isActive = true
-
-    static hasMany = [storedItems: StoredItem]
-
-    static belongsTo = [InventoryStore]
-
-    static constraints = {
-        bin(maxSize:50)
-    }
-
-    String toString() {
-        "${this.bin}"
-    }
-}
Index: trunk/grails-app/domain/StoredItem.groovy
===================================================================
--- trunk/grails-app/domain/StoredItem.groovy	(revision 168)
+++ 	(revision )
@@ -1,16 +1,0 @@
-class StoredItem {
-
-    InventoryItem inventoryItem
-    StoreLocation storeLocation
-    Integer quantity = 0
-
-    static belongsTo = [InventoryItem]
-
-    static constraints = {
-        quantity(min:0)
-    }
-
-    String toString() {
-        "${this.quantity} item(s) at ${storeLocation} in ${storeLocation.inventoryStore}"
-    }
-}