diff --git a/application/views/ogr.php b/application/views/ogr.php
index 2eb13bea..1efc52fb 100644
--- a/application/views/ogr.php
+++ b/application/views/ogr.php
@@ -161,18 +161,10 @@ $Value="₹";
 				<label>Supplier/Customer</label>
 					 
 						 <?php
-						$options = array("0"=>'Select');     
-						//print_r(  $options);
-
-					 									
-			
-						echo form_dropdown('sup', $options,set_value('sup'),'id="sup"'  ,'required="true"' ,'class="form-control select2');
+						//$options = array("0"=>'Select');     
+						//echo form_dropdown('sup', $options,set_value('sup'),'id="sup"'  ,'required="true"' ,'class="form-control select2');
 						?>
-
-						 					 
-					 
-			</div>	
- -->
+		 </div> -->
 
 
 				<div class="col-md-12">
@@ -180,8 +172,8 @@ $Value="&#8377;";
 				 <div class="form-group">
                    <label>OGR TYPE</label>
                       <select id="ogrtype"  >
-                       <option value="0">select option</option>
-                   
+                      <option value="0">select option</option>              
+					  <!-- <option value="1">UNKNOWN TYPE</option> -->
                       <option value="2">PO</option>
                       <option value="3">Service</option>
                        
@@ -194,23 +186,19 @@ $Value="&#8377;";
 	<div class="col-md-3">
 			 <label>Date</label>
 						<div class="form-group">
-						<!-- 
-									<?php
-							 $data = array('name' => 'date','value' => set_value('date'),'id'=>'date',  'class' => 'form-control');
-							echo form_input($data);
-							?>  --> 
-
-
+						<!--<?php
+							//$data = array('name' => 'date','value' => set_value('date'),'id'=>'date',  'class' => 'form-control');
+							//echo form_input($data);
+							?>--> 
 							<?php
