From 7c2bf461d77bc1717242c69093d6f1887f0a032b Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Fri, 2 Nov 2018 15:03:00 +0530
Subject: [PATCH] button changes

---
 application/controllers/cashbook.php     | 3 +--
 application/models/cashbook_model.php    | 2 +-
 application/views/bankamountpaid.php     | 2 +-
 application/views/bankamountreceived.php | 2 +-
 application/views/bankpaidsupp.php       | 2 +-
 application/views/bankreceivedsupp.php   | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

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))
 							
 						<div class="col-md-2" style="margin-top:24px;">
                         <input type="submit" class="btn btn-success" name="btn_submit"
-                               value="View Payable">
+                               value="View Paid">
                         
 							</div> 	
 							
diff --git a/application/views/bankamountreceived.php b/application/views/bankamountreceived.php
index 39fbe602..681867d5 100644
--- a/application/views/bankamountreceived.php
+++ b/application/views/bankamountreceived.php
@@ -223,7 +223,7 @@ foreach($financialyear as $item)
 					
 					<div class="col-md-2" style="margin-top:23px;">
 					<!-- <div class="col-md-1 col-md-offset-10" style="margin-top:20px;"> -->
-                        <input type="submit" class="btn btn-success" name="btn_submit" value="View Receivable" >  
+                        <input type="submit" class="btn btn-success" name="btn_submit" value="View Received" >  
 					
 					</div>
 					 </div>		
diff --git a/application/views/bankpaidsupp.php b/application/views/bankpaidsupp.php
index 0c174c6b..3e34250e 100644
--- a/application/views/bankpaidsupp.php
+++ b/application/views/bankpaidsupp.php
@@ -188,7 +188,7 @@ foreach($financialyear as $item)
 					 
 					<div class="col-md-3" style="margin-top:20px;">
 					<!-- <div class="col-md-1 col-md-offset-10" style="margin-top:20px;"> -->
-                        <input type="submit" class="btn btn-success" name="btn_submit" value="View Payable">    
+                        <input type="submit" class="btn btn-success" name="btn_submit" value="View Paid">    
 					</div> 
 					</div>
 							
diff --git a/application/views/bankreceivedsupp.php b/application/views/bankreceivedsupp.php
index 9685cdad..d29cae05 100644
--- a/application/views/bankreceivedsupp.php
+++ b/application/views/bankreceivedsupp.php
@@ -198,7 +198,7 @@ foreach($financialyear as $item)
 					 
 					<div class="col-md-2" style="margin-top:20px;">
 					<!-- <div class="col-md-1 col-md-offset-10" style="margin-top:20px;"> -->
-                        <input type="submit" class="btn btn-success" name="btn_submit" value="View Receivable">    
+                        <input type="submit" class="btn btn-success" name="btn_submit" value="View Received ">    
 					</div> 
 					</div>