SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cashbook-report and bank-report issues fixes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-05-19 17:25:44 +05:30
parent 952a9c1831
commit 29d3645d64
2 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/models/dahsboard_model.php
View File

@ -2645,9 +2645,9 @@ function daybeforetotal($yesterday){
join t_accountcode ac on ac.code = tinc.account_code join t_accountcode ac on ac.code = tinc.account_code
where (tinc.date >='".$fa."-04-01' and tinc.date <= '".$aa."-03-31')"; where (tinc.date >='".$fa."-04-01' and tinc.date <= '".$aa."-03-31')";
if ($cname!= ''){ 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); $query = $this->db->query($sql);
return $query->result(); return $query->result();

56
application/views/cashbook_cumulative_month_report.php
View File

@ -171,35 +171,39 @@ if (date('m') >= 4) {
<?php <?php
if(!empty($datas)){ if(!empty($datas)){
foreach($datas as $d) //print_r($datas);
{ //die();
foreach($datas as $d)
{
?> ?>
<tr> <tr>
<td><?php echo $d->name; ?></td> <td><?php echo $d->name; ?></td>
<td><?php $tiapr= $tiapr + number_format($d->AprilIncome,2,'.',''); echo number_format($d->Aprinc,2,'.',''); ?></td> <td><?php $tiapr= $tiapr + number_format($d->AprilIncome,2,'.',''); echo number_format($d->AprilIncome,2,'.',''); ?></td>
<td><?php $teapr= $teapr + number_format($d->AprilExpense,2,'.',''); echo number_format($d->Aprexp,2,'.',''); ?></td> <td><?php $teapr= $teapr + number_format($d->AprilExpense,2,'.',''); echo number_format($d->AprilExpense,2,'.',''); ?></td>
<td><?php $timay= $timay + number_format($d->MayIncome,2,'.',''); echo number_format($d->Mayinc,2,'.',''); ?></td> <td><?php $timay= $timay + number_format($d->MayIncome,2,'.',''); echo number_format($d->MayIncome,2,'.',''); ?></td>
<td><?php $temay= $temay + number_format($d->MayExpense,2,'.',''); echo number_format($d->Mayexp,2,'.',''); ?></td> <td><?php $temay= $temay + number_format($d->MayExpense,2,'.',''); echo number_format($d->MayExpense,2,'.',''); ?></td>
<td><?php $tijun= $tijun + number_format($d->JuneIncome,2,'.',''); echo number_format($d->Juninc,2,'.',''); ?></td> <td><?php $tijun= $tijun + number_format($d->JuneIncome,2,'.',''); echo number_format($d->JuneIncome,2,'.',''); ?></td>
<td><?php $tejun= $tejun + number_format($d->JuneExpense,2,'.',''); echo number_format($d->Junexp,2,'.',''); ?></td> <td><?php $tejun= $tejun + number_format($d->JuneExpense,2,'.',''); echo number_format($d->JuneExpense,2,'.',''); ?></td>
<td><?php $tijul= $tijul + number_format($d->JulyIncome,2,'.',''); echo number_format($d->Julinc,2,'.',''); ?></td> <td><?php $tijul= $tijul + number_format($d->JulyIncome,2,'.',''); echo number_format($d->JulyIncome,2,'.',''); ?></td>
<td><?php $tejul= $tejul + number_format($d->JulyExpense,2,'.',''); echo number_format($d->Julexp,2,'.',''); ?></td> <td><?php $tejul= $tejul + number_format($d->JulyExpense,2,'.',''); echo number_format($d->JulyExpense,2,'.',''); ?></td>
<td><?php $tiaug= $tiaug + number_format($d->AugustIncome,2,'.',''); echo number_format($d->Auginc,2,'.',''); ?></td> <td><?php $tiaug= $tiaug + number_format($d->AugustIncome,2,'.',''); echo number_format($d->AugustIncome,2,'.',''); ?></td>
<td><?php $teaug= $teaug + number_format($d->AugustExpense,2,'.',''); echo number_format($d->Augexp,2,'.',''); ?></td> <td><?php $teaug= $teaug + number_format($d->AugustExpense,2,'.',''); echo number_format($d->AugustExpense,2,'.',''); ?></td>
<td><?php $tisep= $tisep + number_format($d->SepIncome,2,'.',''); echo number_format($d->Sepinc,2,'.',''); ?></td> <td><?php $tisep= $tisep + number_format($d->SepIncome,2,'.',''); echo number_format($d->SepIncome,2,'.',''); ?></td>
<td><?php $tesep= $tesep + number_format($d->SepExpense,2,'.',''); echo number_format($d->Sepexp,2,'.',''); ?></td> <td><?php $tesep= $tesep + number_format($d->SepExpense,2,'.',''); echo number_format($d->SepExpense,2,'.',''); ?></td>
<td><?php $tioct= $tioct + number_format($d->OctIncome,2,'.',''); echo number_format($d->Octinc,2,'.',''); ?></td> <td><?php $tioct= $tioct + number_format($d->OctIncome,2,'.',''); echo number_format($d->OctIncome,2,'.',''); ?></td>
<td><?php $teoct= $teoct + number_format($d->OctExpense,2,'.',''); echo number_format($d->Octexp,2,'.',''); ?></td> <td><?php $teoct= $teoct + number_format($d->OctExpense,2,'.',''); echo number_format($d->OctExpense,2,'.',''); ?></td>
<td><?php $tinov= $tinov + number_format($d->NovIncome,2,'.',''); echo number_format($d->Novinc,2,'.',''); ?></td> <td><?php $tinov= $tinov + number_format($d->NovIncome,2,'.',''); echo number_format($d->NovIncome,2,'.',''); ?></td>
<td><?php $tenov= $tenov + number_format($d->NovExpense,2,'.',''); echo number_format($d->Novexp,2,'.',''); ?></td> <td><?php $tenov= $tenov + number_format($d->NovExpense,2,'.',''); echo number_format($d->NovExpense,2,'.',''); ?></td>
<td><?php $tidec= $tidec + number_format($d->DecIncome,2,'.',''); echo number_format($d->Decinc,2,'.',''); ?></td> <td><?php $tidec= $tidec + number_format($d->DecIncome,2,'.',''); echo number_format($d->DecIncome,2,'.',''); ?></td>
<td><?php $tedec= $tedec + number_format($d->DecExpense,2,'.',''); echo number_format($d->Decexp,2,'.',''); ?></td> <td><?php $tedec= $tedec + number_format($d->DecExpense,2,'.',''); echo number_format($d->DecExpense,2,'.',''); ?></td>
<td><?php $tijan= $tijan + number_format($d->JanIncome,2,'.',''); echo number_format($d->Janinc,2,'.',''); ?></td> <td><?php $tijan= $tijan + number_format($d->JanIncome,2,'.',''); echo number_format($d->JanIncome,2,'.',''); ?></td>
<td><?php $tejan= $tejan + number_format($d->JanExpense,2,'.',''); echo number_format($d->Janexp,2,'.',''); ?></td> <td><?php $tejan= $tejan + number_format($d->JanExpense,2,'.',''); echo number_format($d->JanExpense,2,'.',''); ?></td>
<td><?php $tifeb= $tifeb + number_format($d->FebIncome,2,'.',''); echo number_format($d->Febinc,2,'.',''); ?></td> <td><?php $tifeb= $tifeb + number_format($d->FebIncome,2,'.',''); echo number_format($d->FebIncome,2,'.',''); ?></td>
<td><?php $tefeb= $tefeb + number_format($d->FebExpense,2,'.',''); echo number_format($d->Febexp,2,'.',''); ?></td> <td><?php $tefeb= $tefeb + number_format($d->FebExpense,2,'.',''); echo number_format($d->FebExpense,2,'.',''); ?></td>
<td><?php $timar= $timar + number_format($d->MarIncome,2,'.',''); echo number_format($d->Marinc,2,'.',''); ?></td> <td><?php $timar= $timar + number_format($d->MarIncome,2,'.',''); echo number_format($d->MarIncome,2,'.',''); ?></td>
<td><?php $timar= $temar + number_format($d->MarExpense,2,'.',''); echo number_format($d->Marexp,2,'.',''); ?></td> <td><?php $timar= $temar + number_format($d->MarExpense,2,'.',''); echo number_format($d->MarExpense,2,'.',''); ?></td>
<td><?php $rowwise = $rowwise + number_format($d->overalltotal,2,'.',''); echo number_format($d->overalltotal,2,'.',''); ?></td> <td><?php $rowwise = $rowwise + number_format($d->overalltotal,2,'.',''); echo number_format($d->overalltotal,2,'.',''); ?></td>
</tr> </tr>
<?php } ?> <?php } ?>