diff --git a/application/controllers/report.php b/application/controllers/report.php
index 9db8e21e..63bafd6b 100755
--- a/application/controllers/report.php
+++ b/application/controllers/report.php
@@ -354,7 +354,7 @@ class report extends BaseController
               
         $this->global['pageTitle'] = 'Cashbook - Cashbook Reports - ';
 		
-       
+        $data['gettoptotal1'] =  $this->dahsboard_Model->gettoptotal(); 
 	    $data['getTotalServicePoCount'] = $this->dahsboard_Model->getTotalServicePoCount();
 		$data['getTotalimportPoCount'] = $this->dahsboard_Model->getTotalimportPoCount();	
 		$data['getTotalcapitalPoCount'] = $this->dahsboard_Model->getTotalcapitalPoCount();	
@@ -369,12 +369,14 @@ class report extends BaseController
         $data['todayexpense']=$this->dahsboard_Model->today_data($expense);
         $data['yearincome']=$this->dahsboard_Model->yearwise_data($income);
         $data['yearexpense']=$this->dahsboard_Model->yearwise_data($expense);
-		
+	    $data['gettoptotal1'] =  $this->dahsboard_Model->gettoptotal();
+		$data['Indiancurrency']=$this->dahsboard_Model->INRSymbol();
+      //print_r($data['gettoptotal1']);		
 	   // $data['monthlywiseincome']=$this->dahsboard_Model->monthwise_data_income();
        // $data['monthlywiseexpense']=$this->dahsboard_Model->monthwise_data_expense();
        // $data['todayincome']=$this->dahsboard_Model->today_data_income();
        // $data['todayexpense']=$this->dahsboard_Model->today_data_expense();
-	    $this->loadviews("Reportcashbook",$this->global,$data, NULL);
+	    $this->loadviews("reportcashbook",$this->global,$data, NULL);
 
     }
 	
@@ -387,7 +389,7 @@ class report extends BaseController
 	  
        $data['monthlyreport']=$this->dahsboard_Model->monthexpensereport();
 	  // $data['monthlyincreport']=$this->dahsboard_Model->monthincomereport();
-	  
+	  $data['Indiancurrency']=$this->dahsboard_Model->INRSymbol();
 	   $this->loadviews("cashbookmonthlyexpenses",$this->global,$data, NULL);
 
     }
@@ -399,7 +401,7 @@ class report extends BaseController
        
 	    //$data['yearlyincreport']=$this->dahsboard_Model->yearincomereport();
        $data['yearlyreport']=$this->dahsboard_Model->yearexpensereport();
-	   
+	   $data['Indiancurrency']=$this->dahsboard_Model->INRSymbol();
 	  
 	   $this->loadviews("cashbookyearlyexpenses",$this->global,$data, NULL);
 
@@ -409,18 +411,37 @@ class report extends BaseController
     $sid=$_GET['sid'];
 	$this->global['pageTitle'] = 'Cashbook - department - ';
 	$data['departmentwise']=$this->dahsboard_Model->departmentwise($sid);
+	$data['Indiancurrency']=$this->dahsboard_Model->INRSymbol();
 	//print_r($data['departmentwise']);
 	$this->loadviews("cashbookmonthlydep",$this->global,$data, NULL);	
 	}
+	//for cashbook menu link//
+	public function cashbookmonthmenu()
+    {
+   
+	$this->global['pageTitle'] = 'Cashbook - department - ';
+	$data['monthlymenupayments']=$this->dahsboard_Model->monthlypayments();
+	$data['Indiancurrency']=$this->dahsboard_Model->INRSymbol();
+	//print_r($data['departmentwise']);
+	$this->loadviews("cashbookmonthmenu",$this->global,$data, NULL);	
+	}
 	public function yearmonthwise()
     {
     $sid=$_GET['sid'];
 	$this->global['pageTitle'] = 'Cashbook - yearmonthwise - ';
 	$data['yearmonthwise']=$this->dahsboard_Model->yearmonthwise($sid);
+	$data['Indiancurrency']=$this->dahsboard_Model->INRSymbol();
 	//print_r($data['departmentwise']);
 	$this->loadviews("cashbookyearmonthwise",$this->global,$data, NULL);	
 	}
-
+public function Viewtoday()
+    {
+	$this->global['pageTitle'] = 'Cashbook - viewtoday ';
+	$data['tdy']=$this->dahsboard_Model->today();
+    $data['Indiancurrency']=$this->dahsboard_Model->INRSymbol();
+	$this->loadviews("cashbooktoday",$this->global,$data, NULL);	
+	}
 
 }
