diff --git a/Apollo/assets/views/status-update/setFeesForStudent.html b/Apollo/assets/views/status-update/setFeesForStudent.html
index 5001b3a0..822f25fd 100755
--- a/Apollo/assets/views/status-update/setFeesForStudent.html
+++ b/Apollo/assets/views/status-update/setFeesForStudent.html
@@ -21,7 +21,7 @@
                                     <label>
                                         Fees Type <span class="symbol required"></span>
                                     </label>
-                                    <select class="form-control" name="setfeesType" tabindex="7" id="setfeesType" ng-change="changeInstallemt(setModel.feesType,Form);"
+                                    <select class="form-control" name="setfeesType" tabindex="7" id="setfeesType" ng-change="changeInstallemt(setModel.feesType,Form);changeSessions(setModel.feesType);"
                                             ng-model="setModel.feesType"
                                             ng-options="fees.Sem_Year for fees in feesStructureInfo"
                                             required>
@@ -60,23 +60,54 @@
                                     <!--<span class="error text-small block"
                                           ng-if="Form.batchCode.$dirty && Form.batchCode.$invalid">Batch is required</span>-->
                                 </div>
+
+
                                 <div class="col-md-3 form-group"
-                                     ng-class="{'has-error':Form.setsessionname.$dirty && Form.setsessionname.$invalid, 'has-success':Form.setsessionname.$valid}">
+                                     ng-class="{'has-error':Form.setsessionname.$dirty && Form.setsessionname.$invalid, 'has-success':Form.setsessionname.$valid}" ng-if="setModel.feesType.Sem_Year!='TC' && setModel.feesType.Sem_Year!='PC' && setModel.feesType.Sem_Year!='DC' && setModel.feesType.Sem_Year!='MC' && setModel.feesType.Sem_Year!='OTHER'">
                                     <label>
-                                        Session Name <span class="symbol required"></span>
+                                        Session <span class="symbol required"></span>
                                     </label>
+                                    <select class="form-control" name="setsessionname" tabindex="9" id="setsessionname"
+                                            ng-model="setModel.feesType.SessionName"
+                                            ng-options="sess.SessionID as sess.SessionName  for sess in sessionDetails" ng-change="changeSessions(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"
+                                            required>
+                                         <option value=""> Select Session</option>
+                                    </select>
+                                    <span class="error text-small block"
+                                          ng-if="Form.setsessionname.$dirty && Form.setsessionname.$invalid">Session is required</span>
+                                </div>
+                                <div class="col-md-3 form-group"
+                                     ng-class="{'has-error':Form.settosessionname.$dirty && Form.settosessionname.$invalid, 'has-success':Form.settosessionname.$valid}" ng-if="setModel.feesType.ProgramType=='P001' || setModel.feesType.ProgramType=='P002'">
+                                    <label>
+                                        Session 2  <span class="symbol required"></span>
+                                    </label>
+                                    <select class="form-control" name="settosessionname" tabindex="9" id="settosessionname"
+                                            ng-model="setModel.feesType.ToSessionName"
+                                            ng-options="sess.SessionID as sess.SessionName  for sess in sessionDetailsTo" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"
+                                            required>
+                                        <option value=""> Select Session</option>
+                                    </select>
+                                    <span class="error text-small block"
+                                          ng-if="Form.settosessionname.$dirty && Form.settosessionname.$invalid">Session is required</span>
+                                </div>
+                                <div class="col-md-3 form-group"
+                                     ng-if="setModel.feesType.Sem_Year=='TC' || setModel.feesType.Sem_Year=='PC' || setModel.feesType.Sem_Year=='DC' || setModel.feesType.Sem_Year=='MC' || setModel.feesType.Sem_Year=='OTHER'">
+                                    <label>
+                                        Session
+                                    </label>
+
+                                    <!--<select class="form-control" name="setsessionname" tabindex="9" id="setsessionname"
+                                            ng-model="setModel.feesType.SessionName"
+                                            ng-options="sess.SessionID as sess.SessionName  for sess in sessionDetails" ng-click="changeBatch(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"
+                                            required>
+                                        <option value=""> Not applicable</option>
+                                    </select>-->
 
                                     <input type="text"  placeholder="Enter Session Name"
                                            tabindex="9" class="form-control" name="setsessionname"
-                                           ng-model="setModel.feesType.SessionName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
-                                    <span class="error text-small block"
-                                          ng-if="Form.setsessionname.$dirty && Form.setsessionname.$error.required">Session name is required</span>
-                                    <span class="error text-small block"
-                                          ng-if="Form.setsessionname.$dirty && Form.setsessionname.$error.pattern">Invalid session name </span>
-                                    <!--<span class="success text-small"-->
-                                    <!--ng-if="Form.stopname.$valid">Thank You!</span>-->
+                                           ng-model="setModel.feesType.SessionName" ng-readonly="true" />
                                 </div>
