Index: /trunk/grails-app/controllers/AssetController.groovy
===================================================================
--- /trunk/grails-app/controllers/AssetController.groovy	(revision 160)
+++ /trunk/grails-app/controllers/AssetController.groovy	(revision 161)
@@ -27,5 +27,5 @@
         if(assetInstance) {
             try {
-                assetInstance.delete()
+                assetInstance.delete(flush:true)
                 flash.message = "Asset ${params.id} deleted"
                 redirect(action:list)
@@ -77,5 +77,5 @@
         else {
             flash.message = "Asset not found with id ${params.id}"
-            redirect(action:edit,id:params.id)
+            redirect(action:list)
         }
     }
Index: /trunk/grails-app/controllers/AssetDetailedController.groovy
===================================================================
--- /trunk/grails-app/controllers/AssetDetailedController.groovy	(revision 160)
+++ /trunk/grails-app/controllers/AssetDetailedController.groovy	(revision 161)
@@ -48,5 +48,5 @@
         if(assetInstance) {
             try {
-                assetInstance.delete()
+                assetInstance.delete(flush:true)
                 flash.message = "Asset ${params.id} deleted"
                 redirect(action:search)
@@ -103,5 +103,5 @@
         else {
             flash.message = "Asset not found with id ${params.id}"
-            redirect(action:edit,id:params.id)
+            redirect(action:list)
         }
     }
Index: /trunk/grails-app/domain/Asset.groovy
===================================================================
--- /trunk/grails-app/domain/Asset.groovy	(revision 160)
+++ /trunk/grails-app/domain/Asset.groovy	(revision 161)
@@ -6,7 +6,8 @@
     String name
     String description = ""
+    String costCode = ""
     boolean isActive = true
 
-    static hasMany = [maintenanceActions: MaintenanceAction, 
+    static hasMany = [maintenanceActions: MaintenanceAction,
                                     assetExtendedAttributes: AssetExtendedAttribute]
 
Index: /trunk/grails-app/views/asset/create.gsp
===================================================================
--- /trunk/grails-app/views/asset/create.gsp	(revision 160)
+++ /trunk/grails-app/views/asset/create.gsp	(revision 161)
@@ -47,4 +47,13 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
+                                    <label for="costCode">Cost Code:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'costCode','errors')}">
+                                    <input type="text" id="costCode" name="costCode" value="${fieldValue(bean:assetInstance,field:'costCode')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
                                     <label for="description">Description:</label>
                                 </td>
Index: /trunk/grails-app/views/asset/edit.gsp
===================================================================
--- /trunk/grails-app/views/asset/edit.gsp	(revision 160)
+++ /trunk/grails-app/views/asset/edit.gsp	(revision 161)
@@ -66,4 +66,13 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
+                                    <label for="costCode">Cost Code:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'costCode','errors')}">
+                                    <input type="text" id="costCode" name="costCode" value="${fieldValue(bean:assetInstance,field:'costCode')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
                                     <label for="description">Description:</label>
                                 </td>
Index: /trunk/grails-app/views/asset/list.gsp
===================================================================
--- /trunk/grails-app/views/asset/list.gsp	(revision 160)
+++ /trunk/grails-app/views/asset/list.gsp	(revision 161)
@@ -28,10 +28,10 @@
                    	        <th>Asset Type</th>
                    	    
+                   	        <g:sortableColumn property="costCode" title="Cost Code" />
+                        
                    	        <g:sortableColumn property="description" title="Description" />
                         
                    	        <g:sortableColumn property="isActive" title="Is Active" />
                         
-                   	        <th>System Section</th>
-                   	    
                         </tr>
                     </thead>
@@ -46,9 +46,9 @@
                             <td>${fieldValue(bean:assetInstance, field:'assetType')}</td>
                         
+                            <td>${fieldValue(bean:assetInstance, field:'costCode')}</td>
+                        
                             <td>${fieldValue(bean:assetInstance, field:'description')}</td>
                         
                             <td>${fieldValue(bean:assetInstance, field:'isActive')}</td>
