diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index 1669b158..4dceaefb 100644 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -1215,7 +1215,7 @@ class DayBook_model extends CI_Model where ".$where." Status!=? and T_DayBookMaster.BranchCode=? and (case when ListName = 'Income' then T_DayBookMaster.ModeOfPayment != 'WAIVER' and T_DayBookMaster.ModeOfPayment != 'REFERRAL'and T_DayBookMaster.Status !='Pending' and T_Income_Outcome_Master.TypeName NOT LIKE '%BY CASH%' when ListName = 'Expense' then T_DayBookMaster.Status !='Pending' and T_Income_Outcome_Master.TypeName != 'FEES' and T_Income_Outcome_Master.TypeName NOT LIKE '%CASH TO%' end) group by Type,Name"; $query = $this->db->query($subQuery,array('Cancel',$branch)); - +// print_r($subQuery);die(); $expense = $query->result(); diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index f74eea40..8297b815 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -1004,7 +1004,7 @@ APFS.ID AS id, IFNULL(STU_COUR.Status, '-') AS StuCourStatus, BALFEE.totalpayable AS CourseFees, BALFEE.totalpaid AS paidAmount, - BALFEE.balpayable AS balance,CFD.ID + BALFEE.balpayable AS balance,CFD.ID,sfs.CreatedOn as Created,sfs.UpdatedOn as Updated FROM T_Students_Fees_Status AS sfs LEFT JOIN T_Registration_Details AS RD ON sfs.FeesID = RD.Student_Fee_Status_Id AND sfs.StudentID = RD.StudentID LEFT JOIN T_ApplicationFormStatus AS APFS on APFS.Registration_Details_ID = RD.ID AND APFS.ListCode != 'S033' @@ -1108,15 +1108,15 @@ WHERE } if ($from != ''){ $fromd= date("Y-m-d",strtotime($from)); - $sql.="and STR_TO_DATE(BALFEE.CreatedOn,'%d-%m-%Y') >= '".$fromd."'"; + $sql.="and STR_TO_DATE(sfs.CreatedOn,'%d-%m-%Y') >= '".$fromd."'"; } if ($to != ''){ $tod=date("Y-m-d",strtotime($to)); - $sql.=" and STR_TO_DATE(BALFEE.CreatedOn,'%d-%m-%Y') <= '".$tod."'"; + $sql.=" and STR_TO_DATE(sfs.CreatedOn,'%d-%m-%Y') <= '".$tod."'"; } if ($udate != ''){ $ud=date("Y-m-d",strtotime($udate)); - $sql.=" and STR_TO_DATE(APFS.AppFormDate,'%d-%m-%Y') = '".$ud."'"; + $sql.=" and STR_TO_DATE(sfs.UpdatedOn,'%d-%m-%Y') = '".$ud."'"; }