Index: /trunk/grails-app/controllers/InventoryItemPurchaseDetailedController.groovy
===================================================================
--- /trunk/grails-app/controllers/InventoryItemPurchaseDetailedController.groovy	(revision 604)
+++ /trunk/grails-app/controllers/InventoryItemPurchaseDetailedController.groovy	(revision 605)
@@ -148,10 +148,10 @@
             response.contentType = ConfigurationHolder.config.grails.mime.types[params.format]
             response.setHeader("Content-disposition", "attachment; filename=Purchases.${params.extension}")
-            List fields = ["purchaseOrderNumber", "dateEntered", "costCode", "quantity", "orderValueAmount", "invoiceNumber",
+            List fields = ["purchaseOrderNumber", "date", "costCode", "quantity", "orderValueAmount", "invoiceNumber",
                                     "inventoryItemPurchaseType"]
-            Map labels = ["purchaseOrderNumber": "Order Number", "dateEntered": "Date", "costCode": "Cost Code",
+            Map labels = ["purchaseOrderNumber": "Order Number", "date": "Date", "costCode": "Cost Code",
                                     "quantity": "Quantity", "orderValueAmount": "Order \$", "invoiceNumber": "Invoice Number",
                                     "inventoryItemPurchaseType": "Type"]
-            Map formatters = [ dateEntered: dateFmt]
+            Map formatters = [ date: dateFmt]
             Map parameters = [title: title, separator: ","]
 
@@ -165,7 +165,14 @@
         filterParams.order = params.order ?: "desc"
 
+        // Get some associatedProperty values for filterpane.
+        def associatedPropertyValues = [:]
+        def startOfYearRange = dateUtilService.getYearFromDate(dateUtilService.plusYear(new Date(), -10))
+        def endOfYearRange = dateUtilService.getYearFromDate(dateUtilService.plusYear(new Date(), 10))
+        associatedPropertyValues.yearRange = startOfYearRange..endOfYearRange
+
         return[ inventoryItemPurchaseList: inventoryItemPurchaseList,
-                inventoryItemPurchaseTotal: inventoryItemPurchaseTotal,
-                filterParams: filterParams ]
+                        inventoryItemPurchaseTotal: inventoryItemPurchaseTotal,
+                        filterParams: filterParams,
+                        associatedPropertyValues: associatedPropertyValues ]
 
     } // end search()
Index: /trunk/grails-app/domain/InventoryItemPurchase.groovy
===================================================================
--- /trunk/grails-app/domain/InventoryItemPurchase.groovy	(revision 604)
+++ /trunk/grails-app/domain/InventoryItemPurchase.groovy	(revision 605)
@@ -2,9 +2,14 @@
 
     Person enteredBy
+    Person lastUpdatedBy
     InventoryItem inventoryItem
     CostCode costCode
     InventoryItemPurchaseType inventoryItemPurchaseType
+    Supplier supplier
 
-    Date dateEntered = new Date()
+    Date date = new Date()
+    Date lastUpdated // autoTimestamp
+    Date dateCreated // autoTimestamp
+
     Integer quantity
     String purchaseOrderNumber = ''
@@ -12,4 +17,5 @@
     Currency orderValueCurrency
     String invoiceNumber = ''
+    String comment = ""
 
     Boolean receivedComplete = false
@@ -41,4 +47,6 @@
         orderValueAmount(max: new BigDecimal(1000000000000))
         orderValueCurrency()
+        comment(maxSize:255)
+        lastUpdatedBy(nullable: true)
     }
 
Index: /trunk/grails-app/services/InventoryPurchaseService.groovy
===================================================================
--- /trunk/grails-app/services/InventoryPurchaseService.groovy	(revision 604)
+++ /trunk/grails-app/services/InventoryPurchaseService.groovy	(revision 605)
@@ -150,5 +150,5 @@
                     return fail(code:"inventoryItemPurchase.delete.failure.payment.approved")
 
