Index: trunk/grails-app/views/entryDetailed/_create.gsp
===================================================================
--- trunk/grails-app/views/entryDetailed/_create.gsp	(revision 836)
+++ trunk/grails-app/views/entryDetailed/_create.gsp	(revision 838)
@@ -16,4 +16,38 @@
             <table>
                 <tbody>
+
+                    <g:if test="${entryInstance?.entryType?.id == 1}">
+                        <tr class="prop">
+                            <td valign="top" class="name">
+                                <label for="productionReference">Production:</label>
+                            </td>
+                            <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'productionReference','errors')}">
+                                <g:select optionKey="id"
+                                                    from="${ProductionReference.findAllByIsActive(true)}"
+                                                    name="productionReference.id"
+                                                    value="${entryInstance.productionReference?.id}"
+                                                    noSelection="['null':'--None--']">
+                                </g:select>
+                                <custom:helpBalloon code="entry.productionReference.fault" iconSrc="${resource(plugin:'help-balloons', dir:'images', file:'balloon-icon.gif')}" />
+                            </td>
+                        </tr>
+                    </g:if>
+
+                    <g:if test="${entryInstance?.entryType?.id == 6}">
+                        <tr class="prop">
+                            <td valign="top" class="name">
+                                <label for="highestSeverity">Condition Severity:</label>
+                            </td>
+                            <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'highestSeverity','errors')}">
+                                <g:select optionKey="id"
+                                                    from="${ConditionSeverity.findAllByIsActive(true)}"
+                                                    name="highestSeverity.id"
+                                                    value="${entryInstance.highestSeverity?.id}"
+                                                    noSelection="['null':/${g.message(code:'default.please.select.text')}/]" >
+                                </g:select>
+                                <custom:helpBalloon code="entry.comment.pm.entry" iconSrc="${resource(plugin:'help-balloons', dir:'images', file:'balloon-icon.gif')}" />
+                            </td>
+                        </tr>
+                    </g:if>
 
                     <tr class="prop">
@@ -48,21 +82,4 @@
                     </tr>
 
-                    <g:if test="${entryInstance?.entryType?.id == 1}">
-                        <tr class="prop">
-                            <td valign="top" class="name">
-                                <label for="productionReference">Production:</label>
-                            </td>
-                            <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'productionReference','errors')}">
-                                <g:select optionKey="id"
-                                                    from="${ProductionReference.findAllByIsActive(true)}"
-                                                    name="productionReference.id"
-                                                    value="${entryInstance.productionReference?.id}"
-                                                    noSelection="['null':'--None--']">
-                                </g:select>
-                                <custom:helpBalloon code="entry.productionReference.fault" iconSrc="${resource(plugin:'help-balloons', dir:'images', file:'balloon-icon.gif')}" />
-                            </td>
-                        </tr>
-                    </g:if>
-
                     <g:if test="${entryInstance?.entryType?.id != 2}">
                         <tr class="prop">
Index: trunk/grails-app/views/entryDetailed/_list.gsp
===================================================================
--- trunk/grails-app/views/entryDetailed/_list.gsp	(revision 836)
+++ trunk/grails-app/views/entryDetailed/_list.gsp	(revision 838)
@@ -18,4 +18,11 @@
                 <thead>
                     <tr>
+                        <g:if test="${entryList[0]?.entryType?.id == 6}">
+                            <th>
+                                <img src="${resource(dir:'images/skin',file:'award_star_silver_3.png')}"
+                                        alt="Severity"
+                                        title="Highest Severity"  />
+                            </th>
+                        </g:if>
                         <th>Comment</th>
                         <th>Date Done</th>
@@ -28,4 +35,10 @@
                     <g:each in="${entryList}" status="i" var="entry">
                             <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}">
+
+                                <g:if test="${entryList[0]?.entryType?.id == 6}">
+                                    <td onclick='window.location = "${request.getContextPath()}/entryDetailed/edit/${entry.id}"'>
+                                        ${entry.highestSeverity.code.encodeAsHTML()}
+                                    </td>
+                                </g:if>
 
                                 <td width="65%" onclick='window.location = "${request.getContextPath()}/entryDetailed/edit/${entry.id}"'>
Index: trunk/grails-app/views/entryDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/entryDetailed/edit.gsp	(revision 836)
+++ trunk/grails-app/views/entryDetailed/edit.gsp	(revision 838)
@@ -37,4 +37,38 @@
                                 </td>
                             </tr>
+
+                            <g:if test="${entryInstance?.entryType?.id == 1}">
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="productionReference">Production:</label>
+                                    </td>
+                                    <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'productionReference','errors')}">
+                                        <g:select optionKey="id"
+                                                            from="${ProductionReference.findAllByIsActive(true)}"
+                                                            name="productionReference.id"
+                                                            value="${entryInstance.productionReference?.id}"
+                                                            noSelection="['null':'--None--']">
+                                        </g:select>
+                                        <g:helpBalloon code="entry.productionReference.fault" />
+                                    </td>
+                                </tr>
+                            </g:if>
+
+                            <g:if test="${entryInstance?.entryType?.id == 6}">
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="highestSeverity">Condition Severity:</label>
+                                    </td>
+                                    <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'highestSeverity','errors')}">
+                                        <g:select optionKey="id"
+                                                            from="${ConditionSeverity.findAllByIsActive(true)}"
+                                                            name="highestSeverity.id"
+                                                            value="${entryInstance.highestSeverity?.id}"
+                                                            noSelection="['null':/${g.message(code:'default.please.select.text')}/]" >
+                                        </g:select>
+                                        <custom:helpBalloon code="entry.comment.pm.entry" iconSrc="${resource(plugin:'help-balloons', dir:'images', file:'balloon-icon.gif')}" />
+                                    </td>
+                                </tr>
+                            </g:if>
                         
                             <tr class="prop">
