Index: trunk/grails-app/views/inventoryItemDetailed/create.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemDetailed/create.gsp	(revision 178)
+++ trunk/grails-app/views/inventoryItemDetailed/create.gsp	(revision 182)
@@ -43,12 +43,11 @@
                                 </td>
                             </tr>
-
+                        
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="unitsInStock">In Stock:</label>
+                                    <label for="inventoryLocation">Inventory Location:</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 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>
@@ -60,4 +59,5 @@
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'reorderPoint','errors')}">
                                     <input type="text" id="reorderPoint" name="reorderPoint" value="${fieldValue(bean:inventoryItemInstance,field:'reorderPoint')}" />
+                                    <g:select optionKey="id" from="${UnitOfMeasure.list()}" name="unitOfMeasure.id" value="${inventoryItemInstance?.unitOfMeasure?.id}" ></g:select>
                                 </td>
                             </tr> 
@@ -71,31 +71,4 @@
                                 </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 class="prop">
-                                <td valign="top" class="name">
-                                    <label for="isActive">Active:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'isActive','errors')}">
-                                    <g:checkBox name="isActive" value="${inventoryItemInstance?.isActive}" ></g:checkBox>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="isObsolete">Obsolete:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'isObsolete','errors')}">
-                                    <g:checkBox name="isObsolete" value="${inventoryItemInstance?.isObsolete}" ></g:checkBox>
-                                </td>
-                            </tr> 
                         
                             <tr class="prop">
@@ -171,13 +144,4 @@
                             </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>
                     </table>
Index: trunk/grails-app/views/inventoryItemDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemDetailed/edit.gsp	(revision 178)
+++ trunk/grails-app/views/inventoryItemDetailed/edit.gsp	(revision 182)
@@ -7,4 +7,5 @@
         <title>Edit InventoryItem</title>
         <nav:resources override="true"/>
+        <g:render template="/shared/pictureHead" />
     </head>
     <body>
@@ -27,4 +28,19 @@
                     <table>
                         <tbody>
+                    
+                            <tr class="prop">
+                                <td valign="top" class="name">Picture:</td>
+                                <td valign="top" class="value">
+                                    <g:if test="${inventoryItemInstance.picture}" >
+                                        <span class='gallery'>
+                                            <wa:pictureLightboxAnchor picture="${inventoryItemInstance.picture}" size="${Image.Medium}" lightboxSize="${Image.Large}" target="_blank" title="Show Original" />
+                                        </span>
+                                        <br />
+                                        <g:link controller="pictureDetailed" action="edit" id="${inventoryItemInstance.picture.id}" >
+                                            Edit Picture
+                                        </g:link>
+                                    </g:if>
+                                </td>
+                            </tr>
                         
                             <tr class="prop">
@@ -50,7 +66,6 @@
                                     <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 valign="top" class="value">
+                                    ${inventoryItemInstance.unitsInStock} ${inventoryItemInstance.unitOfMeasure}
                                 </td>
                             </tr>
Index: trunk/grails-app/views/inventoryItemDetailed/list.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemDetailed/list.gsp	(revision 178)
+++ trunk/grails-app/views/inventoryItemDetailed/list.gsp	(revision 182)
@@ -52,5 +52,5 @@
                             <td>
                                 <g:link action="show" id="${inventoryItemInstance.id}">
-                                    <img  src="${resource(dir:'images/skin',file:'database_table.png')}" alt="Show" />
+                                    <img  src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" />
                                 </g:link>
                             </td>
Index: trunk/grails-app/views/inventoryItemDetailed/search.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemDetailed/search.gsp	(revision 178)
+++ trunk/grails-app/views/inventoryItemDetailed/search.gsp	(revision 182)
@@ -7,4 +7,5 @@
         <title>InventoryItem Search</title>
         <nav:resources override="true"/>
+        <g:render template="/shared/pictureHead" />
         <filterpane:includes />
     </head>
@@ -33,6 +34,6 @@
                     <thead>
                         <tr>
-                        
-                   	        <g:sortableColumn property="id" title="Id" params="${filterParams}" />
+
+                            <th>Picture</th>
                         
                    	        <g:sortableColumn property="name" title="Name" params="${filterParams}" />
@@ -50,19 +51,35 @@
                     <tbody>
                     <g:each in="${inventoryItemInstanceList}" status="i" var="inventoryItemInstance">