-                def startOfDay = dateUtilService.getMidnight(result.inventoryItemPurchaseInstance.dateEntered)
+                def startOfDay = dateUtilService.getMidnight(result.inventoryItemPurchaseInstance.date)
                 def inventoryMovements = InventoryMovement.withCriteria {
                     eq("inventoryItem", result.inventoryItemPurchaseInstance.inventoryItem )
@@ -234,4 +234,5 @@
             result.inventoryItemPurchaseInstance.properties = params
             result.inventoryItemPurchaseInstance.purchaseOrderNumber = result.inventoryItemPurchaseInstance.purchaseOrderNumber.trim()
+            result.inventoryItemPurchaseInstance.lastUpdatedBy = authService.currentUser
 
             if(result.inventoryItemPurchaseInstance.hasErrors() || !result.inventoryItemPurchaseInstance.save())
@@ -315,4 +316,5 @@
             // Fetch to prevent lazy initialization error.
             result.inventoryItemPurchaseInstance.inventoryItem.unitOfMeasure
+            result.inventoryItemPurchaseInstance.inventoryItem.inventoryLocation
 
             if(order.hasErrors() || !order.save())
@@ -339,5 +341,5 @@
 
         } // end withTransaction
-    } // save()
+    } // receiveSave()
 
     def approveInvoicePaymentSave(params) {
Index: /trunk/grails-app/views/inventoryItemDetailed/show.gsp
===================================================================
--- /trunk/grails-app/views/inventoryItemDetailed/show.gsp	(revision 604)
+++ /trunk/grails-app/views/inventoryItemDetailed/show.gsp	(revision 605)
@@ -448,5 +448,5 @@
                                             <g:sortableColumn action="show" property="purchaseOrderNumber"
                                                                                 title="Order #" params="[paginate: 'purchases']"  />
-                                            <g:sortableColumn action="show"  property="dateEntered"
+                                            <g:sortableColumn action="show"  property="date"
                                                                                 title="Date" params="[paginate: 'purchases']" />
                                             <g:sortableColumn action="show"  property="costCode"
@@ -479,5 +479,5 @@
                                                 </td>
                                                 <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}"'>
-                                                    <g:formatDate date="${purchase.dateEntered}" format="EEE, dd-MMM-yyyy"/>
+                                                    <g:formatDate date="${purchase.date}" format="EEE, dd-MMM-yyyy"/>
                                                 </td>
                                                 <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}"'>
Index: /trunk/grails-app/views/inventoryItemPurchaseDetailed/approveInvoicePayment.gsp
===================================================================
--- /trunk/grails-app/views/inventoryItemPurchaseDetailed/approveInvoicePayment.gsp	(revision 604)
+++ /trunk/grails-app/views/inventoryItemPurchaseDetailed/approveInvoicePayment.gsp	(revision 605)
@@ -21,4 +21,5 @@
                 <g:hiddenField name="inventoryItem.id" value="${inventoryItemPurchaseInstance.inventoryItem?.id}" />
                 <g:hiddenField name="receivedId" value="${receivedId}" />
+                <g:hiddenField name="supplier.id" value="${inventoryItemPurchaseInstance.supplier?.id}" />
                 <g:hiddenField name="returnTo" value="${params.returnTo}" />
                 <div class="dialog">
@@ -88,4 +89,13 @@
                             </tr> 
                         
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="comment">Comment:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'comment','errors')}">
+                                    <textarea rows="5" cols="40" name="comment">${fieldValue(bean:inventoryItemPurchaseInstance, field:'comment')}</textarea>
+                                </td>
+                            </tr>
+                        
                         </tbody>
                     </table>
Index: /trunk/grails-app/views/inventoryItemPurchaseDetailed/create.gsp
===================================================================
--- /trunk/grails-app/views/inventoryItemPurchaseDetailed/create.gsp	(revision 604)
+++ /trunk/grails-app/views/inventoryItemPurchaseDetailed/create.gsp	(revision 605)
@@ -7,4 +7,5 @@
         <title>Create InventoryItemPurchase</title>
         <nav:resources override="true"/>
+        <resource:dateChooser />
     </head>
     <body>
