diff --git a/application/controllers/cashbook.php b/application/controllers/cashbook.php index 970e4366..c47d555c 100644 --- a/application/controllers/cashbook.php +++ b/application/controllers/cashbook.php @@ -1884,6 +1884,7 @@ class cashbook extends BaseController $totalamount =$this->input->post('Totalpoamount'); $Amount = $this->input->post('paidamount'); + $id=$this->input->post('mappingid'); $igrno = $this->input->post('IGRItemNo'); @@ -1920,9 +1921,9 @@ class cashbook extends BaseController $result2= $this->cashbook_model->deleteBankmappingpo($id,$IsActive); $data['$poreportamount'] = $this->cashbook_model->gettotalbankpoamount($igrno); $amountpaidpo= $data['$poreportamount'][0]->Amountpaid; - $balancetopay= $data['$poreportamount'][0]->Balancetopay; - $amountpaidupdate=$amountpaidpo-$Amount; - $balancetopayupdate=$balancetopay+$Amount; + $balancetopaypo= $data['$poreportamount'][0]->Balancetopay; + $amountpaidupdate=($amountpaidpo) - ($Amount); + $balancetopayupdate=($balancetopaypo) + ($Amount); if($amountpaidupdate==0) { $IsAct=0; @@ -1931,7 +1932,7 @@ class cashbook extends BaseController { $IsAct=1; } - $result3= $this->cashbook_model->updateBankporeportpo($igrno,$balancetopayupdate,$amountpaidupdate,$Bankid,$IsAct); + $result3= $this->cashbook_model->updateBankporeport($igrno,$balancetopayupdate,$amountpaidupdate,$IsAct); $this->loadViews("bankstatement", $this->global,$data, NULL); } public function Deletemappingpo() diff --git a/application/models/cashbook_model.php b/application/models/cashbook_model.php index 5606a4a3..8cc0f34c 100644 --- a/application/models/cashbook_model.php +++ b/application/models/cashbook_model.php @@ -1183,7 +1183,7 @@ 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'); + bm.balancetoreceived,bm.amountreceived,br.cclearbalance,br.cbalancetocleared,bm.BankDate'); $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'); @@ -1906,7 +1906,7 @@ function receiptdata() // } function received($clientid,$fdate,$tdate,$fa,$aa,$m) { - $this->db->select('bm.indate,bm.invoiceno,bm.customername,bm.totinvoiceamount,bm.bankid,bm.customerid, + $this->db->select('bm.indate,bm.BankDate,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'); @@ -2234,6 +2234,19 @@ function receiptdata() return $r; } + function updateBankporeport($igrno,$balancetopayupdate,$amountpaidupdate,$IsAct) + { + $this->db->set('Balancetopay',$balancetopayupdate); + $this->db->set('Amountpaid',$amountpaidupdate); + $this->db->set('IsActive',$IsAct); + $this->db->where('IGRLineItemNo',$igrno); + //$this->db->where('mid',$Bankid); + $this->db->update('T_Bankporeport'); + $r = $this->db->affected_rows(); + return $r; + + } + function updatebankinvoicereport($invoiceno,$bankid,$balancetoreceivedupdate,$amountreceivedupdate,$IsAct) { $this->db->set('balancetoreceived',$balancetoreceivedupdate); diff --git a/application/views/bankamountpaid.php b/application/views/bankamountpaid.php index 598f5265..52749812 100644 --- a/application/views/bankamountpaid.php +++ b/application/views/bankamountpaid.php @@ -230,6 +230,7 @@ if(!empty($amountpaid)) Date + BankDate PONO IGR NO IGRItemNo @@ -268,6 +269,7 @@ if(!empty($amountpaid)) Podate),'d-m-Y'); ?> + BankDate),'d-m-Y'); ?> PONO?> IGRNO?> @@ -374,19 +376,24 @@ if(!empty($amountpaid))