-                        <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/inventoryItemDetailed/show/${inventoryItemInstance.id}"'/>
+                        <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" />
+
+                            <td class='gallery'>
+                                <g:if test="${inventoryItemInstance.picture}" >
+                                    <wa:pictureLightboxAnchor picture="${inventoryItemInstance.picture}"
+                                                                                        size="${Image.Small}"
+                                                                                        lightboxSize="${Image.Large}"
+                                                                                        target="_blank"
+                                                                                        title="Show Original" />
+                                </g:if>
+                            </td>
                         
-                            <td>${fieldValue(bean:inventoryItemInstance, field:'id')}</td>
+                            <td onclick='window.location = "${request.getContextPath()}/inventoryItemDetailed/show/${inventoryItemInstance.id}"' >
+                                ${fieldValue(bean:inventoryItemInstance, field:'name')}
+                            </td>
                         
-                            <td>${fieldValue(bean:inventoryItemInstance, field:'name')}</td>
+                            <td onclick='window.location = "${request.getContextPath()}/inventoryItemDetailed/show/${inventoryItemInstance.id}"' >
+                                ${fieldValue(bean:inventoryItemInstance, field:'description')}
+                            </td>
                         
-                            <td>${fieldValue(bean:inventoryItemInstance, field:'description')}</td>
+                            <td onclick='window.location = "${request.getContextPath()}/inventoryItemDetailed/show/${inventoryItemInstance.id}"' >
+                                ${fieldValue(bean:inventoryItemInstance, field:'unitsInStock')}
+                            </td>
                         
-                            <td>${fieldValue(bean:inventoryItemInstance, field:'unitsInStock')}</td>
-                        
-                            <td>${fieldValue(bean:inventoryItemInstance, field:'unitOfMeasure')}</td>
+                            <td onclick='window.location = "${request.getContextPath()}/inventoryItemDetailed/show/${inventoryItemInstance.id}"' >
+                                ${fieldValue(bean:inventoryItemInstance, field:'unitOfMeasure')}
+                            </td>
 
                             <td>
                                 <g:link action="show" id="${inventoryItemInstance.id}">
-                                    <img  src="${resource(dir:'images/skin',file:'database_table.png')}" alt="Show" />
+                                    <img  src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" />
                                 </g:link>
                             </td>
Index: trunk/grails-app/views/inventoryItemDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemDetailed/show.gsp	(revision 178)
+++ trunk/grails-app/views/inventoryItemDetailed/show.gsp	(revision 182)
@@ -7,4 +7,5 @@
         <title>Show InventoryItem</title>
         <nav:resources override="true"/>
+        <g:render template="/shared/pictureHead" />
     </head>
     <body>
@@ -19,5 +20,20 @@
                 <table>
                     <tbody>
-
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Picture:</td>
+                            <td valign="top" class="value">
+                                <g:if test="${inventoryItemInstance.picture}" >
+                                    <span class='gallery'><wa:pictureLightboxAnchor picture="${inventoryItemInstance.picture}" size="${Image.Medium}" lightboxSize="${Image.Large}" target="_blank" title="Show Original" /></span>
+                                </g:if>
+                                <g:else>
+                                    <g:link controller="pictureDetailed"
+                                                    params="['inventoryItem.id':inventoryItemInstance?.id]"
+                                                    action="create">
+                                        Add Picture
+                                    </g:link>
+                                </g:else>
+                            </td>
+                        </tr>
                     
                         <tr class="prop">
@@ -43,17 +59,23 @@
                         
                         <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>
-
+                            <td valign="top" class="name">Location:</td>
+                            
+                            <td valign="top" class="value">
+                                <g:link controller="inventoryLocationDetailed" action="show" id="${inventoryItemInstance?.inventoryLocation?.id}">
+                                    ${inventoryItemInstance?.inventoryLocation?.encodeAsHTML()}
+                                </g:link>
+                                    in ${inventoryItemInstance?.inventoryLocation?.inventoryStore.encodeAsHTML()}
+                            </td>
+                            
+                        </tr>
+                        
+                        <tr class="prop">
+                            <td valign="top" class="name">In Stock:</td>
+                            
+                            <td valign="top" class="value">
+                                ${fieldValue(bean:inventoryItemInstance, field:'unitsInStock')} ${inventoryItemInstance?.unitOfMeasure?.encodeAsHTML()}
+                            </td>
+                            
+                        </tr>
                     
                         <tr class="prop">
@@ -184,11 +206,4 @@
                                 </ul>
                             </td>
-                            
-                        </tr>
-                        
-                        <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>