Index: trunk/grails-app/views/inventoryItemDetailed/create.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemDetailed/create.gsp	(revision 156)
+++ trunk/grails-app/views/inventoryItemDetailed/create.gsp	(revision 175)
@@ -31,5 +31,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" class="description" maxlength="50" id="name" name="name" value="${fieldValue(bean:inventoryItemInstance,field:'name')}"/>
                                 </td>
                             </tr> 
@@ -40,7 +40,17 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'description','errors')}">
-                                    <input type="text" id="description" name="description" value="${fieldValue(bean:inventoryItemInstance,field:'description')}"/>
+                                    <input type="text" class="description" id="description" name="description" value="${fieldValue(bean:inventoryItemInstance,field:'description')}"/>
                                 </td>
-                            </tr> 
+                            </tr>
+
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="unitsInStock">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')}" />
+                                    <g:select optionKey="id" from="${UnitOfMeasure.list()}" name="unitOfMeasure.id" value="${inventoryItemInstance?.unitOfMeasure?.id}" ></g:select>
+                                </td>
+                            </tr>
                         
                             <tr class="prop">
@@ -60,9 +70,18 @@
                                     <g:checkBox name="enableReorder" value="${inventoryItemInstance?.enableReorder}" ></g:checkBox>
                                 </td>
-                            </tr> 
+                            </tr>
                         
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="isActive">Is Active:</label>
+                                    <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">Active:</label>
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'isActive','errors')}">
@@ -73,5 +92,5 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="isObsolete">Is Obsolete:</label>
+                                    <label for="isObsolete">Obsolete:</label>
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'isObsolete','errors')}">
@@ -96,14 +115,5 @@
                                     <g:select optionKey="id" from="${InventoryType.list()}" name="inventoryType.id" value="${inventoryItemInstance?.inventoryType?.id}" ></g:select>
                                 </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>
                         
                             <tr class="prop">
@@ -118,4 +128,17 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
+                                    <label for="manufacturers">Manufacturers:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'manufacturers','errors')}">
+                                    <g:select id="manufacturers" name="manufacturers"
+                                                        from="${Manufacturer.list()}"
+                                                        size="5" multiple="yes" optionKey="id"
+                                                        value="${inventoryItemInstance?.manufacturers?.id}" noSelection="['':'--None--']" />
+
+                                </td>
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
                                     <label for="suppliersPartNumber">Suppliers Part Number:</label>
                                 </td>
@@ -123,14 +146,18 @@
                                     <input type="text" id="suppliersPartNumber" name="suppliersPartNumber" value="${fieldValue(bean:inventoryItemInstance,field:'suppliersPartNumber')}"/>
                                 </td>
-                            </tr> 
+                            </tr>
                         
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="recommendedReorderPoint">Recommended Reorder Point:</label>
+                                    <label for="suppliers">Suppliers:</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:'suppliers','errors')}">
+                                    <g:select id="suppliers" name="suppliers"
+                                                        from="${Supplier.list()}"
+                                                        size="5" multiple="yes" optionKey="id"
+                                                        value="${inventoryItemInstance?.suppliers?.id}" noSelection="['':'--None--']"/>
+
                                 </td>
-                            </tr> 
+                            </tr>
                         
                             <tr class="prop">
@@ -140,6 +167,16 @@
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'averageDeliveryTime','errors')}">
                                     <input type="text" id="averageDeliveryTime" name="averageDeliveryTime" value="${fieldValue(bean:inventoryItemInstance,field:'averageDeliveryTime')}" />
+                                    <g:select optionKey="id" from="${Period.list()}" name="averageDeliveryPeriod.id" value="${inventoryItemInstance?.averageDeliveryPeriod?.id}" noSelection="['null':'--None--']"></g:select>
                                 </td>
-                            </tr> 
+                            </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>
                         
                         </tbody>
Index: trunk/grails-app/views/inventoryItemDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemDetailed/edit.gsp	(revision 156)
+++ trunk/grails-app/views/inventoryItemDetailed/edit.gsp	(revision 175)
@@ -33,5 +33,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> 
@@ -48,4 +48,14 @@
                             <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')}" />
+                                    <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>
@@ -62,9 +72,18 @@
                                     <g:checkBox name="enableReorder" value="${inventoryItemInstance?.enableReorder}" ></g:checkBox>
                                 </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="isActive">Is Active:</label>
