Changeset 600 for trunk/grails-app


Ignore:
Timestamp:
Jun 18, 2010, 4:58:19 PM (15 years ago)
Author:
gav
Message:

Trim inventory purchase order number.
Allow editing of any purchase's flags.
Display description, location and suppliers part number when receiving.

Location:
trunk/grails-app
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/services/InventoryPurchaseService.groovy

    r597 r600  
    233233
    234234            result.inventoryItemPurchaseInstance.properties = params
     235            result.inventoryItemPurchaseInstance.purchaseOrderNumber = result.inventoryItemPurchaseInstance.purchaseOrderNumber.trim()
    235236
    236237            if(result.inventoryItemPurchaseInstance.hasErrors() || !result.inventoryItemPurchaseInstance.save())
     
    255256
    256257            result.inventoryItemPurchaseInstance = new InventoryItemPurchase(params)
     258            result.inventoryItemPurchaseInstance.purchaseOrderNumber = result.inventoryItemPurchaseInstance.purchaseOrderNumber.trim()
    257259            result.inventoryItemPurchaseInstance.enteredBy = authService.currentUser
    258260            result.inventoryItemPurchaseInstance.inventoryItemPurchaseType = InventoryItemPurchaseType.read(1) // Order
  • trunk/grails-app/views/inventoryItemPurchaseDetailed/edit.gsp

    r581 r600  
    8686                            </tr>
    8787
    88                             <g:if test="${inventoryItemPurchaseInstance?.inventoryItemPurchaseType?.id == 1}">
     88                            <g:if test="${inventoryItemPurchaseInstance?.inventoryItemPurchaseType?.id > 0}">
    8989                                <tr class="prop">
    9090                                    <td valign="top" class="name">
  • trunk/grails-app/views/inventoryItemPurchaseDetailed/receive.gsp

    r595 r600  
    3737                                        ${inventoryItemPurchaseInstance.inventoryItem.encodeAsHTML()}
    3838                                    </g:link>
     39                                    <br />
     40                                    Description: ${inventoryItemPurchaseInstance.inventoryItem.description.encodeAsHTML()}
     41                                    <br />
     42                                    Location: ${inventoryItemPurchaseInstance.inventoryItem.inventoryLocation.encodeAsHTML()}
     43                                    <br />
     44                                    Suppliers Part Number: ${inventoryItemPurchaseInstance.inventoryItem.suppliersPartNumber.encodeAsHTML()}
    3945                                </td>
    4046                            </tr>
Note: See TracChangeset for help on using the changeset viewer.