diff --git a/application/controllers/cashbook.php b/application/controllers/cashbook.php index 8c2eb146..4a3c8fd9 100644 --- a/application/controllers/cashbook.php +++ b/application/controllers/cashbook.php @@ -1075,11 +1075,10 @@ class cashbook extends BaseController $tdate = $this->input->post('to_date'); $bankid= $_GET['d']; $data['clearbalance']=$_GET['cb']; - $data['balancetoclear']=$_GET['btc']; $data['mappingcashbook']=$this->cashbook_model->mappingcashcreditbankid($bankid); - $data['mappingiv'] = $this->cashbook_model->creditinvoicelist($bankid); $data['paidcbook'] = $this->cashbook_model->cashbookamount($bankid); + $data['mappingiv'] = $this->cashbook_model->creditinvoicelist($bankid); $data['invoiceramount'] = $this->cashbook_model->invoiceamonut($bankid); $data['supplier'] = $this->cashbook_model->getsupplier(); //redirect('Bankingstatement','refresh'); diff --git a/application/models/cashbook_model.php b/application/models/cashbook_model.php index 6623bb3c..58d9b26d 100644 --- a/application/models/cashbook_model.php +++ b/application/models/cashbook_model.php @@ -1140,7 +1140,7 @@ function receiptdata() { $this->db->select('bm.indate,bm.invoiceno,bm.customername,bm.totinvoiceamount,bm.bankid, bm.balancetoreceived,bm.amountreceived,bm.ID,br.Credit,br.cclearbalance,br.cbalancetocleared'); - $this->db->from ('T_Bankinvoicereport bm'); + $this->db->from ('T_Bankmappingiv bm'); $this->db->join('T_bankreport br','br.ID=bm.bankid'); $this->db->where('bm.bankid',$bankid); $this->db->where('bm.IsActive',1); diff --git a/application/views/bankamountpaid.php b/application/views/bankamountpaid.php index d6db09ba..2ee2d8a3 100644 --- a/application/views/bankamountpaid.php +++ b/application/views/bankamountpaid.php @@ -216,7 +216,7 @@ if(!empty($amountpaid))