Ignore:
Timestamp:
May 7, 2011, 12:42:44 PM (14 years ago)
Author:
gav
Message:

Svn merge -r874:r919 trunk/ into branches/features/purchaseOrders.
This brings the purchaseOrder branch fully up to date.

Location:
branches/features/purchaseOrders
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/features/purchaseOrders

  • branches/features/purchaseOrders/grails-app/domain/InventoryItem.groovy

    r892 r920  
    1313    BigDecimal estimatedUnitPriceAmount
    1414    Currency estimatedUnitPriceCurrency
    15     String suppliersPartNumber
     15    String suppliersPartNumber = ""
    1616    Integer unitsInStock = 0
    1717    Integer reorderPoint = 0
     
    2626
    2727    static hasMany = [spareFor: Asset,
    28                                     inventoryMovements: InventoryMovement,
    29                                     alternateSuppliers: Supplier]
     28                        inventoryMovements: InventoryMovement,
     29                        alternateSuppliers: Supplier]
    3030
    3131//     static belongsTo = []
     
    4848        estimatedUnitPriceAmount(nullable:true, max: new BigDecimal(1000000000000))
    4949        estimatedUnitPriceCurrency(nullable:true)
    50         suppliersPartNumber(blank:true, nullable:true, maxSize:50)
     50        suppliersPartNumber(blank:true, maxSize:50)
    5151        preferredSupplier(nullable:true)
    5252    }
Note: See TracChangeset for help on using the changeset viewer.