From c5cfcd8a53a19c7809db04487585258b567de58d Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Sun, 18 Nov 2018 13:49:09 +0530
Subject: [PATCH] bankchanges sunday

---
 application/models/cashbook_model.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/models/cashbook_model.php b/application/models/cashbook_model.php
index 82012e48..d3ffe397 100644
--- a/application/models/cashbook_model.php
+++ b/application/models/cashbook_model.php
@@ -1024,13 +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_IGR_Details igr','igr.IGRItemNo=bm.IGRLineItemNo');
+		 // $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->where('igr.BankStatus !=',ST072);
 		  //$this->db->group_by('bm.mid');
           if ($fa and $aa != ''){
     
@@ -1680,7 +1680,7 @@ 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_IGR_Details igr','igr.IGRItemNo=bm.IGRLineItemNo');
+		  //$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');
@@ -1755,6 +1755,8 @@ function receiptdata()
     }
 	function amountpaidcashbookfilter($fa,$aa,$m,$fdate,$tdate)
 	{
+		//echo $m;
+		//die();
 		 $this->db->select('tac.name,sum(tie.total)as total,tie.account_code');
 		 $this->db->from ('t_income_expense tie'); 
          $this->db->join('t_accountcode tac','tac.code=tie.account_code');