-                                <div class="col-md-3 form-group"
+                                <div class="col-md-3 form-group" ng-if="setModel.feesType.ProgramType!='P001' && setModel.feesType.ProgramType!='P002'"
                                      ng-class="{'has-error':Form.setrollNo.$dirty && Form.setrollNo.$invalid}">
                                     <label>
                                         Roll Number
@@ -94,6 +125,20 @@
 
                             </div>
                             <div class="row">
+                                <div class="col-md-3 form-group" ng-if="setModel.feesType.ProgramType=='P001' || setModel.feesType.ProgramType=='P002'"
+                                     ng-class="{'has-error':Form.setrollNo.$dirty && Form.setrollNo.$invalid}">
+                                    <label>
+                                        Roll Number
+                                    </label>
+
+                                    <input type="text"  placeholder="Enter Roll No"
+                                           tabindex="10" class="form-control" name="setrollNo"
+                                           ng-model="setModel.feesType.RollNo" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
+                                    <span class="error text-small block"
+                                          ng-if="Form.setrollNo.$dirty && Form.setrollNo.$error.required">Roll no is required</span>
+                                    <span class="error text-small block"
+                                          ng-if="Form.setrollNo.$dirty && Form.setrollNo.$error.pattern">Invalid roll no </span>
+                                </div>
                                 <div class="col-md-3 form-group"
                                      ng-class="{'has-error':Form.feesAmount.$dirty && Form.feesAmount.$invalid,'has-success':Form.feesAmount.$valid}">
                                     <label>
@@ -159,7 +204,7 @@
                                           ng-if="Form.paid.$error.maxlength || Form.paid.$error.pattern">Enter a valid amount</span>
 
                                 </div>-->
-                                <div class="col-md-3 form-group"
+                                <div class="col-md-3 form-group" ng-if="setModel.feesType.ProgramType!='P001' && setModel.feesType.ProgramType!='P002'"
                                      ng-class="{'has-error':Form.waiver.$dirty && Form.waiver.$invalid}">
                                     <label>
                                         Waiver</span>
@@ -178,6 +223,22 @@
 
                             </div>
                             <div class="row">
+                                <div class="col-md-3 form-group" ng-if="setModel.feesType.ProgramType=='P001' || setModel.feesType.ProgramType=='P002'"
+                                     ng-class="{'has-error':Form.waiver.$dirty && Form.waiver.$invalid}">
+                                    <label>
+                                        Waiver</span>
+                                    </label>
+
+                                    <input type="text"  placeholder="Enter Waiver Amount"
+                                           autofocus tabindex="14" class="form-control" name="waiver" id="waiver" ng-maxlength="9"
+                                           ng-model="setModel.feesType.Waiver" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2','2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
+                                    <span class="error text-small block"
+                                          ng-if="Form.waiver.$dirty && Form.waiver.$invalid"
+                                          ng-hide="Form.waiver.$error.maxlength || Form.waiver.$error.pattern">Waiver amount is required</span>
+                                    <span class="error text-small block"
+                                          ng-if="Form.waiver.$error.maxlength || Form.waiver.$error.pattern">Enter a valid amount</span>
+
+                                </div>
                                 <div class="col-md-3 form-group"
                                      ng-class="{'has-error':Form.total.$dirty && Form.total.$invalid}">
                                     <label>
@@ -236,7 +297,7 @@
 
                                                         <input type="text"  placeholder="Enter Fees Amount"
                                                                autofocus class="form-control" name="amount{{$index}}" id="amount{{$index}}" ng-maxlength="8"
-                                                               ng-model="n.Amount" ng-pattern="/^[0-9]*$/" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" required/>
+                                                               ng-model="n.Amount" ng-pattern="/^[0-9]*$/" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-readonly="updateMoreItems.length==$index+1" ng-change="changeInstallemtAmt('{{n.Amount}}',n.Amount,$index);" required/>
                                                         <span class="error text-small block"  ng-if="n.Amount==undefined">Enter a valid amount</span>
 
                                                     </div>
@@ -389,7 +450,8 @@
                                     <thead>
                                     <tr>
                                         <th>Fees Name</th>
-                                        <th>Session Name</th>
+                                        <th>Session</th>
+                                        <th>Session 2</th>
                                         <th>Roll Number</th>
                                         <th>Course Fees</th>
                                         <th>STF/WR</th>
@@ -402,7 +464,8 @@
                                     <tbody ng-repeat="p in feesStructureInfo|orderBy:sortKey:reverse|filter:search:strict">
                                     <tr ng-if="p.ExistValue=='1'">
                                         <td>{{p.Sem_Year}}</td>
-                                        <td>{{p.SessionName}}</td>
+                                        <td>{{p.MasterSessionName}}</td>
+                                        <td>{{p.MasterToSessionName}}</td>
                                         <td>{{p.RollNo}}</td>
                                         <td>{{p.ActualFees}}</td>
                                         <td>{{p.STFOrWR}}</td>