Index: trunk/grails-app/views/taskRecurringSchedule/create.gsp
===================================================================
--- trunk/grails-app/views/taskRecurringSchedule/create.gsp	(revision 131)
+++ trunk/grails-app/views/taskRecurringSchedule/create.gsp	(revision 137)
@@ -47,4 +47,22 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
+                                    <label for="generateAhead">Generate Ahead:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'generateAhead','errors')}">
+                                    <input type="text" id="generateAhead" name="generateAhead" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'generateAhead')}" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="generateAheadPeriod">Generate Ahead Period:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'generateAheadPeriod','errors')}">
+                                    <g:select optionKey="id" from="${Period.list()}" name="generateAheadPeriod.id" value="${taskRecurringScheduleInstance?.generateAheadPeriod?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
                                     <label for="isEnabled">Is Enabled:</label>
                                 </td>
@@ -65,8 +83,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="period">Period:</label>
+                                    <label for="nextGenerationDate">Next Generation Date:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'period','errors')}">
-                                    <g:select optionKey="id" from="${Period.list()}" name="period.id" value="${taskRecurringScheduleInstance?.period?.id}" ></g:select>
+                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'nextGenerationDate','errors')}">
+                                    <g:datePicker name="nextGenerationDate" value="${taskRecurringScheduleInstance?.nextGenerationDate}" ></g:datePicker>
                                 </td>
                             </tr> 
@@ -78,4 +96,13 @@
                                 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'recurEvery','errors')}">
                                     <input type="text" id="recurEvery" name="recurEvery" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'recurEvery')}" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="recurPeriod">Recur Period:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'recurPeriod','errors')}">
+                                    <g:select optionKey="id" from="${Period.list()}" name="recurPeriod.id" value="${taskRecurringScheduleInstance?.recurPeriod?.id}" ></g:select>
                                 </td>
                             </tr> 
Index: trunk/grails-app/views/taskRecurringSchedule/edit.gsp
===================================================================
--- trunk/grails-app/views/taskRecurringSchedule/edit.gsp	(revision 131)
+++ trunk/grails-app/views/taskRecurringSchedule/edit.gsp	(revision 137)
@@ -50,4 +50,22 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
+                                    <label for="generateAhead">Generate Ahead:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'generateAhead','errors')}">
+                                    <input type="text" id="generateAhead" name="generateAhead" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'generateAhead')}" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="generateAheadPeriod">Generate Ahead Period:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'generateAheadPeriod','errors')}">
+                                    <g:select optionKey="id" from="${Period.list()}" name="generateAheadPeriod.id" value="${taskRecurringScheduleInstance?.generateAheadPeriod?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
                                     <label for="isEnabled">Is Enabled:</label>
                                 </td>
@@ -68,8 +86,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="period">Period:</label>
+                                    <label for="nextGenerationDate">Next Generation Date:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'period','errors')}">
-                                    <g:select optionKey="id" from="${Period.list()}" name="period.id" value="${taskRecurringScheduleInstance?.period?.id}" ></g:select>
+                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'nextGenerationDate','errors')}">
+                                    <g:datePicker name="nextGenerationDate" value="${taskRecurringScheduleInstance?.nextGenerationDate}" ></g:datePicker>
                                 </td>
                             </tr> 
@@ -81,4 +99,13 @@
                                 <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'recurEvery','errors')}">
                                     <input type="text" id="recurEvery" name="recurEvery" value="${fieldValue(bean:taskRecurringScheduleInstance,field:'recurEvery')}" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="recurPeriod">Recur Period:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskRecurringScheduleInstance,field:'recurPeriod','errors')}">
+                                    <g:select optionKey="id" from="${Period.list()}" name="recurPeriod.id" value="${taskRecurringScheduleInstance?.recurPeriod?.id}" ></g:select>
                                 </td>
                             </tr> 
Index: trunk/grails-app/views/taskRecurringSchedule/list.gsp
===================================================================
--- trunk/grails-app/views/taskRecurringSchedule/list.gsp	(revision 131)
+++ trunk/grails-app/views/taskRecurringSchedule/list.gsp	(revision 137)
@@ -28,10 +28,10 @@
                    	        <th>Last Generated Sub Task</th>
                    	    
+                   	        <g:sortableColumn property="generateAhead" title="Generate Ahead" />
+                        
+                   	        <th>Generate Ahead Period</th>
+                   	    
                    	        <g:sortableColumn property="isEnabled" title="Is Enabled" />
                         
-                   	        <g:sortableColumn property="nextDueDate" title="Next Due Date" />
-                        
-                   	        <th>Period</th>
-                   	    
                         </tr>
                     </thead>
@@ -46,9 +46,9 @@
                             <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'lastGeneratedSubTask')}</td>
                         
+                            <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'generateAhead')}</td>
+                        
+                            <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'generateAheadPeriod')}</td>
+                        
                             <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'isEnabled')}</td>
-                        
-                            <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'nextDueDate')}</td>
-                        
-                            <td>${fieldValue(bean:taskRecurringScheduleInstance, field:'period')}</td>
                         
                         </tr>
Index: trunk/grails-app/views/taskRecurringSchedule/show.gsp
===================================================================
--- trunk/grails-app/views/taskRecurringSchedule/show.gsp	(revision 131)
+++ trunk/grails-app/views/taskRecurringSchedule/show.gsp	(revision 137)
@@ -45,4 +45,18 @@
                     
                         <tr class="prop">
+                            <td valign="top" class="name">Generate Ahead:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'generateAhead')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Generate Ahead Period:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="period" action="show" id="${taskRecurringScheduleInstance?.generateAheadPeriod?.id}">${taskRecurringScheduleInstance?.generateAheadPeriod?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
                             <td valign="top" class="name">Is Enabled:</td>
                             
@@ -59,7 +73,7 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Period:</td>
+                            <td valign="top" class="name">Next Generation Date:</td>
                             
-                            <td valign="top" class="value"><g:link controller="period" action="show" id="${taskRecurringScheduleInstance?.period?.id}">${taskRecurringScheduleInstance?.period?.encodeAsHTML()}</g:link></td>
+                            <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'nextGenerationDate')}</td>
                             
                         </tr>
@@ -69,4 +83,11 @@
                             
                             <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'recurEvery')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Recur Period:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="period" action="show" id="${taskRecurringScheduleInstance?.recurPeriod?.id}">${taskRecurringScheduleInstance?.recurPeriod?.encodeAsHTML()}</g:link></td>
                             
                         </tr>