Index: trunk/grails-app/views/inventoryItemDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemDetailed/show.gsp	(revision 593)
+++ trunk/grails-app/views/inventoryItemDetailed/show.gsp	(revision 595)
@@ -502,19 +502,28 @@
                                                     </g:link>
                                                 </td>
+
                                                 <g:if test="${purchase.inventoryItemPurchaseType.id == 1}">
                                                     <g:if test="${!purchase.receivedComplete}">
                                                         <td class="notClickable">
-                                                            <g:link controller="inventoryItemPurchaseDetailed" action="receive" id="${purchase.id}">
+                                                            <g:link controller="inventoryItemPurchaseDetailed" action="receive" params="[id: purchase.id, returnTo: 'inventoryItem']">
                                                                 <img  src="${resource(dir:'images/skin',file:'basket_put.png')}" alt="Receive" title="Receive" />
                                                             </g:link>
                                                         </td>
+                                                        <td class="notClickable">
+                                                        </td>
                                                     </g:if>
                                                     <g:else>
                                                         <td class="notClickable">
                                                         </td>
+                                                        <td class="notClickable">
+                                                        </td>
                                                     </g:else>
+                                                </g:if>
+                                                <g:elseif test="${(purchase.inventoryItemPurchaseType.id == 2)||(purchase.inventoryItemPurchaseType.id == 3)}">
                                                     <g:if test="${!purchase.invoicePaymentApproved}">
                                                         <td class="notClickable">
-                                                            <g:link controller="inventoryItemPurchaseDetailed" action="approveInvoicePayment" id="${purchase.id}">
+                                                        </td>
+                                                        <td class="notClickable">
+                                                            <g:link controller="inventoryItemPurchaseDetailed" action="approveInvoicePayment" params="[id: purchase.id, returnTo: 'inventoryItem']">
                                                                 <img  src="${resource(dir:'images/skin',file:'tick.png')}" alt="Approve" title="Approve Payment" />
                                                             </g:link>
@@ -524,6 +533,8 @@
                                                         <td class="notClickable">
                                                         </td>
+                                                        <td class="notClickable">
+                                                        </td>
                                                     </g:else>
-                                                </g:if>
+                                                </g:elseif>
                                                 <g:else>
                                                     <td class="notClickable">
Index: trunk/grails-app/views/inventoryItemPurchaseDetailed/approveInvoicePayment.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemPurchaseDetailed/approveInvoicePayment.gsp	(revision 593)
+++ trunk/grails-app/views/inventoryItemPurchaseDetailed/approveInvoicePayment.gsp	(revision 595)
@@ -21,4 +21,5 @@
                 <g:hiddenField name="inventoryItem.id" value="${inventoryItemPurchaseInstance.inventoryItem?.id}" />
                 <g:hiddenField name="orderId" value="${orderId}" />
+                <g:hiddenField name="returnTo" value="${params.returnTo}" />
                 <div class="dialog">
                     <table>
Index: trunk/grails-app/views/inventoryItemPurchaseDetailed/create.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemPurchaseDetailed/create.gsp	(revision 593)
+++ trunk/grails-app/views/inventoryItemPurchaseDetailed/create.gsp	(revision 595)
@@ -6,4 +6,5 @@
         <meta name="layout" content="main" />
         <title>Create InventoryItemPurchase</title>
+        <nav:resources override="true"/>
     </head>
     <body>
@@ -20,4 +21,5 @@
             <g:form action="save" method="post" >
                 <g:hiddenField name="inventoryItem.id" value="${inventoryItemPurchaseInstance?.inventoryItem?.id}" />
+                <g:hiddenField name="returnTo" value="${params.returnTo}" />
                 <div class="dialog">
                     <table>
Index: trunk/grails-app/views/inventoryItemPurchaseDetailed/receive.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemPurchaseDetailed/receive.gsp	(revision 593)
+++ trunk/grails-app/views/inventoryItemPurchaseDetailed/receive.gsp	(revision 595)
@@ -6,4 +6,5 @@
         <meta name="layout" content="main" />
         <title>Receive InventoryItemPurchase</title>
+        <nav:resources override="true"/>
     </head>
     <body>
@@ -21,4 +22,5 @@
                 <g:hiddenField name="inventoryItem.id" value="${inventoryItemPurchaseInstance.inventoryItem?.id}" />
                 <g:hiddenField name="orderId" value="${orderId}" />
+                <g:hiddenField name="returnTo" value="${params.returnTo}" />
                 <div class="dialog">
                     <table>
Index: trunk/grails-app/views/inventoryItemPurchaseDetailed/search.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemPurchaseDetailed/search.gsp	(revision 593)
+++ trunk/grails-app/views/inventoryItemPurchaseDetailed/search.gsp	(revision 595)
@@ -10,5 +10,5 @@
     <body>
         <div class="nav">