+                            </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> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Active:</label>
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'isActive','errors')}">
@@ -75,5 +94,5 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="isObsolete">Is Obsolete:</label>
+                                    <label for="isObsolete">Obsolete:</label>
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'isObsolete','errors')}">
@@ -98,14 +117,5 @@
                                     <g:select optionKey="id" from="${InventoryType.list()}" name="inventoryType.id" value="${inventoryItemInstance?.inventoryType?.id}" ></g:select>
                                 </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>
                         
                             <tr class="prop">
@@ -125,14 +135,5 @@
                                     <input type="text" id="suppliersPartNumber" name="suppliersPartNumber" value="${fieldValue(bean:inventoryItemInstance,field:'suppliersPartNumber')}"/>
                                 </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> 
+                            </tr>
                         
                             <tr class="prop">
@@ -143,5 +144,14 @@
                                     <input type="text" id="averageDeliveryTime" name="averageDeliveryTime" value="${fieldValue(bean:inventoryItemInstance,field:'averageDeliveryTime')}" />
                                 </td>
-                            </tr> 
+                            </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>
                         
                             <tr class="prop">
@@ -179,8 +189,8 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'manufacturers','errors')}">
-                                    <g:select name="manufacturers"
-from="${Manufacturer.list()}"
-size="5" multiple="yes" optionKey="id"
-value="${inventoryItemInstance?.manufacturers}" />
+                                    <g:select id="manufacturers" name="manufacturers"
+                                                        from="${Manufacturer.list()}"
+                                                        size="5" multiple="yes" optionKey="id"
+                                                        value="${inventoryItemInstance?.manufacturers.id}" />
 
                                 </td>
@@ -198,21 +208,14 @@
 
                                 </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="storedItemDetailed" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>
-</g:each>
-</ul>
-<g:link controller="storedItemDetailed" params="['inventoryItem.id':inventoryItemInstance?.id]" action="create">Add StoredItem</g:link>
-
-                                </td>
-                            </tr> 
+                            </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>
                         
                             <tr class="prop">
@@ -221,11 +224,11 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'suppliers','errors')}">
-                                    <g:select name="suppliers"
-from="${Supplier.list()}"
-size="5" multiple="yes" optionKey="id"
-value="${inventoryItemInstance?.suppliers}" />
-
-                                </td>
-                            </tr> 
+                                    <g:select id="suppliers" name="suppliers"
+                                                        from="${Supplier.list()}"
+                                                        size="5" multiple="yes" optionKey="id"
+                                                        value="${inventoryItemInstance?.suppliers.id}" noSelection="['':'--None--']"/>
+
+                                </td>
+                            </tr>
                         
                         </tbody>
Index: trunk/grails-app/views/inventoryItemDetailed/list.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemDetailed/list.gsp	(revision 156)
+++ trunk/grails-app/views/inventoryItemDetailed/list.gsp	(revision 175)
@@ -27,7 +27,8 @@
                    	        <g:sortableColumn property="description" title="Description" />
                         
-                   	        <g:sortableColumn property="enableReorder" title="Enable Reorder" />
+                            <g:sortableColumn property="unitsInStock" title="Units In Stock" />
+                            
+                            <th>Unit Of Measure</th>
                         
-                   	        <g:sortableColumn property="isActive" title="Is Active" />
 
                             <th></th>
@@ -45,7 +46,7 @@
                             <td>${fieldValue(bean:inventoryItemInstance, field:'description')}</td>
                         
-                            <td>${fieldValue(bean:inventoryItemInstance, field:'enableReorder')}</td>
+                            <td>${fieldValue(bean:inventoryItemInstance, field:'unitsInStock')}</td>
                         
-                            <td>${fieldValue(bean:inventoryItemInstance, field:'isActive')}</td>
+                            <td>${fieldValue(bean:inventoryItemInstance, field:'unitOfMeasure')}</td>
 
                             <td>
Index: trunk/grails-app/views/inventoryItemDetailed/search.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemDetailed/search.gsp	(revision 156)
+++ trunk/grails-app/views/inventoryItemDetailed/search.gsp	(revision 175)
@@ -40,7 +40,7 @@
                    	        <g:sortableColumn property="description" title="Description" params="${filterParams}" />
                         
-                   	        <g:sortableColumn property="enableReorder" title="Enable Reorder" params="${filterParams}" />
-                        
-                   	        <g:sortableColumn property="isActive" title="Is Active" params="${filterParams}" />
+                            <g:sortableColumn property="unitsInStock" title="Units In Stock" />
+                            
+                            <th>Unit Of Measure</th>
 
                             <th></th>
