Index: trunk/grails-app/views/inventoryItemDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemDetailed/show.gsp	(revision 584)
+++ 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">