diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php
index 60f646e6..606a2096 100755
--- a/Apollo/api/application/models/DayBook_model.php
+++ b/Apollo/api/application/models/DayBook_model.php
@@ -760,13 +760,11 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can
     {
          //if($search['MobileNumber']!='' && $search['Firstname']!='' && $search['receipt']!='')
          //{
-        $this->db->select('T_DayBookMaster.ID,Name,Type,Amount,Date,T_DayBookMaster.Description,VoucherNumber,PaidTo,T_DayBookMaster.ModeOfPayment,FeePaymentDetails,Firstname,ListName,T_DayBookMaster.ReceiptNo,T_Students_Fees_PaidDetails.IsActive as IsActive,T_Students_Fees_PaidDetails.ID as FID,T_DayBookMaster.Reason as Reason');
-        $this->db->from('T_DayBookMaster');
-        $this->db->join('T_StudentDetails','T_StudentDetails.StudentID=T_DayBookMaster.StudentID','left');
-        $this->db->join('T_PickListDetails','T_PickListDetails.ListCode=T_DayBookMaster.Name','left');
-        $this->db->join('T_Students_Fees_PaidDetails','T_Students_Fees_PaidDetails.ID = T_DayBookMaster.FeesPaymentID');
-
-        if($search['MobileNumber']!='')
+        $this->db->select('T_Students_Fees_PaidDetails.ID,T_Students_Fees_PaidDetails.StudentID,T_StudentDetails.Firstname,T_Students_Fees_PaidDetails.FeesID,T_Students_Fees_PaidDetails.BillNO,T_Students_Fees_PaidDetails.BillDate,T_Students_Fees_PaidDetails.BillAmount,T_Students_Fees_PaidDetails.InternalComments,T_Students_Fees_PaidDetails.IsActive,T_Students_Fees_PaidDetails.ReceiptNo');
+        $this->db->from('T_Students_Fees_PaidDetails');
+        $this->db->join('T_StudentDetails','T_StudentDetails.StudentID=T_Students_Fees_PaidDetails.StudentID','left');
+        
+       if($search['MobileNumber']!='')
         {
             $this->db->where('T_StudentDetails.MobileNumber',$search['MobileNumber']);
         }
@@ -777,8 +775,8 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can
         }
         if($search['receipt']!='')
         {
-            $this->db->where('T_DayBookMaster.VoucherNumber',$search['receipt']);
-            $this->db->or_where('T_DayBookMaster.ReceiptNo',$search['receipt']);
+            $this->db->where('T_Students_Fees_PaidDetails.ReceiptNo',$search['receipt']);
+            
         }
 
         $searchDetails = $this->db->get();
@@ -819,35 +817,36 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can
         // echo $dateTime;
         // die();
          
-         $daybookarr['ID'] = $up_details['ID'];
+         //$daybookarr['ID'] = $up_details['ID'];
         // $daybookarr['IsActive'] = $up_details['IsActive']; 
-         $daybookarr['Reason'] = $up_details['Reason'];
-         $daybookarr['UpdatedOn'] = $dateTime;
-         $daybookarr['UpdatedBy'] =$up_details['requestedtBy'];
+        // $daybookarr['Reason'] = $up_details['Reason'];
+        // $daybookarr['UpdatedOn'] = $dateTime;
+        // $daybookarr['UpdatedBy'] =$up_details['requestedtBy'];
 
 
-         if($up_details['IsActive'] == 0)
-         {
-            $daybookarr['Status'] = 'Cancel';
-         }
+         // if($up_details['IsActive'] == 0)
+         // {
+            // $daybookarr['Status'] = 'Cancel';
+         // }
 
-         else
-         {
-            $daybookarr['Status'] = 'Approved';
-         }
+         // else
+         // {
+            // $daybookarr['Status'] = 'Approved';
+         // }
 
          
 
-         $this->db->where('ID', $daybookarr['ID']);
-         $this->db->update('T_DayBookMaster', $daybookarr);
+         // $this->db->where('ID', $daybookarr['ID']);
+         // $this->db->update('T_DayBookMaster', $daybookarr);
 
 
-         $feearr['ID'] = $up_details['FeesPaymentID'];
+         //$feearr['ID'] = $up_details['FeesPaymentID'];
          $feearr['IsActive'] = $up_details['IsActive'];
+		 $feearr['InternalComments'] = $up_details['Reason'];
          $feearr['UpdatedOn'] = $dateTime;
          $feearr['UpdatedBy'] = $up_details['branchId'];
 
-         $this->db->where('ID', $feearr['ID']);
+         $this->db->where('ID', $up_details['ID']);
          $this->db->update('T_Students_Fees_PaidDetails', $feearr);
         
         return TRUE;
diff --git a/Apollo/assets/js/controllers/datacorrectionCtrl.js b/Apollo/assets/js/controllers/datacorrectionCtrl.js
index eeab03dc..b00957e5 100644
--- a/Apollo/assets/js/controllers/datacorrectionCtrl.js
+++ b/Apollo/assets/js/controllers/datacorrectionCtrl.js
@@ -181,7 +181,7 @@ else if(myModel.IsActive == false)
                     mobileNumber: myModel.mobileNumber,
                     receipt: myModel.receipt,
                     ID : myModel.ID,
