diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index 17f24011..a87edc9b 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -2130,14 +2130,15 @@ if ($cname!= ''){ } //home--this year// function yearexpensereport($fa,$aa) - { + { $sql="select monthname(date) as month, sum(if(type='PAYMENT',total,0)) as exp, sum(if(type='RECEIPT',total,0)) as inc, sum(total) as total from t_income_expense where date >= '".$fa."-04-01' and date <= '".$aa."-03-31' - group by month "; + group by month + ORDER BY FIELD(month,'April','May','June','July','August','September','October','November','December','January', 'February', 'March')"; $query = $this->db->query($sql); return $query->result(); @@ -2154,7 +2155,8 @@ if ($cname!= ''){ function monthwise_data($value='') { - $sql="SELECT type,Sum(total) as monthlydata FROM t_income_expense WHERE type = ? AND MONTH(date) = MONTH(curdate())"; + $sql="SELECT type,Sum(total) as monthlydata FROM t_income_expense WHERE type = ? AND MONTH(date) = MONTH(curdate()) AND YEAR(date) = YEAR(curdate())"; + //$sql="SELECT type,Sum(total) as monthlydata FROM resicoin_RIADev.t_income_expense WHERE type = ? AND MONTH(date) = MONTH(curdate()) And YEAR(date) = YEAR(curdate())" $query = $this->db->query($sql,array($value)); return $query->result(); diff --git a/application/views/cashbookmthlypaydep.php b/application/views/cashbookmthlypaydep.php index fa53ff24..d3b40383 100755 --- a/application/views/cashbookmthlypaydep.php +++ b/application/views/cashbookmthlypaydep.php @@ -16,7 +16,6 @@ if(!empty($departmentwise)) ?> - - - - - - - - - -