Changeset 616


Ignore:
Timestamp:
Jun 28, 2010, 1:01:30 AM (10 years ago)
Author:
gav
Message:

Domain change, rename InventoryItem property enableReorder to enableReorderListing as per ticket #75.

Location:
trunk/grails-app
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/domain/InventoryItem.groovy

    r610 r616  
    2121    boolean isActive = true
    2222    boolean isObsolete = false
    23     boolean enableReorder = true /// @todo: rename to enableReorderListing.
     23    boolean enableReorderListing = true
    2424
    2525    static mapping = {
     
    4545        estimatedUnitPriceCurrency(nullable:true)
    4646        reorderPoint()
    47         enableReorder()
     47        enableReorderListing()
    4848        recommendedReorderPoint(nullable:true)
    4949        isActive()
  • trunk/grails-app/i18n/messages.properties

    r610 r616  
    370370inventoryItem.search.text.none.found=No results for: {0}
    371371inventoryItem.search.text.below.reorder=Below Reorder
    372 inventoryItem.search.text.below.reorder.description=Inventory items at or below reorder point, with reorder enabled.
     372inventoryItem.search.text.below.reorder.description=Inventory items at or below reorder point.
    373373inventoryItem.search.text.below.reorder.all=Below Reorder (all)
    374 inventoryItem.search.text.below.reorder.all.description=Inventory items at or below reorder point, including reorder disabled.
     374inventoryItem.search.text.below.reorder.all.description=Inventory items at or below reorder point, including reorder listing disabled.
    375375inventoryItem.search.text.below.reorder.none.found=No inventory items found at or below reorder point.
    376376inventoryItem.search.text.all.description=All inventory items.
  • trunk/grails-app/services/InventoryCsvService.groovy

    r462 r616  
    5656            def inventoryProperties = ["name", "description", "comment", "unitsInStock", "reorderPoint", "recommendedReorderPoint",
    5757                                                        "unitOfMeasure", "estimatedUnitPriceAmount", "estimatedUnitPriceCurrency",
    58                                                         "enableReorder", "inventoryLocation", "inventoryStore", "site",
     58                                                        "enableReorderListing", "inventoryLocation", "inventoryStore", "site",
    5959                                                        "inventoryGroup", "inventoryType", "averageDeliveryTime", "averageDeliveryPeriod",
    6060                                                        "suppliersPartNumber", "preferredSupplier", "alternateSuppliers",
     
    578578            row.add(inventoryItem.estimatedUnitPriceAmount)
    579579            row.add(inventoryItem.estimatedUnitPriceCurrency)
    580             row.add(inventoryItem.enableReorder)
     580            row.add(inventoryItem.enableReorderListing)
    581581            row.add(inventoryItem.inventoryLocation)
    582582            row.add(inventoryItem.inventoryLocation.inventoryStore)
  • trunk/grails-app/services/InventoryItemSearchService.groovy

    r566 r616  
    100100                eq("isActive", true)
    101101                if(onlyReorderEnabled)
    102                     eq("enableReorder", true)
     102                    eq("enableReorderListing", true)
    103103                leProperty("unitsInStock", "reorderPoint")
    104104            } // createCriteria
  • trunk/grails-app/views/inventoryItemDetailed/create.gsp

    r610 r616  
    8484                            <tr class="prop">
    8585                                <td valign="top" class="name">
    86                                     <label for="enableReorder">Enable Reorder Listing:</label>
    87                                 </td>
    88                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'enableReorder','errors')}">
    89                                     <g:checkBox name="enableReorder" value="${inventoryItemInstance?.enableReorder}" ></g:checkBox>
     86                                    <label for="enableReorderListing">Enable Reorder Listing:</label>
     87                                </td>
     88                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'enableReorderListing','errors')}">
     89                                    <g:checkBox name="enableReorderListing" value="${inventoryItemInstance?.enableReorderListing}" ></g:checkBox>
    9090                                </td>
    9191                            </tr>
  • trunk/grails-app/views/inventoryItemDetailed/edit.gsp

    r610 r616  
    129129                            <tr class="prop">
    130130                                <td valign="top" class="name">
    131                                     <label for="enableReorder">Enable Reorder Listing:</label>
    132                                 </td>
    133                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'enableReorder','errors')}">
    134                                     <g:checkBox name="enableReorder" value="${inventoryItemInstance?.enableReorder}" ></g:checkBox>
     131                                    <label for="enableReorderListing">Enable Reorder Listing:</label>
     132                                </td>
     133                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'enableReorderListing','errors')}">
     134                                    <g:checkBox name="enableReorderListing" value="${inventoryItemInstance?.enableReorderListing}" ></g:checkBox>
    135135                                </td>
    136136                            </tr>
  • trunk/grails-app/views/inventoryItemDetailed/show.gsp

    r610 r616  
    2828                </div>
    2929            </g:if>
    30             <g:if test="${!inventoryItemInstance.enableReorder}" >
     30            <g:if test="${!inventoryItemInstance.enableReorderListing}" >
    3131                <div class="message">
    3232                    <g:message code="inventory.item.reorder.listing.disabled" />
     
    253253                                    <tr class="prop">
    254254                                        <td valign="top" class="name">Enable Reorder Listing:</td>
    255                                         <td valign="top" class="value">${fieldValue(bean:inventoryItemInstance, field:'enableReorder')}</td>
     255                                        <td valign="top" class="value">${fieldValue(bean:inventoryItemInstance, field:'enableReorderListing')}</td>
    256256                                    </tr>
    257257
Note: See TracChangeset for help on using the changeset viewer.