-?>
\ No newline at end of file
+?>
+
diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php
index 00abcc4a..32be8e25 100755
--- a/application/models/dahsboard_model.php
+++ b/application/models/dahsboard_model.php
@@ -951,42 +951,29 @@ group by supplier_name,material_name";
      }
 	 function cashbook()
 	{
-		    $sql="SELECT date,type,total,towhom,description,account_code FROM kasiram9_SIADEV.t_income_expense";
+		    $sql="SELECT date_format(tinc.date,'%d-%m-%Y')as date,tinc.type,tinc.total,tinc.towhom,tinc.description,tinc.account_code,ac.name FROM t_income_expense tinc join t_accountcode ac on ac.code=tinc.account_code ";
 			$query = $this->db->query($sql);
 			return $query->result();   	
 	}
-	// function monthincomereport()
-	// {
-		   // $sql="SELECT date,type,sum(total)as total,towhom,description,account_code FROM kasiram9_SIADEV.t_income_expense where type='INCOME' and month(date)= month(current_date()) group by account_code order by total desc limit 10  ";
-		   // $query = $this->db->query($sql);
-		   // //echo $query;
-		   // return $query->result();  
 	
-	// }
 	function monthexpensereport()
 	{
-		   $sql="SELECT date,type,sum(total)as total,towhom,description,account_code FROM kasiram9_SIADEV.t_income_expense where type='EXPENSE' and month(date)= month(current_date()) group by account_code order by total desc limit 10  ";
+		   $sql="SELECT date_format(tinc.date,'%d-%m-%Y')as date,tinc.type,sum(tinc.total)as total,tinc.towhom,tinc.description,tinc.account_code, ac.name FROM t_income_expense as tinc  join t_accountcode ac on ac.code=tinc.account_code where tinc.type='EXPENSE' and month(tinc.date)= month(current_date()) group by account_code order by total desc limit 10   ";
 		   $query = $this->db->query($sql);
 		   return $query->result();  
 	
 	}
-	// function yearincomereport()
-	// {
-		   // $sql="SELECT date,type,sum(total)as total,towhom,description,account_code FROM kasiram9_SIADEV.t_income_expense where type='INCOME' and year(date)= year(current_date()) group by account_code order by total desc limit 10 ";
-		   // $query = $this->db->query($sql);
-		   // return $query->result();  
 	
-	// }
 	function yearexpensereport()
 	{
-		   $sql="SELECT date,type,sum(total)as total,towhom,description,account_code,monthname(date)as month FROM kasiram9_SIADEV.t_income_expense where type='EXPENSE' and year(date)= year(current_date()) group by month order by total desc limit 10 ";
+		   $sql="SELECT date_format(date,'%d-%m-%Y')as date,type,sum(total)as total,towhom,description,account_code,monthname(date)as month FROM t_income_expense where type='EXPENSE' and year(date)= year(current_date()) group by month order by total desc limit 10 ";
 		   $query = $this->db->query($sql);
 		   return $query->result();  
 	
 	}
 	function today_data($value='')
     {
-        $sql="SELECT type,Sum(total) as todaydata FROM kasiram9_SIADEV.t_income_expense WHERE type = ? AND DATE(date) =  CURRENT_DATE";
+        $sql="SELECT type,Sum(total) as todaydata FROM t_income_expense WHERE type = ? AND DATE(date) =  CURRENT_DATE";
         $query = $this->db->query($sql,array($value));
         return $query->result();    
            
@@ -994,7 +981,7 @@ group by supplier_name,material_name";
     
     function monthwise_data($value='')
     {
-        $sql="SELECT type,Sum(total) as monthlydata FROM kasiram9_SIADEV.t_income_expense WHERE type = ? AND MONTH(date) = MONTH(curdate())";
+        $sql="SELECT type,Sum(total) as monthlydata FROM t_income_expense WHERE type = ? AND MONTH(date) = MONTH(curdate())";
         $query = $this->db->query($sql,array($value));
         return $query->result();    
            
@@ -1011,7 +998,9 @@ group by supplier_name,material_name";
     }
 	 function departmentwise($sid='')
     {
-        $sql="SELECT date,type,total,towhom,description,account_code FROM t_income_expense WHERE account_code = ?";
+        $sql="SELECT date_format(tinc.date,'%d-%m-%Y')as date,tinc.type,tinc.total,tinc.towhom,.tinc.description, ac.name FROM 
+		t_income_expense tinc join t_accountcode ac on ac.code=tinc.account_code
+		WHERE account_code = ?";
         $query = $this->db->query($sql,array($sid));
 		//print_r($this->db->last_query());
         return $query->result();    
@@ -1019,13 +1008,57 @@ group by supplier_name,material_name";
     }
 	function yearmonthwise($sid='')
     {
-        $sql="SELECT date,type,total,description,towhom,account_code FROM t_income_expense WHERE monthname(date) = ? group by account_code";
+        $sql="SELECT date_format(tinc.date,'%d-%m-%Y')as date,tinc.type,sum(tinc.total)as total,tinc.description,tinc.towhom,tinc.account_code,ac.name FROM t_income_expense tinc 
+		join t_accountcode ac on ac.code=tinc.account_code 
+		WHERE monthname(date) = ? group by account_code";
         $query = $this->db->query($sql,array($sid));
 		//print_r($this->db->last_query());
         return $query->result();    
            
     }
-	 
+	//for dashboard graph in cashbook//
+	function gettoptotal(){
+    $i=1;
+	
+    while($i<=12){
+     $sql="SELECT sum(total) as tot FROM t_income_expense where month(date)= $i";
+   // $sql="SELECT sum(total)as ttl,concat(sum(total),'-',account_code)as atotal FROM t_income_expense where month(date)= $i
+   // group by account_code   order by ttl desc limit 4";
+   
+    $query = $this->db->query($sql);
+	//print_r($this->db->last_query());
+	 //return $query->result(); 
+    $array_result[]=$query->result();
+    $i++;
+
+     }
+	
+      return $array_result;
+    
+}
+function INRSymbol()
+    {
+      $sql='select FontCode2000 from T_Currency_Details where Currency_Code="INR"';
+      $query=$this->db->query($sql);
+      return $query->result();
+	  }	 
+	 function today()
+    {
+        $sql="SELECT date_format(tinc.date,'%d-%m-%Y')as date,tinc.type,tinc.total,tinc.towhom,tinc.description,tinc.account_code,tac.name FROM t_income_expense tinc
+        LEFT JOIN t_accountcode tac ON tac.code = tinc.account_code
+        WHERE DATE(date) =  CURRENT_DATE";
+        $query = $this->db->query($sql);
+        return $query->result();
+    }
+	//for menu link in monthly payments//
+	 function monthlypayments()
+    {
+        $sql="SELECT date_format(tinc.date,'%d-%m-%Y')as date,tinc.type,tinc.total,tinc.towhom,.tinc.description, ac.name FROM t_income_expense tinc join t_accountcode ac on ac.code=tinc.account_code  WHERE MONTH(date) = MONTH(curdate()) group by account_code";
+	   $query = $this->db->query($sql);
+		//print_r($this->db->last_query());
+        return $query->result();    
+           
+    }
 	 
 }
