Changeset 595 for trunk/grails-app/views
- Timestamp:
- Jun 11, 2010, 11:44:49 AM (15 years ago)
- Location:
- trunk/grails-app/views
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/views/inventoryItemDetailed/show.gsp
r584 r595 502 502 </g:link> 503 503 </td> 504 504 505 <g:if test="${purchase.inventoryItemPurchaseType.id == 1}"> 505 506 <g:if test="${!purchase.receivedComplete}"> 506 507 <td class="notClickable"> 507 <g:link controller="inventoryItemPurchaseDetailed" action="receive" id="${purchase.id}">508 <g:link controller="inventoryItemPurchaseDetailed" action="receive" params="[id: purchase.id, returnTo: 'inventoryItem']"> 508 509 <img src="${resource(dir:'images/skin',file:'basket_put.png')}" alt="Receive" title="Receive" /> 509 510 </g:link> 510 511 </td> 512 <td class="notClickable"> 513 </td> 511 514 </g:if> 512 515 <g:else> 513 516 <td class="notClickable"> 514 517 </td> 518 <td class="notClickable"> 519 </td> 515 520 </g:else> 521 </g:if> 522 <g:elseif test="${(purchase.inventoryItemPurchaseType.id == 2)||(purchase.inventoryItemPurchaseType.id == 3)}"> 516 523 <g:if test="${!purchase.invoicePaymentApproved}"> 517 524 <td class="notClickable"> 518 <g:link controller="inventoryItemPurchaseDetailed" action="approveInvoicePayment" id="${purchase.id}"> 525 </td> 526 <td class="notClickable"> 527 <g:link controller="inventoryItemPurchaseDetailed" action="approveInvoicePayment" params="[id: purchase.id, returnTo: 'inventoryItem']"> 519 528 <img src="${resource(dir:'images/skin',file:'tick.png')}" alt="Approve" title="Approve Payment" /> 520 529 </g:link> … … 524 533 <td class="notClickable"> 525 534 </td> 535 <td class="notClickable"> 536 </td> 526 537 </g:else> 527 </g: if>538 </g:elseif> 528 539 <g:else> 529 540 <td class="notClickable"> -
trunk/grails-app/views/inventoryItemPurchaseDetailed/approveInvoicePayment.gsp
r441 r595 21 21 <g:hiddenField name="inventoryItem.id" value="${inventoryItemPurchaseInstance.inventoryItem?.id}" /> 22 22 <g:hiddenField name="orderId" value="${orderId}" /> 23 <g:hiddenField name="returnTo" value="${params.returnTo}" /> 23 24 <div class="dialog"> 24 25 <table> -
trunk/grails-app/views/inventoryItemPurchaseDetailed/create.gsp
r441 r595 6 6 <meta name="layout" content="main" /> 7 7 <title>Create InventoryItemPurchase</title> 8 <nav:resources override="true"/> 8 9 </head> 9 10 <body> … … 20 21 <g:form action="save" method="post" > 21 22 <g:hiddenField name="inventoryItem.id" value="${inventoryItemPurchaseInstance?.inventoryItem?.id}" /> 23 <g:hiddenField name="returnTo" value="${params.returnTo}" /> 22 24 <div class="dialog"> 23 25 <table> -
trunk/grails-app/views/inventoryItemPurchaseDetailed/receive.gsp
r441 r595 6 6 <meta name="layout" content="main" /> 7 7 <title>Receive InventoryItemPurchase</title> 8 <nav:resources override="true"/> 8 9 </head> 9 10 <body> … … 21 22 <g:hiddenField name="inventoryItem.id" value="${inventoryItemPurchaseInstance.inventoryItem?.id}" /> 22 23 <g:hiddenField name="orderId" value="${orderId}" /> 24 <g:hiddenField name="returnTo" value="${params.returnTo}" /> 23 25 <div class="dialog"> 24 26 <table> -
trunk/grails-app/views/inventoryItemPurchaseDetailed/search.gsp
r570 r595 10 10 <body> 11 11 <div class="nav"> 12 < h1>Inventory Purchases</h1>12 <nav:renderSubItems group="navAlt"/> 13 13 </div> 14 14 … … 110 110 <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}"/> 111 111 112 <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id} "'>112 <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}?returnTo=search"'> 113 113 ${fieldValue(bean:purchase, field:'purchaseOrderNumber')} 114 114 </td> 115 <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id} "'>115 <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}?returnTo=search"'> 116 116 <g:formatDate date="${purchase.dateEntered}" format="EEE, dd-MMM-yyyy"/> 117 117 </td> 118 <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id} "'>118 <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}?returnTo=search"'> 119 119 ${fieldValue(bean:purchase, field:'costCode')} 120 120 </td> 121 <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id} "'>121 <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}?returnTo=search"'> 122 122 ${fieldValue(bean:purchase, field:'quantity')} 123 123 </td> 124 <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id} "'>124 <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}?returnTo=search"'> 125 125 ${fieldValue(bean:purchase, field:'orderValueAmount')} 126 126 ${fieldValue(bean:purchase, field:'orderValueCurrency')} 127 127 </td> 128 <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id} "'>128 <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}?returnTo=search"'> 129 129 ${fieldValue(bean:purchase, field:'invoiceNumber')} 130 130 </td> 131 <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id} "'>131 <td onclick='window.location = "${request.getContextPath()}/inventoryItemPurchaseDetailed/show/${purchase.id}?returnTo=search"'> 132 132 ${fieldValue(bean:purchase, field:'inventoryItemPurchaseType')} 133 133 </td> 134 134 <td class="notClickable"> 135 <g:link controller="inventoryItemPurchaseDetailed" action="show" id="${purchase.id}">135 <g:link controller="inventoryItemPurchaseDetailed" action="show" params="[id: purchase.id, returnTo: 'search']"> 136 136 <img src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" title="Show" /> 137 137 </g:link> 138 138 </td> 139 139 140 <g:if test="${purchase.inventoryItemPurchaseType.id == 1}"> 140 141 <g:if test="${!purchase.receivedComplete}"> 141 142 <td class="notClickable"> 142 <g:link controller="inventoryItemPurchaseDetailed" action="receive" id="${purchase.id}">143 <g:link controller="inventoryItemPurchaseDetailed" action="receive" params="[id: purchase.id, returnTo: 'search']"> 143 144 <img src="${resource(dir:'images/skin',file:'basket_put.png')}" alt="Receive" title="Receive" /> 144 145 </g:link> 145 146 </td> 147 <td class="notClickable"> 148 </td> 146 149 </g:if> 147 150 <g:else> 148 151 <td class="notClickable"> 149 152 </td> 153 <td class="notClickable"> 154 </td> 150 155 </g:else> 156 </g:if> 157 <g:elseif test="${(purchase.inventoryItemPurchaseType.id == 2)||(purchase.inventoryItemPurchaseType.id == 3)}"> 151 158 <g:if test="${!purchase.invoicePaymentApproved}"> 152 159 <td class="notClickable"> 153 <g:link controller="inventoryItemPurchaseDetailed" action="approveInvoicePayment" id="${purchase.id}"> 160 </td> 161 <td class="notClickable"> 162 <g:link controller="inventoryItemPurchaseDetailed" action="approveInvoicePayment" params="[id: purchase.id, returnTo: 'search']"> 154 163 <img src="${resource(dir:'images/skin',file:'tick.png')}" alt="Approve" title="Approve Payment" /> 155 164 </g:link> … … 159 168 <td class="notClickable"> 160 169 </td> 170 <td class="notClickable"> 171 </td> 161 172 </g:else> 162 </g: if>173 </g:elseif> 163 174 <g:else> 164 175 <td class="notClickable"> -
trunk/grails-app/views/inventoryItemPurchaseDetailed/show.gsp
r441 r595 6 6 <meta name="layout" content="main" /> 7 7 <title>Show InventoryItemPurchase</title> 8 <nav:resources override="true"/> 8 9 </head> 9 10 <body> 10 11 <div class="nav"> 11 < h1>Show InventoryItemPurchase</h1>12 <nav:renderSubItems group="navAlt"/> 12 13 </div> 13 14 <div class="body"> … … 108 109 <div class="buttons"> 109 110 <g:form> 110 <input type="hidden" name="id" value="${inventoryItemPurchaseInstance?.id}" /> 111 <g:hiddenField name="id" value="${inventoryItemPurchaseInstance?.id}" /> 112 <g:hiddenField name="returnTo" value="${params.returnTo}" /> 111 113 <span class="button"><g:actionSubmit class="edit" value="Edit" /></span> 112 114 <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
Note: See TracChangeset
for help on using the changeset viewer.