@@ -55,21 +89,4 @@
                                 </td>
                             </tr>
-
-                            <g:if test="${entryInstance?.entryType?.id == 1}">
-                                <tr class="prop">
-                                    <td valign="top" class="name">
-                                        <label for="productionReference">Production:</label>
-                                    </td>
-                                    <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'productionReference','errors')}">
-                                        <g:select optionKey="id"
-                                                            from="${ProductionReference.findAllByIsActive(true)}"
-                                                            name="productionReference.id"
-                                                            value="${entryInstance.productionReference?.id}"
-                                                            noSelection="['null':'--None--']">
-                                        </g:select>
-                                        <g:helpBalloon code="entry.productionReference.fault" />
-                                    </td>
-                                </tr>
-                            </g:if>
 
                             <g:if test="${entryInstance?.entryType?.id != 2}">
Index: trunk/grails-app/views/entryDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/entryDetailed/show.gsp	(revision 836)
+++ trunk/grails-app/views/entryDetailed/show.gsp	(revision 838)
@@ -33,4 +33,26 @@
                             
                         </tr>
+
+                        <g:if test="${entryInstance.productionReference}">
+                            <tr class="prop">
+                                <td valign="top" class="name">Production:</td>
+
+                                <td valign="top" class="value">
+                                    ${fieldValue(bean:entryInstance, field:'productionReference')}
+                                </td>
+
+                            </tr>
+                        </g:if>
+
+                        <g:if test="${entryInstance.highestSeverity}">
+                            <tr class="prop">
+                                <td valign="top" class="name">Condition Severity:</td>
+
+                                <td valign="top" class="value">
+                                    ${fieldValue(bean:entryInstance, field:'highestSeverity')}
+                                </td>
+
+                            </tr>
+                        </g:if>
                     
                         <tr class="prop">
@@ -49,15 +71,4 @@
                             
                         </tr>
-
-                        <g:if test="${entryInstance.productionReference}">
-                            <tr class="prop">
-                                <td valign="top" class="name">Production:</td>
-
-                                <td valign="top" class="value">
-                                    ${fieldValue(bean:entryInstance, field:'productionReference')}
-                                </td>
-
-                            </tr>
-                        </g:if>
                     
                         <tr class="prop">
Index: trunk/grails-app/views/taskDetailed/search.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/search.gsp	(revision 836)
+++ trunk/grails-app/views/taskDetailed/search.gsp	(revision 838)
@@ -93,4 +93,10 @@
                                                                                                 params="${filterParams}" />
 
+                                <custom:sortableColumnWithImg property="highestSeverity"
+                                                                                                imgSrc="${resource(dir:'images/skin',file:'award_star_silver_3.png')}"
+                                                                                                imgAlt="Severity"
+                                                                                                imgTitle="Highest Severity"
+                                                                                                params="${filterParams}" />
+
                                 <g:sortableColumn property="targetStartDate" title="Target Start Date" params="${filterParams}" />
 
@@ -125,4 +131,10 @@
                                     <g:if test="${taskInstance.attentionFlag}">
                                         <img  src="${resource(dir:'images/skin',file:'flag_red.png')}" alt="Flag" title="Attention Flag"/>
+                                    </g:if>
+                                </td>
+
+                                <td class="idColumn" onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>
+                                    <g:if test="${taskInstance.highestSeverity}">
+                                        ${taskInstance.highestSeverity.code.encodeAsHTML()}
                                     </g:if>
                                 </td>
@@ -237,5 +249,5 @@
                                                                                 leadPerson.firstName,
                                                                                 taskGroup.name,
-                                                                                associatedAssets.name,
+                                                                                highestSeverity.code,
                                                                                 primaryAsset.name,
                                                                                 taskStatus.name,
@@ -245,5 +257,5 @@
                                                                                 'leadPerson.firstName':[values: associatedPropertyValues.firstNameList],
                                                                                 'taskGroup.name':[values: associatedPropertyValues.taskGroupList],
-                                                                                'associatedAssets.name':[values: associatedPropertyValues.assetList],
+                                                                                'highestSeverity.code':[values: associatedPropertyValues.highestSeverityList],
                                                                                 'primaryAsset.name':[values: associatedPropertyValues.assetList],
                                                                                 'taskStatus.name':[values: associatedPropertyValues.taskStatusList],
Index: trunk/grails-app/views/taskDetailed/searchCalendar.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/searchCalendar.gsp	(revision 836)
+++ trunk/grails-app/views/taskDetailed/searchCalendar.gsp	(revision 838)
@@ -122,5 +122,5 @@
                                                                                 leadPerson.firstName,
                                                                                 taskGroup.name,
-                                                                                associatedAssets.name,
+                                                                                highestSeverity.code,
                                                                                 primaryAsset.name,
                                                                                 taskStatus.name,
@@ -130,6 +130,6 @@
                                                                                 'leadPerson.firstName':[values: associatedPropertyValues.firstNameList],
                                                                                 'taskGroup.name':[values: associatedPropertyValues.taskGroupList],
-                                                                                'associatedAssets.name':[values: associatedPropertyValues.assetList],
                                                                                 'primaryAsset.name':[values: associatedPropertyValues.assetList],
+                                                                                'highestSeverity.code':[values: associatedPropertyValues.highestSeverityList],
                                                                                 'taskStatus.name':[values: associatedPropertyValues.taskStatusList],
                                                                                 'taskType.name':[values: associatedPropertyValues.taskTypeList],