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

latest changes

Browse Source
This commit is contained in:
gayathri1990 2018-11-14 15:08:23 +05:30
parent ff502f0919
commit cbcb71f9e2
4 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/cashbook.php
View File

@ -1134,7 +1134,7 @@ class cashbook extends BaseController
$sid = $this->input->post('sid');
$tot = $this->input->post('tot');
//$now = date('Y-m-d H:i:s');
$rowcount = $this->input->post('rc');
$totalpaidamount= $this->input->post('tpv');

55
application/models/cashbook_model.php
View File

@ -557,7 +557,7 @@ left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID
left join T_Service_Tax st on st.LineItemNo = pl.LineItemNo
left join T_Revenue_Tax rt on rt.LineItemNo = pl.LineItemNo
left join T_Bankporeport br on br.IGRLineItemNo=id.IGRItemNo
where im.IGRStatus = 'ST027' and id.BankStatus !='ST070'" ;
where im.IGRStatus = 'ST027' and id.BankStatus !='ST070'";
$sql.=" group by id.IGRItemNo";
//echo $sql;
@ -697,7 +697,7 @@ $sql.="group by sd.SupplierName";
{
$sql="select sd.SupplierName as SupplierName,sd.SupplierID,
$sql="select sd.SupplierName as SupplierName,sd.SupplierID,im.MaterialRcvdDate,
round(ifnull(if(POType = 'REVENUE',
(id.QuantityAsPerInvoice * pl.Rate)+((id.QuantityAsPerInvoice * pl.Rate)*(rt.SGST/100)),
(id.QuantityAsPerInvoice * pl.Rate)+((id.QuantityAsPerInvoice * pl.Rate)*(st.SGST /100))),0),2) as sgst,
@ -1024,11 +1024,13 @@ function receiptdata()
bm.Balancetopay,bm.Amountpaid,bm.IGRNO,bm.IGRLineItemNo,br.Balancetocleared,br.Clearbalance,
inward.FilePath as igrfile,bu.FilePath pofile');
$this->db->from ('T_Bankmappingpo bm');
$this->db->join('T_Inwardgateregister_fileupload inward','inward.IGRNO =bm.IGRNO','left');
$this->db->join('T_IGR_Details igr','igr.IGRItemNo=bm.IGRLineItemNo');
$this->db->join('T_Inwardgateregister_fileupload inward','inward.IGRNO =bm.IGRNO','left');
$this->db->join('T_PurchaseOrder_BillUpload bu','bm.PONO=bu.PONO','left');
$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->where('igr.BankStatus !=',ST072);
//$this->db->group_by('bm.mid');
if ($fa and $aa != ''){
@ -1157,11 +1159,12 @@ function receiptdata()
$this->db->select('bm.ID,bm.indate,bm.invoiceno,bm.customername,bm.totinvoiceamount,bm.bankid,
bm.balancetoreceived,bm.amountreceived,br.cclearbalance,br.cbalancetocleared');
$this->db->from ('T_Bankmappingiv bm');
$this->db->join('ip_invoices iv','iv.invoice_number=bm.invoiceno');
$this->db->join ('ip_clients ic','ic.client_name = bm.customername','left');
$this->db->join('T_bankreport br','br.ID = bm.bankid');
$this->db->where('bm.IsActive',1);
$this->db->where('bm.customerid',$clientid);
$this->db->where('iv.receivedstatus !=',ST066);
if ($fa and $aa != ''){
//$sql.=" and (im.CreatedDate >= '".$fa."-04-01' and im.CreatedDate <= '".$aa."-03-31')";
@ -1189,15 +1192,13 @@ function receiptdata()
function uncreditinvoicelistfilter($client,$fdate,$tdate,$fa,$aa,$m)
{
$this->db->select('iva.invoice_id,iva.invoice_total,iv.invoice_date_created,iv.invoice_number,iva.invoice_paid,ic.client_id,ic.client_name,BI.balancetoreceived,BI.amountreceived');
$this->db->select('iva.invoice_id,iva.invoice_total,iv.invoice_date_created,iv.invoice_number,iva.invoice_paid,ic.client_id,ic.client_name,BI.balancetoreceived,BI.amountreceived');
$this->db->from ('ip_invoice_amounts iva');
$this->db->join ('ip_invoices iv','iva.invoice_id = iv.invoice_id');
$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.invoice_status_id','2');
$this->db->where('iv.receivedstatus','ST066');
$this->db->where('iv.receivedstatus',ST066);
$this->db->where('ic.client_id',$client);
if ($fa and $aa != ''){
@ -1226,11 +1227,11 @@ function receiptdata()
//for cashbook edit screen and update bankreport//
function invoiceamonut($bankid)
{
$this->db->select('sum(amountreceived)as amountreceived');
$this->db->from ('T_Bankmappingiv');
$this->db->where('bankid',$bankid);
$this->db->where('IsActive',1);
//$this->db->group_by('invoiceno');
$this->db->select('sum(bm.amountreceived)as amountreceived');
$this->db->from ('T_Bankmappingiv bm');
$this->db->where('bm.bankid',(int)$bankid);
$this->db->where('bm.IsActive',1);
//$this->db->group_by('bm.ID');
$query = $this->db->get();
return $query->result();
@ -1671,17 +1672,20 @@ function receiptdata()
return TRUE;
}
function paided($supplierid,$fa,$aa,$m,$fdate,$tdate)
{
$this->db->select('bm.id,bm.mid,bm.PONO,bm.Suppliername,bm.Totalpoamount,bm.Podate,
bm.Balancetopay,bm.Amountpaid,bm.IGRNO,bm.IGRLineItemNo,br.Balancetocleared,br.Clearbalance,
inward.FilePath as igrfile,bu.FilePath pofile');
$this->db->from ('T_Bankmappingpo bm');
$this->db->join('T_IGR_Details igr','igr.IGRItemNo=bm.IGRLineItemNo');
$this->db->join('T_Inwardgateregister_fileupload inward','inward.IGRNO =bm.IGRNO','left');
$this->db->join('T_PurchaseOrder_BillUpload bu','bm.PONO=bu.PONO','left');
$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->where('igr.BankStatus !=',ST072);
//$this->db->group_by('bm.mid');
if ($fa and $aa != ''){
@ -1712,9 +1716,11 @@ 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_Bankmappingpo bm');
$this->db->where('bm.IsActive',1);
$this->db->group_by('bm.SupplierID');
$this->db->from ('T_Bankmappingpo bm');
$this->db->join('T_IGR_Details igr','igr.IGRItemNo=bm.IGRLineItemNo');
$this->db->where('bm.IsActive',1);
$this->db->where('igr.BankStatus !=',ST072);
$this->db->group_by('bm.SupplierID');
$query = $this->db->get();
return $query->result();
@ -1820,6 +1826,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->from ('T_Bankmappingpo bm');
$this->db->join('T_IGR_Details igr','igr.IGRItemNo=bm.IGRLineItemNo');
$this->db->where('igr.BankStatus !=',ST072);
$this->db->where('bm.IsActive',1);
@ -1862,16 +1870,18 @@ function receiptdata()
// // $query = $this->db->get();
// // $result = $query->result();
// // return $result;
// }
function received($clientid,$fdate,$tdate,$fa,$aa,$m)
{
$this->db->select('bm.indate,bm.invoiceno,bm.customername,bm.totinvoiceamount,bm.bankid,bm.customerid,
bm.balancetoreceived,bm.amountreceived,bm.ID,br.Credit,br.cclearbalance,br.cbalancetocleared');
$this->db->from ('T_Bankmappingiv bm');
$this->db->join('ip_invoices iv','iv.invoice_number=bm.invoiceno');
$this->db->join('T_bankreport br','br.ID=bm.bankid');
$this->db->where('bm.IsActive',1);
$this->db->where('bm.customerid',$clientid);
$this->db->where('iv.receivedstatus !=',ST066);
if ($fa and $aa != ''){
//$sql.=" and (im.CreatedDate >= '".$fa."-04-01' and im.CreatedDate <= '".$aa."-03-31')";
@ -1901,9 +1911,11 @@ function receiptdata()
bm.balancetoreceived,sum(bm.amountreceived)as amountreceived,bm.ID,br.Credit,br.cclearbalance,br.cbalancetocleared');
$this->db->from ('T_Bankmappingiv bm');
$this->db->join('T_bankreport br','br.ID=bm.bankid');
$this->db->join('ip_invoices iv','iv.invoice_number=bm.invoiceno');
$this->db->join('ip_clients ic','ic.client_name=bm.customername','left');
$this->db->where('bm.IsActive',1);
$this->db->group_by('bm.customerid');
$this->db->where('iv.receivedstatus !=',ST066);
$query = $this->db->get();
return $query->result();
}
@ -1912,9 +1924,12 @@ function receiptdata()
$this->db->select('bm.indate,bm.invoiceno,bm.customername,bm.customerid as customerid,bm.totinvoiceamount,bm.bankid,ic.client_id,
bm.balancetoreceived,sum(bm.amountreceived)as amountreceived,bm.ID,br.Credit,br.cclearbalance,br.cbalancetocleared');
$this->db->from ('T_Bankmappingiv bm');
$this->db->join('ip_invoices iv','iv.invoice_number=bm.invoiceno');
$this->db->join('T_bankreport br','br.ID=bm.bankid');
$this->db->join('ip_clients ic','ic.client_name=bm.customername','left');
$this->db->where('bm.IsActive',1);
$this->db->where('iv.receivedstatus !=',ST066);
// $this->db->where('bm.customername',$Customer);
if ($fa and $aa != ''){
@ -1950,7 +1965,7 @@ 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.receivedstatus',ST066);
$this->db->where('iv.invoice_status_id','2');
$this->db->where('ic.client_id',$clientname);
if ($fa and $aa != ''){
@ -1985,7 +2000,7 @@ 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.receivedstatus',ST066);
$this->db->where('iv.invoice_status_id','2');
@ -2002,7 +2017,7 @@ 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.receivedstatus',ST066);
$this->db->where('iv.invoice_status_id','2');
// $this->db->where('bm.customername',$Customer);

11
application/views/bankinvoice.php
View File

@ -630,8 +630,8 @@ function Save()
var invoicereceived=$('#invoicereceived'+number).val();
//var payment = parseFloat(invoiceamount);
// if(parseFloat(bankdebitamount) > parseFloat(totalvalue))
// {
$.ajax(
{
data:{date:date,invid:invid,cname:customername,cid:customerid,invamount:invoiceamount,ar:amountreceived,rc:rowCount,tpv:totalvalue,bda:bankdebitamount,bi:bid,check:check,rw:rw,invrec:invoicereceived},
@ -647,7 +647,12 @@ function Save()
}
}
});
// }
// else
// {
// alert('Your payment exceeding ');
// location.reload();
// }
// j=j+1;
}
}

2
application/views/bankstatement.php
View File

@ -343,7 +343,7 @@ $Bankname = $t->Bankname;
<td align="left" id="credited<?php echo $i ?>"><span><?php echo ($t->Credit)-($t->cclearbalance);?></span></td>
<td align="left" id="csta<?php echo $i ?>"><span><?php echo $t->cstatus?><?php echo $t->Status?></span></td>
<!-- <td align="left" id="dsta<?php echo $i ?>"><span><?php echo $t->Status?></span></td> -->
<!-- <td><?php echo $t->cstatus;?></td> -->