@@ -50,4 +51,13 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
+                                    <label for="date">Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'date','errors')}">
+                                    <richui:dateChooser name="date" format="dd-MM-yyyy" value="${inventoryItemPurchaseInstance.date}" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
                                     <label for="costCode">Cost Code:</label>
                                 </td>
@@ -57,7 +67,22 @@
                                                         name="costCode.id"
                                                         value="${inventoryItemPurchaseInstance?.costCode?.id}"
-                                                        noSelection="['null':'']"></g:select>
+                                                        noSelection="['null':/${g.message(code:'default.please.select.text')}/]"></g:select>
                                 </td>
-                            </tr> 
+                            </tr>
+                        
+                             <tr class="prop">
+                                 <td valign="top" class="name">
+                                    <label for="supplier">Supplier:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'supplier','errors')}">
+                                    <g:select optionKey="id"
+                                                        from="${ Supplier.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }"
+                                                        name="supplier.id"
+                                                        value="${inventoryItemPurchaseInstance?.supplier?.id}"
+                                                        noSelection="['null':/${g.message(code:'default.please.select.text')}/]">
+                                    </g:select>
+                                    <p><g:link controller="supplierDetailed" action="create">+Add Supplier</g:link></p>
+                                </td>
+                            </tr>
                         
                             <tr class="prop">
@@ -73,5 +98,5 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="orderValue">Purchase Order $:</label>
+                                    <label for="orderValue">Order Value:</label>
                                 </td>
                                 <td valign="top" class="value">
@@ -80,7 +105,18 @@
                                                     value="${inventoryItemPurchaseInstance.orderValueAmount}" />
                                     <g:currencySelect name="orderValueCurrency"
-                                                                        value="${inventoryItemPurchaseInstance.orderValueCurrency}" />
+                                                                        value="${inventoryItemPurchaseInstance?.orderValueCurrency}"
+                                                                        from="${grailsApplication.config.currencyList}">
+                                    </g:currencySelect>
                                 </td>
-                            </tr> 
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="comment">Comment:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'comment','errors')}">
+                                    <textarea rows="5" cols="40" name="comment">${fieldValue(bean:inventoryItemPurchaseInstance, field:'comment')}</textarea>
+                                </td>
+                            </tr>
                         
                         </tbody>
Index: /trunk/grails-app/views/inventoryItemPurchaseDetailed/edit.gsp
===================================================================
--- /trunk/grails-app/views/inventoryItemPurchaseDetailed/edit.gsp	(revision 604)
+++ /trunk/grails-app/views/inventoryItemPurchaseDetailed/edit.gsp	(revision 605)
@@ -33,5 +33,5 @@
                         
                             <tr class="prop">
-                                <td valign="top" class="name">Inventory Item Purchase Type:</td>
+                                <td valign="top" class="name">Purchase Type:</td>
                                 
                                 <td valign="top" class="value">${inventoryItemPurchaseInstance?.inventoryItemPurchaseType?.encodeAsHTML()}</td>
@@ -41,5 +41,5 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="invoiceNumber">Purchase Order Number:</label>
+                                    <label for="invoiceNumber">Purchase Order #:</label>
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'purchaseOrderNumber','errors')}">
@@ -47,4 +47,13 @@
                                 </td>
                             </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="date">Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'date','errors')}">
+                                    <richui:dateChooser name="date" format="dd-MM-yyyy" value="${inventoryItemPurchaseInstance.date}" />
+                                </td>
+                            </tr> 
                         
                             <tr class="prop">
@@ -57,4 +66,19 @@
                                                         name="costCode.id"
                                                         value="${inventoryItemPurchaseInstance?.costCode?.id}" ></g:select>
+                                </td>
+                            </tr>
+                        
+                             <tr class="prop">
+                                 <td valign="top" class="name">
+                                    <label for="supplier">Supplier:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'supplier','errors')}">
+                                    <g:select optionKey="id"
+                                                        from="${ Supplier.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }"
+                                                        name="supplier.id"
+                                                        value="${inventoryItemPurchaseInstance?.supplier?.id}"
+                                                        noSelection="['null':/${g.message(code:'default.please.select.text')}/]">
+                                    </g:select>
+                                    <p><g:link controller="supplierDetailed" action="create">+Add Supplier</g:link></p>
                                 </td>
                             </tr>
