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

bankbook

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-11-02 18:29:26 +05:30
parent 05cd645df2
commit 5398415b9d
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/controllers/cashbook.php
View File

@ -1569,6 +1569,7 @@ class cashbook extends BaseController
{
$data['bankdebitsupp'] = $this->cashbook_model->amountpaidsupplierwise();
$data['amountpaidcashbook']=$this->cashbook_model->amountpaidcashbook();
}

19
application/models/cashbook_model.php
View File

@ -1056,7 +1056,7 @@ function receiptdata()
$this->db->where($date);
}
$this->db->group_by('bm.IGRLineItemNo');
$query = $this->db->get();
return $query->result();
@ -1668,6 +1668,7 @@ function receiptdata()
$this->db->join('T_bankreport br','br.ID=bm.mid','left');
$this->db->where('bm.SupplierID',$supplierid);
$this->db->where('bm.IsActive',1);
//$this->db->group_by('bm.mid');
if ($fa and $aa != ''){
//$sql.=" and (im.CreatedDate >= '".$fa."-04-01' and im.CreatedDate <= '".$aa."-03-31')";
@ -1688,7 +1689,7 @@ function receiptdata()
and date(bm.Podate) <= '".$todate."'";
$this->db->where($date);
}
$this->db->group_by('bm.IGRLineItemNo');
//$this->db->group_by('bm.IGRLineItemNo');
$query = $this->db->get();
return $query->result();
@ -1697,8 +1698,8 @@ function receiptdata()
{
$this->db->select('bm.id,bm.mid,bm.PONO,bm.Suppliername,bm.SupplierID,bm.Totalpoamount,bm.Podate,
bm.Balancetopay,sum(bm.Amountpaid) as Amountpaid,bm.IGRNO,bm.IGRLineItemNo');
$this->db->from ('T_Bankporeport bm');
$this->db->where('bm.IsActive',1);
$this->db->from ('T_Bankporeport bm');
$this->db->where('bm.IsActive',1);
$this->db->group_by('bm.SupplierID');
$query = $this->db->get();
return $query->result();
@ -1804,9 +1805,8 @@ function receiptdata()
{
$this->db->select('bm.id,bm.mid,bm.PONO,bm.Suppliername,bm.SupplierID,sum(bm.Totalpoamount)as Totalpoamount,
bm.Balancetopay,sum(bm.Amountpaid) as Amountpaid,bm.Podate,bm.IGRLineItemNo');
$this->db->where('bm.IsActive',1);
$this->db->from ('T_Bankporeport bm');
$this->db->where('bm.IsActive',1);
if ($fa and $aa != ''){
@ -1988,6 +1988,9 @@ function receiptdata()
$this->db->join ('ip_invoices iv','iva.invoice_id = iv.invoice_id','left');
$this->db->join ('ip_clients ic','iv.client_id = ic.client_id','left');
$this->db->join ('T_Bankinvoicereport BI',' iv.invoice_number =BI.invoiceno','left');
$this->db->where('iv.receivedstatus','ST066');
$this->db->where('iv.invoice_status_id','2');
$this->db->where('bm.IsActive',1);
// $this->db->where('bm.customername',$Customer);
if ($fa and $aa != ''){
@ -2010,9 +2013,7 @@ function receiptdata()
and date(iv.invoice_date_created) <= '".$todate."'";
$this->db->where($date);
}
$this->db->where('iv.receivedstatus','ST066');
$this->db->where('iv.invoice_status_id','2');
$this->db->group_by('ic.client_name');
//$this->db->where('inc.type','PAYMENT');

5
application/views/bankpaidsupp.php
View File

@ -221,7 +221,8 @@ foreach($financialyear as $item)
$rate=$t->Amountpaid;
$Amountpaid=$t->Amountpaid;
$supplierid=$t->SupplierID;
@ -231,7 +232,7 @@ foreach($financialyear as $item)
<td align="left" id="sn<?php echo $i ?>" ><a href="<?= base_url() ?>cashbook/amountpaid?sid=<?php echo $t->SupplierID;?>&sn=<?php echo $t->Suppliername ?>&fa=<?php echo $fa ?>&aa=<?php echo $aa ?>&m=<?php echo $m ?>&fdate=<?php echo $fdate ?>&tdate=<?php echo $tdate ?>"><span><?php echo $t->Suppliername?></span></a></td>
<td align="left" id="tov<?php echo $i ?>" ><span><?php $tot_amount=$tot_amount+round($rate)?><?php echo round($rate,2)?></span></td>
<td align="left" id="tov<?php echo $i ?>" ><span><?php $tot_amount=$tot_amount+round($Amountpaid)?><?php echo round($Amountpaid,2)?></span></td>