Index: trunk/grails-app/views/inventoryItem/create.gsp
===================================================================
--- trunk/grails-app/views/inventoryItem/create.gsp	(revision 151)
+++ trunk/grails-app/views/inventoryItem/create.gsp	(revision 175)
@@ -32,5 +32,5 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'name','errors')}">
-                                    <input type="text" maxlength="75" id="name" name="name" value="${fieldValue(bean:inventoryItemInstance,field:'name')}"/>
+                                    <input type="text" maxlength="50" id="name" name="name" value="${fieldValue(bean:inventoryItemInstance,field:'name')}"/>
                                 </td>
                             </tr> 
@@ -42,4 +42,22 @@
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'description','errors')}">
                                     <input type="text" id="description" name="description" value="${fieldValue(bean:inventoryItemInstance,field:'description')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="unitsInStock">Units In Stock:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'unitsInStock','errors')}">
+                                    <input type="text" id="unitsInStock" name="unitsInStock" value="${fieldValue(bean:inventoryItemInstance,field:'unitsInStock')}" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="unitOfMeasure">Unit Of Measure:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'unitOfMeasure','errors')}">
+                                    <g:select optionKey="id" from="${UnitOfMeasure.list()}" name="unitOfMeasure.id" value="${inventoryItemInstance?.unitOfMeasure?.id}" ></g:select>
                                 </td>
                             </tr> 
@@ -60,4 +78,13 @@
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'enableReorder','errors')}">
                                     <g:checkBox name="enableReorder" value="${inventoryItemInstance?.enableReorder}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="recommendedReorderPoint">Recommended Reorder Point:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'recommendedReorderPoint','errors')}">
+                                    <input type="text" id="recommendedReorderPoint" name="recommendedReorderPoint" value="${fieldValue(bean:inventoryItemInstance,field:'recommendedReorderPoint')}" />
                                 </td>
                             </tr> 
@@ -101,13 +128,4 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="unitOfMeasure">Unit Of Measure:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'unitOfMeasure','errors')}">
-                                    <g:select optionKey="id" from="${UnitOfMeasure.list()}" name="unitOfMeasure.id" value="${inventoryItemInstance?.unitOfMeasure?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
                                     <label for="manufacturersPartNumber">Manufacturers Part Number:</label>
                                 </td>
@@ -128,8 +146,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="recommendedReorderPoint">Recommended Reorder Point:</label>
+                                    <label for="averageDeliveryTime">Average Delivery Time:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'recommendedReorderPoint','errors')}">
-                                    <input type="text" id="recommendedReorderPoint" name="recommendedReorderPoint" value="${fieldValue(bean:inventoryItemInstance,field:'recommendedReorderPoint')}" />
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'averageDeliveryTime','errors')}">
+                                    <input type="text" id="averageDeliveryTime" name="averageDeliveryTime" value="${fieldValue(bean:inventoryItemInstance,field:'averageDeliveryTime')}" />
                                 </td>
                             </tr> 
@@ -137,8 +155,17 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="averageDeliveryTime">Average Delivery Time:</label>
+                                    <label for="averageDeliveryPeriod">Average Delivery Period:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'averageDeliveryTime','errors')}">
-                                    <input type="text" id="averageDeliveryTime" name="averageDeliveryTime" value="${fieldValue(bean:inventoryItemInstance,field:'averageDeliveryTime')}" />
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'averageDeliveryPeriod','errors')}">
+                                    <g:select optionKey="id" from="${Period.list()}" name="averageDeliveryPeriod.id" value="${inventoryItemInstance?.averageDeliveryPeriod?.id}" noSelection="['null':'']"></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="inventoryLocation">Inventory Location:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'inventoryLocation','errors')}">
+                                    <g:select optionKey="id" from="${InventoryLocation.list()}" name="inventoryLocation.id" value="${inventoryItemInstance?.inventoryLocation?.id}" ></g:select>
                                 </td>
                             </tr> 
