diff --git a/application/controllers/cashbook.php b/application/controllers/cashbook.php
index a216dd5b..24bc878b 100755
--- a/application/controllers/cashbook.php
+++ b/application/controllers/cashbook.php
@@ -93,11 +93,11 @@ class cashbook extends BaseController
 		$accounttype = $this->input->post('myradio');
 		if($accounttype == 1)
 		{
-			$accounttype = 'INCOME';
+			$accounttype = 'RECEIPT';
 		}
 		else
 		{
-			$accounttype = 'EXPENSE';
+			$accounttype = 'PAYMENT';
 		}
 		$accountcode = $this->input->post('accode');
 		$date = $this->input->post('Date');
@@ -264,6 +264,20 @@ class cashbook extends BaseController
        
         
                        
+    }
+	
+	 public function editcashbook()
+    {
+         
+      
+            $this->load->model('cashbook_model');
+        
+            // $data['cashbook'] = $this->cashbook_model->Selectcash();
+
+            // $this->global['pageTitle'] = 'Siddharth : Cashbook Listing';
+            
+            $this->loadViews("editincomeexpenses", $this->global, NULL);
+        
     }
 	
 	
diff --git a/application/controllers/report.php b/application/controllers/report.php
index 38a24c9c..ea54f018 100755
--- a/application/controllers/report.php
+++ b/application/controllers/report.php
@@ -904,8 +904,8 @@ class report extends BaseController
 		$data['getTotalrevenuePoCount'] = $this->dahsboard_Model->getTotalrevenuePoCount();
         $data['cashbook']=$this->dahsboard_Model->cashbook();
 	    
-		$income="INCOME";
-        $expense="EXPENSE";
+		$income="RECEIPT";
+        $expense="PAYMENT";
         $data['monthlywiseincome']=$this->dahsboard_Model->monthwise_data($income);
         $data['monthlywiseexpense']=$this->dahsboard_Model->monthwise_data($expense);
         $data['todayincome']=$this->dahsboard_Model->today_data($income);
@@ -1005,14 +1005,31 @@ class report extends BaseController
 	//print_r($data['departmentwise']);
 	$this->loadviews("cashbookyearmonthwise",$this->global,$data, NULL);	
 	}
-public function Viewtoday()
+   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);	
 	}
-
+	public function depmenu()
+    {
+	$this->global['pageTitle'] = 'Cashbook - viewtoday ';
+	$data['depmenu']=$this->dahsboard_Model->departmentmenu();
+    $data['Indiancurrency']=$this->dahsboard_Model->INRSymbol();
+	$this->loadviews("cashbookdepmenu",$this->global,$data, NULL);	
+	}
+   public function cashbookmenudepartment()
+    {
+    $sid=$_GET['sid'];
+	
+	$this->global['pageTitle'] = 'Cashbook - department - ';
+	$data['menudepartmentwise']=$this->dahsboard_Model->menudepartmentwise($sid);
+	$data['Indiancurrency']=$this->dahsboard_Model->INRSymbol();
+	//print_r($data['departmentwise']);
+	$this->loadviews("cashbookdepday",$this->global,$data, NULL);	
+	}
 }
 ?>
 