-                        
-                            <td>${fieldValue(bean:assetInstance, field:'systemSection')}</td>
                         
                         </tr>
Index: /trunk/grails-app/views/asset/show.gsp
===================================================================
--- /trunk/grails-app/views/asset/show.gsp	(revision 160)
+++ /trunk/grails-app/views/asset/show.gsp	(revision 161)
@@ -58,4 +58,11 @@
                     
                         <tr class="prop">
+                            <td valign="top" class="name">Cost Code:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:assetInstance, field:'costCode')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
                             <td valign="top" class="name">Description:</td>
                             
Index: /trunk/grails-app/views/assetDetailed/create.gsp
===================================================================
--- /trunk/grails-app/views/assetDetailed/create.gsp	(revision 160)
+++ /trunk/grails-app/views/assetDetailed/create.gsp	(revision 161)
@@ -37,4 +37,22 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
+                                    <label for="description">Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'description','errors')}">
+                                    <input type="text" id="description" name="description" value="${fieldValue(bean:assetInstance,field:'description')}"/>
+                                </td>
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="costCode">Cost Code:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'costCode','errors')}">
+                                    <input type="text" id="costCode" name="costCode" value="${fieldValue(bean:assetInstance,field:'costCode')}"/>
+                                </td>
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
                                     <label for="assetType">Asset Type:</label>
                                 </td>
@@ -51,15 +69,6 @@
                                     <g:select optionKey="id" from="${SystemSection.list()}" name="systemSection.id" value="${assetInstance?.systemSection?.id}" ></g:select>
                                 </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="description">Description:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'description','errors')}">
-                                    <input type="text" id="description" name="description" value="${fieldValue(bean:assetInstance,field:'description')}"/>
-                                </td>
-                            </tr> 
-                        
+                            </tr>
+
                             <tr class="prop">
                                 <td valign="top" class="name">
Index: /trunk/grails-app/views/assetDetailed/edit.gsp
===================================================================
--- /trunk/grails-app/views/assetDetailed/edit.gsp	(revision 160)
+++ /trunk/grails-app/views/assetDetailed/edit.gsp	(revision 161)
@@ -39,4 +39,22 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
+                                    <label for="description">Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'description','errors')}">
+                                    <input type="text" id="description" name="description" value="${fieldValue(bean:assetInstance,field:'description')}"/>
+                                </td>
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="costCode">Cost Code:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'costCode','errors')}">
+                                    <input type="text" id="costCode" name="costCode" value="${fieldValue(bean:assetInstance,field:'costCode')}"/>
+                                </td>
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
                                     <label for="assetType">Asset Type:</label>
                                 </td>
@@ -52,13 +70,4 @@
                                 <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'systemSection','errors')}">
                                     <g:select optionKey="id" from="${SystemSection.list()}" name="systemSection.id" value="${assetInstance?.systemSection?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="description">Description:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetInstance,field:'description','errors')}">
-                                    <input type="text" id="description" name="description" value="${fieldValue(bean:assetInstance,field:'description')}"/>
                                 </td>
                             </tr>
Index: /trunk/grails-app/views/assetDetailed/show.gsp
===================================================================
--- /trunk/grails-app/views/assetDetailed/show.gsp	(revision 160)
+++ /trunk/grails-app/views/assetDetailed/show.gsp	(revision 161)
@@ -36,4 +36,18 @@
                     
                         <tr class="prop">
+                            <td valign="top" class="name">Description:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:assetInstance, field:'description')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Cost Code:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:assetInstance, field:'costCode')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
                             <td valign="top" class="name">Asset Type:</td>
                             
@@ -60,11 +74,4 @@
                             
                             <td valign="top" class="value"><g:link controller="systemSectionDetailed" action="show" id="${assetInstance?.systemSection?.id}">${assetInstance?.systemSection?.encodeAsHTML()}</g:link></td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Description:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:assetInstance, field:'description')}</td>
                             
                         </tr>