diff --git a/application/controllers/user.php b/application/controllers/user.php
index 44813b08..afc8783a 100755
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -43,10 +43,10 @@ class user extends BaseController
 		//print_r( $data['totalpurchaseorder']);
 	   $data['totalordervalue']=$this->dahsboard_Model->totalordervalue(); 
 	   $data['pendingpo']=$this->dahsboard_Model->pendingpo(); 
-	   $data['totalserviceamount']=$this->dahsboard_Model->totalserviceamount(); 
-	   $data['totalcapitalamount']=$this->dahsboard_Model->totalcapitalamount(); 
-	   $data['totalimportamount']=$this->dahsboard_Model->totalimportamount(); 
-	   $data['totalrevenueamount']=$this->dahsboard_Model->totalrevenueamount(); 
+	   // $data['totalserviceamount']=$this->dahsboard_Model->totalserviceamount(); 
+	   // $data['totalcapitalamount']=$this->dahsboard_Model->totalcapitalamount(); 
+	   // $data['totalimportamount']=$this->dahsboard_Model->totalimportamount(); 
+	   // $data['totalrevenueamount']=$this->dahsboard_Model->totalrevenueamount(); 
 	 
 	   
 	   // $data['totalservicepo']=$this->dahsboard_Model->totalservicepo();
diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php
index 0875a8da..453479cc 100755
--- a/application/models/dahsboard_model.php
+++ b/application/models/dahsboard_model.php
@@ -129,7 +129,7 @@ where att.Month_Year = ? and att.EmpID = ?;";
 	function totalpurchaseorder(){
 		
 		
-		$sql="select count(PONO)  as totalpurchaseorder from T_PurchaseOrder_Master";
+		$sql="select count(PONO)  as totalpurchaseorder from T_PurchaseOrder_Master where Status != 'ST030'";
         $query = $this->db->query($sql);
         return $query->result();	
 		
@@ -137,7 +137,7 @@ where att.Month_Year = ? and att.EmpID = ?;";
 	function totalordervalue(){
 		
 		
-		$sql="select sum(totalordervalue) as totalordervalue from T_PurchaseOrder_Master";
+		$sql="select sum(totalordervalue) as totalordervalue from T_PurchaseOrder_Master where Status != 'ST030'";
         $query = $this->db->query($sql);
         return $query->result();	
 		
@@ -145,11 +145,36 @@ where att.Month_Year = ? and att.EmpID = ?;";
 	function pendingpo(){
 		
 		
-		$sql="select count(PONO) as pending from T_PurchaseOrder_Master where status='ST020'";
+		$sql="select count(PONO) as pending from T_PurchaseOrder_Master where status='ST020' and Status != 'ST030'";
         $query = $this->db->query($sql);
         return $query->result();	
 		
 	}
+	 function req_pending(){
+        
+        
+        $sql="SELECT count(Status) as TOTAL_PENDING_REQUESTS FROM T_Requestion_Master where Status = 'ST002';";
+        $query = $this->db->query($sql);
+        return $query->result();    
+        
+        
+        
+    }
+	function reqdetail(){
+        
+        
+        $sql="SELECT count(Status) as TODAY_REQUESTS FROM T_Requestion_Master where date(ReqDate) = date(now());";
+
+       $query = $this->db->query($sql);
+
+       // echo "from Model";
+        // print_r($query->result());
+
+       return $query->result();    
+        
+        
+        
+    }
 	function january(){
 		
 		
@@ -158,41 +183,51 @@ where att.Month_Year = ? and att.EmpID = ?;";
         return $query->result();	
 		
 	}
-	function totalserviceamount()
-	{
-	$sql="select sum(BudgetAmount) as totalserviceamount from T_CostCenter_Budget where BudgetType='SERVICE'";
-	 $query = $this->db->query($sql);
-        return $query->result();	
+	// function totalserviceamount()
+	// {
+	// $sql="select sum(BudgetAmount) as totalserviceamount from T_CostCenter_Budget where BudgetType='SERVICE'";
+	 // $query = $this->db->query($sql);
+        // return $query->result();	
 		
-	} 
-	function totalcapitalamount()
-	{
-	$sql="select sum(BudgetAmount) as totalcapitalamount from T_CostCenter_Budget where BudgetType='CAPITAL'";
-	$query = $this->db->query($sql);
-        return $query->result();	
-}
-function totalimportamount()
-	{
-	$sql="select sum(BudgetAmount) as totalimportamount from T_CostCenter_Budget where BudgetType='IMPORT'";
-	$query = $this->db->query($sql);
-        return $query->result();	
-}
-function totalrevenueamount()
-	{
-	$sql="select sum(BudgetAmount) as totalrevenueamount from T_CostCenter_Budget where BudgetType='REVENUE'";
-	$query = $this->db->query($sql);
-        return $query->result();	
-}
+	// } 
+	// function totalcapitalamount()
+	// {
+	// $sql="select sum(BudgetAmount) as totalcapitalamount from T_CostCenter_Budget where BudgetType='CAPITAL'";
+	// $query = $this->db->query($sql);
+        // return $query->result();	
+// }
+// function totalimportamount()
+	// {
+	// $sql="select sum(BudgetAmount) as totalimportamount from T_CostCenter_Budget where BudgetType='IMPORT'";
+	// $query = $this->db->query($sql);
+        // return $query->result();	
+// }
+// function totalrevenueamount()
+	// {
+	// $sql="select sum(BudgetAmount) as totalrevenueamount from T_CostCenter_Budget where BudgetType='REVENUE'";
+	// $query = $this->db->query($sql);
+        // return $query->result();	
+// }
 //totalservice
 function getTotalServicePoCount(){
     $i=1;
-	
+	if (date('m') >= 4) 
+		{
+					$yearl = date('Y').'-'.(date('Y')+1);
+				} else {
+					$yearl = (date('Y')-1).'-'.date('Y');
+				}
+		 $ab=$yearl;
+		 $fa=substr($ab,0,-5);
+		 $aa=substr($ab,5,5);
     while($i<=12){
+		
 
    $sql="SELECT  count(cmast.PONO) as totalService FROM T_PurchaseOrder_Master cmast
-      join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO
-      join T_Requestion_Master req on req.ReqNo=line.ReqNo
-      where ReqType='SERVICE' and month(PODate) = $i ";
+      left join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO
+      left join T_Requestion_Master req on req.ReqNo=line.ReqNo
+      where ReqType='SERVICE' and month(PODate) = $i 
+	  and date(cmast.PODate) >= '".$fa."-04-01' and date(cmast.PODate) <= '".$aa."-03-31'";
 
 $query = $this->db->query($sql);
 $array_result[]=$query->result();
@@ -206,13 +241,23 @@ $i++;
 
 function getTotalimportPoCount(){
     $i=1;
-	
+	if (date('m') >= 4) 
+		{
+					$yearl = date('Y').'-'.(date('Y')+1);
+				} else {
+					$yearl = (date('Y')-1).'-'.date('Y');
+				}
+		 $ab=$yearl;
+		 $fa=substr($ab,0,-5);
+		 $aa=substr($ab,5,5);
     while($i<=12){
+		
 
    $sql="SELECT  count(cmast.PONO) as totalImport FROM T_PurchaseOrder_Master cmast
-      join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO
-      join T_Requestion_Master req on req.ReqNo=line.ReqNo
-      where ReqType='IMPORT' and month(PODate) = $i ";
+      left join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO
+      left join T_Requestion_Master req on req.ReqNo=line.ReqNo
+      where ReqType='IMPORT' and month(PODate) = $i 
+	  and date(cmast.PODate) >= '".$fa."-04-01' and date(cmast.PODate) <= '".$aa."-03-31'";
 
 $query = $this->db->query($sql);
 $array_result[]=$query->result();
@@ -225,13 +270,22 @@ $i++;
 }
 function getTotalcapitalPoCount(){
     $i=1;
-	
+	if (date('m') >= 4) 
+		{
+					$yearl = date('Y').'-'.(date('Y')+1);
+				} else {
+					$yearl = (date('Y')-1).'-'.date('Y');
+				}
+		 $ab=$yearl;
+		 $fa=substr($ab,0,-5);
+		 $aa=substr($ab,5,5);
     while($i<=12){
 
    $sql="SELECT  count(cmast.PONO) as totalcapital FROM T_PurchaseOrder_Master cmast
-      join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO
-      join T_Requestion_Master req on req.ReqNo=line.ReqNo
-      where ReqType='CAPITAL' and month(PODate) = $i ";
+      left join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO
+      left join T_Requestion_Master req on req.ReqNo=line.ReqNo
+      where ReqType='CAPITAL' and month(PODate) = $i 
+	  and date(cmast.PODate) >= '".$fa."-04-01' and date(cmast.PODate) <= '".$aa."-03-31'";
 
 $query = $this->db->query($sql);
 $array_result[]=$query->result();
@@ -244,13 +298,22 @@ $i++;
 }
  function getTotalrevenuePoCount(){
     $i=1;
-	
+	if (date('m') >= 4) 
+		{
+					$yearl = date('Y').'-'.(date('Y')+1);
+				} else {
+					$yearl = (date('Y')-1).'-'.date('Y');
+				}
+		 $ab=$yearl;
+		 $fa=substr($ab,0,-5);
+		 $aa=substr($ab,5,5);
     while($i<=12){
 
    $sql="SELECT  count(cmast.PONO) as totalrevenue FROM T_PurchaseOrder_Master cmast
-      join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO
-      join T_Requestion_Master req on req.ReqNo=line.ReqNo
-      where ReqType='REVENUE' and month(PODate) = $i ";
+      left join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO
+      left join T_Requestion_Master req on req.ReqNo=line.ReqNo
+      where ReqType='REVENUE' and month(PODate) = $i 
+	  and date(cmast.PODate) >= '".$fa."-04-01' and date(cmast.PODate) <= '".$aa."-03-31'";
 
 $query = $this->db->query($sql);
 $array_result[]=$query->result();
@@ -364,17 +427,14 @@ function capitalbud ()
 function capitalbal ()
 {
 	$sql="SELECT ROUND(sum(BudgetAmount)-(SELECT 
-case po.CapitalRange
-     when '0'
-	 then ifnull((sum(distinct(PO_Line_Item.Quantity * PO_Line_Item.Rate) * po.ExchangeRate)),0)
-     when '1'
-     then ifnull((sum(distinct PO_Line_Item.Quantity * PO_Line_Item.Rate)),0)
-     end
+ifnull(sum(distinct if(CapitalRange=0,(( PO_Line_Item.Quantity * PO_Line_Item.Rate) * po.ExchangeRate),( PO_Line_Item.Quantity * PO_Line_Item.Rate) - st.Afterdiscountval)),0)
 as Util_Amount
 from T_CostCenter_Budget Cost_Center_Budget
 join T_PurchaseOrder_LineItem PO_Line_Item on Cost_Center_Budget.CostCenterCode=PO_Line_Item.CostCenterCode 
-JOIN T_PurchaseOrder_Master po on po.PONO=PO_Line_Item.PONO and po.POType=Cost_Center_Budget.BudgetType
-WHERE Cost_Center_Budget.BudgetType='CAPITAL' and YEAR(STR_TO_DATE(`BudgetYear`,'%Y')) = YEAR(NOW())),2)  as balcapitalbudget FROM T_CostCenter_Budget where BudgetType ='CAPITAL' and YEAR(STR_TO_DATE(`BudgetYear`,'%Y')) = YEAR(NOW())"; 
+JOIN T_PurchaseOrder_Master po on po.PONO=PO_Line_Item.PONO and po.POType=Cost_Center_Budget.BudgetType and po.Status !='ST030'
+left JOIN T_Service_Tax st on st.LineItemNo = PO_Line_Item.LineItemNo
+WHERE Cost_Center_Budget.BudgetType='CAPITAL' and YEAR(STR_TO_DATE(`BudgetYear`,'%Y')) = YEAR(NOW())),2)  as balcapitalbudget FROM T_CostCenter_Budget where BudgetType ='CAPITAL' and YEAR(STR_TO_DATE(`BudgetYear`,'%Y')) = YEAR(NOW())
+"; 
     $query = $this->db->query($sql);
         return $query->result();
 }
@@ -413,32 +473,8 @@ WHERE Cost_Center_Budget.BudgetType='REVENUE' and YEAR(STR_TO_DATE(`BudgetYear`,
     $query = $this->db->query($sql);
         return $query->result();
 }
-function reqdetail(){
-        
-        
-        $sql="SELECT count(Status) as TODAY_REQUESTS FROM T_Requestion_Master where date(ReqDate) = date(now());";
 
-       $query = $this->db->query($sql);
-
-       // echo "from Model";
-        // print_r($query->result());
-
-       return $query->result();    
-        
-        
-        
-    }
-    
-    function req_pending(){
-        
-        
-        $sql="SELECT count(Status) as TOTAL_PENDING_REQUESTS FROM T_Requestion_Master where Status = 'ST002';";
-        $query = $this->db->query($sql);
-        return $query->result();    
-        
-        
-        
-    }
+   
     
     function req_list(){
 		
@@ -618,7 +654,7 @@ order by monthname(matv.PODate)";
 	function report_purchase($cname,$prod,$fa,$aa,$m,$frm,$t){
         
         
-        $sql="SELECT pm.PONO as pono,date_format(pm.PODate,'%d-%m-%Y') as created_date, 
+        $sql="SELECT pm.PONO as pono,pm.POType as potype,date_format(pm.PODate,'%d-%m-%Y') as created_date, 
 TIME_FORMAT(pm.PODate,'%l:%i %p') as created_time,
 mm.MaterialName as material_name,sd.SupplierName as supplier_name,
 ifnull(sum(pl.Quantity),0) as quantity,mm.UOM as UOM,ifnull(sum(pl.Rate),0) as rate,
@@ -692,7 +728,7 @@ $sql.="group by pono,material_name,supplier_name";
 	 function report_purchase_link($cname,$prod,$fa,$aa,$m,$frm,$t,$sid,$mid,$d){
         
         
-        $sql="SELECT pm.PONO as pono,date_format(pm.PODate,'%d-%m-%Y') as created_date, 
+        $sql="SELECT pm.PONO as pono,pm.POType as potype,date_format(pm.PODate,'%d-%m-%Y') as created_date, 
 TIME_FORMAT(pm.PODate,'%l:%i %p') as created_time,
 mm.MaterialName as material_name,sd.SupplierName as supplier_name,
 ifnull(sum(pl.Quantity),0) as quantity,mm.UOM as UOM,ifnull(sum(pl.Rate),0) as rate,
@@ -1077,7 +1113,7 @@ group by supplier_name,material_name";
 	function ireport_purchase($cname,$prod,$fa,$aa,$m,$frm,$t,$cat){
         
         
-        $sql="SELECT pm.PONO as pono,date_format(pm.PODate,'%d-%m-%Y') as created_date, 
+        $sql="SELECT pm.PONO as pono,pm.POType as potype,date_format(pm.PODate,'%d-%m-%Y') as created_date, 
 TIME_FORMAT(pm.PODate,'%l:%i %p') as created_time,
 mm.MaterialName as material_name,mm.Category as category,sd.SupplierName as supplier_name,
 ifnull(sum(pl.Quantity),0) as quantity,mm.UOM as UOM,ifnull(sum(pl.Rate),0) as rate,
@@ -1155,7 +1191,7 @@ $sql.="group by pono,material_name,category,supplier_name";
 	 function ireport_purchase_link($cname,$prod,$fa,$aa,$m,$frm,$t,$sid,$mid,$d,$cat){
         
         
-        $sql="SELECT pm.PONO as pono,date_format(pm.PODate,'%d-%m-%Y') as created_date, 
+        $sql="SELECT pm.PONO as pono,pm.POType as potype,date_format(pm.PODate,'%d-%m-%Y') as created_date, 
 TIME_FORMAT(pm.PODate,'%l:%i %p') as created_time,
 mm.MaterialName as material_name,mm.Category as category,sd.SupplierName as supplier_name,
 ifnull(sum(pl.Quantity),0) as quantity,mm.UOM as UOM,ifnull(sum(pl.Rate),0) as rate,
@@ -1604,7 +1640,7 @@ group by supplier_name,material_name";
 	 function rawi_report_consolidate($cname,$fa,$aa){
         
         
-        $sql="select mm.Category as category,
+        $sql="select sd.SupplierID as sid,mm.MaterialCode as mid,mm.Category as category,sd.SupplierName as supplier_name,mm.MaterialName as material_name,
 SUM(IF(month(pm.PODate) = 4, pl.Quantity, 0)) AS April,
 SUM(IF(month(pm.PODate) = 5, pl.Quantity, 0)) AS May,
 SUM(IF(month(pm.PODate) = 6, pl.Quantity, 0)) AS June,
diff --git a/application/views/Report_Material_Master_ItemWise.php b/application/views/Report_Material_Master_ItemWise.php
index a5498742..17d4e64b 100755
--- a/application/views/Report_Material_Master_ItemWise.php
+++ b/application/views/Report_Material_Master_ItemWise.php
@@ -6,9 +6,10 @@ if(!empty($mmi))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -88,11 +89,13 @@ if(!empty($mmi))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -104,14 +107,20 @@ $(document).ready(function() {
         "dom": "<'row'<'col-md-6'l><'col-md-6'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 MM-ItemWise Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+         buttons: [
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				//messageTop: $('h3').text(),
+				title: 'Report - Material Master - Item Wise',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_Material_Master_ReceiptValue.php b/application/views/Report_Material_Master_ReceiptValue.php
index 2a9e2dba..5747f14d 100755
--- a/application/views/Report_Material_Master_ReceiptValue.php
+++ b/application/views/Report_Material_Master_ReceiptValue.php
@@ -6,9 +6,10 @@ if(!empty($mmr))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -88,11 +89,13 @@ if(!empty($mmr))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 <script> 
 	
 
@@ -104,13 +107,19 @@ $(document).ready(function() {
 "<'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 MM-Receipt Value Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				//messageTop: $('h3').text(),
+				title: 'Report - Material Master - ReceiptValue',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_Material_Master_SupplierWise.php b/application/views/Report_Material_Master_SupplierWise.php
index e8d8ce9c..a6b0e10e 100755
--- a/application/views/Report_Material_Master_SupplierWise.php
+++ b/application/views/Report_Material_Master_SupplierWise.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -91,11 +92,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -107,14 +110,20 @@ $(document).ready(function() {
         "dom": "<'row'<'col-md-6'l><'col-md-6'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 MM-SupplierWise Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+         buttons: [
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				//messageTop: $('h3').text(),
+				title: 'Report - Material Master - SupplierWise',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_POreleased.php b/application/views/Report_POreleased.php
index 9afc7f75..851b33d7 100755
--- a/application/views/Report_POreleased.php
+++ b/application/views/Report_POreleased.php
@@ -6,9 +6,10 @@ if(!empty($rel_po))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -81,7 +82,7 @@ if(!empty($rel_po))
 					  <tr>
                         <td><span><?php echo $rel->PONO?></span></td>
                         <td><span><?php echo $rel->POType?></span></td>
-				        <td><span><?php $date = new DateTime($rel->CreatedDate);echo $date->format('d-m-Y'); ?></span></td>
+				        <td><span><?php $date = new DateTime($rel->PODate);echo $date->format('d-m-Y'); ?></span></td>
                         <td><span><?php $date = new DateTime($rel->ReleasedDate);echo $date->format('d-m-Y'); ?></span></td>
 						<td><span><?php echo $rel->Dept_Name?></span></td>
 					    <td align="right"><span><?php echo number_format($rel->TotalOrderValue,2,'.','')?></span></td>
@@ -103,11 +104,13 @@ if(!empty($rel_po))
         </div>
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -120,13 +123,19 @@ $(document).ready(function() {
 "<'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 ReleasedPO-Order value',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				//messageTop: $('h3').text(),
+				title: 'Report - Released PO',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_consolidate.php b/application/views/Report_consolidate.php
index 315bc7f7..3a24d953 100755
--- a/application/views/Report_consolidate.php
+++ b/application/views/Report_consolidate.php
@@ -9,14 +9,16 @@
                 
             }); 
 </script>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
                             text-align: right;
                             }
+		
 			   .dataTables_paginate {
                             width: 50%;
                             float: right;
@@ -40,7 +42,19 @@
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Consolidate</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Consolidate</b><br><br>
+			  <?php
+			  if($this->input->post('client_name')){
+				  $cl=$this->input->post('client_name');
+				  echo $cl;
+			  }
+			  if($this->input->post('financialyear')){
+				  $ab=$this->input->post('financialyear'); 
+				  echo '('.$ab.')';
+			  }
+		   
+			  ?>
+			  </p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -613,11 +627,13 @@
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -629,14 +645,20 @@ $(document).ready(function() {
         "dom": "<'row'<'col-md-6'l><'col-md-6'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 Purchase Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+       buttons: [
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Consolidate(Quantity)',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
@@ -645,14 +667,20 @@ $(document).ready(function() {
         "dom": "<'row'<'col-md-6'l><'col-md-6'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 Purchase Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+       buttons: [
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Consolidate(Value)',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_consolidate_inward.php b/application/views/Report_consolidate_inward.php
index 7fe457af..be7af89a 100644
--- a/application/views/Report_consolidate_inward.php
+++ b/application/views/Report_consolidate_inward.php
@@ -9,9 +9,10 @@
                 
             }); 
 </script>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -40,7 +41,18 @@
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Consolidate-Inward</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Consolidate-Inward</b><br><br>
+			  <?php
+			  if($this->input->post('client_name')){
+				  $cl=$this->input->post('client_name');
+				  echo $cl;
+			  }
+			  if($this->input->post('financialyear')){
+				  $ab=$this->input->post('financialyear'); 
+				  echo '('.$ab.')';
+			  }
+		   
+			  ?></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -613,11 +625,13 @@
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -629,14 +643,20 @@ $(document).ready(function() {
         "dom": "<'row'<'col-md-6'l><'col-md-6'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 Purchase Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+         buttons: [
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Consolidate-Inward(Quantity)',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
@@ -645,14 +665,20 @@ $(document).ready(function() {
         "dom": "<'row'<'col-md-6'l><'col-md-6'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 Purchase Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+         buttons: [
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Consolidate-Inward(Quantity)',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_consolidate_month.php b/application/views/Report_consolidate_month.php
index 3fb6801c..e4c0a9a6 100644
--- a/application/views/Report_consolidate_month.php
+++ b/application/views/Report_consolidate_month.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -37,7 +38,7 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Consolidate Month(<?php
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Consolidate Category-Wise(<?php
 			  $m = $this->input->get('m');
 			  echo $m;
 			  ?>)</b></p></h3></center>
@@ -158,11 +159,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -175,13 +178,19 @@ $(document).ready(function() {
 "<'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 cumulative month Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Consolidate Category-Wise',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_consolidate_raw.php b/application/views/Report_consolidate_raw.php
index 3c98f844..af798d9d 100644
--- a/application/views/Report_consolidate_raw.php
+++ b/application/views/Report_consolidate_raw.php
@@ -9,9 +9,10 @@
                 
             }); 
 </script>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -40,7 +41,18 @@
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Consolidate (Category-Wise)</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Consolidate (Category-Wise)</b><br><br>
+			  <?php
+			  if($this->input->post('client_name')){
+				  $cl=$this->input->post('client_name');
+				  echo $cl;
+			  }
+			  if($this->input->post('financialyear')){
+				  $ab=$this->input->post('financialyear'); 
+				  echo '('.$ab.')';
+			  }
+		   
+			  ?></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -642,11 +654,13 @@
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -659,13 +673,19 @@ $(document).ready(function() {
 "<'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 Purchase Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Consolidate-Category(Quantity)',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
@@ -675,13 +695,19 @@ $(document).ready(function() {
 "<'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 Purchase Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Consolidate-Category(Quantity)',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_consolidate_year.php b/application/views/Report_consolidate_year.php
index 1e923377..d8fb2c28 100644
--- a/application/views/Report_consolidate_year.php
+++ b/application/views/Report_consolidate_year.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -37,7 +38,7 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Consolidate Month(<?php
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Consolidate Category-Wise(<?php
 			  $m = $this->input->get('ab');
 			  echo $m;
 			  ?>)</b></p></h3></center>
@@ -159,11 +160,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -176,13 +179,19 @@ $(document).ready(function() {
 "<'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 cumulative month Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Consolidate Category-Wise',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_costcenter.php b/application/views/Report_costcenter.php
index b5ed45e4..c4c7a22c 100755
--- a/application/views/Report_costcenter.php
+++ b/application/views/Report_costcenter.php
@@ -7,10 +7,10 @@ if(!empty($ccrpt))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
-	         
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -47,7 +47,15 @@ if(!empty($ccrpt))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cost Center</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cost Center</b><br><br>
+			  <?php
+			 
+			  if($this->input->post('financialyear')){
+				  $ab=$this->input->post('financialyear'); 
+				  echo '('.$ab.')';
+			  }
+		   
+			  ?></p></h3></center>
 			 <div class="col-xs-12 col-md-4 col-md-offset-4">
 			  
                       
@@ -129,11 +137,13 @@ if(!empty($ccrpt))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 
 
@@ -147,14 +157,20 @@ $(document).ready(function() {
         "dom": "<'row'<'col-md-6'l><'col-md-6'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 Cost Center Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+       buttons: [
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-CostCentre',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_cumulative.php b/application/views/Report_cumulative.php
index 2bb1274e..ccea3370 100755
--- a/application/views/Report_cumulative.php
+++ b/application/views/Report_cumulative.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -37,7 +38,17 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative</b>
+			   (<i>
+			  <?php
+			  if (date('m') >= 4) {
+								$yearl = date('Y').'-'.(date('Y')+1);
+							} else {
+								$yearl = (date('Y')-1).'-'.date('Y');
+							}
+					 echo $yearl;
+			  ?>
+			  </i>)</p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -214,11 +225,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -231,13 +244,19 @@ $(document).ready(function() {
 "<'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 cumulative Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Cumulative',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_cumulative_day.php b/application/views/Report_cumulative_day.php
index e622be32..b1e7e4ce 100755
--- a/application/views/Report_cumulative_day.php
+++ b/application/views/Report_cumulative_day.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -37,7 +38,7 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative Today</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative (<?php echo date('d-m-Y'); ?>)</b></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -140,11 +141,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -156,14 +159,20 @@ $(document).ready(function() {
         "dom": "<'row'<'col-md-6'l><'col-md-6'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 cumulative Year Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+       buttons: [
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Cumulative Today',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_cumulative_day_inward.php b/application/views/Report_cumulative_day_inward.php
index e141ca71..d5d95fd2 100644
--- a/application/views/Report_cumulative_day_inward.php
+++ b/application/views/Report_cumulative_day_inward.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -37,7 +38,7 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative Today - Inward</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative - Inward(<?php echo date('d-m-Y'); ?>)</b></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -140,11 +141,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -157,13 +160,19 @@ $(document).ready(function() {
 "<'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 cumulative Year Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Cumulative Day Inward',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_cumulative_day_raw.php b/application/views/Report_cumulative_day_raw.php
index c6eb9ede..db271bfc 100644
--- a/application/views/Report_cumulative_day_raw.php
+++ b/application/views/Report_cumulative_day_raw.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -37,7 +38,7 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative Today (Category-Wise)</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative-Category-Wise(<?php echo date('d-m-Y'); ?>)</b></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -150,11 +151,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -167,13 +170,19 @@ $(document).ready(function() {
 "<'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 cumulative Year Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Cumulative Day',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_cumulative_inward.php b/application/views/Report_cumulative_inward.php
index 40b63a59..5d4cf468 100644
--- a/application/views/Report_cumulative_inward.php
+++ b/application/views/Report_cumulative_inward.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -37,7 +38,16 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative - Inward</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative - Inward</b>(<i>
+			  <?php
+			  if (date('m') >= 4) {
+								$yearl = date('Y').'-'.(date('Y')+1);
+							} else {
+								$yearl = (date('Y')-1).'-'.date('Y');
+							}
+					 echo $yearl;
+			  ?>
+			  </i>)</p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -214,11 +224,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -230,14 +242,20 @@ $(document).ready(function() {
         "dom": "<'row'<'col-md-6'l><'col-md-6'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 cumulative Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+         buttons: [
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Cumulative-Inward',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_cumulative_month.php b/application/views/Report_cumulative_month.php
index ba730659..320aa8e8 100755
--- a/application/views/Report_cumulative_month.php
+++ b/application/views/Report_cumulative_month.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -37,7 +38,7 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative Month</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative Month(<?php echo date('F'); ?>)</b></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -146,11 +147,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -163,13 +166,19 @@ $(document).ready(function() {
 "<'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 cumulative month Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Cumulative Month',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_cumulative_month_inward.php b/application/views/Report_cumulative_month_inward.php
index 99289edf..a63f41d4 100644
--- a/application/views/Report_cumulative_month_inward.php
+++ b/application/views/Report_cumulative_month_inward.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -37,7 +38,7 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative Month - Inward</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative Month - Inward(<?php echo date('F'); ?>)</b></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -146,11 +147,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -162,14 +165,20 @@ $(document).ready(function() {
         "dom": "<'row'<'col-md-6'l><'col-md-6'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 cumulative month Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+       buttons: [
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Cumulative Month-Inward',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_cumulative_month_raw.php b/application/views/Report_cumulative_month_raw.php
index 2a40879e..0d0ab64e 100644
--- a/application/views/Report_cumulative_month_raw.php
+++ b/application/views/Report_cumulative_month_raw.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -37,7 +38,7 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative Month (Category-Wise)</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative Month-Category-Wise(<?php echo date('F'); ?>)</b></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -157,11 +158,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -174,13 +177,19 @@ $(document).ready(function() {
 "<'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 cumulative month Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Cumulative Month-Category Wise',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_cumulative_raw.php b/application/views/Report_cumulative_raw.php
index 454ecaf7..4685aaf1 100644
--- a/application/views/Report_cumulative_raw.php
+++ b/application/views/Report_cumulative_raw.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -37,7 +38,16 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative (Category-Wise)</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative-Category-Wise</b>(<i>
+			  <?php
+			  if (date('m') >= 4) {
+								$yearl = date('Y').'-'.(date('Y')+1);
+							} else {
+								$yearl = (date('Y')-1).'-'.date('Y');
+							}
+					 echo $yearl;
+			  ?>
+			  </i>)</p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -222,11 +232,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -238,14 +250,20 @@ $(document).ready(function() {
         "dom": "<'row'<'col-md-6'l><'col-md-6'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 cumulative Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+         buttons: [
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Cumulative-Category Wise',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_cumulative_year.php b/application/views/Report_cumulative_year.php
index 23115271..e5c8e483 100755
--- a/application/views/Report_cumulative_year.php
+++ b/application/views/Report_cumulative_year.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -37,7 +38,18 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative Year</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative Year
+			  
+			  </b>(<i>
+			  <?php
+			  if (date('m') >= 4) {
+								$yearl = date('Y').'-'.(date('Y')+1);
+							} else {
+								$yearl = (date('Y')-1).'-'.date('Y');
+							}
+					 echo $yearl;
+			  ?>
+			  </i>)</p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -152,11 +164,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -169,13 +183,19 @@ $(document).ready(function() {
 "<'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 cumulative Year Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Cumulative-Year',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_cumulative_year_inward.php b/application/views/Report_cumulative_year_inward.php
index ec0ea5c5..1552f857 100644
--- a/application/views/Report_cumulative_year_inward.php
+++ b/application/views/Report_cumulative_year_inward.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -37,7 +38,16 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative Year - Inward</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative Year - Inward</b>(<i>
+			  <?php
+			  if (date('m') >= 4) {
+								$yearl = date('Y').'-'.(date('Y')+1);
+							} else {
+								$yearl = (date('Y')-1).'-'.date('Y');
+							}
+					 echo $yearl;
+			  ?>
+			  </i>)</p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -152,11 +162,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -168,14 +180,20 @@ $(document).ready(function() {
         "dom": "<'row'<'col-md-6'l><'col-md-6'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 cumulative Year Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+         buttons: [
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Cumulative-Year-Inward',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_cumulative_year_raw.php b/application/views/Report_cumulative_year_raw.php
index 6fc85743..61f41534 100644
--- a/application/views/Report_cumulative_year_raw.php
+++ b/application/views/Report_cumulative_year_raw.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -37,7 +38,16 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative Year (Category-Wise)</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Cumulative Year-Category-Wise</b>(<i>
+			  <?php
+			  if (date('m') >= 4) {
+								$yearl = date('Y').'-'.(date('Y')+1);
+							} else {
+								$yearl = (date('Y')-1).'-'.date('Y');
+							}
+					 echo $yearl;
+			  ?>
+			  </i>)</p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -163,11 +173,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -179,14 +191,20 @@ $(document).ready(function() {
         "dom": "<'row'<'col-md-6'l><'col-md-6'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 cumulative Year Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+         buttons: [
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'REPORT-Cumulative-Year-Category-Wise',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_month_wise.php b/application/views/Report_month_wise.php
index f7d98dd7..bed7a148 100755
--- a/application/views/Report_month_wise.php
+++ b/application/views/Report_month_wise.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -126,11 +127,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -142,14 +145,20 @@ $(document).ready(function() {
         "dom": "<'row'<'col-md-6'l><'col-md-6'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 Month-wise Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+       buttons: [
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'Report - Month Wise',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_month_wise_inward.php b/application/views/Report_month_wise_inward.php
index 3d21bc1c..30c93fea 100644
--- a/application/views/Report_month_wise_inward.php
+++ b/application/views/Report_month_wise_inward.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -126,11 +127,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -143,13 +146,19 @@ $(document).ready(function() {
 "<'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 Month-wise Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'Report - Month Wise Inward',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_openorder.php b/application/views/Report_openorder.php
index 97b9cb17..49555990 100755
--- a/application/views/Report_openorder.php
+++ b/application/views/Report_openorder.php
@@ -6,9 +6,10 @@ if(!empty($open_po))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -48,7 +49,7 @@ if(!empty($open_po))
            </div>
 		   <div class="col-md-6">
 			 <div class="input-group input-daterange input">
-                   <div class="input-group-addon"><b>Created Date From:</b></div>
+                   <div class="input-group-addon"><b>PO Date From:</b></div>
                    <input type="text" id="min-date" class="form-control filter1" placeholder="From:">
                    <div class="input-group-addon"><b>to</b></div>
                    <input type="text" id="max-date" class="form-control filter1" placeholder="To:">
@@ -65,7 +66,7 @@ if(!empty($open_po))
                      <tr>
 				       <th>PO NO</th>
                        <th>PO Type</th>
-					   <th>Created Date</th>
+					   <th>PO Date</th>
 					   <th>Approved Date</th>
 					   <th>Requested Department</th>
                        <th>Total Order Value &nbsp;( <i class="fa fa-rupee "></i>)</th>
@@ -80,7 +81,7 @@ if(!empty($open_po))
 					  <tr>
                         <td><span><?php echo $rel->PONO?></span></td>
                         <td><span><?php echo $rel->POType?></span></td>
-				        <td><span><?php echo $rel->CreatedDate?></span></td>
+				        <td><span><?php echo $rel->PODate?></span></td>
                         <td><span><?php echo $rel->ApprovedDate?></span></td>
 						<td><span><?php echo $rel->Dept_Name?></span></td>
 					    <td align="right"><span><?php echo number_format($rel->TotalOrderValue,2,'.','')?></span></td>
@@ -102,11 +103,13 @@ if(!empty($open_po))
         </div>
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -119,13 +122,19 @@ $(document).ready(function() {
 "<'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 Open Orders-Pending',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				//messageTop: $('h3').text(),
+				title: 'Report - Open Order-Pending',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_purchase.php b/application/views/Report_purchase.php
index 9463fe18..684a5926 100755
--- a/application/views/Report_purchase.php
+++ b/application/views/Report_purchase.php
@@ -15,9 +15,10 @@ if(!empty($mms))
                 
             }); 
 </script>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -46,7 +47,39 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Purchase</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Purchase</b>
+			  <br><br>
+			  <?php
+			  if($this->input->post('client_name')){
+				  $cl=$this->input->post('client_name');
+				  echo $cl;
+				  echo ' '.' ';
+			  }
+			  if($this->input->post('item_name')){
+				  $it=$this->input->post('item_name');
+				  echo $it;
+				  echo ' '.' ';
+			  }
+			  
+			  if($this->input->post('financialyear')){
+				  $ab=$this->input->post('financialyear'); 
+				  echo '('.$ab.')';
+				  echo ' ';
+				  
+			  }
+			  if($this->input->post('month')){
+				  $m=$this->input->post('month');   
+				  echo '('.$m.')';
+				  echo ' ';
+			  }
+			  if($this->input->post('from_date') && $this->input->post('to_date')){
+				   $frm = $this->input->post('from_date');
+		           $t = $this->input->post('to_date');  
+				  echo $frm.'to'.$t;
+			  }
+		 
+			  ?>
+			  </p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -183,7 +216,7 @@ if(!empty($mms))
 		       
 			 <div class="box-body">
               <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
+                <table class="table table-bordered table-hover" width="100%"id="cc" style="font-size:11px !important;">
                    <thead>
                      <tr>
 				       <th style="text-align:center">PO NO</th>
@@ -224,7 +257,9 @@ if(!empty($mms))
 					    {				
 					   ?> 
 					  <tr>
-                        <td><span><?php echo $rel->pono;?></span></td>
+                        <td><span>
+						<a href="<?php echo base_url().'purchaseorder/CreatePOPrint?PONO='.$rel->pono.'&ReqType='.$rel->potype; ?>"><?php echo $rel->pono;?></a>
+						</span></td>
                         <td style="text-align:center"><span><?php echo $rel->created_date;?></span></td>
 				        <td style="text-align:right"><span><?php echo $rel->created_time;?></span></td>
 						<td><span><?php echo $rel->material_name;?></span></td>
@@ -418,11 +453,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -435,13 +472,19 @@ $(document).ready(function() {
 "<'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 Purchase Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'Report - Purchase',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_purchase_inward.php b/application/views/Report_purchase_inward.php
index daa214c8..ee5e7b42 100644
--- a/application/views/Report_purchase_inward.php
+++ b/application/views/Report_purchase_inward.php
@@ -15,9 +15,10 @@ if(!empty($mms))
                 
             }); 
 </script>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -46,7 +47,37 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Purchase-Inward</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Purchase-Inward</b><br><br>
+			  <?php
+			  if($this->input->post('client_name')){
+				  $cl=$this->input->post('client_name');
+				  echo $cl;
+				  echo ' '.' ';
+			  }
+			  if($this->input->post('item_name')){
+				  $it=$this->input->post('item_name');
+				  echo $it;
+				  echo ' '.' ';
+			  }
+			  
+			  if($this->input->post('financialyear')){
+				  $ab=$this->input->post('financialyear'); 
+				  echo '('.$ab.')';
+				  echo ' ';
+				  
+			  }
+			  if($this->input->post('month')){
+				  $m=$this->input->post('month');   
+				  echo '('.$m.')';
+				  echo ' ';
+			  }
+			  if($this->input->post('from_date') && $this->input->post('to_date')){
+				   $frm = $this->input->post('from_date');
+		           $t = $this->input->post('to_date');  
+				  echo $frm.'to'.$t;
+			  }
+		 
+			  ?></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -182,7 +213,7 @@ if(!empty($mms))
 		       
 			 <div class="box-body">
               <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
+                <table class="table table-bordered table-hover" id="cc" style="font-size:11px !important;">
                    <thead>
                      <tr>
 				       <th style="text-align:center">PO NO</th>
@@ -224,7 +255,9 @@ if(!empty($mms))
 					    {				
 					   ?> 
 					  <tr>
-                        <td><span><?php echo $rel->pono;?></span></td>
+                        <td><span>
+						<a href="<?php echo base_url().'purchaseorder/CreatePOPrint?PONO='.$rel->pono.'&ReqType='.$rel->potype; ?>"><?php echo $rel->pono;?></a>
+						</span></td>
                         <td style="text-align:center"><span><?php echo $rel->created_date;?></span></td>
 				        <td style="text-align:right"><span><?php echo $rel->created_time;?></span></td>
 						<td><span><?php echo $rel->material_name;?></span></td>
@@ -420,11 +453,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -437,13 +472,19 @@ $(document).ready(function() {
 "<'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 Purchase Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'Report - Purchase-Inward',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_supplier.php b/application/views/Report_supplier.php
index bc495c83..03f86c19 100755
--- a/application/views/Report_supplier.php
+++ b/application/views/Report_supplier.php
@@ -15,9 +15,10 @@ if(!empty($mms))
                 
             }); 
 </script>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -46,7 +47,32 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Purchase</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Purchase-SupplierWise</b><br><br>
+			  <?php
+			  if($this->input->post('client_name')){
+				  $cl=$this->input->post('client_name');
+				  echo $cl;
+				  echo ' '.' ';
+			  }
+			  
+			  if($this->input->post('financialyear')){
+				  $ab=$this->input->post('financialyear'); 
+				  echo '('.$ab.')';
+				  echo ' ';
+				  
+			  }
+			  if($this->input->post('month')){
+				  $m=$this->input->post('month');   
+				  echo '('.$m.')';
+				  echo ' ';
+			  }
+			  if($this->input->post('from_date') && $this->input->post('to_date')){
+				   $frm = $this->input->post('from_date');
+		           $t = $this->input->post('to_date');  
+				  echo $frm.'to'.$t;
+			  }
+		 
+			  ?></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -57,10 +83,10 @@ if(!empty($mms))
                         <div class="form-group has-feedback">
 						<div class="col-md-2">
 						    <label for="client_name">
-                                <?php echo 'Supplier'; ?>
+                                <?php echo 'Supplier'; ?><span style="color:red;">* </span>
                             </label>
                             <div class="input-group">
-                                 <select class="form-control" id="client_name" name="client_name">
+                                 <select class="form-control" id="client_name" name="client_name" required="true">
 								 <option value="">Select Supplier</option>
 								 <?php 
 								foreach($cust as $item):
@@ -263,11 +289,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -279,14 +307,20 @@ $(document).ready(function() {
         "dom": "<'row'<'col-md-6'l><'col-md-6'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 Purchase Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+       buttons: [
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'Report - Supplier-Wise',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_supplier_inward.php b/application/views/Report_supplier_inward.php
index 16f0c4cd..0d164c39 100644
--- a/application/views/Report_supplier_inward.php
+++ b/application/views/Report_supplier_inward.php
@@ -15,9 +15,10 @@ if(!empty($mms))
                 
             }); 
 </script>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -46,7 +47,32 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Supplier-Inward</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Supplier-Inward</b><br><br>
+			  <?php
+			  if($this->input->post('client_name')){
+				  $cl=$this->input->post('client_name');
+				  echo $cl;
+				  echo ' '.' ';
+			  }
+			  
+			  if($this->input->post('financialyear')){
+				  $ab=$this->input->post('financialyear'); 
+				  echo '('.$ab.')';
+				  echo ' ';
+				  
+			  }
+			  if($this->input->post('month')){
+				  $m=$this->input->post('month');   
+				  echo '('.$m.')';
+				  echo ' ';
+			  }
+			  if($this->input->post('from_date') && $this->input->post('to_date')){
+				   $frm = $this->input->post('from_date');
+		           $t = $this->input->post('to_date');  
+				  echo $frm.'to'.$t;
+			  }
+		 
+			  ?></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -57,10 +83,10 @@ if(!empty($mms))
                         <div class="form-group has-feedback">
 						<div class="col-md-2">
 						    <label for="client_name">
-                                <?php echo 'Supplier'; ?>
+                                <?php echo 'Supplier'; ?><span style="color:red;">* </span>
                             </label>
                             <div class="input-group">
-                                 <select class="form-control" id="client_name" name="client_name">
+                                 <select class="form-control" id="client_name" name="client_name" required="true">
 								 <option value="">Select Supplier</option>
 								 <?php 
 								foreach($cust as $item):
@@ -261,11 +287,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -278,13 +306,19 @@ $(document).ready(function() {
 "<'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 Purchase Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'Report - Supplier-Wise-Inward',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_totalorders.php b/application/views/Report_totalorders.php
index 614e4638..06fca0c0 100755
--- a/application/views/Report_totalorders.php
+++ b/application/views/Report_totalorders.php
@@ -6,9 +6,10 @@ if(!empty($Total))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -34,7 +35,18 @@ if(!empty($Total))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Total Orders</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Total Orders</b>
+			  <br><br>
+			  <?php
+			  
+			  if($this->input->post('financialyear')){
+				  $ab=$this->input->post('financialyear'); 
+				  echo '('.$ab.')';
+				  echo ' ';
+				  
+			  }
+			 
+			  ?></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 				 <div class="col-xs-12 col-md-4 col-md-offset-4">
@@ -129,11 +141,13 @@ if(!empty($Total))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 	  
 <script> 
 	
@@ -146,13 +160,19 @@ $(document).ready(function() {
 "<'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 Total Orders',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'Report - TotalOrders',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_year_wise.php b/application/views/Report_year_wise.php
index 6bee5839..4dea68e7 100755
--- a/application/views/Report_year_wise.php
+++ b/application/views/Report_year_wise.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -37,7 +38,17 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Year-Wise</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Year-Wise</b><br><br>
+			  <?php
+			  
+			  if($this->input->post('financialyear')){
+				  $ab=$this->input->post('financialyear'); 
+				  echo '('.$ab.')';
+				  echo ' ';
+				  
+			  }
+			 
+			  ?></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -169,11 +180,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -186,13 +199,19 @@ $(document).ready(function() {
 "<'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 Purchase Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'Report - YearWise',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_year_wise_inward.php b/application/views/Report_year_wise_inward.php
index 9838bca1..7f57709d 100644
--- a/application/views/Report_year_wise_inward.php
+++ b/application/views/Report_year_wise_inward.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -37,7 +38,17 @@ if(!empty($mms))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Year-Wise-Inward</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#3c8dbc"><b>Report - Year-Wise-Inward</b><br><br>
+			  <?php
+			  
+			  if($this->input->post('financialyear')){
+				  $ab=$this->input->post('financialyear'); 
+				  echo '('.$ab.')';
+				  echo ' ';
+				  
+			  }
+			 
+			  ?></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -169,11 +180,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -185,14 +198,20 @@ $(document).ready(function() {
         "dom": "<'row'<'col-md-6'l><'col-md-6'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 Purchase Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+         buttons: [
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'Report - YearWise',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_year_wise_total.php b/application/views/Report_year_wise_total.php
index a9c1926a..d95eb846 100755
--- a/application/views/Report_year_wise_total.php
+++ b/application/views/Report_year_wise_total.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -127,11 +128,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -143,14 +146,20 @@ $(document).ready(function() {
         "dom": "<'row'<'col-md-6'l><'col-md-6'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 Year-wise-Total Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+       buttons: [
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'Report - YearWise-Total',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/Report_year_wise_total_inward.php b/application/views/Report_year_wise_total_inward.php
index a0485911..aa0cfde5 100644
--- a/application/views/Report_year_wise_total_inward.php
+++ b/application/views/Report_year_wise_total_inward.php
@@ -6,9 +6,10 @@ if(!empty($mms))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -127,11 +128,13 @@ if(!empty($mms))
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -144,13 +147,19 @@ $(document).ready(function() {
 "<'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 Year-wise-Total Report',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				messageTop: $('h3').text(),
+				title: 'Report - YearWise-Total-Inward',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );
diff --git a/application/views/dashboard.php b/application/views/dashboard.php
index c4719434..a5bfddc4 100755
--- a/application/views/dashboard.php
+++ b/application/views/dashboard.php
@@ -745,7 +745,20 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
               <div class="row">
                 <div class="col-md-8">
                   <p class="text-center">
-                    <strong>1 April, 2017 - 31 March, 2018</strong>
+                    <strong>
+					<?php
+					if (date('m') >= 4) {
+								$yearl = date('Y').'-'.(date('Y')+1);
+							} else {
+								$yearl = (date('Y')-1).'-'.date('Y');
+							}
+					 $ab=$yearl;
+					 $fa=substr($ab,0,-5);
+		             $aa=substr($ab,5,5);
+					 echo '1 April, '.$fa.' - 31 March, '.$aa.'';
+					 ?>
+					
+					</strong>
                   </p>
 
                   <div class="chart">
@@ -763,14 +776,14 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
               <br><br>    
 
                   <div class="progress-group">
-				    <?php if(!empty($totalserviceamount))
+				    <?php if(!empty($servicebudgt))
 			{       
-					foreach($totalserviceamount as $service)
+					foreach($servicebudgt as $service)
 			          
 			{
 				
 				?>
-				    <span class="description-text"><strong style="font-size:16px;">SERVICE   &nbsp; :&nbsp;&nbsp;</strong><strong style="color:#00c0ef;font-size:18px;"><i class="fa fa-rupee " style="padding: 5px;"></i><?php echo $service->totalserviceamount;?></strong></span>
+				    <span class="description-text"><strong style="font-size:16px;">SERVICE   &nbsp; :&nbsp;&nbsp;</strong><strong style="color:#00c0ef;font-size:18px;"><i class="fa fa-rupee " style="padding: 5px;"></i><?php echo $service->totalservicebudget;?></strong></span>
 					
                     <h5 class="description-header" </h5>
                     
@@ -782,14 +795,14 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
 				  <br>
                   <!-- /.progress-group -->
                   <div class="progress-group">
-				  <?php if(!empty($totalrevenueamount))
+				  <?php if(!empty($revenuebudgt))
 			{       
-				  foreach($totalrevenueamount as $revenue)
+				  foreach($revenuebudgt as $revenue)
 			
 			{
 				
 				?>
-				  <span class="description-text"><strong style="font-size:16px;">REVENUE  :&nbsp;&nbsp;</strong><strong style="color:#dd4b39;font-size:18px;"><i class="fa fa-rupee " style="padding: 5px;"></i><?php echo $revenue->totalrevenueamount;?></strong></span>
+				  <span class="description-text"><strong style="font-size:16px;">REVENUE  :&nbsp;&nbsp;</strong><strong style="color:#dd4b39;font-size:18px;"><i class="fa fa-rupee " style="padding: 5px;"></i><?php echo $revenue->totalrevenuebudget;?></strong></span>
 				 
                      
 					<?php
@@ -801,14 +814,14 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
 				 <br>
                   <!-- /.progress-group -->
                   <div class="progress-group">
-				 <?php  if(!empty($totalimportamount))
+				 <?php  if(!empty($importbudgt))
 			{       
-				 foreach($totalimportamount as $import)
+				 foreach($importbudgt as $import)
 			
 			{
 				
 				?>
-				   <span class="description-text"><strong style="font-size:16px;">IMPORT  &nbsp;&nbsp;&nbsp;:&nbsp;&nbsp;</strong><strong style="color:#00a65a;font-size:18px;"><i class="fa fa-rupee " style="padding: 5px;"></i><?php echo $import->totalimportamount;?></strong></span>
+				   <span class="description-text"><strong style="font-size:16px;">IMPORT  &nbsp;&nbsp;&nbsp;:&nbsp;&nbsp;</strong><strong style="color:#00a65a;font-size:18px;"><i class="fa fa-rupee " style="padding: 5px;"></i><?php echo $import->totalimportbudget;?></strong></span>
 				   
                     
 					<?php
@@ -819,14 +832,14 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
 				  <br>
                   <!-- /.progress-group -->
                   <div class="progress-group">
-				  <?php  if(!empty($totalcapitalamount))
+				  <?php  if(!empty($capitalbud))
 			{       
-				  foreach($totalcapitalamount as $capital)
+				  foreach($capitalbud as $capital)
 			
 			{
 				
 				?>
-				     <span class="description-text" ><strong style="font-size:16px;">CAPITAL &nbsp;&nbsp;&nbsp;:&nbsp;&nbsp</strong><strong style="color:#f39c12;font-size:18px;"><i class="fa fa-rupee " style="padding: 5px;"></i><?php echo $capital->totalcapitalamount;?></strong></span>
+				     <span class="description-text" ><strong style="font-size:16px;">CAPITAL &nbsp;&nbsp;&nbsp;:&nbsp;&nbsp</strong><strong style="color:#f39c12;font-size:18px;"><i class="fa fa-rupee " style="padding: 5px;"></i><?php echo $capital->totalcapitalbudget;?></strong></span>
 					 
                    
 					<?php
@@ -1137,10 +1150,10 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
 		   revenueValues.push(obj[0].totalrevenue);
 		 });
 		
-		
+		//console.log(serviceValues);
 			//alert(arr.total2);
  var salesChartData = {
-    labels: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
+    labels: [ "April", "May", "June", "July", "August", "September", "October", "November", "December","January", "February", "March"],
 	
     datasets: [
 	 
@@ -1152,7 +1165,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
         pointStrokeColor: "rgba(60,141,188,1)",
         pointHighlightFill: "#fff",
         pointHighlightStroke: "rgba(60,141,188,1)",
-	    data:serviceValues
+	    data:[serviceValues[3],serviceValues[4],serviceValues[5],serviceValues[6],serviceValues[7],serviceValues[8],serviceValues[9],serviceValues[10],serviceValues[11],serviceValues[0],serviceValues[1],serviceValues[2]]
 	  
       },
 	 
@@ -1164,7 +1177,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
         pointStrokeColor: "rgba(60,141,188,1)",
         pointHighlightFill: "#fff",
         pointHighlightStroke: "rgba(60,141,188,1)",
-        data:revenueValues
+        data:[revenueValues[3],revenueValues[4],revenueValues[5],revenueValues[6],revenueValues[7],revenueValues[8],revenueValues[9],revenueValues[10],revenueValues[11],revenueValues[0],revenueValues[1],revenueValues[2]]
       },
       {
         label: "Food",
@@ -1174,7 +1187,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
         pointStrokeColor: "rgba(60,141,188,1)",
         pointHighlightFill: "#fff",
         pointHighlightStroke: "rgba(60,141,188,1",
-        data:ImportValues
+        data:[ImportValues[3],ImportValues[4],ImportValues[5],ImportValues[6],ImportValues[7],ImportValues[8],ImportValues[9],ImportValues[10],ImportValues[11],ImportValues[0],ImportValues[1],ImportValues[2]]
       },
        {
         label: "Food",
@@ -1184,7 +1197,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
         pointStrokeColor: "rgba(60,141,188,1)",
         pointHighlightFill: "#fff",
         pointHighlightStroke: "rgba(60,141,188,1",
-        data:capitalValues
+        data:[capitalValues[3],capitalValues[4],capitalValues[5],capitalValues[6],capitalValues[7],capitalValues[8],capitalValues[9],capitalValues[10],capitalValues[11],capitalValues[0],capitalValues[1],capitalValues[2]]
       }
 
    ]
diff --git a/application/views/report_pendingreqst.php b/application/views/report_pendingreqst.php
index 134076e2..9e8cc8b7 100755
--- a/application/views/report_pendingreqst.php
+++ b/application/views/report_pendingreqst.php
@@ -6,9 +6,10 @@ if(!empty($pending_list))
 
 }
 ?>
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.3.1/css/buttons.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
- 
+          .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
                             width: 50%;
                             float: right;
@@ -101,11 +102,13 @@ if(!empty($pending_list))
         </div>
         <!-- /.col -->
       </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 src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -118,13 +121,19 @@ $(document).ready(function() {
 "<'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 pending details',
-				  buttons: [
-				             'excel'
-				           ]
-		}
+            
+            {
+                extend: 'excelHtml5',
+				footer: 'true',
+				//messageTop: $('h3').text(),
+				title: 'Report - Pending Request',
+                exportOptions: {
+                    columns: ':visible'
+					
+                }
+            },
+            
+            'colvis'
         ]
     } );
 } );