diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 043aade0..23bb9af3 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -517,7 +517,7 @@ SUM(IF(month(STR_TO_DATE(dbm.Date,'%d-%m-%Y')) =12, dbm.Amount, 0)) AS December, FROM T_Income_Outcome_Master exp join T_DayBookMaster dbm on dbm.Type=exp.ID left join T_BranchMaster b on b.BranchCode=exp.BranchCode - where dbm.Name = 'I001' and exp.TypeName not like 'FEES' and dbm.Status = 'Approved' and exp.BranchCode = '".$br."' + where dbm.Name = 'I001' and exp.TypeName not like 'FEES' AND dbm.IsActive ='1' AND dbm.Status != 'Cancel' and exp.BranchCode = '".$br."' "; if ($from != ''){ @@ -532,7 +532,7 @@ FROM T_Income_Outcome_Master exp } $sql.=" group by Expense_name"; - + //echo $sql; $leadDet=$this->db->query($sql); $expense = $leadDet->result();