-?>zz
\ No newline at end of file
+?>
\ No newline at end of file
diff --git a/application/views/cashbookmonthlydep.php b/application/views/cashbookmonthlydep.php
index a3e73769..2ac565d9 100644
--- a/application/views/cashbookmonthlydep.php
+++ b/application/views/cashbookmonthlydep.php
@@ -7,7 +7,16 @@ if(!empty($departmentwise))
 
 }
 
-?>
+
+	$inrsymbol='';
+if(!empty($Indiancurrency))
+          {
+              foreach ($Indiancurrency as $inr)
+              {
+              $inrsymbol  = $inr->FontCode2000;
+            }}
+			?>
+
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
       <style> 
  
@@ -47,10 +56,10 @@ if(!empty($departmentwise))
                      <tr>
 					   
 				       <th>Date</th>
-					    <th>Account Code</th>
-					   <th>Paid To</th>
+					   <!--<th>Account Code</th>-->
+					  <th>Account Name</th>
 					   <th>Paid Type</th>
-					   <th>Amount</th>
+					   <th style="text-align:right;"> Amount <?php echo '('.$inrsymbol.')' ?></th>
 					  
 					   <th>Description</th>
                        
@@ -65,10 +74,10 @@ if(!empty($departmentwise))
 					  <tr>
 					    
                         <td><span><?php echo $dw->date?></span></td>
-						<td align="left"><span><?php echo  $dw->account_code?></span></td>
-						<td align="left"><span><?php echo  $dw->towhom?></span></td>
+						<!--<td align="left"><span><?php echo  $dw->account_code?></span></td>-->
+						<td align="left"><span><?php echo  $dw->name?></span></td>
 				        <td align="left"><span><?php echo  $dw->type?></span></td>
-						<td align="left"><span><?php echo  $dw->total?></span></td>
+						<td align="right"><span><?php echo  $dw->total?></span></td>
 						
 						<td align="left"><span><?php echo  $dw->description?></span></td>
 					    