-                    FID : myModel.FID,
+                    FID : myModel.FeesID,
                     Date :myModel.Date,
                     Amount :myModel.Amount, 
                     Reason : myModel.Reason,
diff --git a/Apollo/assets/views/data_correction.html b/Apollo/assets/views/data_correction.html
index 5e6673b6..d1064439 100644
--- a/Apollo/assets/views/data_correction.html
+++ b/Apollo/assets/views/data_correction.html
@@ -135,12 +135,10 @@
       <table  id="datatable"   class="table table-hover">
          <thead>
             <tr >
-               <th style="font-size: 12px;">Type</th>
-               <th style="font-size: 12px;">Receipt No</th>
+               <th style="font-size: 12px;">Bill Number</th>
                <th style="font-size: 12px;">Paid To / Received From</th>
                <th style="font-size: 12px">Date</th>
-               <th style="font-size: 12px;">Sem</th>
-               <th style="font-size: 12px;">Voucher Number / Bill Number</th>
+               <th style="font-size: 12px;">Receipt No</th>
                <th style="font-size: 12px;">Amount</th>
                <!-- <th style="font-size: 12px;">Status</th> -->
                <th style="font-size: 12px;">Action</th>
@@ -148,13 +146,11 @@
          </thead>
          <tbody dir-paginate="p in studentInfo|filter:search:strict|itemsPerPage:10">
             <tr>
-                <td>{{p.ListName}}</td>
+                <td>{{p.BillNO}}</td>
+                <td>{{p.Firstname}}</td>
+                <td>{{p.BillDate}}</td>
                 <td>{{p.ReceiptNo}}</td>
-                <td>{{p.PaidTo}}</td>
-                <td>{{p.Date}}</td>
-                <td>{{p.FeePaymentDetails}}</td>
-                <td>{{p.VoucherNumber}}</td>
-                <td>{{p.Amount}}</td>
+                <td>{{p.BillAmount}}</td>
                 <td><span><a class="text-azure" id="editRowBtn{{p.ID}}" ng-click="setEditId(p.ID);"><b class="glyphicon glyphicon-pencil" tooltip="Edit Details" aria-hidden="true"></b></a> </span></td>
                 <!-- <td></td>  -->
             </tr>
diff --git a/Apollo/assets/views/edit_daybookentries.html b/Apollo/assets/views/edit_daybookentries.html
index 49c3874c..f8c28d90 100644
--- a/Apollo/assets/views/edit_daybookentries.html
+++ b/Apollo/assets/views/edit_daybookentries.html
@@ -11,19 +11,10 @@
                     </div>
 
                     <div>
-                    <input type="hidden" name="feeid" ng-model="p.FID">
+                    <input type="hidden" name="feeid" ng-model="p.FeesID">
                     </div>
                     <div class="row">
-                        <div class="col-md-3 form-group"
-                             ng-class="{'has-error':Form.edittype.$dirty && Form.edittype.$invalid, 'has-success':Form.edittype.$valid}">
-                            <label >
-                                Type <span class="symbol required"></span>
-                            </label>
-                             <input type="text" tabindex="3" class="form-control" name="editListName" ng-model="p.ListName" readonly="true" capitalize
-                                   required/>
-                        </div>
-
-
+                       
                         <div class="col-md-3 form-group" ng-if="p.ReceiptNo!=null">
                             <label>
                                 Receipt No <span class="symbol required"></span>
@@ -40,7 +31,7 @@
                                 Paid to / Received From <span class="symbol required"></span>
                             </label>
 
-                            <input type="text" placeholder="Enter Name" tabindex="5" class="form-control" name="editName" readonly="true" ng-model="p.PaidTo" capitalize
+                            <input type="text" placeholder="Enter Name" tabindex="5" class="form-control" name="editName" readonly="true" ng-model="p.Firstname" capitalize
                                    required/>
                 
 
@@ -54,7 +45,7 @@
                             <!-- <input type="text" placeholder="Enter Name" tabindex="5" class="form-control" name="edit" ng-model="p.Date" capitalize
                                    required/> -->
 
-                             <input  type="text" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.Date" is-open="startOpen" ng-init="startOpen = false" name="date" datepicker-options="dateOptions" placeholder="Select Date"
+                             <input  type="text" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.BillDate" is-open="startOpen" ng-init="startOpen = false" name="date" datepicker-options="dateOptions" placeholder="Select Date"
                              min-date="currentDate" max-date="futureDate" ng-changes="setDate();"
                              close-text="Close" required="required" ng-readonly="true"/>       
                 
@@ -67,7 +58,7 @@
                               Amount <span class="symbol required"></span>
                             </label>
 
-                            <input type="text" tabindex="5" class="form-control" name="editAmount" ng-model="p.Amount" readonly="true" capitalize required/>
+                            <input type="text" tabindex="5" class="form-control" name="editAmount" ng-model="p.BillAmount" readonly="true" capitalize required/>
                         </div>