@@ -73,16 +97,21 @@
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'orderValueAmount','errors')}">
                                     <input type="text" id="orderValueAmount" name="orderValueAmount" value="${fieldValue(bean:inventoryItemPurchaseInstance,field:'orderValueAmount')}" />
-                                    <g:currencySelect name="orderValueCurrency" value="${inventoryItemPurchaseInstance?.orderValueCurrency}" ></g:currencySelect>
+                                    <g:currencySelect name="orderValueCurrency"
+                                                                        value="${inventoryItemPurchaseInstance?.orderValueCurrency}"
+                                                                        from="${grailsApplication.config.currencyList}">
+                                    </g:currencySelect>
                                 </td>
                             </tr>
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="invoiceNumber">Invoice Number:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'invoiceNumber','errors')}">
-                                    <input type="text" maxlength="50" id="invoiceNumber" name="invoiceNumber" value="${fieldValue(bean:inventoryItemPurchaseInstance,field:'invoiceNumber')}"/>
-                                </td>
-                            </tr>
+
+                            <g:if test="${inventoryItemPurchaseInstance.inventoryItemPurchaseType?.id == 4}">
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="invoiceNumber">Invoice Number:</label>
+                                    </td>
+                                    <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'invoiceNumber','errors')}">
+                                        <input type="text" maxlength="50" id="invoiceNumber" name="invoiceNumber" value="${fieldValue(bean:inventoryItemPurchaseInstance,field:'invoiceNumber')}"/>
+                                    </td>
+                                </tr>
+                            </g:if>
 
                             <g:if test="${inventoryItemPurchaseInstance?.inventoryItemPurchaseType?.id > 0}">
@@ -126,18 +155,33 @@
                         
                             <tr class="prop">
-                                <td valign="top" class="name">Date Entered:</td>
-                                
-                                <td valign="top" class="value">
-                                    <g:formatDate date="${inventoryItemPurchaseInstance?.dateEntered}" format="EEE, dd-MMM-yyyy @ HH:mm"/>
+                                <td valign="top" class="name">
+                                    <label for="comment">Comment:</label>
                                 </td>
-                                
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'comment','errors')}">
+                                    <textarea rows="5" cols="40" name="comment">${fieldValue(bean:inventoryItemPurchaseInstance, field:'comment')}</textarea>
+                                </td>
                             </tr>
                         
+                        <tr class="prop">
+                            <td valign="top" class="name">Entered By:</td>
+                            <td valign="top" class="value">
+                                <g:link controller="person" action="show" id="${inventoryItemPurchaseInstance?.enteredBy?.id}">
+                                    ${inventoryItemPurchaseInstance?.enteredBy?.encodeAsHTML()}
+                                </g:link>
+                                    on <g:formatDate date="${inventoryItemPurchaseInstance?.dateCreated}" format="EEE, dd-MMM-yyyy @ HH:mm"/>
+                            </td>
+                        </tr>
+
+                        <g:if test="${inventoryItemPurchaseInstance.lastUpdatedBy}">
                             <tr class="prop">
-                                <td valign="top" class="name">Entered By:</td>
-                                
-                                <td valign="top" class="value"><g:link controller="person" action="show" id="${inventoryItemPurchaseInstance?.enteredBy?.id}">${inventoryItemPurchaseInstance?.enteredBy?.encodeAsHTML()}</g:link></td>
-                                
+                                <td valign="top" class="name">Last Updated By:</td>
+                                <td valign="top" class="value">
+                                    <g:link controller="person" action="show" id="${inventoryItemPurchaseInstance?.lastUpdatedBy?.id}">
+                                        ${inventoryItemPurchaseInstance?.lastUpdatedBy.encodeAsHTML()}
+                                    </g:link>
+                                    on <g:formatDate date="${inventoryItemPurchaseInstance?.lastUpdated}" format="EEE, dd-MMM-yyyy @ HH:mm"/>
+                                </td>
                             </tr>
