From 6c1dfd7bcaedfed6dad21c9430dcba274bf1721f Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Mon, 25 Jun 2018 19:14:57 +0530 Subject: [PATCH] bankstatement --- application/controllers/cashbook.php | 26 ++++++---- application/models/cashbook_model.php | 44 +++++++--------- application/views/bankamountpaid.php | 56 ++++++++++++--------- application/views/bankamountreceived.php | 49 +++++++++--------- application/views/bankinvoicesettlement.php | 43 ++++++++-------- application/views/banksettlement.php | 9 ++-- 6 files changed, 114 insertions(+), 113 deletions(-) diff --git a/application/controllers/cashbook.php b/application/controllers/cashbook.php index 7867050d..64dc81a4 100755 --- a/application/controllers/cashbook.php +++ b/application/controllers/cashbook.php @@ -1264,7 +1264,7 @@ class cashbook extends BaseController $data['bankdebit'] = $this->cashbook_model->debitpolistfilter($SupplierName,$fdate,$tdate); } - $data['amountpaid'] = $this->cashbook_model->paided(); + $data['amountpaid'] = $this->cashbook_model->paided(); $data['supplier'] = $this->cashbook_model->getsupplier(); $this->loadViews("bankamountpaid", $this->global,$data, NULL); @@ -1303,7 +1303,7 @@ class cashbook extends BaseController $totalamount =$this->input->post('Totalpoamount'); $Amount = $this->input->post('paidamount'); - + $id=$this->input->post('mappingid'); $igrno = $this->input->post('igrno'); $Bankid = $this->input->post('bankid'); $balancetoclear=$this->input->post('balancetobankingclear'); @@ -1330,7 +1330,7 @@ class cashbook extends BaseController $totalbalancetopay=$Amount+$balancetopay; //$updateamount=0; $IsActive=0; - $result2= $this->cashbook_model->deleteBankmappingpo($igrno,$Bankid,$IsActive); + $result2= $this->cashbook_model->deleteBankmappingpo($id,$IsActive); //for update mapping amount inT_Bankporeport table// //die(); $result3= $this->cashbook_model->updateBankporeportpo($igrno,$totalbalancetopay,$updateamount,$Bankid); @@ -1342,6 +1342,7 @@ class cashbook extends BaseController $Bankid = $_GET['bankid']; $Amount = $_GET['amount']; $igrno = $_GET['igrno']; + $id=$_GET['id']; $balancetoclear=$_GET['balancetoclear']; $bankamount=$_GET['bankamount']; $updateamount=$bankamount-$Amount; @@ -1366,7 +1367,7 @@ class cashbook extends BaseController $totalbalancetopay=$Amount + $balancetopay; //$updateamount=0; $IsActive=0; - $result2= $this->cashbook_model->deleteBankmappingpo($igrno,$Bankid,$IsActive); + $result2= $this->cashbook_model->deleteBankmappingpo($id,$IsActive); //for update mapping amount inT_Bankporeport table// $result3= $this->cashbook_model->updateBankporeportpo($igrno,$totalbalancetopay,$updateamount,$Bankid); @@ -1382,6 +1383,7 @@ class cashbook extends BaseController $this->global['pageTitle'] = 'Siddharth : Bank Report - Delete Mapping Invoice'; $invoiceno = $this->input->post('invoiceno'); $bankid = $this->input->post('bankid'); + $mappingid=$this->input->post('mappingid'); $amountreceived = $this->input->post('amountreceived'); $bankingclear = $this->input->post('bankingclear'); $bankingbalclear = $this->input->post('bankingbalclear'); @@ -1394,7 +1396,7 @@ class cashbook extends BaseController //print_r($result1); //die(); $IsActive=0; - $result2= $this->cashbook_model->deletemappinginvoice($bankid,$invoiceno,$IsActive); + $result2= $this->cashbook_model->deletemappinginvoice($mappingid,$IsActive); $updatebalancetoreceived=$balancetoreceived+$amountreceived; $updateamountreceived=$totinvoiceamount-$updatebalancetoreceived; $result3= $this->cashbook_model->updatebankinvoicereport($invoiceno,$bankid,$updatebalancetoreceived,$updateamountreceived); @@ -1413,14 +1415,15 @@ class cashbook extends BaseController $Bankid = $_GET['bankid']; $Amount = $_GET['amount']; $accountname = $_GET['accountname']; + $id=$_GET['id']; $IsActive=0; $balancetoclear=$_GET['balancetoclear']; $clearbalance =$bankamount-$Amount; $updatebankamount= $Amount+$balancetoclear; - $data['$accountcode'] = $this->cashbook_model->getaccountcode($accountname); - $accountcode=$data['$accountcode'][0]->code; + // $data['$accountcode'] = $this->cashbook_model->getaccountcode($accountname); + // $accountcode=$data['$accountcode'][0]->code; $result=$this->cashbook_model->deletecashbookdata($Bankid,$updatebankamount,$clearbalance,$IsActive); - $result1=$this->cashbook_model->StatusUpadateCashbook($Bankid,$accountcode,$IsActive); + $result1=$this->cashbook_model->StatusUpadateCashbook($id,$IsActive); if(count($result1)>0) { redirect('Bankingstatement','refresh'); @@ -1433,15 +1436,16 @@ class cashbook extends BaseController $Bankid = $_GET['bankid']; $Amount = $_GET['amount']; $accountname = $_GET['accountname']; + $id=$_GET['id']; $IsActive=0; $balancetoclear=$_GET['balancetoclear']; $clearbalance =$_GET['clearbalance']; $updateclearbalance=$clearbalance-$Amount; $updatebalancetoclear=$balancetoclear+$Amount; - $data['$accountcode'] = $this->cashbook_model->getaccountcode($accountname); - $accountcode=$data['$accountcode'][0]->code; + // $data['$accountcode'] = $this->cashbook_model->getaccountcode($accountname); + // $accountcode=$data['$accountcode'][0]->code; $result=$this->cashbook_model->deletecashbookdatacredit($Bankid,$updateclearbalance,$updatebalancetoclear); - $result1=$this->cashbook_model->StatusUpadateCashbook($Bankid,$accountcode,$IsActive); + $result1=$this->cashbook_model->StatusUpadateCashbook($id,$IsActive); if(count($result1)>0) { // $this->loadViews("Bankingstatement", $this->global,$result1, NULL); diff --git a/application/models/cashbook_model.php b/application/models/cashbook_model.php index 0b008ff7..c0205421 100755 --- a/application/models/cashbook_model.php +++ b/application/models/cashbook_model.php @@ -292,19 +292,13 @@ function clearedbalance(){ //$Supplierid; $this->db->distinct(); $this->db->select('igr.PONO,supp.SupplierName,igrli.CreatedDate,igrli.IGRItemNo,igr.IGRNO,BR.Balancetopay,BR.Amountpaid,pom.Status,poli.ReceivedQuantity,poli.Rate'); + // $this->db->from ('T_IGR_Details igrli'); $this->db->join('T_IGR_Master igr','igrli.IGRNO = igr.IGRNO'); + $this->db->join('T_PurchaseOrder_LineItem poli','igr.PONO= poli.PONO'); $this->db->join('T_PurchaseOrder_Master pom','igr.PONO =pom.PONO'); - $this->db->join('T_PurchaseOrder_LineItem poli','pom.PONO= poli.PONO'); $this->db->join('T_SupplierDetailsN supp','pom.SupplierID =supp.SupplierID'); $this->db->join ('T_Bankporeport BR','pom.PONO = BR.PONO','left'); - // $this->db->where_in('POM.Status',[ST044,ST056]); - // $this->db->where('POM.Paymentstatus !=','ST057'); - // $sql='select distinct T_IGR_Master.PONO,T_IGR_Details.IGRNO,T_PurchaseOrder_LineItem.Quantity,T_PurchaseOrder_LineItem.Rate,T_SupplierDetailsN.SupplierName from T_IGR_Master - // INNER JOIN T_IGR_Details ON T_IGR_Details.IGRNO=T_IGR_Master.IGRNO - // INNER JOIN T_PurchaseOrder_Master ON T_PurchaseOrder_Master.PONO=T_IGR_Master.PONO - // INNER JOIN T_SupplierDetailsN ON T_SupplierDetailsN.SupplierID = T_PurchaseOrder_Master.SupplierID - // INNER JOIN T_PurchaseOrder_LineItem ON T_PurchaseOrder_LineItem.PONO=T_IGR_Master.PONO '; if ($fdate and $tdate != ''){ $fromdate= date("Y-m-d",strtotime($fdate)); @@ -380,7 +374,7 @@ function receiptdata() function debitpolist($bankid) { - $this->db->select('bp.mid,bp.Podate,bp.PONO,bp.Suppliername,bp.Totalpoamount, + $this->db->select('bp.id,bp.mid,bp.Podate,bp.PONO,bp.Suppliername,bp.Totalpoamount, bp.Balancetopay,bp.Amountpaid,bp.IGRNO,igrm.file,igrde.IGRItemNo'); $this->db->from ('T_Bankmappingpo bp'); $this->db->join ('T_IGR_Master igrm','igrm.IGRNO = bp.IGRNO','left'); @@ -398,12 +392,12 @@ function debitpolist($bankid) function debitpolistfilter($SupplierName,$fdate,$tdate) { - $this->db->select('bm.mid,bm.Podate,bm.PONO,bm.Suppliername,bm.Totalpoamount, + $this->db->select('bm.id,bm.mid,bm.Podate,bm.PONO,bm.Suppliername,bm.Totalpoamount, bm.Balancetopay,bm.Amountpaid,bm.IGRNO,igrm.file,igrde.IGRItemNo,br.Clearbalance,br.Balancetocleared'); $this->db->from ('T_Bankmappingpo bm'); - $this->db->join ('T_IGR_Master igrm','igrm.IGRNO = bm.IGRNO','left'); - $this->db->join ('T_IGR_Details igrde','igrde.IGRNO=igrm.IGRNO','left'); - $this->db->join ('T_SupplierDetailsN sd','sd.SupplierName = bm.Suppliername','left'); + $this->db->join ('T_IGR_Master igrm','igrm.IGRNO = bm.IGRNO'); + $this->db->join ('T_IGR_Details igrde','igrde.IGRNO=igrm.IGRNO'); + $this->db->join ('T_SupplierDetailsN sd','sd.SupplierName = bm.Suppliername'); $this->db->join ('T_bankreport br','br.ID=bm.mid'); if($fdate!='' && $tdate!='') { @@ -414,7 +408,7 @@ function debitpolist($bankid) $this->db->where('sd.SupplierID',$SupplierName); } - // $this->db->where('mid',$bankid); + $this->db->where('bm.IsActive',1);; $this->db->group_by('PONO'); $query = $this->db->get(); return $query->result(); @@ -424,7 +418,7 @@ function debitpolist($bankid) function creditinvoicelist($bankid) { $this->db->select('indate,invoiceno,customername,totinvoiceamount,bankid, - balancetoreceived,amountreceived'); + balancetoreceived,amountreceived,ID'); $this->db->from ('T_Bankmappingiv'); $this->db->where('bankid',$bankid); $this->db->where('IsActive',1); @@ -493,7 +487,7 @@ function debitpolist($bankid) function mappingcash($SupplierName,$fdate,$tdate,$bankid) { - $this->db->select('ie.date,ie.bankid,ie.cashtype,ie.amounttype,ie.total,ac.name,totalbankamount'); + $this->db->select('ie.id,ie.date,ie.bankid,ie.cashtype,ie.amounttype,ie.total,ac.name,totalbankamount,ie.id'); $this->db->from ('t_income_expense as ie'); $this->db->join ('t_accountcode ac ','ac.code = ie.account_code','left'); $this->db->where('bankid',$bankid); @@ -851,19 +845,18 @@ function debitpolist($bankid) $r = $this->db->affected_rows(); return $r; } - function deleteBankmappingpo($igrno,$Bankid,$IsActive) + function deleteBankmappingpo($id,$IsActive) { $this->db->set('IsActive',$IsActive); - $this->db->where('IGRLineItemNo',$igrno); - $this->db->where('mid',$Bankid); + $this->db->where('id',$id); $this->db->update('T_Bankmappingpo'); $r = $this->db->affected_rows(); return $r; } - function deletemappinginvoice($bankid,$invoiceno,$IsActive) - { $this->db->set('IsActive',$IsActive); - $this->db->where('invoiceno',$invoiceno); - $this->db->where('bankid',$bankid); + function deletemappinginvoice($mappingid,$IsActive) + { + $this->db->set('IsActive',$IsActive); + $this->db->where('ID',$mappingid); $this->db->update('T_Bankmappingiv'); $r = $this->db->affected_rows(); return $r; @@ -925,11 +918,10 @@ function debitpolist($bankid) $query = $this->db->get(); return $query->result(); } - function StatusUpadateCashbook($Bankid,$accountcode,$IsActive) + function StatusUpadateCashbook($id,$IsActive) { $this->db->set('IsActive',$IsActive); - $this->db->where('bankid',$Bankid); - $this->db->where('account_code',$accountcode); + $this->db->where('id',$id); $this->db->update('t_income_expense'); $r = $this->db->affected_rows(); return $r; diff --git a/application/views/bankamountpaid.php b/application/views/bankamountpaid.php index 9c8e1f08..ad92450a 100644 --- a/application/views/bankamountpaid.php +++ b/application/views/bankamountpaid.php @@ -127,7 +127,7 @@ if(!empty($amountpaid)) - + @@ -150,27 +150,28 @@ if(!empty($amountpaid)) $tvt=0.00; if(!empty($bankdebit)){ foreach($bankdebit as $ap) - { + { + // $id=$ap->id; ?> - - - - - - - + + + + + + + - - - - - - + + + + + + @@ -208,31 +209,36 @@ if(!empty($amountpaid))
Date PONO IGR NO
Podate?>PONO?>Podate?>PONO?> IGRNO?>IGRItemNo?>Suppliername?>Totalpoamount?>Balancetopay?>Amountpaid?>IGRNO?>IGRItemNo?>Suppliername?>Totalpoamount?>Balancetopay?>Amountpaid?> -     +