diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index 3ddfadc9..f01d9e7f 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -2645,9 +2645,9 @@ function daybeforetotal($yesterday){ join t_accountcode ac on ac.code = tinc.account_code where (tinc.date >='".$fa."-04-01' and tinc.date <= '".$aa."-03-31')"; if ($cname!= ''){ - $sql.="and ac1.name = '".$cname."'"; + $sql.="and ac.name = '".$cname."'"; } - $sql.= "tinc.account_code"; + $sql.= " group by tinc.account_code"; $query = $this->db->query($sql); return $query->result(); diff --git a/application/views/cashbook_cumulative_month_report.php b/application/views/cashbook_cumulative_month_report.php index d661b163..36344815 100755 --- a/application/views/cashbook_cumulative_month_report.php +++ b/application/views/cashbook_cumulative_month_report.php @@ -171,35 +171,39 @@ if (date('m') >= 4) { name; ?> - AprilIncome,2,'.',''); echo number_format($d->Aprinc,2,'.',''); ?> - AprilExpense,2,'.',''); echo number_format($d->Aprexp,2,'.',''); ?> - MayIncome,2,'.',''); echo number_format($d->Mayinc,2,'.',''); ?> - MayExpense,2,'.',''); echo number_format($d->Mayexp,2,'.',''); ?> - JuneIncome,2,'.',''); echo number_format($d->Juninc,2,'.',''); ?> - JuneExpense,2,'.',''); echo number_format($d->Junexp,2,'.',''); ?> - JulyIncome,2,'.',''); echo number_format($d->Julinc,2,'.',''); ?> - JulyExpense,2,'.',''); echo number_format($d->Julexp,2,'.',''); ?> - AugustIncome,2,'.',''); echo number_format($d->Auginc,2,'.',''); ?> - AugustExpense,2,'.',''); echo number_format($d->Augexp,2,'.',''); ?> - SepIncome,2,'.',''); echo number_format($d->Sepinc,2,'.',''); ?> - SepExpense,2,'.',''); echo number_format($d->Sepexp,2,'.',''); ?> - OctIncome,2,'.',''); echo number_format($d->Octinc,2,'.',''); ?> - OctExpense,2,'.',''); echo number_format($d->Octexp,2,'.',''); ?> - NovIncome,2,'.',''); echo number_format($d->Novinc,2,'.',''); ?> - NovExpense,2,'.',''); echo number_format($d->Novexp,2,'.',''); ?> - DecIncome,2,'.',''); echo number_format($d->Decinc,2,'.',''); ?> - DecExpense,2,'.',''); echo number_format($d->Decexp,2,'.',''); ?> - JanIncome,2,'.',''); echo number_format($d->Janinc,2,'.',''); ?> - JanExpense,2,'.',''); echo number_format($d->Janexp,2,'.',''); ?> - FebIncome,2,'.',''); echo number_format($d->Febinc,2,'.',''); ?> - FebExpense,2,'.',''); echo number_format($d->Febexp,2,'.',''); ?> - MarIncome,2,'.',''); echo number_format($d->Marinc,2,'.',''); ?> - MarExpense,2,'.',''); echo number_format($d->Marexp,2,'.',''); ?> + AprilIncome,2,'.',''); echo number_format($d->AprilIncome,2,'.',''); ?> + AprilExpense,2,'.',''); echo number_format($d->AprilExpense,2,'.',''); ?> + MayIncome,2,'.',''); echo number_format($d->MayIncome,2,'.',''); ?> + MayExpense,2,'.',''); echo number_format($d->MayExpense,2,'.',''); ?> + JuneIncome,2,'.',''); echo number_format($d->JuneIncome,2,'.',''); ?> + JuneExpense,2,'.',''); echo number_format($d->JuneExpense,2,'.',''); ?> + JulyIncome,2,'.',''); echo number_format($d->JulyIncome,2,'.',''); ?> + JulyExpense,2,'.',''); echo number_format($d->JulyExpense,2,'.',''); ?> + AugustIncome,2,'.',''); echo number_format($d->AugustIncome,2,'.',''); ?> + AugustExpense,2,'.',''); echo number_format($d->AugustExpense,2,'.',''); ?> + SepIncome,2,'.',''); echo number_format($d->SepIncome,2,'.',''); ?> + SepExpense,2,'.',''); echo number_format($d->SepExpense,2,'.',''); ?> + OctIncome,2,'.',''); echo number_format($d->OctIncome,2,'.',''); ?> + OctExpense,2,'.',''); echo number_format($d->OctExpense,2,'.',''); ?> + NovIncome,2,'.',''); echo number_format($d->NovIncome,2,'.',''); ?> + NovExpense,2,'.',''); echo number_format($d->NovExpense,2,'.',''); ?> + DecIncome,2,'.',''); echo number_format($d->DecIncome,2,'.',''); ?> + DecExpense,2,'.',''); echo number_format($d->DecExpense,2,'.',''); ?> + JanIncome,2,'.',''); echo number_format($d->JanIncome,2,'.',''); ?> + JanExpense,2,'.',''); echo number_format($d->JanExpense,2,'.',''); ?> + FebIncome,2,'.',''); echo number_format($d->FebIncome,2,'.',''); ?> + FebExpense,2,'.',''); echo number_format($d->FebExpense,2,'.',''); ?> + MarIncome,2,'.',''); echo number_format($d->MarIncome,2,'.',''); ?> + MarExpense,2,'.',''); echo number_format($d->MarExpense,2,'.',''); ?> overalltotal,2,'.',''); echo number_format($d->overalltotal,2,'.',''); ?>