+                        </g:if >
                         
                         </tbody>
Index: /trunk/grails-app/views/inventoryItemPurchaseDetailed/receive.gsp
===================================================================
--- /trunk/grails-app/views/inventoryItemPurchaseDetailed/receive.gsp	(revision 604)
+++ /trunk/grails-app/views/inventoryItemPurchaseDetailed/receive.gsp	(revision 605)
@@ -22,4 +22,5 @@
                 <g:hiddenField name="inventoryItem.id" value="${inventoryItemPurchaseInstance.inventoryItem?.id}" />
                 <g:hiddenField name="orderId" value="${orderId}" />
+                <g:hiddenField name="supplier.id" value="${inventoryItemPurchaseInstance.supplier?.id}" />
                 <g:hiddenField name="returnTo" value="${params.returnTo}" />
                 <div class="dialog">
@@ -64,4 +65,13 @@
                             </tr> 
                         
+                             <tr class="prop">
+                                 <td valign="top" class="name">
+                                    <label for="supplier">Supplier:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'supplier','errors')}">
+                                    ${inventoryItemPurchaseInstance.supplier}
+                                </td>
+                            </tr>
+                        
                             <tr class="prop">
                                 <td valign="top" class="name">
@@ -84,6 +94,14 @@
                                     ${inventoryItemPurchaseInstance.orderValueCurrency?.encodeAsHTML()}
                                 </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="comment">Comment:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'comment','errors')}">
+                                    <textarea rows="5" cols="40" name="comment">${fieldValue(bean:inventoryItemPurchaseInstance, field:'comment')}</textarea>
+                                </td>
                             </tr>
-                            </tr> 
                         
                         </tbody>
Index: /trunk/grails-app/views/inventoryItemPurchaseDetailed/search.gsp
===================================================================
--- /trunk/grails-app/views/inventoryItemPurchaseDetailed/search.gsp	(revision 604)
+++ /trunk/grails-app/views/inventoryItemPurchaseDetailed/search.gsp	(revision 605)
@@ -83,5 +83,5 @@
                                 <g:sortableColumn property="purchaseOrderNumber"
                                                                     title="Order #" params="${filterParams}"  />
-                                <g:sortableColumn property="dateEntered"
+                                <g:sortableColumn property="date"
                                                                     title="Date" params="${filterParams}" />
                                 <g:sortableColumn property="costCode"
@@ -114,5 +114,5 @@
                                     </td>
                                     <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}?returnTo=search"'>
-                                        <g:formatDate date="${purchase.dateEntered}" format="EEE, dd-MMM-yyyy"/>
+                                        <g:formatDate date="${purchase.date}" format="EEE, dd-MMM-yyyy"/>
                                     </td>
                                     <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}?returnTo=search"'>
@@ -193,8 +193,8 @@
                                     action="search"
                                     class="overlayPane"
-                                    excludeProperties="orderValueCurrency"
+                                    excludeProperties="orderValueCurrency, dateCreated"
                                     associatedProperties="inventoryItemPurchaseType.name"
                                     filterPropertyValues="${['inventoryItemPurchaseType.name':[values:InventoryItemPurchaseType.findAllByIsActive(true)],
-                                                                                dateEntered:[years:2020..2000,precision:'day']
+                                                                                date:[years: associatedPropertyValues.yearRange,precision:'day']
                                                                                 ]}"/>
         </div> <!-- end body  -->
Index: /trunk/grails-app/views/inventoryItemPurchaseDetailed/show.gsp
===================================================================
--- /trunk/grails-app/views/inventoryItemPurchaseDetailed/show.gsp	(revision 604)
+++ /trunk/grails-app/views/inventoryItemPurchaseDetailed/show.gsp	(revision 605)
@@ -26,5 +26,5 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Inventory Item Purchase Type:</td>
+                            <td valign="top" class="name">Purchase Type:</td>
                             
                             <td valign="top" class="value">${inventoryItemPurchaseInstance?.inventoryItemPurchaseType?.encodeAsHTML()}</td>