+
diff --git a/application/logs/log-2017-12-12.php b/application/logs/log-2017-12-12.php
new file mode 100644
index 00000000..23ebc0e6
--- /dev/null
+++ b/application/logs/log-2017-12-12.php
@@ -0,0 +1,3 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed'); ?>
+
+ERROR - 2017-12-12 08:24:42 --> Severity: Warning  --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_result.php 38
diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php
index 68184035..a55f7c3b 100755
--- a/application/models/dahsboard_model.php
+++ b/application/models/dahsboard_model.php
@@ -1687,14 +1687,31 @@ if ($fa and $aa != ''){
      }
 	 function cashbook()
 	{
-		    $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 where tinc.type='EXPENSE'";
+		    $sql="SELECT date_format(tinc.date,'%d-%m-%Y')as date,
+			ifnull(case 
+			when tinc.type = 'PAYMENT'
+			then tinc.total
+			end,'0') as expense,
+			ifnull(case 
+			when tinc.type = 'RECEIPT'
+			then tinc.total
+			end, '0') as income,
+            ifnull(case 
+			when tinc.type = 'PAYMENT'
+			then tinc.towhom
+			end,'-') as paymentname,
+			ifnull(case 
+			when tinc.type = 'RECEIPT'
+			then tinc.towhom
+			end, '-') as receiptname,
+            tinc.total,tinc.towhom,tinc.description,tinc.type,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 monthexpensereport()
 	{
-		   $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,monthname(tinc.date)as month,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   ";
+		   $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,monthname(tinc.date)as month,ac.name FROM t_income_expense as tinc  join t_accountcode ac on ac.code=tinc.account_code where tinc.type='PAYMENT' 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();  
 	
@@ -1702,7 +1719,7 @@ if ($fa and $aa != ''){
 	
 	function yearexpensereport()
 	{
-		   $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 ";
+		   $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='PAYMENT' and year(date)= year(current_date()) group by month order by total desc limit 10 ";
 		   $query = $this->db->query($sql);
 		   return $query->result();  
 	
@@ -1736,7 +1753,7 @@ if ($fa and $aa != ''){
     {
         $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 tinc.type='EXPENSE' and account_code = '$sid' and monthname(date)='$d'";
+		WHERE tinc.type='PAYMENT' and account_code = '$sid' and monthname(date)='$d'";
         $query = $this->db->query($sql);
 		//print_r($this->db->last_query());
 		//echo $sql;
@@ -1747,7 +1764,7 @@ if ($fa and $aa != ''){
     {
         $sql="SELECT date_format(tinc.date,'%d-%m-%Y')as date,tinc.type,sum(tinc.total)as total,monthname(tinc.date)as month,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 tinc.type='EXPENSE' and monthname(date) = ? group by account_code";
+		WHERE tinc.type='PAYMENT' and monthname(date) = ? group by account_code";
         $query = $this->db->query($sql,array($sid));
 		//print_r($this->db->last_query());
         return $query->result();    
@@ -1796,6 +1813,25 @@ function INRSymbol()
         return $query->result();    
            
     }
-	 
+	function departmentmenu()
+    {
+        $sql="SELECT tinc.type,sum(tinc.total)as total,tinc.account_code,ac.name FROM t_income_expense tinc 
+		join t_accountcode ac on ac.code=tinc.account_code 
+		 group by account_code";
+	   $query = $this->db->query($sql);
+		//print_r($this->db->last_query());
+        return $query->result();    
+           
+    }
+	 function menudepartmentwise($sid='')
+    {
+        $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 = '$sid'";
+        $query = $this->db->query($sql);
+		//print_r($this->db->last_query());
+		//echo $sql;
+        return $query->result();    
+           
+    } 
 }
 ?>
\ No newline at end of file
diff --git a/application/views/addnewIncomeExpense.php b/application/views/addnewIncomeExpense.php
index 7c887e79..f395d5d7 100755
--- a/application/views/addnewIncomeExpense.php
+++ b/application/views/addnewIncomeExpense.php
@@ -11,7 +11,7 @@ $(function() {
 	var inc = [];
 	t= <?php echo json_encode($dropdownvalues)?>;
 	$.each(t,function(i,item){
-		if(item.type == 'INCOME')
+		if(item.type == 'RECEIPT')
 		{
 			$("#accode").append( $('<option></option>').val(item.code).html(item.name));
 		}
@@ -82,7 +82,7 @@ function loadAccountType(id)
 		 $('#accode').find('option').remove().end().append('<option value="-1">Select Account Name</option>').val('Select Account Code');
 	  
 	$.each(t,function(i,item){
-		if(item.type == 'INCOME')
+		if(item.type == 'RECEIPT')
 		{
 			$("#accode").append( $('<option></option>').val(item.code).html(item.name));
 		}
@@ -97,7 +97,7 @@ function loadAccountType(id)
 		 $('#accode').find('option').remove().end().append('<option value="-1">Select Account Name</option>').val('Select Account Code');
 	  	
 		$.each(t,function(i,item){
-		if(item.type == 'EXPENSE')
+		if(item.type == 'PAYMENT')
 		{
 			$("#accode").append( $('<option></option>').val(item.code).html(item.name));
 		}
@@ -144,8 +144,8 @@ function loadAccountType(id)
 									<div class="col-md-3">
 										<div class="form-group">
 										<b><span for="Accountcode">Select Accounut type:</span> </b>  </br></br>	
-										<input type="radio" onclick = loadAccountType(this.id); id="myradio1" name="myradio" value="1" checked>Income &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-										<input type="radio" onclick = loadAccountType(this.id); id="myradio2" name="myradio" value="2" >Expense
+										<input type="radio" onclick = loadAccountType(this.id); id="myradio1" name="myradio" value="1" checked>RECEIPT &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+										<input type="radio" onclick = loadAccountType(this.id); id="myradio2" name="myradio" value="2" >PAYMENT
 										
 										
 										</div>
diff --git a/application/views/cashbookdepday.php b/application/views/cashbookdepday.php
new file mode 100644
index 00000000..43b2ecc0
--- /dev/null
+++ b/application/views/cashbookdepday.php
@@ -0,0 +1,116 @@
+<?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> 
+ 
+         .dataTables_filter {
+                            width: 50%;
+                            float: right;
+                            text-align: right;
+                            }
+			   .dataTables_paginate {
+                            width: 50%;
+                            float: right;
+                            text-align: right;
+                           }
+		    div.dt-buttons {
+                            position: relative;
+                            float: right;
+
+                           }
+		  </style> 
+
+<div class="content-wrapper">  
+    <section class="content">
+    <div class="box">
+     <div class="box-header">
+                 <CENTER><h3 class="box-title"><strong>Department Based Report</strong></h3></CENTER>                   
+                </div>
+                 <div class="container-fluid">
+       
+        <div class="row">
+           <div class="col-md-10 col-md-offset-1"> 
+                
+                  <table class="table table-bordered table-hover" id="req" style="background-color:#fff;font-size:11px;" >
+				  <thead style="background-color:#ddf">
+                    <tr>
+                                  
+                      
+					                  <th>date</th>
+                                       <th>Account Name</th>
+                                       <th>Paid Type</th>
+                                        <th style="text-align:right;"> Amount <?php echo '('.$inrsymbol.')' ?></th>
+                                        <th>Description</th>
+                                       
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <?php if(!empty($menudepartmentwise)){
+                                       foreach($menudepartmentwise as $dt)
+                                        {				
+                                       ?> 
+                                      <tr>
+                                        
+                                       
+                                       <td align="left"><span><?php echo  $dt->date?></span></td>
+                                       <td align="left"><span><?php echo  $dt->name?></span></td>
+                                       <td align="left"><span><?php echo  $dt->type?></span></td>
+                                       <td align="right"><span><?php echo  number_format($dt->total,2,'.','');?></span></td>
+                                       <td align="left"><span><?php echo  $dt->description?></span></td>
+                                        
+                                       
+                                    
+                                      </tr>
+                                       <?php
+                                        }
+                                        
+                                       }
+                                       ?>
+                                    </tbody>
+                  </table>
+                  
+             </div>
+        </div>
+        </div>
+        </div>
+    </section>
+</div>
+<script src="https://cdn.datatables.net/buttons/1.3.1/js/dataTables.buttons.min.js"></script>
+<script src="https://cdn.datatables.net/buttons/1.3.1/js/buttons.flash.min.js"></script>
+<script src="https://cdn.datatables.net/buttons/1.3.1/js/buttons.html5.min.js"></script>
+<script src="https://cdn.datatables.net/buttons/1.3.1/js/buttons.print.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+
+ <script> 
+	
+
+// Bootstrap datepicker
+// Set up your table
+$(document).ready(function() {
+    table = $('#req').DataTable( {
+        "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: [
+		{
+			    extend: 'collection',
+                text: 'Export Cashbook Reports',
+				  buttons: [
+				             'excel'
+				           ]
+		}
+        ]
+    } );
+} );
+
+
+
+	</script>
+	
diff --git a/application/views/cashbookdepmenu.php b/application/views/cashbookdepmenu.php
new file mode 100644
index 00000000..3fc17fdd
--- /dev/null
+++ b/application/views/cashbookdepmenu.php
@@ -0,0 +1,119 @@
+<?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> 
+ 
+         .dataTables_filter {
+                            width: 50%;
+                            float: right;
+                            text-align: right;
+                            }
+			   .dataTables_paginate {
+                            width: 50%;
+                            float: right;
+                            text-align: right;
+                           }
+		    div.dt-buttons {
+                            position: relative;
+                            float: right;
+
+                           }
+		 
+			   
+	 </style> 
+
+<div class="content-wrapper">  
+    <section class="content">
+    <div class="box">
+     <div class="box-header">
+                 <CENTER><h3 class="box-title"><strong>Cashbook Department</strong></h3></CENTER>                   
+                </div>
+                 <div class="container-fluid">
+       
+        <div class="row">
+           <div class="col-md-10 col-md-offset-1"> 
+                
+                  <table class="table table-bordered table-hover" id="req" style="background-color:#fff;font-size:11px;" >
+				  <thead style="background-color:#ddf">
+                    <tr>
+                                  
+                      
+					                  
+                                       <th>Account Name</th>
+                                       <th>Paid Type</th>
+                                        <th style="text-align:right;"> Amount <?php echo '('.$inrsymbol.')' ?></th>
+                                     
+                                       
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <?php if(!empty($depmenu)){
+                                       foreach($depmenu as $t)
+                                        {				
+                                       ?> 
+                                      <tr>
+                                        
+                                       
+                                       
+                                       <td align="left"><a href="<?php echo base_url(); ?>report/cashbookmenudepartment?sid=<?php echo $t->account_code;?>"><span><?php echo  $t->name?></span></a></td>
+                                       
+                                        <td align="left"><span><?php echo  $t->type?></span></td>
+                                        <td align="right"><span><?php echo  number_format($t->total,2,'.','');?></span></td>
+
+                                        
+                                       
+                                    
+                                      </tr>
+                                       <?php
+                                        }
+                                        
+                                       }
+                                       ?>
+                                    </tbody>
+                  </table>
+                  
+             </div>
+        </div>
+        </div>
+        </div>
+    </section>
+</div>
+<script src="https://cdn.datatables.net/buttons/1.3.1/js/dataTables.buttons.min.js"></script>
+<script src="https://cdn.datatables.net/buttons/1.3.1/js/buttons.flash.min.js"></script>
+<script src="https://cdn.datatables.net/buttons/1.3.1/js/buttons.html5.min.js"></script>
+<script src="https://cdn.datatables.net/buttons/1.3.1/js/buttons.print.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+
+ <script> 
+	
+
+// Bootstrap datepicker
+// Set up your table
+$(document).ready(function() {
+    table = $('#req').DataTable( {
+        "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: [
+		{
+			    extend: 'collection',
+                text: 'Export Cashbook Reports',
+				  buttons: [
+				             'excel'
+				           ]
+		}
+        ]
+    } );
+} );
+
+
+
+	</script>
+	
diff --git a/application/views/cashbooklisting.php b/application/views/cashbooklisting.php
index 0da75ff6..c5659f4e 100755
--- a/application/views/cashbooklisting.php
+++ b/application/views/cashbooklisting.php
@@ -20,8 +20,8 @@
          
                       <div class="col-md-12">
                         <div class="col-md-3"><span>Account Type :</span>&nbsp;&nbsp;<span style="color:#ff6347;">*</span><br>
-                          <input type="radio" name="accounttype" id="accounttype" value="INCOME" checked> Income<br>
-                          <input type="radio" name="accounttype" id="accounttype" value="EXPENSE"> Expense<br>
+                          <input type="radio" name="accounttype" id="accounttype" value="RECEIPT" checked> RECEIPT<br>
+                          <input type="radio" name="accounttype" id="accounttype" value="PAYMENT"> PAYMENT<br>
                         </div><p style="color:red"></p>
                          
                         <div class="col-md-3 pad"><span>Account Code :</span>&nbsp;&nbsp;<span style="color:#ff6347;">*</span>
diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php
index 1e308214..5206e515 100755
--- a/application/views/editCapitalPo.php
+++ b/application/views/editCapitalPo.php
@@ -3143,6 +3143,20 @@ $("#PaymentMethod").select2();
 							 </div>
 							 
                 </div>
+				<div class="col-md-12" id="" style="padding: 0px;">
+				 <div class="col-md-5 col-md-offset-4" align="right">
+							<label>Total Amount <?php echo "($INR)"?></label>			 
+					</div>	
+		<div class="col-md-3">
+							 <div class="form-group">
+													<?php
+											 $data = array('name' => 'ViewTotalAmountlocal','value' => set_value('ViewTotalAmountlocal'),'id'=>'ViewTotalAmountlocal',  'class' => 'form-control num' ,'placeholder' => 'Total Amount','readonly' => 'true');
+											echo form_input($data);
+											?>   
+										</div>
+							 </div>
+							 
+                
                     <div class="col-md-12" style="padding:1%;" ></div>
                                                     <div class="col-md-12"  style="border:1px solid #000;padding:0px;" id="ViewModalImportTaxHide" style="display:none;">
                                                         <br/>
@@ -5884,6 +5898,7 @@ function DeleteRow(rowid)
 		$('#ViewAfterSgst').val($('#AfterSgst'+userid).val());
 		$('#ViewAfterIgst').val($('#AfterIgst'+userid).val());
 		$('#ViewOtherAllowances').val($('#OtherAmt'+userid).val());
+		$('#ViewTotalAmountlocal').val(cellval[9].innerHTML);
 		
     
     $('#drpFreightviewloc').val($("#Ftype"+userid).val());
diff --git a/application/views/income_expense_list.php b/application/views/income_expense_list.php
index d9594bdb..fde90f4d 100755
--- a/application/views/income_expense_list.php
+++ b/application/views/income_expense_list.php
@@ -29,7 +29,7 @@
          <th>Account Name</th>
 		 <th>Amount</th>         
          <th>Details</th>
-		  
+		 <!--<th>Action</th>-->
       </tr>
     </thead>
     <tbody id="inexlistbody">
@@ -41,7 +41,18 @@
 				{
 					?>
 					
-		<tr> <td><?php echo '<a href="'.$base.'cashbook/incomeExpenseList/'.$l->id.'">'.$l->type.'</a>';?></td> <td style="text-align:right;"><?php echo date_format(date_create($l->date),'d-m-Y');?></td> <td><?php echo $l->name;?></td> <td style="text-align:right;"><?php echo $l->total;?></td> <td><?php echo $l->description;?></td></tr>			
+		<tr> 
+		<td><?php echo '<a href="'.$base.'cashbook/incomeExpenseList/'.$l->id.'">'.$l->type.'</a>';?></td> 
+		<td style="text-align:right;"><?php echo date_format(date_create($l->date),'d-m-Y');?></td>
+		<td><?php echo $l->name;?></td> 
+		<td style="text-align:right;"><?php echo $l->total;?></td>
+		<td><?php echo $l->description;?></td>
+		 <!--<td>
+          <a href="<?php echo base_url(); ?>cashbook/editcashbook"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the "></i>&nbsp;&nbsp;&nbsp;</a>
+						 
+						  
+                      </td>-->
+		</tr>			
 					
 	   <?php
 				}
diff --git a/application/views/reportcashbook.php b/application/views/reportcashbook.php
index a0a09dc2..446a0178 100644
--- a/application/views/reportcashbook.php
+++ b/application/views/reportcashbook.php
@@ -149,11 +149,11 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
       
         <!-- fix for small devices only -->
         <div class="clearfix visible-sm-block"></div>	
-        <div class="col-md-4">
+        <div class="col-md-3">
           <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"><a href="<?php echo base_url().'report/Viewtoday' ?>" data-toggle="tooltip" title="Click here to View Today's payments"><?php echo "Today's Payments" ?></a></span>
+             <span class="info-box-number" ><a href="<?php echo base_url().'report/Viewtoday' ?>" data-toggle="tooltip" title="Click here to View Today's payments" ><?php echo "Today's Payments" ?></a></span>
               
 			  <span class="info-box-text text-center"><strong>Receipt :</strong><?php echo $inrsymbol.number_format($today_in,2,'.','');  ?> </span>
               <span class="info-box-text text-center"><strong>Payments :</strong><?php echo  $inrsymbol.number_format($today_ex,2,'.','');  ?> </span>
@@ -164,7 +164,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
      
         <!-- fix for small devices only -->
         <div class="clearfix visible-sm-block"></div>	
-        <div class="col-md-4">
+        <div class="col-md-3">
           <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">
@@ -177,11 +177,22 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
       
         <!-- fix for small devices only -->
         <div class="clearfix visible-sm-block"></div>	
-        <div class="col-md-4">
+        <div class="col-md-3">
           <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"><a href="<?php echo base_url().'report/yearexpenses' ?>" data-toggle="tooltip" title="Click here to View Monthly payments"><?php echo "year Payments" ?></a></span>
+              <span class="info-box-number"><a href="<?php echo base_url().'report/yearexpenses' ?>" data-toggle="tooltip" title="Click here to View Yearly payments"><?php echo "Year Payments" ?></a></span>
+              <span class="info-box-text text-center"><strong>Receipt :</strong><?php echo $inrsymbol. number_format($year_in,2,'.',''); ?></span>
+              <span class="info-box-text text-center"><strong>Payments :</strong><?php echo $inrsymbol.number_format($year_ex,2,'.',''); ?></span>
+            </div>            
+          </div>          
+        </div>
+		<div class="clearfix visible-sm-block"></div>	
+        <div class="col-md-3">
+          <div class="info-box">
+            <span class="info-box-icon bg-green" style="height: 90px;padding:25;"><i class="fa fa-hourglass-1 " style="padding: 5px; background-color:orange;"></i></span>
+            <div class="info-box-content">
+              <span class="info-box-number"><a href="<?php echo base_url().'report/depmenu' ?>" data-toggle="tooltip" title="Click here to View Department payments"><?php echo "Dep Payments" ?></a></span>
               <span class="info-box-text text-center"><strong>Receipt :</strong><?php echo $inrsymbol. number_format($year_in,2,'.',''); ?></span>
               <span class="info-box-text text-center"><strong>Payments :</strong><?php echo $inrsymbol.number_format($year_ex,2,'.',''); ?></span>
             </div>            
@@ -225,9 +236,13 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
 				       <th>Date</th>
 					   <!--<th>Account Code</th>-->
 					   <th>Account Name</th>
+					   <th>Type</th>
+					   <th>Received From</th>
 					   <th>Paid To</th>
-					   <th>Paid Type</th>
-					  <th style="text-align:right;"> Amount <?php echo '('.$inrsymbol.')' ?></th>
+					   <!--<th>Paid Type(RECEIPT)</th>-->
+					   <!--<th>Paid Type(PAYMENTS)</th>-->
+					  <th style="text-align:right;"> Receipt <?php echo '('.$inrsymbol.')' ?></th>
+					  <th style="text-align:right;"> Payments <?php echo '('.$inrsymbol.')' ?></th>
 					  
 					   <th>Description</th>
                        
@@ -236,7 +251,9 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
                     </thead>
 				    <tbody>
 				       <?php if(!empty($cashbook)){
+					  $ti=0.00;
 					  $tvt=0.00;
+					  
 					   foreach($cashbook as $cash)
 					    {				
 					   ?> 
@@ -244,11 +261,17 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
 					    
                         <td><span><?php echo $cash->date?></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->type?></span></td>
+						<td align="left"><span><?php echo  $cash->receiptname?></span></td>
+						<td align="left"><span><?php echo  $cash->paymentname?></span></td>
+				        
+						<!--<td align="left"><span><?php echo  $cash->expense?></span></td>-->
 						<td align="right"><span><?php 
-						$tvt= $tvt + number_format($cash->total,2,'.','');
-						echo  number_format($cash->total,2,'.','');?></span></td>
+						$ti= $ti + number_format($cash->income,2,'.','');
+						echo  number_format($cash->income,2,'.','');?></span></td>
+						<td align="right"><span><?php 
+						$tvt= $tvt + number_format($cash->expense,2,'.','');
+						echo  number_format($cash->expense,2,'.','');?></span></td>
 						
 						<td align="left"><span><?php echo  $cash->description?></span></td>
 					    
@@ -263,10 +286,20 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
 			        </tbody>
 					<tfoot  width="100%">
 							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
+						<td style="text-align:left;"><strong>Total</strong></td>
 						  <td>&nbsp;</td>
 						  <td>&nbsp;</td>
 						  <td>&nbsp;</td>
+						   <td>&nbsp;</td>
+						  <td style="text-align:right"><strong>
+								 <?php 
+								 {
+								 echo number_format($ti,2,'.','');
+								
+								  } 
+								 ?>  
+								</strong>	 
+								</td>  
 							<td style="text-align:right"><strong>
 								 <?php 
 								 {
diff --git a/application/views/viewIndIncomeExpense.php b/application/views/viewIndIncomeExpense.php
index 092c4c5b..904a8052 100755
--- a/application/views/viewIndIncomeExpense.php
+++ b/application/views/viewIndIncomeExpense.php
@@ -20,7 +20,7 @@ if(!empty($data))
 		$document = 'uploads/cashbook/noimage.png';
 	}
 	
-	if($extype == 'INCOME')
+	if($extype == 'RECEIPT')
 	{
 		$label = 'Received From :';
 	}