Index: trunk/grails-app/views/inventoryItem/edit.gsp
===================================================================
--- trunk/grails-app/views/inventoryItem/edit.gsp	(revision 151)
+++ trunk/grails-app/views/inventoryItem/edit.gsp	(revision 175)
@@ -35,5 +35,5 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'name','errors')}">
-                                    <input type="text" maxlength="75" id="name" name="name" value="${fieldValue(bean:inventoryItemInstance,field:'name')}"/>
+                                    <input type="text" maxlength="50" id="name" name="name" value="${fieldValue(bean:inventoryItemInstance,field:'name')}"/>
                                 </td>
                             </tr> 
@@ -50,4 +50,22 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
+                                    <label for="unitsInStock">Units In Stock:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'unitsInStock','errors')}">
+                                    <input type="text" id="unitsInStock" name="unitsInStock" value="${fieldValue(bean:inventoryItemInstance,field:'unitsInStock')}" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="unitOfMeasure">Unit Of Measure:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'unitOfMeasure','errors')}">
+                                    <g:select optionKey="id" from="${UnitOfMeasure.list()}" name="unitOfMeasure.id" value="${inventoryItemInstance?.unitOfMeasure?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
                                     <label for="reorderPoint">Reorder Point:</label>
                                 </td>
@@ -68,4 +86,13 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
+                                    <label for="recommendedReorderPoint">Recommended Reorder Point:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'recommendedReorderPoint','errors')}">
+                                    <input type="text" id="recommendedReorderPoint" name="recommendedReorderPoint" value="${fieldValue(bean:inventoryItemInstance,field:'recommendedReorderPoint')}" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
                                     <label for="isActive">Is Active:</label>
                                 </td>
@@ -104,13 +131,4 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="unitOfMeasure">Unit Of Measure:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'unitOfMeasure','errors')}">
-                                    <g:select optionKey="id" from="${UnitOfMeasure.list()}" name="unitOfMeasure.id" value="${inventoryItemInstance?.unitOfMeasure?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
                                     <label for="manufacturersPartNumber">Manufacturers Part Number:</label>
                                 </td>
@@ -131,17 +149,17 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="recommendedReorderPoint">Recommended Reorder Point:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'recommendedReorderPoint','errors')}">
-                                    <input type="text" id="recommendedReorderPoint" name="recommendedReorderPoint" value="${fieldValue(bean:inventoryItemInstance,field:'recommendedReorderPoint')}" />
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
                                     <label for="averageDeliveryTime">Average Delivery Time:</label>
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'averageDeliveryTime','errors')}">
                                     <input type="text" id="averageDeliveryTime" name="averageDeliveryTime" value="${fieldValue(bean:inventoryItemInstance,field:'averageDeliveryTime')}" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="averageDeliveryPeriod">Average Delivery Period:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'averageDeliveryPeriod','errors')}">
+                                    <g:select optionKey="id" from="${Period.list()}" name="averageDeliveryPeriod.id" value="${inventoryItemInstance?.averageDeliveryPeriod?.id}" noSelection="['null':'']"></g:select>
                                 </td>
                             </tr> 
@@ -157,4 +175,13 @@
 value="${inventoryItemInstance?.alternateItems}" />
 
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="inventoryLocation">Inventory Location:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'inventoryLocation','errors')}">
+                                    <g:select optionKey="id" from="${InventoryLocation.list()}" name="inventoryLocation.id" value="${inventoryItemInstance?.inventoryLocation?.id}" ></g:select>
                                 </td>
                             </tr> 
@@ -198,20 +225,4 @@
 size="5" multiple="yes" optionKey="id"
 value="${inventoryItemInstance?.spareFor}" />
-
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="storedItems">Stored Items:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'storedItems','errors')}">
-                                    
-<ul>
-<g:each var="s" in="${inventoryItemInstance?.storedItems?}">
-    <li><g:link controller="storedItem" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>
-</g:each>
-</ul>
-<g:link controller="storedItem" params="['inventoryItem.id':inventoryItemInstance?.id]" action="create">Add StoredItem</g:link>
 
                                 </td>
Index: trunk/grails-app/views/inventoryItem/list.gsp
===================================================================
--- trunk/grails-app/views/inventoryItem/list.gsp	(revision 151)
+++ trunk/grails-app/views/inventoryItem/list.gsp	(revision 175)
@@ -28,9 +28,9 @@
                    	        <g:sortableColumn property="description" title="Description" />
                         