-                  $data = array('name' => 'date','value' => set_value('date',$CurrentDate),'id'=>'date',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
-                  echo form_input($data);
-              ?>   
+                  				$data = array('name' => 'date','value' => set_value('date',$CurrentDate),'id'=>'date',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
+                  				echo form_input($data);
+              				?>   
 						</div>
-
-						 					 
-					 
-			</div>
-		<div class="col-md-3">
+ 
+	</div>
+		
+	<div class="col-md-3">
 			 <label>Vehicle No</label>
 						<div class="form-group">
 						
@@ -266,8 +254,8 @@ $Value="&#8377;";
                       <select id="ogrtype"  >
                        <option value="0">select option</option>
                    
-                      <option value="2">PO</option>
-                      <option value="3">Service</option>
+                       <option value="2">PO</option>
+                       <option value="3">Service</option>
                        
                     </select>
                     </div>
@@ -277,17 +265,9 @@ $Value="&#8377;";
               <div class="col-md-12">
 				<label>Supplier/Customer</label>
 					 
-						 <?php
-						$options = array("0"=>'Select');     
-						//print_r(  $options);
-
-					 									
-			
-						echo form_dropdown('sup', $options,set_value('sup'),'id="sup"'  ,'required="true"' ,'class="form-control select2');
-						?>
-
-						 					 
-					 
+						 <?php $options = array("0"=>'Select');     
+							   echo form_dropdown('sup', $options,set_value('sup'),'id="sup"'  ,'required="true"' ,'class="form-control select2');
+						 ?>
 			</div>	
 	 
 	</div>
@@ -300,9 +280,6 @@ $Value="&#8377;";
 					 
 						 <?php
 						$options = array("0"=>'Select Invoice No');     
-						//print_r(  $options);
-					 									
-			
 						echo form_dropdown('invno', $options,set_value(''),'id="invno"'  ,'required="true"' ,'class="form-control select2');
 						?>
  
@@ -310,11 +287,10 @@ $Value="&#8377;";
 			<div class="col-md-3">
 			 <label>Item Code</label>
 						<div class="form-group">
-						
-									<?php
+						<?php
 							 $data = array('name' => 'itemcode','value' => set_value('itemcode'),'id'=>'itemcode',  'class' => 'form-control');
-							echo form_input($data);
-							?>   
+							 echo form_input($data);
+						?>   
 						</div>
 
 						 					 
@@ -323,11 +299,10 @@ $Value="&#8377;";
 			<div class="col-md-3">
 			 <label>Description</label>
 						<div class="form-group">
-						
-									<?php
+						<?php
 							 $data = array('name' => 'Description','value' => set_value('Description'),'id'=>'Description',  'class' => 'form-control');
-							echo form_input($data);
-							?>   
+							 echo form_input($data);
+						?>   
 						</div>
 
 						 					 
@@ -336,11 +311,10 @@ $Value="&#8377;";
 			<div class="col-md-3">
 			 <label>Ordered Qty</label>
 						<div class="form-group">
-						
-									<?php
+						<?php
 							 $data = array('name' => 'qtyorder','value' => set_value('qtyorder'),'id'=>'qtyorder',  'class' => 'form-control');
 							echo form_input($data);
-							?>   
+						?>   
 						</div>
 
 						 					 
@@ -389,9 +363,6 @@ $Value="&#8377;";
 					 
 						 <?php
 						$options = array("0"=>'Select PONO');     
-						//print_r(  $options);
-					 									
-			
 						echo form_dropdown('pono', $options,set_value('pono'),'id="pono"'  ,'required="true"' ,'class="form-control select2');
 						?>
  
@@ -403,9 +374,6 @@ $Value="&#8377;";
 					 
 						 <?php
 						$options = array("0"=>'Select');     
-						//print_r(  $options);
-					 									
-			
 						echo form_dropdown('mrirno', $options,set_value('mrirno'),'id="mrirno"'  ,'required="true"' ,'class="form-control select2');
 						?>
 
@@ -421,9 +389,6 @@ $Value="&#8377;";
 					 
 						 <?php
 						$options = array("0"=>'Select');     
-						//print_r(  $options);
-					 									
-			
 						echo form_dropdown('materialcode', $options,set_value('materialcode'),'id="materialcode"'  ,'required="true"' ,'class="form-control select2');
 						?>
 
@@ -453,12 +418,12 @@ $Value="&#8377;";
 						
 							 <?php
 						$options = array("0"=>'Select');     
-						//print_r(  $options);
+						
 						if(!empty($storedmaterialcode))
 										{
 									    foreach ($storedmaterialcode as $SID):
-                                         // echo $SID->ConfigValue;
-									   	  $options[$SID->MaterialCode] =  $SID->MaterialCode .'-'. $SID->MaterialName ;
+                        
+									   	$options[$SID->MaterialCode] =  $SID->MaterialCode .'-'. $SID->MaterialName ;
 
 										endforeach;
 											
@@ -1371,12 +1336,4 @@ function Save(type)
    }
 }
 
-
-
-
-
-</script>
-
-
-
-
+</script>
\ No newline at end of file
diff --git a/application/views/reportcashbook.php b/application/views/reportcashbook.php
index fcd177d2..282fdef5 100755
--- a/application/views/reportcashbook.php
+++ b/application/views/reportcashbook.php
@@ -112,7 +112,7 @@ div.dt-buttons {
           <div class="info-box">
           <span class="info-box-icon bg-red" style="height: 117px;padding: 35px;width: 120px;"><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 Cashbook Report" ><?php echo "Today" ?></a></span>
+            <span class="info-box-number" ><a href="<?php echo base_url().'report/daily_incexp' ?>" data-toggle="tooltip" title="Click here to View Today's Cashbook Report" ><?php echo "Today" ?></a></span>
               <span class="info-box-text text-center"><strong>Opening Balances :</strong><i class="fa fa-rupee "></i><?php echo number_format($strday_balances,2,'.','');  ?> </span>
 			        <span class="info-box-text text-center"><strong>Receipt :</strong><i class="fa fa-rupee "></i><?php echo number_format($today_in,2,'.','');  ?> </span>
               <span class="info-box-text text-center"><strong>Payment :</strong><i class="fa fa-rupee "></i><?php echo number_format($today_ex,2,'.','');  ?> </span>
@@ -127,7 +127,7 @@ div.dt-buttons {
           <div class="info-box">
            <span class="info-box-icon bg-aqua" style="height: 117px;padding: 35px;width: 120px;"><i<i class="fa fa-spinner"></span>
             <div class="info-box-content">
-              <span class="info-box-number"><a href="<?php echo base_url().'report/monthexpenses' ?>" data-toggle="tooltip" title="Click here to View Monthly Cashbook Report"><?php echo "This Month" ?></a></span>
+              <span class="info-box-number"><a href="<?php echo base_url().'report/monthly_incexp' ?>" data-toggle="tooltip" title="Click here to View Monthly Cashbook Report"><?php echo "This Month" ?></a></span>
               <span class="info-box-text text-center"><strong>Opening Balances :</strong><i class="fa fa-rupee "></i><?php echo number_format($premonth_balances,2,'.','');  ?> </span>
               <span class="info-box-text text-center"><strong>Receipt :</strong><i class="fa fa-rupee "></i><?php echo number_format($month_in,2,'.','');  ?></span>
               <span class="info-box-text text-center"><strong>Payment :</strong><i class="fa fa-rupee "></i><?php echo number_format($month_ex,2,'.','');  ?></span>
@@ -142,7 +142,7 @@ div.dt-buttons {
           <div class="info-box">
             <span class="info-box-icon bg-green" style="height: 117px;padding: 35px;width: 120px;"><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 Yearly Cashbook Report"><?php echo "This Year" ?></a></span>
+              <span class="info-box-number"><a href="<?php echo base_url().'report/yearly_incexp' ?>" data-toggle="tooltip" title="Click here to View Yearly Cashbook Report"><?php echo "This Year" ?></a></span>
               <span class="info-box-text text-center"><strong>Opening Balances :</strong><i class="fa fa-rupee "></i><?php echo number_format($preyear_balances,2,'.','');  ?></span>
               <span class="info-box-text text-center"><strong>Receipt :</strong><i class="fa fa-rupee "></i><?php echo number_format($year_in,2,'.',''); ?></span>
               <span class="info-box-text text-center"><strong>Payment :</strong><i class="fa fa-rupee "></i><?php echo number_format($year_ex,2,'.',''); ?></span>