Changeset 609
- Timestamp:
- Jun 22, 2010, 1:33:55 PM (15 years ago)
- Location:
- trunk/grails-app
- Files:
-
- 7 edited
-
domain/InventoryItemPurchase.groovy (modified) (1 diff)
-
i18n/messages.properties (modified) (2 diffs)
-
views/inventoryItemPurchaseDetailed/approveInvoicePayment.gsp (modified) (5 diffs)
-
views/inventoryItemPurchaseDetailed/create.gsp (modified) (6 diffs)
-
views/inventoryItemPurchaseDetailed/edit.gsp (modified) (8 diffs)
-
views/inventoryItemPurchaseDetailed/receive.gsp (modified) (4 diffs)
-
views/inventoryItemPurchaseDetailed/show.gsp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/domain/InventoryItemPurchase.groovy
r605 r609 7 7 InventoryItemPurchaseType inventoryItemPurchaseType 8 8 Supplier supplier 9 TaskBudgetStatus taskBudgetStatus 9 10 10 11 Date date = new Date() -
trunk/grails-app/i18n/messages.properties
r601 r609 40 40 person.pass.blank=Password cannot be blank 41 41 person.pass.doesNotMatch=Passwords must match 42 43 # 44 # Help Balloon messages. 45 # 42 46 43 47 person.personGroups=Person Groups … … 59 63 person.authorities.help=Give this person authority to do things in the application. \ 60 64 The user must logout for changes to take effect. 65 66 # InventoryItemPurchase properties. 67 inventoryItemPurchase.purchaseOrderNumber=Purchase Order # 68 inventoryItemPurchase.purchaseOrderNumber.help=This number must be exact in case and spacing. \ 69 All purchase received and invoice approval requires this number to track correctly. \ 70 The number may only appear once for each inventory item. \ 71 To enter multiple line items for a purchase order # 'M123' use 'M123.1' and 'M123.2' for example. 72 inventoryItemPurchase.order.placed.date=Date 73 inventoryItemPurchase.order.placed.date.help=The date that the order was placed. \ 74 May be adjusted at the end of financial years. Also see the 'date created' and 'last updated' properties. 75 inventoryItemPurchase.cost.code=Cost Code 76 inventoryItemPurchase.cost.code.help=Cost codes assign cost to the correct asset and accouting ledger number/account. \ 77 Ideally cost codes should be asset based and reflect the asset tree. 78 inventoryItemPurchase.task.budget.status=Budget Status 79 inventoryItemPurchase.task.budget.status.help=Was this purchase planned for in the budget or is it an unplanned spend. 80 inventoryItemPurchase.supplier=Supplier 81 inventoryItemPurchase.supplier.help=The supplier to make the purchase out to. 82 inventoryItemPurchase.quantity=Quantity 83 inventoryItemPurchase.quantity.help=The number of inventory item units purchased. 84 inventoryItemPurchase.receive.quantity=Receive Quantity 85 inventoryItemPurchase.receive.quantity.help=The number of inventory item units received. 86 inventoryItemPurchase.approve.quantity=Approve Quantity 87 inventoryItemPurchase.approve.quantity.help=The number of inventory item units to approve payment for. 88 inventoryItemPurchase.order.value=Order Value 89 inventoryItemPurchase.order.value.help=The total value of this line item. 90 inventoryItemPurchase.receive.value=Receive Value 91 inventoryItemPurchase.receive.value.help=The value of items received. 92 inventoryItemPurchase.approve.value=Approve Value 93 inventoryItemPurchase.approve.value.help=The value to approve payment for. 94 inventoryItemPurchase.invoice.number=Invoice Number 95 inventoryItemPurchase.invoice.number.help=The invoice number that this line item approves payment for. 61 96 62 97 entry.duration=Duration -
trunk/grails-app/views/inventoryItemPurchaseDetailed/approveInvoicePayment.gsp
r605 r609 22 22 <g:hiddenField name="receivedId" value="${receivedId}" /> 23 23 <g:hiddenField name="supplier.id" value="${inventoryItemPurchaseInstance.supplier?.id}" /> 24 <g:hiddenField name="taskBudgetStatus.id" value="${inventoryItemPurchaseInstance.taskBudgetStatus?.id}" /> 24 25 <g:hiddenField name="returnTo" value="${params.returnTo}" /> 25 26 <div class="dialog"> … … 60 61 <tr class="prop"> 61 62 <td valign="top" class="name"> 63 <label for="taskBudgetStatus">Budget Status:</label> 64 </td> 65 <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'taskBudgetStatus','errors')}"> 66 ${inventoryItemPurchaseInstance.taskBudgetStatus.encodeAsHTML()} 67 </td> 68 </tr> 69 70 <tr class="prop"> 71 <td valign="top" class="name"> 62 72 <label for="quantity">Invoice #:</label> 63 73 </td> 64 74 <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'invoiceNumber','errors')}"> 65 75 <input type="text" id="invoiceNumber" name="invoiceNumber" value="${fieldValue(bean:inventoryItemPurchaseInstance,field:'invoiceNumber')}" /> 76 <g:helpBalloon code="inventoryItemPurchase.invoice.number" /> 66 77 </td> 67 78 </tr> … … 74 85 <input type="text" id="quantity" name="quantity" value="${fieldValue(bean:inventoryItemPurchaseInstance,field:'quantity')}" /> 75 86 ${inventoryItemPurchaseInstance.inventoryItem.unitOfMeasure.encodeAsHTML()} 87 <g:helpBalloon code="inventoryItemPurchase.approve.quantity" /> 76 88 </td> 77 89 </tr> … … 79 91 <tr class="prop"> 80 92 <td valign="top" class="name"> 81 <label for="orderValue"> Purchase Order $:</label>93 <label for="orderValue">Approve Value:</label> 82 94 </td> 83 95 <td valign="top"> … … 86 98 value="${fieldValue(bean:inventoryItemPurchaseInstance,field:'orderValueAmount')}" /> 87 99 ${inventoryItemPurchaseInstance.orderValueCurrency?.encodeAsHTML()} 100 <g:helpBalloon code="inventoryItemPurchase.approve.value" /> 88 101 </td> 89 102 </tr> -
trunk/grails-app/views/inventoryItemPurchaseDetailed/create.gsp
r605 r609 46 46 <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'purchaseOrderNumber','errors')}"> 47 47 <input type="text" maxlength="50" id="purchaseOrderNumber" name="purchaseOrderNumber" value="${fieldValue(bean:inventoryItemPurchaseInstance,field:'purchaseOrderNumber')}"/> 48 <g:helpBalloon code="inventoryItemPurchase.purchaseOrderNumber" /> 48 49 </td> 49 50 </tr> … … 55 56 <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'date','errors')}"> 56 57 <richui:dateChooser name="date" format="dd-MM-yyyy" value="${inventoryItemPurchaseInstance.date}" /> 58 <g:helpBalloon code="inventoryItemPurchase.order.placed.date" /> 57 59 </td> 58 60 </tr> … … 67 69 name="costCode.id" 68 70 value="${inventoryItemPurchaseInstance?.costCode?.id}" 69 noSelection="['null':/${g.message(code:'default.please.select.text')}/]"></g:select> 71 noSelection="['null':/${g.message(code:'default.please.select.text')}/]"> 72 </g:select> 73 <g:helpBalloon code="inventoryItemPurchase.cost.code" /> 74 </td> 75 </tr> 76 77 <tr class="prop"> 78 <td valign="top" class="name"> 79 <label for="taskBudgetStatus">Budget Status:</label> 80 </td> 81 <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'taskBudgetStatus','errors')}"> 82 <g:select optionKey="id" 83 from="${ TaskBudgetStatus.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }" 84 name="taskBudgetStatus.id" 85 value="${inventoryItemPurchaseInstance?.taskBudgetStatus?.id}" 86 noSelection="['null':/${g.message(code:'default.please.select.text')}/]"> 87 </g:select> 88 <g:helpBalloon code="inventoryItemPurchase.task.budget.status" /> 70 89 </td> 71 90 </tr> … … 82 101 noSelection="['null':/${g.message(code:'default.please.select.text')}/]"> 83 102 </g:select> 103 <g:helpBalloon code="inventoryItemPurchase.supplier" /> 84 104 <p><g:link controller="supplierDetailed" action="create">+Add Supplier</g:link></p> 85 105 </td> … … 93 113 <input type="text" id="quantity" name="quantity" value="${fieldValue(bean:inventoryItemPurchaseInstance,field:'quantity')}" /> 94 114 ${inventoryItemPurchaseInstance.inventoryItem.unitOfMeasure.encodeAsHTML()} 115 <g:helpBalloon code="inventoryItemPurchase.quantity" /> 95 116 </td> 96 117 </tr> … … 108 129 from="${grailsApplication.config.currencyList}"> 109 130 </g:currencySelect> 131 <g:helpBalloon code="inventoryItemPurchase.order.value" /> 110 132 </td> 111 133 </tr> -
trunk/grails-app/views/inventoryItemPurchaseDetailed/edit.gsp
r605 r609 6 6 <meta name="layout" content="main" /> 7 7 <title>Edit InventoryItemPurchase</title> 8 <resource:dateChooser /> 8 9 </head> 9 10 <body> … … 45 46 <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'purchaseOrderNumber','errors')}"> 46 47 <input type="text" maxlength="50" id="purchaseOrderNumber" name="purchaseOrderNumber" value="${fieldValue(bean:inventoryItemPurchaseInstance,field:'purchaseOrderNumber')}"/> 48 <g:helpBalloon code="inventoryItemPurchase.purchaseOrderNumber" /> 47 49 </td> 48 50 </tr> … … 54 56 <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'date','errors')}"> 55 57 <richui:dateChooser name="date" format="dd-MM-yyyy" value="${inventoryItemPurchaseInstance.date}" /> 58 <g:helpBalloon code="inventoryItemPurchase.order.placed.date" /> 56 59 </td> 57 60 </tr> … … 65 68 from="${ CostCode.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }" 66 69 name="costCode.id" 67 value="${inventoryItemPurchaseInstance?.costCode?.id}" ></g:select> 70 value="${inventoryItemPurchaseInstance?.costCode?.id}" > 71 </g:select> 72 <g:helpBalloon code="inventoryItemPurchase.cost.code" /> 73 </td> 74 </tr> 75 76 <tr class="prop"> 77 <td valign="top" class="name"> 78 <label for="taskBudgetStatus">Budget Status:</label> 79 </td> 80 <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'taskBudgetStatus','errors')}"> 81 <g:select optionKey="id" 82 from="${ TaskBudgetStatus.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }" 83 name="taskBudgetStatus.id" 84 value="${inventoryItemPurchaseInstance?.taskBudgetStatus?.id}" > 85 </g:select> 86 <g:helpBalloon code="inventoryItemPurchase.task.budget.status" /> 68 87 </td> 69 88 </tr> … … 80 99 noSelection="['null':/${g.message(code:'default.please.select.text')}/]"> 81 100 </g:select> 101 <g:helpBalloon code="inventoryItemPurchase.supplier" /> 82 102 <p><g:link controller="supplierDetailed" action="create">+Add Supplier</g:link></p> 83 103 </td> … … 87 107 <td valign="top" class="name">Quantity:</td> 88 108 89 <td valign="top" class="value">${fieldValue(bean:inventoryItemPurchaseInstance, field:'quantity')}</td> 109 <td valign="top" class="value"> 110 ${fieldValue(bean:inventoryItemPurchaseInstance, field:'quantity')} 111 <g:helpBalloon code="inventoryItemPurchase.quantity" /> 112 </td> 90 113 91 114 </tr> … … 101 124 from="${grailsApplication.config.currencyList}"> 102 125 </g:currencySelect> 126 <g:helpBalloon code="inventoryItemPurchase.order.value" /> 103 127 </td> 104 128 </tr> … … 111 135 <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'invoiceNumber','errors')}"> 112 136 <input type="text" maxlength="50" id="invoiceNumber" name="invoiceNumber" value="${fieldValue(bean:inventoryItemPurchaseInstance,field:'invoiceNumber')}"/> 137 <g:helpBalloon code="inventoryItemPurchase.invoice.number" /> 113 138 </td> 114 139 </tr> -
trunk/grails-app/views/inventoryItemPurchaseDetailed/receive.gsp
r605 r609 23 23 <g:hiddenField name="orderId" value="${orderId}" /> 24 24 <g:hiddenField name="supplier.id" value="${inventoryItemPurchaseInstance.supplier?.id}" /> 25 <g:hiddenField name="taskBudgetStatus.id" value="${inventoryItemPurchaseInstance.taskBudgetStatus?.id}" /> 25 26 <g:hiddenField name="returnTo" value="${params.returnTo}" /> 26 27 <div class="dialog"> … … 81 82 <input type="text" id="quantity" name="quantity" value="${fieldValue(bean:inventoryItemPurchaseInstance,field:'quantity')}" /> 82 83 ${inventoryItemPurchaseInstance.inventoryItem.unitOfMeasure.encodeAsHTML()} 84 <g:helpBalloon code="inventoryItemPurchase.receive.quantity" /> 83 85 </td> 84 86 </tr> … … 86 88 <tr class="prop"> 87 89 <td valign="top" class="name"> 88 <label for="orderValueAmount"> Purchase Order $:</label>90 <label for="orderValueAmount">Receive Value:</label> 89 91 </td> 90 92 <td valign="top"> … … 93 95 value="${fieldValue(bean:inventoryItemPurchaseInstance,field:'orderValueAmount')}" /> 94 96 ${inventoryItemPurchaseInstance.orderValueCurrency?.encodeAsHTML()} 97 <g:helpBalloon code="inventoryItemPurchase.receive.value" /> 95 98 </td> 96 99 </tr> -
trunk/grails-app/views/inventoryItemPurchaseDetailed/show.gsp
r605 r609 50 50 51 51 <td valign="top" class="value"><g:link controller="costCodeDetailed" action="show" id="${inventoryItemPurchaseInstance?.costCode?.id}">${inventoryItemPurchaseInstance?.costCode?.encodeAsHTML()}</g:link></td> 52 53 </tr> 54 55 <tr class="prop"> 56 <td valign="top" class="name">Budget Status:</td> 57 58 <td valign="top" class="value">${inventoryItemPurchaseInstance?.taskBudgetStatus?.encodeAsHTML()}</td> 52 59 53 60 </tr>
Note: See TracChangeset
for help on using the changeset viewer.
