Index: trunk/grails-app/services/TaskService.groovy
===================================================================
--- trunk/grails-app/services/TaskService.groovy	(revision 431)
+++ trunk/grails-app/services/TaskService.groovy	(revision 432)
@@ -675,4 +675,5 @@
             result.taskInstance.approved = true
             result.taskInstance.leadPerson = authService.currentUser
+            result.taskInstance.targetCompletionDate = result.taskInstance.targetStartDate
 
             if(result.taskInstance.hasErrors() || !result.taskInstance.save())
@@ -695,4 +696,5 @@
                                             entryType: EntryType.get(1),
                                             comment: params.entryFault.comment,
+                                            dateDone: result.taskInstance.targetStartDate,
                                             productionReference: productionReference,
                                             durationHour: params.entryFault.durationHour,
@@ -703,4 +705,5 @@
             def causeParams = [task: result.taskInstance,
                                             entryType: EntryType.get(2),
+                                            dateDone: result.taskInstance.targetStartDate,
                                             comment: params.entryCause.comment]
             def causeResult = saveEntry(causeParams)
@@ -710,4 +713,5 @@
                                                     entryType: EntryType.get(3),
                                                     comment: params.entryWorkDone.comment,
+                                            dateDone: result.taskInstance.targetStartDate,
                                                     durationHour: params.entryWorkDone.durationHour,
                                                     durationMinute: params.entryWorkDone.durationMinute]
Index: trunk/grails-app/views/entryDetailed/create.gsp
===================================================================
--- trunk/grails-app/views/entryDetailed/create.gsp	(revision 431)
+++ trunk/grails-app/views/entryDetailed/create.gsp	(revision 432)
@@ -50,4 +50,7 @@
                                     </g:if>
                                     <g:elseif test="${entryInstance?.entryType?.id == 2}">
+                                        <g:helpBalloon code="entry.comment.cause" />
+                                    </g:elseif>
+                                    <g:elseif test="${entryInstance?.entryType?.id == 3}">
                                         <g:helpBalloon code="entry.comment.work.done" />
                                     </g:elseif>
@@ -81,21 +84,23 @@
                                 </tr>
                             </g:if>
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="durationHour">Duration:</label>
-                                </td>
 
-                                <td valign="top" class="value">
-                                    <input class="time ${hasErrors(bean:entryInstance,field:'durationHour','errors')}" 
-                                        type="text" id="durationHour" name="durationHour" 
-                                        value="${fieldValue(bean:entryInstance,field:'durationHour')}" />
-                                    :
-                                    <input class="time ${hasErrors(bean:entryInstance,field:'durationMinute','errors')}" 
-                                        type="text" id="durationMinute" name="durationMinute" 
-                                        value="${fieldValue(bean:entryInstance,field:'durationMinute')}" />
-                                    <g:helpBalloon code="entry.duration" />
-                                </td> 
-                            </tr>
+                            <g:if test="${entryInstance?.entryType?.id != 2}">
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="durationHour">Duration:</label>
+                                    </td>
+
+                                    <td valign="top" class="value">
+                                        <input class="time ${hasErrors(bean:entryInstance,field:'durationHour','errors')}" 
+                                            type="text" id="durationHour" name="durationHour" 
+                                            value="${fieldValue(bean:entryInstance,field:'durationHour')}" />
+                                        :
+                                        <input class="time ${hasErrors(bean:entryInstance,field:'durationMinute','errors')}" 
+                                            type="text" id="durationMinute" name="durationMinute" 
+                                            value="${fieldValue(bean:entryInstance,field:'durationMinute')}" />
+                                        <g:helpBalloon code="entry.duration" />
+                                    </td>
+                                </tr>
+                            </g:if>
                         
                         </tbody>
Index: trunk/grails-app/views/entryDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/entryDetailed/edit.gsp	(revision 431)
+++ trunk/grails-app/views/entryDetailed/edit.gsp	(revision 432)
@@ -72,21 +72,23 @@
                                 </tr>
                             </g:if>
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="durationHour">Duration:</label>
-                                </td>
 
-                                <td valign="top" class="value">
-                                    <input class="time ${hasErrors(bean:entryInstance,field:'durationHour','errors')}" 
-                                        type="text" id="durationHour" name="durationHour" 
-                                        value="${fieldValue(bean:entryInstance,field:'durationHour')}" />
-                                    :
-                                    <input class="time ${hasErrors(bean:entryInstance,field:'durationMinute','errors')}" 
-                                        type="text" id="durationMinute" name="durationMinute" 
-                                        value="${fieldValue(bean:entryInstance,field:'durationMinute')}" />
-                                    <g:helpBalloon code="entry.duration" />
-                                </td>
-                            </tr>
+                            <g:if test="${entryInstance?.entryType?.id != 2}">
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="durationHour">Duration:</label>
+                                    </td>
+
+                                    <td valign="top" class="value">
+                                        <input class="time ${hasErrors(bean:entryInstance,field:'durationHour','errors')}" 
+                                            type="text" id="durationHour" name="durationHour" 
+                                            value="${fieldValue(bean:entryInstance,field:'durationHour')}" />
+                                        :
+                                        <input class="time ${hasErrors(bean:entryInstance,field:'durationMinute','errors')}" 
+                                            type="text" id="durationMinute" name="durationMinute" 
+                                            value="${fieldValue(bean:entryInstance,field:'durationMinute')}" />
+                                        <g:helpBalloon code="entry.duration" />
+                                    </td>
+                                </tr>
+                            </g:if>
                         
                             <tr class="prop">