@@ -33,5 +33,5 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Purchase Order Number:</td>
+                            <td valign="top" class="name">Purchase Order #:</td>
                             
                             <td valign="top" class="value">${fieldValue(bean:inventoryItemPurchaseInstance, field:'purchaseOrderNumber')}</td>
@@ -40,7 +40,21 @@
                     
                         <tr class="prop">
+                            <td valign="top" class="name">Date:</td>
+                            <td valign="top" class="value">
+                                <g:formatDate date="${inventoryItemPurchaseInstance?.date}" format="EEE, dd-MMM-yyyy"/>
+                            </td>
+                        </tr>
+                    
+                        <tr class="prop">
                             <td valign="top" class="name">Cost Code:</td>
                             
                             <td valign="top" class="value"><g:link controller="costCodeDetailed" action="show" id="${inventoryItemPurchaseInstance?.costCode?.id}">${inventoryItemPurchaseInstance?.costCode?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                        
+                         <tr class="prop">
+                            <td valign="top" class="name">Supplier:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="supplierDetailed" action="show" id="${inventoryItemPurchaseInstance?.supplier?.id}">${inventoryItemPurchaseInstance?.supplier?.encodeAsHTML()}</g:link></td>
                             
                         </tr>
@@ -62,11 +76,11 @@
                             
                         </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Invoice Number:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:inventoryItemPurchaseInstance, field:'invoiceNumber')}</td>
-                            
-                        </tr>
+
+                        <g:if test="${inventoryItemPurchaseInstance.inventoryItemPurchaseType?.id == 4}">
+                            <tr class="prop">
+                                <td valign="top" class="name">Invoice Number:</td>
+                                <td valign="top" class="value">${fieldValue(bean:inventoryItemPurchaseInstance, field:'invoiceNumber')}</td>
+                            </tr>
+                        </g:if>
                         
                         <tr class="prop">
@@ -87,20 +101,31 @@
                             </td>
                         </tr>
-                    
+                        
                         <tr class="prop">
-                            <td valign="top" class="name">Date Entered:</td>
-                            
-                            <td valign="top" class="value">
-                                <g:formatDate date="${inventoryItemPurchaseInstance?.dateEntered}" format="EEE, dd-MMM-yyyy @ HH:mm"/>
-                            </td>
-                            
+                            <td valign="top" class="name">Comment:</td>
+                            <td valign="top" class="value">${fieldValue(bean:inventoryItemPurchaseInstance, field:'comment')}</td>
                         </tr>
                     
                         <tr class="prop">
                             <td valign="top" class="name">Entered By:</td>
-                            
-                            <td valign="top" class="value"><g:link controller="person" action="show" id="${inventoryItemPurchaseInstance?.enteredBy?.id}">${inventoryItemPurchaseInstance?.enteredBy?.encodeAsHTML()}</g:link></td>
-                            
+                            <td valign="top" class="value">
+                                <g:link controller="person" action="show" id="${inventoryItemPurchaseInstance?.enteredBy?.id}">
+                                    ${inventoryItemPurchaseInstance?.enteredBy?.encodeAsHTML()}
+                                </g:link>
+                                    on <g:formatDate date="${inventoryItemPurchaseInstance?.dateCreated}" format="EEE, dd-MMM-yyyy @ HH:mm"/>
+                            </td>
                         </tr>
+
+                        <g:if test="${inventoryItemPurchaseInstance.lastUpdatedBy}">
+                            <tr class="prop">
+                                <td valign="top" class="name">Last Updated By:</td>
+                                <td valign="top" class="value">
+                                    <g:link controller="person" action="show" id="${inventoryItemPurchaseInstance?.lastUpdatedBy?.id}">
+                                        ${inventoryItemPurchaseInstance?.lastUpdatedBy.encodeAsHTML()}
+                                    </g:link>
+                                    on <g:formatDate date="${inventoryItemPurchaseInstance?.lastUpdated}" format="EEE, dd-MMM-yyyy @ HH:mm"/>
+                                </td>
+                            </tr>
+                        </g:if >
                     
                     </tbody>