@@ -58,7 +58,7 @@
                             <td>${fieldValue(bean:inventoryItemInstance, field:'description')}</td>
                         
-                            <td>${fieldValue(bean:inventoryItemInstance, field:'enableReorder')}</td>
+                            <td>${fieldValue(bean:inventoryItemInstance, field:'unitsInStock')}</td>
                         
-                            <td>${fieldValue(bean:inventoryItemInstance, field:'isActive')}</td>
+                            <td>${fieldValue(bean:inventoryItemInstance, field:'unitOfMeasure')}</td>
 
                             <td>
@@ -81,5 +81,14 @@
                                     action="search"
                                     class="overlayPane"
-                                    excludeProperties="" />
+                                    excludeProperties=""
+                                    associatedProperties="inventoryLocation.name,
+                                                                            spareFor.name,
+                                                                            manufacturers.name,
+                                                                            suppliers.name"
+                                    filterPropertyValues="${['inventoryLocation.name':[values:InventoryLocation.list()],
+                                                                                'spareFor.name':[values:Asset.list()],
+                                                                                'manufacturers.name':[values:Manufacturer.list()],
+                                                                                'suppliers.name':[values:Supplier.list()],
+                                                                                ]}"/>
         </div> <!-- end body div -->
     </body>
Index: trunk/grails-app/views/inventoryItemDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemDetailed/show.gsp	(revision 156)
+++ trunk/grails-app/views/inventoryItemDetailed/show.gsp	(revision 175)
@@ -41,4 +41,19 @@
                             
                         </tr>
+                        
+                        <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">${inventoryItemInstance?.unitOfMeasure?.encodeAsHTML()}</td>
+                            
+                        </tr>
+
                     
                         <tr class="prop">
@@ -55,7 +70,14 @@
                             
                         </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Is Active:</td>
+                        
+                        <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">Active:</td>
                             
                             <td valign="top" class="value">${fieldValue(bean:inventoryItemInstance, field:'isActive')}</td>
@@ -64,5 +86,5 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Is Obsolete:</td>
+                            <td valign="top" class="name">Obsolete:</td>
                             
                             <td valign="top" class="value">${fieldValue(bean:inventoryItemInstance, field:'isObsolete')}</td>
@@ -76,4 +98,5 @@
                             
                         </tr>
+
                     
                         <tr class="prop">
@@ -85,11 +108,4 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Unit Of Measure:</td>
-                            
-                            <td valign="top" class="value">${inventoryItemInstance?.unitOfMeasure?.encodeAsHTML()}</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
                             <td valign="top" class="name">Manufacturers Part Number:</td>
                             
@@ -125,5 +141,5 @@
                                 <ul>
                                 <g:each var="a" in="${inventoryItemInstance.alternateItems}">
-                                    <li><g:link controller="inventoryItem" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
+                                    <li><g:link controller="inventoryItemDetailed" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
                                 </g:each>
                                 </ul>
@@ -138,5 +154,5 @@
                                 <ul>
                                 <g:each var="i" in="${inventoryItemInstance.inventoryMovements}">
-                                    <li><g:link controller="inventoryMovement" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li>
+                                    <li><g:link controller="inventoryMovementDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li>
                                 </g:each>
                                 </ul>
@@ -151,5 +167,5 @@
                                 <ul>
                                 <g:each var="m" in="${inventoryItemInstance.manufacturers}">
-                                    <li><g:link controller="manufacturer" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
+                                    <li><g:link controller="manufacturerDetailed" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
                                 </g:each>
                                 </ul>
@@ -170,15 +186,9 @@
                             
                         </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="storedItemDetailed" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>
-                                </g:each>
-                                </ul>
-                            </td>
+                        
+                        <tr class="prop">
+                            <td valign="top" class="name">Inventory Location:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="inventoryLocationDetailed" action="show" id="${inventoryItemInstance?.inventoryLocation?.id}">${inventoryItemInstance?.inventoryLocation?.encodeAsHTML()}</g:link></td>
                             
                         </tr>
@@ -190,5 +200,5 @@
                                 <ul>
                                 <g:each var="s" in="${inventoryItemInstance.suppliers}">
-                                    <li><g:link controller="supplier" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>
+                                    <li><g:link controller="supplierDetailed" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>
                                 </g:each>
                                 </ul>