diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php
index 9b066783..e3207494 100755
--- a/Apollo/api/application/models/Fees_status_model.php
+++ b/Apollo/api/application/models/Fees_status_model.php
@@ -80,7 +80,7 @@ class Fees_status_model extends CI_Model
     public function getStudentFeesStructure($student=null){
 
 
-        $this->db->select('CF.ID,CF.Sem_Year,SFS.FeesID,SFS.CourseID,SFS.CourseFees,SFS.STFOrWR,SFS.Waiver,SFS.Others,SFS.RollNo,CU.PC,CU.TC,CU.DC,CU.MC,CU.OtherFees,SM.SessionName as SessionName,SM1.SessionName as ToSessionName');
+        $this->db->select('CF.ID,CF.Sem_Year,CF.ProgramType,SFS.FeesID,SFS.CourseID,SFS.CourseFees,SFS.STFOrWR,SFS.Waiver,SFS.Others,SFS.RollNo,CU.PC,CU.TC,CU.DC,CU.MC,CU.OtherFees,SM.SessionName as SessionName,SM1.SessionName as ToSessionName');
         $this->db->from(STUDENTS_FEES_STATUS.' as SFS');
         $this->db->join(SESSIONMASTER.' as SM', 'SM.SessionID = SFS.SessionName');
         $this->db->join(SESSIONMASTER.' as SM1', 'SM1.SessionID = SFS.ToSessionName','left');
@@ -96,6 +96,7 @@ class Fees_status_model extends CI_Model
                 $fetchData['FeesID'] = $row->FeesID;
                 $fetchData['CourseID'] = $row->CourseID;
                 $fetchData['Sem_Year'] = $row->Sem_Year;
+                $fetchData['ProgramType'] = $row->ProgramType;
                 $fetchData['ActualFees'] = $row->CourseFees;
                 $fetchData['STFOrWR'] = $row->STFOrWR;
                 $fetchData['Waiver'] = $row->Waiver;
@@ -192,6 +193,7 @@ class Fees_status_model extends CI_Model
                 $fetchData['FeesID'] = $row->FeesID;
                 $fetchData['CourseID'] = $row->CourseID;
                 $fetchData['Sem_Year'] = $row->FeesType;
+                $fetchData['ProgramType'] = $row->FeesType;
                 $fetchData['ActualFees'] = $row->CourseFees;
                 $fetchData['STFOrWR'] = $row->STFOrWR;
                 $fetchData['Waiver'] = $row->Waiver;
@@ -235,7 +237,7 @@ class Fees_status_model extends CI_Model
     public function existStudentFeesDetails($student=null){
 
         $this->db->distinct();
-        $this->db->select('SFS.FeesID,SFS.FeesType,SFS.RollNo,ifnull(SFS.CourseFees,0) as CourseFees,ifnull(SFS.STFOrWR,0) as STFOrWR,ifnull(SFS.Waiver,0) as Waiver,ifnull(SFS.Others,0) as Others,ST.Firstname,ST.MobileNumber,ST.Fathername,CU.CourseName,CU.CourseID,CF.Sem_Year,STC.EnrollmentID,US.UniversityName,SM.SessionName,SM1.SessionName as ToSessionName');
+        $this->db->select('SFS.FeesID,SFS.FeesType,SFS.RollNo,ifnull(SFS.CourseFees,0) as CourseFees,ifnull(SFS.STFOrWR,0) as STFOrWR,ifnull(SFS.Waiver,0) as Waiver,ifnull(SFS.Others,0) as Others,ST.Firstname,ST.MobileNumber,ST.Fathername,CU.CourseName,CU.CourseID,CF.Sem_Year,STC.EnrollmentID,US.UniversityName,SM.SessionName,SM1.SessionName as ToSessionName,CF.ProgramType');
         $this->db->from(STUDENTS_FEES_PAID.' as SFP');
         $this->db->join(STUDENTS_FEES_STATUS.' as SFS','SFP.FeesId = SFS.FeesID');
         $this->db->join(SESSIONMASTER.' as SM', 'SM.SessionID = SFS.SessionName');
@@ -256,6 +258,7 @@ class Fees_status_model extends CI_Model
                $storePaidDetails['FeesID'] = $feeRow->FeesID;
                $storePaidDetails['FeesName'] = $feeRow->Sem_Year;
                 $storePaidDetails['CourseFees'] = $feeRow->CourseFees;
+                $storePaidDetails['ProgramType'] = $feeRow->ProgramType;
                 $storePaidDetails['SessionName'] = $feeRow->SessionName;
                 if($feeRow->ToSessionName=='' OR $feeRow->ToSessionName==null){
                     $storePaidDetails['ToSessionName'] = "Not Applicable";
@@ -340,6 +343,7 @@ class Fees_status_model extends CI_Model
             foreach ($getFeeDetails->result() as $feeRow){
                 $storePaidDetails['FeesID'] = $feeRow->FeesID;
                 $storePaidDetails['FeesName'] = $feeRow->FeesType;
+                $storePaidDetails['ProgramType'] = $feeRow->FeesType;
                 $storePaidDetails['CourseFees'] = $feeRow->CourseFees;
                 $storePaidDetails['SessionName'] = "Not Applicable";
                 $storePaidDetails['ToSessionName'] = "Not Applicable";
@@ -394,14 +398,12 @@ class Fees_status_model extends CI_Model
     public function updateFees($feesPaidDetails=null)
     {
         if($feesPaidDetails['UpdatedBy']=='All'){
-            $this->db->select('BranchID,ST.Firstname');
+            $this->db->select('BranchID');
             $this->db->where('FeesID', $feesPaidDetails['FeesId']);
             $this->db->from(STUDENTS_FEES_STATUS.' as SFS');
             $this->db->join(STUDENTCOURSE.' as SC', 'SC.CourseID = SFS.CourseID');
-            $this->db->join(STUDENTS.' as ST', 'ST.StudentID = SC.StudentID');
             $getStudentBranch=$this->db->get()->result();
             $feesPaidDetails['UpdatedBy'] = $getStudentBranch[0]->BranchID;
-            $studentName=$getStudentBranch[0]->Firstname;
 
         }
         $this->db->select('BillNO');
@@ -434,7 +436,6 @@ class Fees_status_model extends CI_Model
                     $result['paidStatus'] = true;
                     $result['message'] = "Successfully fees details added";
                    $feesPayedID =  $this->db->insert_id();
-                    $feesPaidDetails['StudentName']= $studentName;
                    // $entryOfCallTrack = $this->updateInCallTrack($trackDetails);
                     // day book entry
                     if($feesPaidDetails['BillAmount']!='0'){
@@ -1088,6 +1089,8 @@ class Fees_status_model extends CI_Model
      * created by kms
      * */
     public function insertDayBookMaster($data=null,$paymentID){
+        print_r($data);
+        die();
             // this is for income entry
             $insertArray['Date'] = $data['BillDate'];
             $insertArray['CreatedBy'] = $data['CreatedBy'];
@@ -1097,8 +1100,7 @@ class Fees_status_model extends CI_Model
             $insertArray['Status'] = 'Approved';
             $insertArray['PaymentStatus'] = false;
             $insertArray['FeesPaymentID'] = $paymentID;
-            $insertArray['VoucherNumber'] = $data['BillNO'];
-            $insertArray['PaidTo'] = $data['StudentName'];
+            //$insertArray['Date'] = $data['BillDate'];
             $insertArray['BranchCode'] = $data['UpdatedBy'];
 
             $this->db->select('ID,TypeID');
@@ -1124,8 +1126,7 @@ class Fees_status_model extends CI_Model
             $expenseArray['Status'] = 'Approved';
             $expenseArray['PaymentStatus'] = false;
             $expenseArray['FeesPaymentID'] = $paymentID;
-            $expenseArray['VoucherNumber'] = $data['BillNO'];
-            $expenseArray['PaidTo'] = $data['StudentName'];
+
             $expenseArray['BranchCode'] = $data['UpdatedBy'];
 
             $this->db->select('ID,TypeID');