@@ -106,7 +115,7 @@ if(!empty($departmentwise))
 // Set up your table
 $(document).ready(function() {
     table = $('#req').DataTable( {
-        "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
+        "dom": "<'row'<'col-md-3'l><'col-md-9'Bf>>" +
 "<'row'<'col-md-6'><'col-md-6'>>" +
 "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
         buttons: [
@@ -122,6 +131,5 @@ $(document).ready(function() {
 } );
 
 
-
 	</script>
 	
\ No newline at end of file
diff --git a/application/views/cashbookmonthlyexpenses.php b/application/views/cashbookmonthlyexpenses.php
index 315e0d80..add43ade 100644
--- a/application/views/cashbookmonthlyexpenses.php
+++ b/application/views/cashbookmonthlyexpenses.php
@@ -1,7 +1,14 @@
-
-
 <?php
 
+	$inrsymbol='';
+if(!empty($Indiancurrency))
+          {
+              foreach ($Indiancurrency as $inr)
+              {
+              $inrsymbol  = $inr->FontCode2000;
+            }}
+			
+
 if(!empty($monthlyreport))
 {
 
@@ -50,10 +57,10 @@ if(!empty($monthlyincreport))
                      <tr>
 					   
 				       <th>Date</th>
-					   <th>Account Code</th>
-					   <!--<th>Paid To</th>-->
+					    <!--<th>Account Code</th>-->
+					  <th>Paid To</th>
 					   <th>Paid Type</th>
-					   <th>Amount</th>
+					 <th style="text-align:right;"> Amount <?php echo '('.$inrsymbol.')' ?></th>
 					   
 					   <!--<th>Description</th>-->
                        
@@ -68,8 +75,8 @@ if(!empty($monthlyincreport))
 					  <tr>
 					    
                         <td><span><?php echo $mr->date?></span></td>
-						<td align="left"><a href="<?php echo base_url(); ?>report/cashbookdepartment?sid=<?php echo $mr->account_code;?>"><span><?php echo  $mr->account_code?></span></a></td>
-						<!--<td align="left"><span><?php echo  $mr->towhom?></span></td>-->
+						<!--<td align="left"><a href="<?php echo base_url(); ?>report/cashbookdepartment?sid=<?php echo $mr->account_code;?>"><span><?php echo  $mr->account_code?></span></a></td>-->
+						<td align="left"><a href="<?php echo base_url(); ?>report/cashbookdepartment?sid=<?php echo  $mr->account_code;?>"><span><?php echo  $mr->name?></span></a></td>
 				        <td align="left"><span><?php echo  $mr->type?></span></td>
 						<td align="right"><span><?php echo  $mr->total?></span></td>
 						<!--<td align="left"><span><?php echo  $mr->account_code?></span></td>-->
@@ -109,7 +116,7 @@ if(!empty($monthlyincreport))
 // Set up your table
 $(document).ready(function() {
     table = $('#req').DataTable( {
-        "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
+        "dom": "<'row'<'col-md-3'l><'col-md-9'Bf>>" +
 "<'row'<'col-md-6'><'col-md-6'>>" +
 "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
         buttons: [
diff --git a/application/views/cashbookmonthmenu.php b/application/views/cashbookmonthmenu.php
new file mode 100644
index 00000000..ff71bed0
--- /dev/null
+++ b/application/views/cashbookmonthmenu.php
@@ -0,0 +1,83 @@
+<?php
+$inrsymbol='';
+if(!empty($Indiancurrency))
+          {
+              foreach ($Indiancurrency as $inr)
+              {
+              $inrsymbol  = $inr->FontCode2000;
+            }}
+?>
+
+<div class="content-wrapper">  
+    <section class="content">
+    <div class="box">
+     <div class="box-header">
+                 <CENTER><h3 class="box-title"><strong>Caskbook - "Monthly Payments"</strong></h3></CENTER>                   
+                </div>
+                 <div class="container-fluid">
+       
+        <div class="row">
+           <div class="col-md-8 col-md-offset-2"> 
+                
+                  <table class="table table-bordered table-hover" id="datatable" style="background-color:#fff;font-size:11px;" >
+				  <thead style="background-color:#ddf">
+                    <tr>
+                                   <th>Date</th>
+                      
+					                  
+                                       <th>Paid To</th>
+                                       <th>Paid Type</th>
+                                        <th style="text-align:right;"> Amount <?php echo '('.$inrsymbol.')' ?></th>
+                                     
+                                       
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <?php if(!empty($monthlymenupayments)){
+                                       foreach($monthlymenupayments as $t)
+                                        {				
+                                       ?> 
+                                      <tr>
+                                        
+                                        <td><span><?php echo $t->date?></span></td>
+                                       
+                                        <td align="left"><span><?php echo  $t->name ?></span></td>
+                                       
+                                        <td align="left"><span><?php echo  $t->type?></span></td>
+                                        <td align="right"><span><?php echo  $t->total?></span></td>
+
+                                        
+                                       
+                                    
+                                      </tr>
+                                       <?php
+                                        }
+                                        
+                                       }
+                                       ?>
+                                    </tbody>
+                  </table>
+                  
+             </div>
+        </div>
+        </div>
+        </div>
+    </section>
+</div>
+<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
+ <script type="text/javascript">
+   
+	$(function () {
+   
+    $('#datatable').DataTable({
+      "paging": true,
+      "lengthChange": true,
+      "searching": true,
+      "ordering": true,
+      "info": true,
+      "autoWidth": true
+	   
+    }); 
+  });
+	
+</script>
diff --git a/application/views/cashbooktoday.php b/application/views/cashbooktoday.php
new file mode 100644
index 00000000..1fb29d79
--- /dev/null
+++ b/application/views/cashbooktoday.php
@@ -0,0 +1,82 @@
+
+<?php
+$inrsymbol='';
+if(!empty($Indiancurrency))
+          {
+              foreach ($Indiancurrency as $inr)
+              {
+              $inrsymbol  = $inr->FontCode2000;
+            }}
+?>
+<div class="content-wrapper">  
+    <section class="content">
+    <div class="box">
+     <div class="box-header">
+                 <CENTER><h3 class="box-title">Caskbook - "Today's Payments"</h3></CENTER>                   
+                </div>
+                 <div class="container-fluid">
+       
+        <div class="row">
+           <div class="col-md-8 col-md-offset-2"> 
+                
+                  <table class="table table-bordered table-hover" id="datatable" style="background-color:#fff;font-size:11px;" >
+				  <thead style="background-color:#ddf">
+                    <tr>
+                                   <th>Date</th>
+                       <!-- <th>Account Code</th>-->
+                                       <th>Paid To</th>
+                                       <th>Paid Type</th>
+                                       <th style="text-align:right;"> Amount <?php echo '('.$inrsymbol.')' ?></th>
+                                      <th>Description</th>
+                                       
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <?php if(!empty($tdy)){
+                                       foreach($tdy as $t)
+                                        {				
+                                       ?> 
+                                      <tr>
+                                        
+                                        <td><span><?php echo $t->date?></span></td>
+                                        <!--<td align="left"><span><?php echo  $t->account_code?></span></td>-->
+                                        <td align="left"><span><?php echo  $t->name ?></span></td>
+                                        <!--<td align="left"><span><?php echo  $t->towhom?></span></td>-->
+                                        <td align="left"><span><?php echo  $t->type?></span></td>
+                                        <td align="left"><span><?php echo  $t->total?></span></td>
+                                        <td align="left"><span><?php echo  $t->description?></span></td>
+                                        
+                                       
+                                    
+                                      </tr>
+                                       <?php
+                                        }
+                                        
+                                       }
+                                       ?>
+                                    </tbody>
+                  </table>
+                  
+             </div>
+        </div>
+        </div>
+        </div>
+    </section>
+</div>
+<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
+ <script type="text/javascript">
+   
+	$(function () {
+   
+    $('#datatable').DataTable({
+      "paging": true,
+      "lengthChange": true,
+      "searching": true,
+      "ordering": true,
+      "info": true,
+      "autoWidth": true
+	   
+    }); 
+  });
+	
+</script>
diff --git a/application/views/cashbookyearlyexpenses.php b/application/views/cashbookyearlyexpenses.php
index fd3bd590..f07b6b04 100644
--- a/application/views/cashbookyearlyexpenses.php
+++ b/application/views/cashbookyearlyexpenses.php
@@ -1,6 +1,12 @@
-
-
-
+<?php
+$inrsymbol='';
+if(!empty($Indiancurrency))
+          {
+              foreach ($Indiancurrency as $inr)
+              {
+              $inrsymbol  = $inr->FontCode2000;
+            }}
+?>
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
       <style> 
  
@@ -32,7 +38,7 @@
 	  <center><b>Yearly Payments</b></center>                
 	  </div>                
 	  <div class="btn-group btn-group-justified no-margin">                    
-	  <table class="table table-bordered table-hover" style="font-size:13px;">
+	  <table class="table table-bordered table-hover" id="req"style="font-size:13px;">
                    <thead>
                      <tr>
 					   
@@ -40,7 +46,7 @@
 					   <th>Month</th>
 					  <!-- <th>Paid To</th>-->
 					   <th>Paid Type</th>
-					   <th>Amount</th>
+					  <th style="text-align:right;"> Amount <?php echo '('.$inrsymbol.')' ?></th>
 					   <!--<th>Account Code</th>-->
 					   <!--<th>Description</th>-->
                        
@@ -94,7 +100,7 @@
 // Set up your table
 $(document).ready(function() {
     table = $('#req').DataTable( {
-        "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
+        "dom": "<'row'<'col-md-3'l><'col-md-9'Bf>>" +
 "<'row'<'col-md-6'><'col-md-6'>>" +
 "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
         buttons: [
diff --git a/application/views/cashbookyearmonthwise.php b/application/views/cashbookyearmonthwise.php
index a1910565..6d3ba331 100644
--- a/application/views/cashbookyearmonthwise.php
+++ b/application/views/cashbookyearmonthwise.php
@@ -1,6 +1,14 @@
 
+<?php
 
-
+	$inrsymbol='';
+if(!empty($Indiancurrency))
+          {
+              foreach ($Indiancurrency as $inr)
+              {
+              $inrsymbol  = $inr->FontCode2000;
+            }}
+			?>
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
       <style> 
  
@@ -38,11 +46,11 @@
                      <tr>
 					   
 				       <th>Date</th>
-					    <th>Account Code</th>
+					    <th>Account Name</th>
 					   <!--<th>month</th>-->
 					   <!--<th>Paid To</th>-->
 					   <th>Paid Type</th>
-					   <th>Amount</th>
+					  <th style="text-align:right;"> Amount <?php echo '('.$inrsymbol.')' ?></th>
 					  
 					   <!--<th>Description</th>-->
                        
@@ -58,7 +66,7 @@
 					    
                         <td><span><?php echo $ym->date?></span></td>
 						<!--<td align="right"><span><a href="<?= base_url() ?>report/yearmonthwise"><?php echo  $ym->month?></a></span></td>-->
-						<td align="left"><a href="<?php echo base_url(); ?>report/cashbookdepartment?sid=<?php echo $ym->account_code;?>"><span><?php echo  $ym->account_code?></span></a></td>
+						<td align="left"><a href="<?php echo base_url(); ?>report/cashbookdepartment?sid=<?php echo $ym->account_code;?>"><span><?php echo  $ym->name?></span></a></td>
 						<!--<td align="right"><span><?php echo  $ym->towhom?></span></td>-->
 				        <td align="left"><span><?php echo  $ym->type?></span></td>
 						<td align="right"><span><?php echo  $ym->total?></span></td>
@@ -97,7 +105,7 @@
 // Set up your table
 $(document).ready(function() {
     table = $('#req').DataTable( {
-        "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
+        "dom": "<'row'<'col-md-3'l><'col-md-9'Bf>>" +
 "<'row'<'col-md-6'><'col-md-6'>>" +
 "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
         buttons: [
diff --git a/application/views/reportcashbook.php b/application/views/reportcashbook.php
index faab1094..6fde9f03 100644
--- a/application/views/reportcashbook.php
+++ b/application/views/reportcashbook.php
@@ -57,7 +57,14 @@ if(!empty($todayincome))
             $year_in  = $yi->yearlydata;
           }}
 
-		 
+	    $inrsymbol='';
+        if(!empty($Indiancurrency))
+          {
+              foreach ($Indiancurrency as $inr)
+              {
+              $inrsymbol  = $inr->FontCode2000;
+            }}
+	 
 
 ?>
 <head>
@@ -133,12 +140,12 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
 <div>	 
 	 <section class="content-header">
 	
-    </section>
+   
     <!-- Main content -->
     <section class="content">
       <!-- Info boxes -->
   <center>
-      <div class="row">
+     <div class="col-md-12">
       
         <!-- fix for small devices only -->
         <div class="clearfix visible-sm-block"></div>	
@@ -146,24 +153,24 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
           <div class="info-box">
              <span class="info-box-icon bg-red" style="height: 90px;padding:25px;"><i class="fa fa-hourglass-end"></i></span>
             <div class="info-box-content">
-              <span class="info-box-number"><?php echo "Today's Exp & Inc" ?></span>
+             <span class="info-box-number"><a href="<?php echo base_url().'report/Viewtoday' ?>" data-toggle="tooltip" title="Click here to View Today's data"><?php echo "Today's Payments" ?></a></span>
               
-			  <span class="info-box-text text-center"><?php echo "Income : ".$today_in ?> Rs</span>
-              <span class="info-box-text text-center"><?php echo "Expense : ".$today_ex ?> Rs</span>
+			  <span class="info-box-text text-center"><?php echo "Receipt: ".$today_in.$inrsymbol ?> </span>
+              <span class="info-box-text text-center"><?php echo "Payments : ".$today_ex.$inrsymbol ?> </span>
 			  
             </div>            
           </div>          
         </div>
-      
+     
         <!-- fix for small devices only -->
         <div class="clearfix visible-sm-block"></div>	
         <div class="col-md-4">
           <div class="info-box">
            <span class="info-box-icon bg-aqua" style="height: 90px;padding:25px;"><i<i class="fa fa-spinner"></span>
             <div class="info-box-content">
-              <span class="info-box-number"><?php echo "Month Exp & Inc" ?></span>
-              <span class="info-box-text text-center"><?php echo "Income :".$month_in ?>Rs</span>
-              <span class="info-box-text text-center"><?php echo "Expense :".$month_ex ?>Rs</span>
+               <span class="info-box-number"><a href="<?php echo base_url().'report/cashbookmonthmenu' ?>" data-toggle="tooltip" title="Click here to View Today's data"><?php echo "Monthly Payments" ?></a></span>
+              <span class="info-box-text text-center"><?php echo "Receipt :".$month_in.$inrsymbol ?></span>
+              <span class="info-box-text text-center"><?php echo "Payments :".$month_ex.$inrsymbol ?></span>
             </div>            
           </div>          
         </div>
@@ -174,24 +181,25 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
           <div class="info-box">
             <span class="info-box-icon bg-green" style="height: 90px;padding:25;"><i class="fa fa-industry" style="padding: 5px;"></i></span>
             <div class="info-box-content">
-              <span class="info-box-number"><?php echo "year Exp & Inc" ?></span>
-              <span class="info-box-text text-center"><?php echo "Income :".$year_in ?>Rs</span>
-              <span class="info-box-text text-center"><?php echo "Expense :".$year_ex ?>Rs</span>
+              <span class="info-box-number"><?php echo "year Payments" ?></span>
+              <span class="info-box-text text-center"><?php echo "Receipt :".$year_in.$inrsymbol ?></span>
+              <span class="info-box-text text-center"><?php echo "Payments :".$year_ex.$inrsymbol ?></span>
             </div>            
           </div>          
         </div>
       </div>
   </center>
- </section>
+ 
   </div>
    
  
-     <div class="row">
+     <!--<div class="row">
         <div class="col-md-12">
           <div id="container"></div>
 
 	</div>
- </div>
+ </div>-->
+  
             
            
 
@@ -215,10 +223,11 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
                      <tr>
 					   
 				       <th>Date</th>
-					    <th>Account Code</th>
+					   <!--<th>Account Code</th>-->
+					   <th>Account Name</th>
 					   <th>Paid To</th>
 					   <th>Paid Type</th>
-					   <th>Amount</th>
+					  <th style="text-align:right;"> Amount <?php echo '('.$inrsymbol.')' ?></th>
 					  
 					   <th>Description</th>
                        
@@ -233,10 +242,10 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
 					  <tr>
 					    
                         <td><span><?php echo $cash->date?></span></td>
-						<td align="left"><span><?php echo  $cash->account_code?></span></td>
+						<td align="left"><span><?php echo  $cash->name?></span></td>
 						<td align="left"><span><?php echo  $cash->towhom?></span></td>
 				        <td align="left"><span><?php echo  $cash->type?></span></td>
-						<td align="left"><span><?php echo  $cash->total?></span></td>
+						<td align="right"><span><?php echo  $cash->total?></span></td>
 						
 						<td align="left"><span><?php echo  $cash->description?></span></td>
 					    
@@ -292,72 +301,172 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
 </script>
 <script src="<?php echo base_url();?>assets/plugins/chartjs/Chart.min.js"></script>
 <script src="<?php echo base_url(); ?>assets/plugins/knob/jquery.knob.js"></script>
+
 <script>
-Highcharts.chart('container', {
 
-    title: {
-        text: 'Solar Employment Growth by Sector, 2010-2016'
-    },
+/* ChartJS
+   * -------
+   * Here we will create a few charts using ChartJS
+   */
 
-    subtitle: {
-        text: 'Source: thesolarfoundation.com'
-    },
+  //-----------------------
+  //- MONTHLY SALES CHART -
+  //-----------------------
 
-    yAxis: {
-        title: {
-            text: 'Number of Employees'
-        }
-    },
-    legend: {
-        layout: 'vertical',
-        align: 'right',
-        verticalAlign: 'middle'
-    },
+  // Get context with jQuery - using jQuery's .get() method.
+ 
 
-    plotOptions: {
-        series: {
-            label: {
-                connectorAllowed: false
-            },
-            pointStart: 2010
-        }
-    },
+/* ChartJS
+   * -------
+   * Here we will create a few charts using ChartJS
+   */
 
-    series: [{
-        name: 'Installation',
-        data: [43934, 52503, 57177, 69658, 97031, 119931, 137133, 154175]
-    }, {
-        name: 'Manufacturing',
-        data: [24916, 24064, 29742, 29851, 32490, 30282, 38121, 40434]
-    }, {
-        name: 'Sales & Distribution',
-        data: [11744, 17722, 16005, 19771, 20185, 24377, 32147, 39387]
-    }, {
-        name: 'Project Development',
-        data: [null, null, 7988, 12169, 15112, 22452, 34400, 34227]
-    }, {
-        name: 'Other',
-        data: [12908, 5948, 8105, 11248, 8989, 11816, 18274, 18111]
-    }],
-
-    responsive: {
-        rules: [{
-            condition: {
-                maxWidth: 500
-            },
-            chartOptions: {
-                legend: {
-                    layout: 'horizontal',
-                    align: 'center',
-                    verticalAlign: 'bottom'
-                }
-            }
-        }]
-    }
-
-});
+  //-----------------------
+  //- MONTHLY SALES CHART -
+  //-----------------------
 
+  // Get context with jQuery - using jQuery's .get() method.
+  var salesChartCanvas = $("#salesChart").get(0).getContext("2d");
+  // This will get the first returned node in the jQuery collection.
 
+  var salesChart = new Chart(salesChartCanvas);
+ 
+ 
+   var service = <?php echo JSON_encode($gettoptotal1)?>;
   
+  //var service = <?php echo JSON_encode($getTotalServicePoCount)?>;
+  // alert(service+'hai');
+   //print_r($gettoptotal1);
+  var Import = <?php echo JSON_encode($getTotalimportPoCount)?>;
+  var capital = <?php echo JSON_encode($getTotalcapitalPoCount)?>;
+  var revenue = <?php echo JSON_encode($getTotalrevenuePoCount)?>;
+  
+   //alert(service.PONO);
+		var serviceValues = [];
+		// var arr = new Array();
+		 $.each (service,function(idx,obj){
+		   serviceValues.push(obj[0].tot);
+		 });
+		var ImportValues = [];
+		// var arr = new Array();
+		 $.each (Import,function(idx,obj){
+		   ImportValues.push(obj[0].totalImport);
+		 });
+		 var capitalValues = [];
+		// var arr = new Array();
+		 $.each (capital,function(idx,obj){
+		   capitalValues.push(obj[0].totalcapital);
+		 });
+		var revenueValues = [];
+		// var arr = new Array();
+		 $.each (revenue,function(idx,obj){
+		   revenueValues.push(obj[0].totalrevenue);
+		 });
+		
+		
+			//alert(arr.total2);
+ var salesChartData = {
+    labels: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
+	
+    datasets: [
+	 
+      {
+        label: "Electronics",
+        fillColor: "rgba(0, 192, 239, 0.2)",
+        strokeColor: "rgba(0, 192, 239,0.6)",
+        pointColor: "#00c0ef ",
+        pointStrokeColor: "rgba(60,141,188,1)",
+        pointHighlightFill: "#fff",
+        pointHighlightStroke: "rgba(60,141,188,1)",
+	    data:serviceValues
+	  
+      },
+	 
+      {
+        label: "Digital Goods",
+        fillColor: "rgba(221, 75, 57,0.2)",
+        strokeColor: "rgba(221, 75, 57,0.8)",
+        pointColor: "#dd4b39 ",
+        pointStrokeColor: "rgba(60,141,188,1)",
+        pointHighlightFill: "#fff",
+        pointHighlightStroke: "rgba(60,141,188,1)",
+        data:revenueValues
+      },
+      {
+        label: "Food",
+        fillColor: "rgba(0, 166, 90, 0.2)",
+        strokeColor: "rgba(0, 166, 90,0.8)",
+        pointColor: "#00a65a ",
+        pointStrokeColor: "rgba(60,141,188,1)",
+        pointHighlightFill: "#fff",
+        pointHighlightStroke: "rgba(60,141,188,1",
+        data:ImportValues
+      },
+       {
+        label: "Food",
+        fillColor: "rgba(243, 156, 18, 0.2)",
+        strokeColor: "rgba(243, 156, 18,0.8)",
+        pointColor: "#f39c12 ",
+        pointStrokeColor: "rgba(60,141,188,1)",
+        pointHighlightFill: "#fff",
+        pointHighlightStroke: "rgba(60,141,188,1",
+        data:capitalValues
+      }
+
+   ]
+  };
+ 
+ 
+  var salesChartOptions = {
+    //Boolean - If we should show the scale at all
+    showScale: true,
+    //Boolean - Whether grid lines are shown across the chart
+    scaleShowGridLines: false,
+    //String - Colour of the grid lines
+    scaleGridLineColor: "rgba(0,0,0,.05)",
+    //Number - Width of the grid lines
+    scaleGridLineWidth: 1,
+    //Boolean - Whether to show horizontal lines (except X axis)
+    scaleShowHorizontalLines: true,
+    //Boolean - Whether to show vertical lines (except Y axis)
+    scaleShowVerticalLines: true,
+    //Boolean - Whether the line is curved between points
+    bezierCurve: true,
+    //Number - Tension of the bezier curve between points
+    bezierCurveTension: 0.3,
+    //Boolean - Whether to show a dot for each point
+    pointDot: true,
+    //Number - Radius of each point dot in pixels
+    pointDotRadius: 4,
+    //Number - Pixel width of point dot stroke
+    pointDotStrokeWidth: 1,
+    //Number - amount extra to add to the radius to cater for hit detection outside the drawn point
+    pointHitDetectionRadius: 20,
+    //Boolean - Whether to show a stroke for datasets
+    datasetStroke: true,
+    //Number - Pixel width of dataset stroke
+    datasetStrokeWidth: 5,
+    //Boolean - Whether to fill the dataset with a color
+    datasetFill: true,
+    //String - A legend template
+    legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].lineColor%>\"></span><%=datasets[i].label%></li><%}%></ul>",
+    //Boolean - whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container
+    maintainAspectRatio: false,
+    //Boolean - whether to make the chart responsive to window resizing
+    responsive: true
+  };
+
+ // alert(salesChartData);
+
+  //Create the line chart
+  salesChart.Line(salesChartData, salesChartOptions);
+
+  //---------------------------
+  //- END MONTHLY SALES CHART -
+  //- PIE CHART -
+  //-------------
+  // Get context with jQuery - using jQuery's .get() method.
+ 
 
 </script>
+