+                   	        <g:sortableColumn property="unitsInStock" title="Units In Stock" />
+                        
+                   	        <th>Unit Of Measure</th>
+                   	    
                    	        <g:sortableColumn property="reorderPoint" title="Reorder Point" />
-                        
-                   	        <g:sortableColumn property="enableReorder" title="Enable Reorder" />
-                        
-                   	        <g:sortableColumn property="isActive" title="Is Active" />
                         
                         </tr>
@@ -46,9 +46,9 @@
                             <td>${fieldValue(bean:inventoryItemInstance, field:'description')}</td>
                         
+                            <td>${fieldValue(bean:inventoryItemInstance, field:'unitsInStock')}</td>
+                        
+                            <td>${fieldValue(bean:inventoryItemInstance, field:'unitOfMeasure')}</td>
+                        
                             <td>${fieldValue(bean:inventoryItemInstance, field:'reorderPoint')}</td>
-                        
-                            <td>${fieldValue(bean:inventoryItemInstance, field:'enableReorder')}</td>
-                        
-                            <td>${fieldValue(bean:inventoryItemInstance, field:'isActive')}</td>
                         
                         </tr>
Index: trunk/grails-app/views/inventoryItem/show.gsp
===================================================================
--- trunk/grails-app/views/inventoryItem/show.gsp	(revision 151)
+++ trunk/grails-app/views/inventoryItem/show.gsp	(revision 175)
@@ -45,4 +45,18 @@
                     
                         <tr class="prop">
+                            <td valign="top" class="name">Units In Stock:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:inventoryItemInstance, field:'unitsInStock')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Unit Of Measure:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="unitOfMeasure" action="show" id="${inventoryItemInstance?.unitOfMeasure?.id}">${inventoryItemInstance?.unitOfMeasure?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
                             <td valign="top" class="name">Reorder Point:</td>
                             
@@ -59,4 +73,11 @@
                     
                         <tr class="prop">
+                            <td valign="top" class="name">Recommended Reorder Point:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:inventoryItemInstance, field:'recommendedReorderPoint')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
                             <td valign="top" class="name">Is Active:</td>
                             
@@ -87,11 +108,4 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Unit Of Measure:</td>
-                            
-                            <td valign="top" class="value"><g:link controller="unitOfMeasure" action="show" id="${inventoryItemInstance?.unitOfMeasure?.id}">${inventoryItemInstance?.unitOfMeasure?.encodeAsHTML()}</g:link></td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
                             <td valign="top" class="name">Manufacturers Part Number:</td>
                             
@@ -108,14 +122,14 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Recommended Reorder Point:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:inventoryItemInstance, field:'recommendedReorderPoint')}</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
                             <td valign="top" class="name">Average Delivery Time:</td>
                             
                             <td valign="top" class="value">${fieldValue(bean:inventoryItemInstance, field:'averageDeliveryTime')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Average Delivery Period:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="period" action="show" id="${inventoryItemInstance?.averageDeliveryPeriod?.id}">${inventoryItemInstance?.averageDeliveryPeriod?.encodeAsHTML()}</g:link></td>
                             
                         </tr>
@@ -135,4 +149,11 @@
                     
                         <tr class="prop">
+                            <td valign="top" class="name">Inventory Location:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="inventoryLocation" action="show" id="${inventoryItemInstance?.inventoryLocation?.id}">${inventoryItemInstance?.inventoryLocation?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
                             <td valign="top" class="name">Inventory Movements:</td>
                             
@@ -167,17 +188,4 @@
                                 <g:each var="s" in="${inventoryItemInstance.spareFor}">
                                     <li><g:link controller="asset" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>
-                                </g:each>
-                                </ul>
-                            </td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Stored Items:</td>
-                            
-                            <td  valign="top" style="text-align:left;" class="value">
-                                <ul>
-                                <g:each var="s" in="${inventoryItemInstance.storedItems}">
-                                    <li><g:link controller="storedItem" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>
                                 </g:each>
                                 </ul>