-            <h1>Inventory Purchases</h1>
+            <nav:renderSubItems group="navAlt"/>
         </div>
 
@@ -110,46 +110,55 @@
                                 <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}"/>
 
-                                    <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}"'>
+                                    <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}?returnTo=search"'>
                                         ${fieldValue(bean:purchase, field:'purchaseOrderNumber')}
                                     </td>
-                                    <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}"'>
+                                    <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}?returnTo=search"'>
                                         <g:formatDate date="${purchase.dateEntered}" format="EEE, dd-MMM-yyyy"/>
                                     </td>
-                                    <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}"'>
+                                    <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}?returnTo=search"'>
                                         ${fieldValue(bean:purchase, field:'costCode')}
                                     </td>
-                                    <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}"'>
+                                    <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}?returnTo=search"'>
                                         ${fieldValue(bean:purchase, field:'quantity')}
                                     </td>
-                                    <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}"'>
+                                    <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}?returnTo=search"'>
                                         ${fieldValue(bean:purchase, field:'orderValueAmount')}
                                         ${fieldValue(bean:purchase, field:'orderValueCurrency')}
                                     </td>
-                                    <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}"'>
+                                    <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}?returnTo=search"'>
                                         ${fieldValue(bean:purchase, field:'invoiceNumber')}
                                     </td>
-                                    <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}"'>
+                                    <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}?returnTo=search"'>
                                         ${fieldValue(bean:purchase, field:'inventoryItemPurchaseType')}
                                     </td>
                                     <td class="notClickable">
-                                        <g:link controller="inventoryItemPurchaseDetailed" action="show" id="${purchase.id}">
+                                        <g:link controller="inventoryItemPurchaseDetailed" action="show" params="[id: purchase.id, returnTo: 'search']">
                                             <img  src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" title="Show" />
                                         </g:link>
                                     </td>
+
                                     <g:if test="${purchase.inventoryItemPurchaseType.id == 1}">
                                         <g:if test="${!purchase.receivedComplete}">
                                             <td class="notClickable">
-                                                <g:link controller="inventoryItemPurchaseDetailed" action="receive" id="${purchase.id}">
+                                                <g:link controller="inventoryItemPurchaseDetailed" action="receive" params="[id: purchase.id, returnTo: 'search']">
                                                     <img  src="${resource(dir:'images/skin',file:'basket_put.png')}" alt="Receive" title="Receive" />
                                                 </g:link>
                                             </td>
+                                            <td class="notClickable">
+                                            </td>
                                         </g:if>
                                         <g:else>
                                             <td class="notClickable">
                                             </td>
+                                            <td class="notClickable">
+                                            </td>
                                         </g:else>
+                                    </g:if>
+                                    <g:elseif test="${(purchase.inventoryItemPurchaseType.id == 2)||(purchase.inventoryItemPurchaseType.id == 3)}">
                                         <g:if test="${!purchase.invoicePaymentApproved}">
                                             <td class="notClickable">
-                                                <g:link controller="inventoryItemPurchaseDetailed" action="approveInvoicePayment" id="${purchase.id}">
+                                            </td>
+                                            <td class="notClickable">
+                                                <g:link controller="inventoryItemPurchaseDetailed" action="approveInvoicePayment" params="[id: purchase.id, returnTo: 'search']">
                                                     <img  src="${resource(dir:'images/skin',file:'tick.png')}" alt="Approve" title="Approve Payment" />
                                                 </g:link>
@@ -159,6 +168,8 @@
                                             <td class="notClickable">
                                             </td>
+                                            <td class="notClickable">
+                                            </td>
                                         </g:else>
-                                    </g:if>
+                                    </g:elseif>
                                     <g:else>
                                         <td class="notClickable">
Index: trunk/grails-app/views/inventoryItemPurchaseDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemPurchaseDetailed/show.gsp	(revision 593)
+++ trunk/grails-app/views/inventoryItemPurchaseDetailed/show.gsp	(revision 595)
@@ -6,8 +6,9 @@
         <meta name="layout" content="main" />
         <title>Show InventoryItemPurchase</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <h1>Show InventoryItemPurchase</h1>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
@@ -108,5 +109,6 @@
             <div class="buttons">
                 <g:form>
-                    <input type="hidden" name="id" value="${inventoryItemPurchaseInstance?.id}" />
+                    <g:hiddenField name="id" value="${inventoryItemPurchaseInstance?.id}" />
+                    <g:hiddenField name="returnTo" value="${params.returnTo}" />
                     <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
                     <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>