all reports(code merged)

application/config/routes.php

@@ -245,6 +245,7 @@ $route['Report_consolidate_category'] = "report/rawi_consolidate";
 $route['Report_pending_purchase'] = "report/pending_purchase";
 $route['Report_purchase_attach'] = "report/iattach";
 $route['Report_Material_inward_Register'] ="user/getMaterialInwardRegister";
+$route['DeliveryPerformance']="user/deliver_perform";
 
 
 

application/controllers/report.php

@@ -24,35 +24,24 @@ class report extends BaseController
 	
 	public function pending_report()
     {
-		 $this->global['pageTitle'] = $this->CompanyName.' : Reports';
 		
+		$this->global['pageTitle'] = $this->CompanyName.' : Reports';
         if ($this->input->post('btn_submit')) {      
 			
-        		$this->global['pageTitle'] = 'Total Pending Requests Reports -';
+		$this->global['pageTitle'] = 'Total Pending Requests Reports ';
 		
         $ab=$this->input->post('financialyear');
-		
 		$fa=substr($ab,0,-5);
-		
 		$aa=substr($ab,5,5);
-		
 		$m=$this->input->post('month');
-		
 		$frm = $this->input->post('from_date');
-		
 		$t = $this->input->post('to_date');
-		
 		$agf = $this->input->post('aging_from');
-		
 		$agt = $this->input->post('aging_to');
-		
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
-		
        $data['pending_list']=$this->dahsboard_Model->req_list($fa,$aa,$m,$frm,$t,$agf,$agt);
 	   
-		
 		}
-		
 		$data['finyear']=$this->dahsboard_Model->report_finyear();
        
 	   
@@ -60,94 +49,64 @@ class report extends BaseController
 
 	  
     }
-	
      public function releasedPO()
     {
 		$this->global['pageTitle'] = $this->CompanyName.' : Reports';    
-		
        if ($this->input->post('btn_submit')) {      
 		
-		$this->global['pageTitle'] = 'Order Value - Released Reports - ';
+		$this->global['pageTitle'] = 'Order Value - Released Reports ';
+		
        $ab=$this->input->post('financialyear');
-		
 		$fa=substr($ab,0,-5);
-		
 		$aa=substr($ab,5,5);
-		
 		$m=$this->input->post('month');
-		
 		$frm = $this->input->post('from_date');
-		
 		$t = $this->input->post('to_date');
-		
 		$agf = $this->input->post('total_order_value_From');
-		
 		$agt = $this->input->post('total_order_value_To');
-		
 	    $data['finyear']=$this->dahsboard_Model->report_finyear();
-		
         $data['rel_po']=$this->dahsboard_Model->report_relpo($fa,$aa,$m,$frm,$t,$agf,$agt);
 	   
+		
 		}
+	  
         $data['finyear']=$this->dahsboard_Model->report_finyear();
 	   
 	  
-	  
-       //$data['rel_po']=$this->dahsboard_Model->report_relpo();
-	   
-
 	   $this->loadviews("Report_POreleased",$this->global,$data, NULL);
 	  
 
     }
-	
 	public function openorderPO()
     {
 		$this->global['pageTitle'] = $this->CompanyName.' : Reports';      
         
         if ($this->input->post('btn_submit')) {      
 			
-			$this->global['pageTitle'] = 'Open Orders - Pending Reports - ';
+			$this->global['pageTitle'] = 'Open Orders - Pending Reports  ';
-		       
 		
        $ab=$this->input->post('financialyear');
-		
 		$fa=substr($ab,0,-5);
-		
 		$aa=substr($ab,5,5);
-		
 		$m=$this->input->post('month');
-		
 		$frm = $this->input->post('from_date');
-		
 		$t = $this->input->post('to_date');
-		
 		$agf = $this->input->post('total_order_value_From');
-		
 		$agt = $this->input->post('total_order_value_To');
-		
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
-		
        $data['open_po']=$this->dahsboard_Model->report_openpending($fa,$aa,$m,$frm,$t,$agf,$agt);
+	   
+	
 		}
 	  
-			   
-		
-	
-		
         $data['finyear']=$this->dahsboard_Model->report_finyear();
        
 	   
 	   
-       
-	  
-	   //$data['open_po']=$this->dahsboard_Model->report_openpending();
-	 
 	   $this->loadviews("Report_openorder",$this->global,$data, NULL);
 	  
 
     }
-	
 	public function TotalOrd()
     {
               
@@ -162,14 +121,16 @@ class report extends BaseController
 		}
 	  $data['finyear']=$this->dahsboard_Model->report_finyear();
 
+	 
 	   $this->loadviews("Report_totalorders",$this->global,$data, NULL);
 	   
-	}
 
+    }
 	public function ccr()
     {
               
-		$this->global['pageTitle'] = 'Cost Center Reports -';  
+		$this->global['pageTitle'] = 'Cost Center Reports ';  
+        
 		
        if ($this->input->post('financialyear')) {
 	     $ab = $this->input->post('financialyear');
@@ -182,11 +143,14 @@ class report extends BaseController
 	   }
 	    $data['finyear']=$this->dahsboard_Model->report_finyear();
 
+	   
+		
 	    $this->loadviews("Report_costcenter",$this->global,$data, NULL);
 	  
 		
-	   }
+	   //print_r($data);
 
+    }
 	public function MM_Supplier()
     {
               
@@ -197,9 +161,11 @@ class report extends BaseController
        $data['mms']=$this->dahsboard_Model->report_MMSupplier();
 	   
 	   
+	  
 	   $this->loadviews("Report_Material_Master_SupplierWise",$this->global,$data, NULL);
 	  
 
+
     }
 	public function MM_Item()
     {
@@ -207,47 +173,32 @@ class report extends BaseController
 		$this->global['pageTitle'] = 'Material Master - Item Wise Reports-';
 		
     
-	  
        $data['mmi']=$this->dahsboard_Model->report_MMItem();
-	   
-	  
-	   	
 	   $this->loadviews("Report_Material_Master_ItemWise",$this->global,$data, NULL);
 
 	  
     }
 	public function MM_ReceiptValue()
     {
+              
         $this->global['pageTitle'] = $this->CompanyName.' : Reports';  
-        
-		
         if ($this->input->post('btn_submit')) {      
-			
 			$this->global['pageTitle'] = 'Material Master - Receipt Value Reports-';	
 		
        $ab=$this->input->post('financialyear');
-			
 		$fa=substr($ab,0,-5);
-			
 		$aa=substr($ab,5,5);
-			
 		$m=$this->input->post('month');
-			
 		$data['finyear']=$this->dahsboard_Model->report_finyear();
-			
        $data['mmr']=$this->dahsboard_Model->report_MMReceiptValue($fa,$aa,$m);
-			
 		}
-			
 		$data['finyear']=$this->dahsboard_Model->report_finyear();
 	  
-	  
-	   	
 	   $this->loadviews("Report_Material_Master_ReceiptValue",$this->global,$data, NULL);
 	  
 
-    }
 
+    }
 	public function purchase()
     {
               
@@ -261,22 +212,18 @@ class report extends BaseController
 		$m=$this->input->post('month');
 		$frm = $this->input->post('from_date');
 		$t = $this->input->post('to_date');
-		 
+		 //print_r($prod);
        $data['material']=$this->dahsboard_Model->material_name();
 	   $data['cust']=$this->dahsboard_Model->customer_name();
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
        $data['purchase']=$this->dahsboard_Model->report_purchase($cname,$prod,$fa,$aa,$m,$frm,$t);
 		}
-	
 		$data['material']=$this->dahsboard_Model->material_name();
 	   $data['cust']=$this->dahsboard_Model->customer_name();
 		$data['finyear']=$this->dahsboard_Model->report_finyear();
 	  
-	  
-	   	
 	   $this->loadviews("Report_purchase",$this->global,$data, NULL);
     
-
     }
 	public function link_purchase()
     {
@@ -300,6 +247,7 @@ class report extends BaseController
 	  
 	   
 	   } else{    
+		
 		$this->global['pageTitle'] = $this->CompanyName.' : Reports';
 		//$this->input->post('btn_submit');
 		$cname = $this->input->get('cname');
@@ -321,17 +269,21 @@ class report extends BaseController
        $data['purchase']=$this->dahsboard_Model->report_purchase_link($cname,$prod,$fa,$aa,$m,$frm,$t,$sid,$mid,$d);
 	   }
 
+	   
+	  
 	   $this->loadviews("Report_purchase",$this->global,$data, NULL);
 	  
 
+
+
     }
+
 	public function year_wise()
     {
 		$this->global['pageTitle'] = $this->CompanyName.' : Reports';    
         
 		
        if ($this->input->post('financialyear')) {
-	 
 	    $ab=$this->input->post('financialyear');
 		$a=substr($ab,0,-5);
 		$b=substr($ab,5,5);
@@ -357,9 +309,12 @@ class report extends BaseController
 			//print_r($month);
 		 $data['mont']=$mon;	
 	   $data['month']=$this->dahsboard_Model->report_month_wise($month);
+
+	   
 	   $this->loadviews("Report_month_wise",$this->global,$data, NULL);
 	 
 
+
     }
 	 public function year_wise_total()
     {
@@ -374,14 +329,16 @@ class report extends BaseController
 		 $data['year']=$month;	
 	   $data['ytotal']=$this->dahsboard_Model->report_year_wise_total($a,$b);
   
+       
 	   $this->loadviews("Report_year_wise_total",$this->global,$data, NULL);
 	 
+
     }
 	
      public function purchase_supplier()
     {
               
-         $this->global['pageTitle'] = $this->CompanyName.' : Supplier-wise Reports';
+        $this->global['pageTitle'] = $this->CompanyName.' : Reports';
 		if ($this->input->post('btn_submit')) {
 		$cname = $this->input->post('client_name');
 		$ab=$this->input->post('financialyear');
@@ -390,7 +347,7 @@ class report extends BaseController
 		$m=$this->input->post('month');
 		$frm = $this->input->post('from_date');
 		$t = $this->input->post('to_date');
-		 
+		 //print_r($prod);
        $data['material']=$this->dahsboard_Model->material_name();
 	   $data['cust']=$this->dahsboard_Model->customer_name();
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
@@ -401,13 +358,15 @@ class report extends BaseController
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
 	   
 	  
+	  
 	   $this->loadviews("Report_supplier",$this->global,$data, NULL);
 	 
+
     }
 	public function consolidate()
     {
               
-         $this->global['pageTitle'] = $this->CompanyName.' : Consolidated Reports';
+        $this->global['pageTitle'] = $this->CompanyName.' : Reports';
 		if ($this->input->post('btn_submit')) {
 		$cname = $this->input->post('client_name');
 		$ab=$this->input->post('financialyear');
@@ -419,75 +378,85 @@ class report extends BaseController
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
        $data['spurchse']=$this->dahsboard_Model->report_consolidate($cname,$fa,$aa);
 		}
-	
 		 $data['material']=$this->dahsboard_Model->material_name();
 	   $data['cust']=$this->dahsboard_Model->customer_name();
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
 	   
 	  
-	
 	   $this->loadviews("Report_consolidate",$this->global,$data, NULL);
 	  
+
+
+
     }
-	
-
 	public function consolidate_month()
     {
               
         $this->global['pageTitle'] = $this->CompanyName.' : Reports';
+		//$this->input->post('btn_submit');
 		$sid=$this->input->get('sid');
 		$mid = $this->input->get('mid');
 		$cname = $this->input->get('cname');
 		$prod = $this->input->get('prod');
+		//$mat = $this->input->get('mid');
 		$m = $this->input->get('m');
 		$ab=$this->input->get('ab');
 		$fa=substr($ab,0,-5);
 		$aa=substr($ab,5,5);
-	
+		//print_r($prod);
        $data['material']=$this->dahsboard_Model->material_name();
 	   $data['cust']=$this->dahsboard_Model->customer_name();
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
        $data['spurchse']=$this->dahsboard_Model->consolidate_month($m,$sid,$mid,$fa,$aa);
+	   // print_r( $data['spurchse']);
 	  
 	   $this->loadviews("Report_consolidate_m",$this->global,$data, NULL);
-	   }
 	  
+
+    }
 	public function consolidate_year()
     {
+              
         $this->global['pageTitle'] = $this->CompanyName.' : Reports';
+		//$this->input->post('btn_submit');
 		$sid=$this->input->get('sid');
 		$mid = $this->input->get('mid');
 		$cname = $this->input->get('cname');
 		$prod = $this->input->get('prod');
+		//$mat = $this->input->get('mid');
 		$ab=$this->input->get('ab');
 		$fa=substr($ab,0,-5);
 		$aa=substr($ab,5,5);
-	
+		//print_r($prod);
        $data['material']=$this->dahsboard_Model->material_name();
 	   $data['cust']=$this->dahsboard_Model->customer_name();
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
        $data['spurchse']=$this->dahsboard_Model->consolidate_year($sid,$mid,$fa,$aa);
+	   // print_r( $data['spurchse']);
 	   
 	   $this->loadviews("Report_consolidate_y",$this->global,$data, NULL);
+	  
+
     }
-	
-	
      public function cumulative()
     {
               
-         $this->global['pageTitle'] = $this->CompanyName.' : Cumulative Reports';
+        $this->global['pageTitle'] = $this->CompanyName.' : Reports';
 		
 		//print_r($prod);
       
        $data['cum']=$this->dahsboard_Model->report_cumulative();
     
+     
 	   $this->loadviews("Report_cumulative",$this->global,$data, NULL);
 
+
+
     }
 	 public function cum_month()
     {
               
-         $this->global['pageTitle'] = $this->CompanyName.' : Cumulative Month-wise Reports';
+        $this->global['pageTitle'] = $this->CompanyName.' : Reports';
 		$last = $this->uri->segment_array();
 			  
 			 $sup = $last[3];
@@ -495,15 +464,13 @@ class report extends BaseController
 		//print_r($prod);
       
        $data['cum_month']=$this->dahsboard_Model->report_cum_month($sup,$mat);
-	   
 	   $this->loadviews("Report_cumulative_month",$this->global,$data, NULL);
 
-
     }
      public function cum_year()
     {
               
-         $this->global['pageTitle'] = $this->CompanyName.' : Cumulative Year-wise Reports';
+        $this->global['pageTitle'] = $this->CompanyName.' : Reports';
 		$last = $this->uri->segment_array();
 			  
 			 $sup = $last[3];
@@ -514,12 +481,11 @@ class report extends BaseController
        $data['cum_year']=$this->dahsboard_Model->report_cum_year($sup,$mat);
 	   $this->loadviews("Report_cumulative_year",$this->global,$data, NULL);
 
-
     }
 	 public function cum_day()
     {
               
-         $this->global['pageTitle'] = $this->CompanyName.' : Cumulative Day-wise Reports';
+        $this->global['pageTitle'] = $this->CompanyName.' : Reports';
 		$last = $this->uri->segment_array();
 			  
 			 $sup = $last[3];
@@ -527,7 +493,6 @@ class report extends BaseController
 		//print_r($prod);
       
        $data['cum_day']=$this->dahsboard_Model->report_cum_day($sup,$mat);
-	   	
 	   $this->loadviews("Report_cumulative_day",$this->global,$data, NULL);
 
     }
@@ -545,24 +510,18 @@ class report extends BaseController
 		$m=$this->input->post('month');
 		$frm = $this->input->post('from_date');
 		$t = $this->input->post('to_date');
-		$sid=$this->input->get('sid');
-		$mid = $this->input->get('mid');
-		$d = $this->input->get('d');
 		 //print_r($prod);
        $data['material']=$this->dahsboard_Model->material_name();
 	   $data['cust']=$this->dahsboard_Model->customer_name();
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
-	   $data['purchase']=$this->dahsboard_Model->ireport_purchase($cname,$prod,$fa,$aa,$m,$frm,$t,$sid,$mid,$d);
+       $data['purchase']=$this->dahsboard_Model->ireport_purchase($cname,$prod,$fa,$aa,$m,$frm,$t,$cat);
 		}
 		$data['material']=$this->dahsboard_Model->material_name();
 	   $data['cust']=$this->dahsboard_Model->customer_name();
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
 	 
-	  
 	   $this->loadviews("Report_purchase_inward",$this->global,$data, NULL);
 	  
-
-
     }
 	public function ilink_purchase()
     {
@@ -578,41 +537,42 @@ class report extends BaseController
 		$m=$this->input->post('month');
 		$frm = $this->input->post('from_date');
 		$t = $this->input->post('to_date');
+		$sid=$this->input->get('sid');
+		$mid = $this->input->get('mid');
+		$d = $this->input->get('d');
 		 //print_r($prod);
        $data['material']=$this->dahsboard_Model->material_name();
 	   $data['cust']=$this->dahsboard_Model->customer_name();
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
-       $data['purchase']=$this->dahsboard_Model->ireport_purchase($cname,$prod,$fa,$aa,$m,$frm,$t);
+       $data['purchase']=$this->dahsboard_Model->ireport_purchase($cname,$prod,$fa,$aa,$m,$frm,$t,$sid,$mid,$d);
 	  
 	   
 	   } else{    
         $this->global['pageTitle'] = $this->CompanyName.' : Reports';
 		//$this->input->post('btn_submit');
-		$cname = $this->input->get('cname');
 		$cat = $this->input->get('cat');
+		$cname = $this->input->get('cname');
 		$prod = $this->input->get('prod');
 		$ab=$this->input->get('ab');
 		$fa=substr($ab,0,-5);
 		$aa=substr($ab,5,5);
-		$m=$this->input->get('month');
+		$m=$this->input->get('m');
 		$frm = $this->input->get('frm');
 		$t = $this->input->get('t');
 		$sid=$this->input->get('sid');
 		$mid = $this->input->get('mid');
 		$d = $this->input->get('d');
-		
+		$da = $this->input->get('da');
-		 //print_r($prod);
+		$po = $this->input->get('po');
        $data['material']=$this->dahsboard_Model->material_name();
 	   $data['cust']=$this->dahsboard_Model->customer_name();
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
-       $data['purchase']=$this->dahsboard_Model->ireport_purchase_link($cname,$prod,$fa,$aa,$m,$frm,$t,$sid,$mid,$d,$cat);
+       $data['purchase']=$this->dahsboard_Model->ireport_purchase_link($cname,$prod,$fa,$aa,$m,$frm,$t,$sid,$mid,$d,$cat,$da,$po);
 	   }
 	  
 	   $this->loadviews("Report_purchase_inward",$this->global,$data, NULL);
 
     }
-	
-
 	public function iattach()
     {
               
@@ -638,13 +598,12 @@ class report extends BaseController
     //   {
 	   $this->loadviews("Report_attach_inward",$this->global,$data, NULL);
 	//   }
-
 	//    else
 	//   {
 	//     $this->loadViews("access", $this->global, $data, NULL);	
 	//   }
-	}
 
+    }
 	public function iyear_wise()
     {
 		$this->global['pageTitle'] = $this->CompanyName.' : Reports';
@@ -662,7 +621,9 @@ class report extends BaseController
 	    $data['finyear']=$this->dahsboard_Model->report_finyear();
 
           
+		
 	    $this->loadviews("Report_year_wise_inward",$this->global,$data, NULL);
+	 
     }
     
     public function imonth_wise()
@@ -716,15 +677,7 @@ class report extends BaseController
 		$data['material']=$this->dahsboard_Model->material_name();
 	   $data['cust']=$this->dahsboard_Model->customer_name();
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
-	
-	   
-
-	  
 	   $this->loadviews("Report_supplier_inward",$this->global,$data, NULL);
-
-
-
-
     }
 	public function iconsolidate()
     {
@@ -745,7 +698,6 @@ class report extends BaseController
 	   $data['cust']=$this->dahsboard_Model->customer_name();
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
 	   
-	    
 	   $this->loadviews("Report_consolidate_inward",$this->global,$data, NULL);
 	   
     }
@@ -758,8 +710,6 @@ class report extends BaseController
 		$mid = $this->input->get('mid');
 		$cname = $this->input->get('cname');
 		$prod = $this->input->get('prod');
-		$cname = $this->input->get('cname');
-		$prod = $this->input->get('prod');
 		//$mat = $this->input->get('mid');
 		$m = $this->input->get('m');
 		$ab=$this->input->get('ab');
@@ -769,16 +719,18 @@ class report extends BaseController
        $data['material']=$this->dahsboard_Model->material_name();
 	   $data['cust']=$this->dahsboard_Model->customer_name();
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
-	   $data['spurchse']=$this->dahsboard_Model->i_consolidate_month($m,$sid,$prod,$fa,$aa);
+       $data['spurchse']=$this->dahsboard_Model->i_consolidate_month($m,$sid,$mid,$fa,$aa);
 	   // print_r( $data['spurchse']);
+	   
 	   $this->loadviews("Report_consolidate_month_inward",$this->global,$data, NULL);
 	   
+
     }
 	public function i_consolidate_year()
     {
               
         $this->global['pageTitle'] = $this->CompanyName.' : Reports';
-		//$this->input->post('btn_submit');
+		
 		$sid=$this->input->get('sid');
 		$mid = $this->input->get('mid');
 		$cname = $this->input->get('cname');
@@ -793,10 +745,15 @@ class report extends BaseController
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
        $data['spurchse']=$this->dahsboard_Model->i_consolidate_year($sid,$mid,$fa,$aa);
 	   // print_r( $data['spurchse']);
+	   
 	   $this->loadviews("Report_consolidate_year_inward",$this->global,$data, NULL);
+	  //  }
+	  //  else
+	  // {
+	  //   $this->loadViews("access", $this->global, $data, NULL);	
+	  // }
 
     }
-    
      public function icumulative()
     {
               
@@ -806,8 +763,8 @@ class report extends BaseController
       
        $data['cum']=$this->dahsboard_Model->ireport_cumulative();
 
-	   $this->loadviews("Report_cumulative_inward",$this->global,$data, NULL);
      	
+	   $this->loadviews("Report_cumulative_inward",$this->global,$data, NULL);
 	 
     }
 	 public function icum_month()
@@ -821,8 +778,8 @@ class report extends BaseController
 		//print_r($prod);
       
        $data['cum_month']=$this->dahsboard_Model->ireport_cum_month($sup,$mat);
- 
 	   $this->loadviews("Report_cumulative_month_inward",$this->global,$data, NULL);
+
     }
      public function icum_year()
     {
@@ -853,7 +810,6 @@ class report extends BaseController
 	   $this->loadviews("Report_cumulative_day_inward",$this->global,$data, NULL);
 
     }
-	
 	 public function rawi_cumulative()
     {
               
@@ -863,7 +819,9 @@ class report extends BaseController
       
        $data['cum']=$this->dahsboard_Model->rawi_report_cumulative();
 
+      
 	   $this->loadviews("Report_cumulative_raw",$this->global,$data, NULL);
+	 
     }
 	 public function rawi_cum_year()
     {
@@ -907,12 +865,11 @@ class report extends BaseController
               
         $this->global['pageTitle'] = $this->CompanyName.' : Reports';
 		if ($this->input->post('btn_submit')) {
-		
 		$cname = $this->input->post('client_name');
 		$ab=$this->input->post('financialyear');
 		$fa=substr($ab,0,-5);
 		$aa=substr($ab,5,5);
-		
+		//print_r($prod);
        $data['material']=$this->dahsboard_Model->category();
 	   $data['cust']=$this->dahsboard_Model->customer_name();
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
@@ -922,7 +879,6 @@ class report extends BaseController
 	   $data['cust']=$this->dahsboard_Model->customer_name();
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
 	    
-	   
 	   $this->loadviews("Report_consolidate_raw",$this->global,$data, NULL);
 	  
 
@@ -948,6 +904,7 @@ class report extends BaseController
 	   
 	   $this->loadviews("Report_consolidate_month",$this->global,$data, NULL);
 	  
+
     }
 	public function rawi_consolidate_year()
     {
@@ -975,104 +932,91 @@ class report extends BaseController
     {
               
         $this->global['pageTitle'] = $this->CompanyName.' : Reports';
-	
 		if ($this->input->post('btn_submit')) {
-	
 		$cname = $this->input->post('client_name');
-	
 		$prod = $this->input->post('item_name');
-	
 		$ab=$this->input->post('financialyear');
-	
 		$cat = $this->input->get('cat');
-	
 		$fa=substr($ab,0,-5);
-	
 		$aa=substr($ab,5,5);
-	
 		$m=$this->input->post('month');
-	
 		$frm = $this->input->post('from_date');
-	
 		$t = $this->input->post('to_date');
-	
+		 //print_r($prod);
        $data['material']=$this->dahsboard_Model->material_name();
-	
 	   $data['cust']=$this->dahsboard_Model->customer_name();
-	
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
-	
        $data['ppurchse']=$this->dahsboard_Model->pending_purchase($cname,$prod,$fa,$aa,$m,$frm,$t);
-	
 		}
-	
 		$data['material']=$this->dahsboard_Model->material_name();
-	
 	   $data['cust']=$this->dahsboard_Model->customer_name();
-	
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
       
+	   // print_r( $data['spurchse']);
 	   
 	   $this->loadviews("Report_pending_purchase",$this->global,$data, NULL);
 	  
-	    }
 
+    }
 	public function per()
     {
               
         $this->global['pageTitle'] = $this->CompanyName.' : Reports';
 	
+		
 		$ab=$this->input->post('financialyear');
 		
 		$fa=substr($ab,0,-5);
-
 		$aa=substr($ab,5,5);
-
 		$m=$this->input->post('month');
 		
+		 //print_r($prod);
       
 	   $data['fy']=$this->dahsboard_Model->fy();
       $data['per']=$this->dahsboard_Model->per($fa,$aa,$m);
      
+	   // print_r( $data['spurchse']);
 	    
 	   $this->loadviews("report_emp",$this->global,$data, NULL);
 	  
-   }
 
+    }
 	public function cashbook()
     {
               
+		
 		$this->global['pageTitle'] = $this->CompanyName.' : Cashbook Reports';
 		
+        $data['gettoptotal1'] =  $this->dahsboard_Model->gettoptotal(); 
+	    $data['getTotalServicePoCount'] = $this->dahsboard_Model->getTotalServicePoCount();
+		$data['getTotalimportPoCount'] = $this->dahsboard_Model->getTotalimportPoCount();	
+		$data['getTotalcapitalPoCount'] = $this->dahsboard_Model->getTotalcapitalPoCount();	
+		$data['getTotalrevenuePoCount'] = $this->dahsboard_Model->getTotalrevenuePoCount();
+        $data['cashbook']=$this->dahsboard_Model->cashbook();
+	    
 		$income="RECEIPT";
         $expense="PAYMENT";
-
-	   $data['cashbook']=$this->dahsboard_Model->cashbook();
-	   $data['gettoptotal1'] =  $this->dahsboard_Model->gettoptotal();
-	   $data['tdy']=$this->dahsboard_Model->today();
-
-	   //This Array used to get and display today data (for today tile option)
-	   $data['todayincome']=$this->dahsboard_Model->today_data($income);
-	   $data['todayexpense']=$this->dahsboard_Model->today_data($expense);
-	   //This Array used to get and display current month data (for monthly tile option)
         $data['monthlywiseincome']=$this->dahsboard_Model->monthwise_data($income);
         $data['monthlywiseexpense']=$this->dahsboard_Model->monthwise_data($expense);
-	   //This Array used to get and display current fin year data (for yearly tile option)
+        $data['todayincome']=$this->dahsboard_Model->today_data($income);
+        $data['todayexpense']=$this->dahsboard_Model->today_data($expense);
         $data['yearincome']=$this->dahsboard_Model->yearwise_data($income);
         $data['yearexpense']=$this->dahsboard_Model->yearwise_data($expense);
-	   
+	    $data['gettoptotal1'] =  $this->dahsboard_Model->gettoptotal();
-	   $now = new DateTime();
+		$data['tdy']=$this->dahsboard_Model->today();
-	   $currentdate = $now->format('Y-m-d');    // MySQL datetime format
+	   //echo ($data['tdy']);
-	   $yesterday =  date('Y-m-d', strtotime("-1 day"));
+		$data['Indiancurrency']=$this->dahsboard_Model->INRSymbol();
-	   
+      //print_r($data['gettoptotal1']);		
-	   $data['yesterdaytotal'] = $this->dahsboard_Model->daybeforetotal($yesterday);
+	   // $data['monthlywiseincome']=$this->dahsboard_Model->monthwise_data_income();
+       // $data['monthlywiseexpense']=$this->dahsboard_Model->monthwise_data_expense();
+       // $data['todayincome']=$this->dahsboard_Model->today_data_income();
+       // $data['todayexpense']=$this->dahsboard_Model->today_data_expense();
 
 		
 	    $this->loadviews("reportcashbook",$this->global,$data, NULL);
 	 
 	}
 
-
 	 //This Function used to get and display today data (link = form today tile option)//
   // public function Viewtoday()
   public function daily_incexp()
@@ -1092,7 +1036,6 @@ class report extends BaseController
   }
 	
 	//This Function used to get and display current monthly data (link = form monthly tile option)//
-   //public function monthexpenses()
       public function load_monthly_incexp()
    {    $data['monthyearvalue'] = '';
          $this->global['pageTitle'] = $this->CompanyName.' : Cashbook Monthly Reports';
@@ -1208,6 +1151,5 @@ class report extends BaseController
 	
 	$this->loadviews("cashbookyearmonthwise",$this->global,$data, NULL);	
 	}
-	
 }
 ?>

application/models/dahsboard_model.php

@@ -903,6 +903,7 @@ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterIGST),sum(distinct st.After_IG
 ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0) as discount,
 ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterFreightValue),sum(distinct st.AfterFreightValue)),0) as freight,
 ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterPackagingValue),0),0) as Package,
+ifnull(rt.Insurance,0) as insurance,
 round((
   if(POType = 'IMPORT',sum(distinct pm.ExchangeRate * (pl.Quantity * pl.Rate)),
 if(POType = 'CAPITAL' && CapitalRange = 0,sum(distinct pm.ExchangeRate * (pl.Quantity * pl.Rate)),
@@ -912,6 +913,7 @@ ifnull(sum(pl.Quantity * pl.Rate),0)))
 + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterIGST),sum(distinct st.After_IGST)),0) 
 + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterFreightValue),sum(distinct st.AfterFreightValue)),0) 
 + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterPackagingValue),0),0)
++ ifnull(rt.Insurance,0)	
 - ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0)),2) as total
  FROM T_PurchaseOrder_Master pm
 join T_PurchaseOrder_LineItem pl on pl.PONO = pm.PONO
@@ -977,6 +979,7 @@ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterIGST),sum(distinct st.After_IG
 ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0) as discount,
 ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterFreightValue),sum(distinct st.AfterFreightValue)),0) as freight,
 ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterPackagingValue),0),0) as Package,
+ifnull(rt.Insurance,0) as insurance,
 round((
   if(POType = 'IMPORT',sum(distinct pm.ExchangeRate * (pl.Quantity * pl.Rate)),
 if(POType = 'CAPITAL' && CapitalRange = 0,sum(distinct pm.ExchangeRate * (pl.Quantity * pl.Rate)),
@@ -986,6 +989,7 @@ ifnull(sum(pl.Quantity * pl.Rate),0)))
 + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterIGST),sum(distinct st.After_IGST)),0) 
 + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterFreightValue),sum(distinct st.AfterFreightValue)),0) 
 + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterPackagingValue),0),0)
++ ifnull(rt.Insurance,0) 	
 - ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0)),2) as total
  FROM T_PurchaseOrder_Master pm
 left join T_PurchaseOrder_LineItem pl on pl.PONO = pm.PONO
@@ -1134,9 +1138,7 @@ group by supplier_name,material_name";
     
 case pm.POType
 when 'IMPORT'
-then ifnull((sum(distinct(pl.Quantity * pl.Rate) * pm.ExchangeRate)
+then ifnull((sum(distinct(pl.Quantity * pl.Rate) * pm.ExchangeRate)),0) + ifnull(rt.Insurance,0) 
-
-),0)
 when 'CAPITAL'
 then  sum(distinct if(pm.CapitalRange=0,(( pl.Quantity * pl.Rate) * pm.ExchangeRate),( pl.Quantity * pl.Rate) 
 - st.Afterdiscountval))
@@ -1144,6 +1146,7 @@ then  sum(distinct if(pm.CapitalRange=0,(( pl.Quantity * pl.Rate) * pm.ExchangeR
 + ifnull(sum(distinct st.After_CGST),0)
 + ifnull(sum(distinct st.After_IGST),0)
 + ifnull(sum(distinct st.AfterFreightValue),0)
++ ifnull(rt.Insurance,0)
 
 
 when 'SERVICE' 
@@ -1152,6 +1155,7 @@ then ifnull(sum(distinct pl.Quantity * pl.Rate),0)
 + ifnull(sum(distinct st.After_CGST),0)
 + ifnull(sum(distinct st.After_IGST),0)
 + ifnull(sum(distinct st.AfterFreightValue),0)
++ ifnull(rt.Insurance,0)
 - ifnull(sum(distinct st.Afterdiscountval),0)
 
 when 'REVENUE' 
@@ -1162,6 +1166,7 @@ then ifnull(sum(distinct pl.Quantity * pl.Rate),0)
 + ifnull(sum(distinct rt.AfterIGST),0) 
 + ifnull(sum(distinct rt.AfterFreightValue),0) 
 + ifnull(sum(distinct rt.AfterPackagingValue),0)
++ ifnull(rt.Insurance,0)
 
 end
  as total
@@ -1400,32 +1405,56 @@ group by supplier_name,material_name";
   function ireport_purchase($cname,$prod,$fa,$aa,$m,$frm,$t,$cat){
         
         
-        $sql="select im.IGRNO as igrn,im.PONO as pono,pm.POType as potype,date_format(im.CreatedDate,'%d-%m-%Y') as created_date,TIME_FORMAT(im.CreatedDate,'%l:%i %p') as created_time,mm.MaterialName as material_name,mm.Category as category,sd.SupplierName as supplier_name,mm.UOM as UOM, sum(distinct id.QuantityAsPerInvoice) as quantity,pl.Rate as rate,sum(distinct id.QuantityAsPerInvoice) * pl.Rate as value,if(POType = 'IMPORT' or POType = 'CAPITAL',sum(distinct pm.ExchangeRate),0) as exchange_rate,
+        $sql="select im.IGRNO as igrn,pm.POType as potype,im.PONO as pono,date_format(im.CreatedDate,'%d-%m-%Y') as created_date,TIME_FORMAT(im.CreatedDate,'%l:%i %p') as created_time,mm.MaterialName as material_name,mm.Category as category,sd.SupplierName as supplier_name,mm.UOM as UOM, sum(id.QuantityAsPerInvoice) as quantity,pl.Rate as rate,round(sum(id.QuantityAsPerInvoice) * pl.Rate,2) as value,if(POType = 'IMPORT' or POType = 'CAPITAL',sum(pm.ExchangeRate),0) as exchange_rate,
-ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterSGST),sum(distinct st.After_SGST)),0) as sgst,
+round(ifnull(if(POType = 'REVENUE',
-ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterCGST),sum(distinct st.After_CGST)),0) as cgst,
+sum(id.QuantityAsPerInvoice * rt.AfterSGST / pl.Quantity),
-ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterIGST),sum(distinct st.After_IGST)),0) as igst,
+sum(id.QuantityAsPerInvoice * st.After_SGST / pl.Quantity)),0),2) as sgst,
-ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0) as discount,
+round(ifnull(if(POType = 'REVENUE',
-ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterFreightValue),sum(distinct st.AfterFreightValue)),0) as freight,
+sum(id.QuantityAsPerInvoice * rt.AfterCGST / pl.Quantity),
-ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterPackagingValue),0),0) as Package,
+sum(id.QuantityAsPerInvoice * st.After_CGST / pl.Quantity)),0),2) as cgst,
+round(ifnull(if(POType = 'REVENUE',
+sum(id.QuantityAsPerInvoice * rt.AfterIGST / pl.Quantity),
+sum(id.QuantityAsPerInvoice * st.After_IGST / pl.Quantity)),0),2) as igst,
+round(ifnull(if(POType = 'REVENUE',
+sum(id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity),
+sum(id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2) as discount,
+round(ifnull(if(POType = 'REVENUE',
+sum(id.QuantityAsPerInvoice * rt.AfterFreightValue / pl.Quantity),
+sum(id.QuantityAsPerInvoice * st.AfterFreightValue / pl.Quantity)),0),2) as freight,
+round(ifnull(if(POType = 'REVENUE',
+sum(id.QuantityAsPerInvoice * rt.AfterPackagingValue / pl.Quantity),0),0),2) as Package,
+
 round((
-  if(POType = 'IMPORT',sum(distinct pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)),
+  if(POType = 'IMPORT',sum(pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)),
-if(POType = 'CAPITAL' && CapitalRange = 0,sum(distinct pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)),
+if(POType = 'CAPITAL' && CapitalRange = 0,sum(pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)),
-ifnull(sum(distinct id.QuantityAsPerInvoice * pl.Rate),0)))
+ifnull(sum(id.QuantityAsPerInvoice * pl.Rate),0)))
-+ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterSGST),sum(distinct st.After_SGST)),0) 
++  round(ifnull(if(POType = 'REVENUE',
-+ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterCGST),sum(distinct st.After_CGST)),0) 
+   sum(id.QuantityAsPerInvoice * rt.AfterSGST / pl.Quantity),
-+ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterIGST),sum(distinct st.After_IGST)),0) 
+   sum(id.QuantityAsPerInvoice * st.After_SGST / pl.Quantity)),0),2) 
-+ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterFreightValue),sum(distinct st.AfterFreightValue)),0) 
++  round(ifnull(if(POType = 'REVENUE',
-+ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterPackagingValue),0),0)
+   sum(id.QuantityAsPerInvoice * rt.AfterCGST / pl.Quantity),
-- ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0)),2) as total,pb.FilePath as file
+   sum(id.QuantityAsPerInvoice * st.After_CGST / pl.Quantity)),0),2)  
++  round(ifnull(if(POType = 'REVENUE',
+   sum(id.QuantityAsPerInvoice * rt.AfterIGST / pl.Quantity),
+   sum(id.QuantityAsPerInvoice * st.After_IGST / pl.Quantity)),0),2) 
++  round(ifnull(if(POType = 'REVENUE',
+   sum(id.QuantityAsPerInvoice * rt.AfterFreightValue / pl.Quantity),
+   sum(id.QuantityAsPerInvoice * st.AfterFreightValue / pl.Quantity)),0),2) 
++  round(ifnull(if(POType = 'REVENUE',
+   sum(id.QuantityAsPerInvoice * rt.AfterPackagingValue / pl.Quantity),0),0),2)
+-  round(ifnull(if(POType = 'REVENUE',
+   sum(id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity),
+   sum(id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2)),2) as total,
+pb.FilePath as file
 from T_IGR_Master im
-join T_IGR_Details id on id.IGRNO = im.IGRNO
 join T_PurchaseOrder_LineItem pl on pl.PONO = im.PONO
+join T_IGR_Details id on id.IGRNO = im.IGRNO and id.MaterialCode = pl.MaterialCode
 join T_PurchaseOrder_Master pm on pm.PONO = pl.PONO
 left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode
 left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID
 left join T_Service_Tax st on st.LineItemNo = pl.LineItemNo 
 left join T_Revenue_Tax rt on rt.LineItemNo = pl.LineItemNo 
-left join T_PurchaseOrder_BillUpload pb on pb.PONO=pm.PONO
+left join T_PurchaseOrder_BillUpload pb on pb.IGRNO=im.IGRNO
 where pm.Status != 'ST030'  ";
 
 if ($cname!= ''){
@@ -1473,35 +1502,59 @@ $sql.="group by pono,material_name,category,supplier_name";
         $query = $this->db->query($sql);
         return $query->result();    
      }
-   function ireport_purchase_link($cname,$prod,$fa,$aa,$m,$frm,$t,$sid,$mid,$d,$cat){
+   function ireport_purchase_link($cname,$prod,$fa,$aa,$m,$frm,$t,$sid,$mid,$d,$cat,$da,$po){
         
         
-        $sql="select im.IGRNO as igrn,im.PONO as pono,pm.POType as potype,date_format(im.CreatedDate,'%d-%m-%Y') as created_date,TIME_FORMAT(im.CreatedDate,'%l:%i %p') as created_time,mm.MaterialName as material_name,mm.Category as category,sd.SupplierName as supplier_name,mm.UOM as UOM, sum(distinct id.QuantityAsPerInvoice) as quantity,pl.Rate as rate,sum(distinct id.QuantityAsPerInvoice) * pl.Rate as value,if(POType = 'IMPORT' or POType = 'CAPITAL',sum(distinct pm.ExchangeRate),0) as exchange_rate,
+        $sql="select im.IGRNO as igrn,pm.POType as potype,im.PONO as pono,date_format(im.CreatedDate,'%d-%m-%Y') as created_date,TIME_FORMAT(im.CreatedDate,'%l:%i %p') as created_time,mm.MaterialName as material_name,mm.Category as category,sd.SupplierName as supplier_name,mm.UOM as UOM, sum(id.QuantityAsPerInvoice) as quantity,pl.Rate as rate,round(sum(id.QuantityAsPerInvoice) * pl.Rate,2) as value,if(POType = 'IMPORT' or POType = 'CAPITAL',sum(pm.ExchangeRate),0) as exchange_rate,
-ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterSGST),sum(distinct st.After_SGST)),0) as sgst,
+round(ifnull(if(POType = 'REVENUE',
-ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterCGST),sum(distinct st.After_CGST)),0) as cgst,
+sum(id.QuantityAsPerInvoice * rt.AfterSGST / pl.Quantity),
-ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterIGST),sum(distinct st.After_IGST)),0) as igst,
+sum(id.QuantityAsPerInvoice * st.After_SGST / pl.Quantity)),0),2) as sgst,
-ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0) as discount,
+round(ifnull(if(POType = 'REVENUE',
-ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterFreightValue),sum(distinct st.AfterFreightValue)),0) as freight,
+sum(id.QuantityAsPerInvoice * rt.AfterCGST / pl.Quantity),
-ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterPackagingValue),0),0) as Package,
+sum(id.QuantityAsPerInvoice * st.After_CGST / pl.Quantity)),0),2) as cgst,
+round(ifnull(if(POType = 'REVENUE',
+sum(id.QuantityAsPerInvoice * rt.AfterIGST / pl.Quantity),
+sum(id.QuantityAsPerInvoice * st.After_IGST / pl.Quantity)),0),2) as igst,
+round(ifnull(if(POType = 'REVENUE',
+sum(id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity),
+sum(id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2) as discount,
+round(ifnull(if(POType = 'REVENUE',
+sum(id.QuantityAsPerInvoice * rt.AfterFreightValue / pl.Quantity),
+sum(id.QuantityAsPerInvoice * st.AfterFreightValue / pl.Quantity)),0),2) as freight,
+round(ifnull(if(POType = 'REVENUE',
+sum(id.QuantityAsPerInvoice * rt.AfterPackagingValue / pl.Quantity),0),0),2) as Package,
+
 round((
-  if(POType = 'IMPORT',sum(distinct pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)),
+  if(POType = 'IMPORT',sum(pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)),
-if(POType = 'CAPITAL' && CapitalRange = 0,sum(distinct pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)),
+if(POType = 'CAPITAL' && CapitalRange = 0,sum(pm.ExchangeRate * (id.QuantityAsPerInvoice * pl.Rate)),
-ifnull(sum(distinct id.QuantityAsPerInvoice * pl.Rate),0)))
+ifnull(sum(id.QuantityAsPerInvoice * pl.Rate),0)))
-+ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterSGST),sum(distinct st.After_SGST)),0) 
++  round(ifnull(if(POType = 'REVENUE',
-+ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterCGST),sum(distinct st.After_CGST)),0) 
+   sum(id.QuantityAsPerInvoice * rt.AfterSGST / pl.Quantity),
-+ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterIGST),sum(distinct st.After_IGST)),0) 
+   sum(id.QuantityAsPerInvoice * st.After_SGST / pl.Quantity)),0),2) 
-+ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterFreightValue),sum(distinct st.AfterFreightValue)),0) 
++  round(ifnull(if(POType = 'REVENUE',
-+ ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterPackagingValue),0),0)
+   sum(id.QuantityAsPerInvoice * rt.AfterCGST / pl.Quantity),
-- ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0)),2) as total,pb.FilePath as file
+   sum(id.QuantityAsPerInvoice * st.After_CGST / pl.Quantity)),0),2)  
++  round(ifnull(if(POType = 'REVENUE',
+   sum(id.QuantityAsPerInvoice * rt.AfterIGST / pl.Quantity),
+   sum(id.QuantityAsPerInvoice * st.After_IGST / pl.Quantity)),0),2) 
++  round(ifnull(if(POType = 'REVENUE',
+   sum(id.QuantityAsPerInvoice * rt.AfterFreightValue / pl.Quantity),
+   sum(id.QuantityAsPerInvoice * st.AfterFreightValue / pl.Quantity)),0),2) 
++  round(ifnull(if(POType = 'REVENUE',
+   sum(id.QuantityAsPerInvoice * rt.AfterPackagingValue / pl.Quantity),0),0),2)
+-  round(ifnull(if(POType = 'REVENUE',
+   sum(id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity),
+   sum(id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2)),2) as total,
+pb.FilePath as file
 from T_IGR_Master im
-join T_IGR_Details id on id.IGRNO = im.IGRNO
 join T_PurchaseOrder_LineItem pl on pl.PONO = im.PONO
+join T_IGR_Details id on id.IGRNO = im.IGRNO and id.MaterialCode = pl.MaterialCode
 join T_PurchaseOrder_Master pm on pm.PONO = pl.PONO
 left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode
 left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID
 left join T_Service_Tax st on st.LineItemNo = pl.LineItemNo 
 left join T_Revenue_Tax rt on rt.LineItemNo = pl.LineItemNo 
-left join T_PurchaseOrder_BillUpload pb on pb.PONO=pm.PONO
+left join T_PurchaseOrder_BillUpload pb on pb.IGRNO=im.IGRNO
 where pm.Status != 'ST030' ";
 
 if ($cname!= ''){
@@ -1555,6 +1608,16 @@ if ($cname!= ''){
       
           $sql.=" and mm.Category = '".$cat."' ";
         
+        }
+		 if ($da!= ''){
+      $ddd= date("Y-m-d",strtotime($da));
+          $sql.=" and date(im.CreatedDate) = '".$ddd."' ";
+        
+        }
+		 if ($po!= ''){
+      
+          $sql.=" and im.PONO = '".$po."' ";
+        
         }
         
 
@@ -1566,8 +1629,6 @@ $sql.="group by pono,material_name,category,supplier_name";
         $query = $this->db->query($sql);
         return $query->result();    
      }
-  
-
 	  function ireport_attachment($cname,$fa,$aa,$m,$frm,$t){
         
         
@@ -1657,47 +1718,51 @@ group by material_name,supplier_name";
     
 case pm.POType
 when 'IMPORT'
-then ifnull((sum(distinct(id.QuantityAsPerInvoice * pl.Rate) * pm.ExchangeRate)
+then ifnull((sum((id.QuantityAsPerInvoice * pl.Rate) * pm.ExchangeRate)
++ ifnull(rt.Insurance,0)
 
 ),0)
 when 'CAPITAL'
-then  sum(distinct if(pm.CapitalRange=0,(( id.QuantityAsPerInvoice * pl.Rate) * pm.ExchangeRate),( id.QuantityAsPerInvoice * pl.Rate) 
+then  sum( if(pm.CapitalRange=0,(( id.QuantityAsPerInvoice * pl.Rate) * pm.ExchangeRate),( id.QuantityAsPerInvoice * pl.Rate) 
 - st.Afterdiscountval))
-+ ifnull(sum(distinct st.After_SGST),0)
++ ifnull(sum(st.After_SGST),0)
-+ ifnull(sum(distinct st.After_CGST),0)
++ ifnull(sum(st.After_CGST),0)
-+ ifnull(sum(distinct st.After_IGST),0)
++ ifnull(sum(st.After_IGST),0)
-+ ifnull(sum(distinct st.AfterFreightValue),0)
++ ifnull(sum(st.AfterFreightValue),0)
++ ifnull(rt.Insurance,0)
 
 
 when 'SERVICE' 
-then ifnull(sum(distinct id.QuantityAsPerInvoice * pl.Rate),0)
+then ifnull(sum(id.QuantityAsPerInvoice * pl.Rate),0)
-+ ifnull(sum(distinct st.After_SGST),0)
++ ifnull(sum(st.After_SGST),0)
-+ ifnull(sum(distinct st.After_CGST),0)
++ ifnull(sum(st.After_CGST),0)
-+ ifnull(sum(distinct st.After_IGST),0)
++ ifnull(sum(st.After_IGST),0)
-+ ifnull(sum(distinct st.AfterFreightValue),0)
++ ifnull(sum(st.AfterFreightValue),0)
-- ifnull(sum(distinct st.Afterdiscountval),0)
++ ifnull(rt.Insurance,0)
+- ifnull(sum(st.Afterdiscountval),0)
 
 when 'REVENUE' 
-then ifnull(sum(distinct id.QuantityAsPerInvoice * pl.Rate),0) 
+then ifnull(sum(id.QuantityAsPerInvoice * pl.Rate),0) 
-- ifnull(sum(distinct rt.AfterDiscount),0)
+- ifnull(sum(rt.AfterDiscount),0)
-+ ifnull(sum(distinct rt.AfterSGST),0) 
++ ifnull(sum(rt.AfterSGST),0) 
-+ ifnull(sum(distinct rt.AfterCGST),0) 
++ ifnull(sum(rt.AfterCGST),0) 
-+ ifnull(sum(distinct rt.AfterIGST),0) 
++ ifnull(sum(rt.AfterIGST),0) 
-+ ifnull(sum(distinct rt.AfterFreightValue),0) 
++ ifnull(sum(rt.AfterFreightValue),0) 
-+ ifnull(sum(distinct rt.AfterPackagingValue),0)
++ ifnull(sum(rt.AfterPackagingValue),0)
++ ifnull(rt.Insurance,0)
 
 end
  as total
 from T_IGR_Master im 
-join T_IGR_Details id on id.IGRNO = im.IGRNO
 join T_PurchaseOrder_LineItem pl on pl.PONO = im.PONO
-join T_PurchaseOrder_Master pm on pm.PONO = pl.PONO
+ join T_IGR_Details id on id.IGRNO = im.IGRNO and id.MaterialCode = pl.MaterialCode 
-left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode
+ join T_PurchaseOrder_Master pm on pm.PONO = pl.PONO 
-left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID
+ left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode
-left join T_Service_Tax st on st.LineItemNo = pl.LineItemNo 
+ left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID 
-left join T_Revenue_Tax rt on rt.LineItemNo = pl.LineItemNo 
+ left join T_Service_Tax st on st.LineItemNo = pl.LineItemNo 
-left join T_PurchaseOrder_BillUpload pb on pb.PONO=pm.PONO
+ left join T_Revenue_Tax rt on rt.LineItemNo = pl.LineItemNo
-where pm.Status != 'ST030' ";
+ left join T_PurchaseOrder_BillUpload pb on pb.IGRNO=im.IGRNO
+ where pm.Status != 'ST030'";
 
 if ($cname!= ''){
       
@@ -2102,6 +2167,8 @@ if ($cname!= ''){
     //echo $sql;
         return $query->result();    
      }
+
+//Cashbook query are.,
   function cashbook()
   {
         $sql="SELECT date_format(tinc.date,'%d-%m-%Y')as date,

application/views/Report_Material_Master_ItemWise.php

@@ -6,10 +6,9 @@ if(!empty($mmi))
 
 }
 ?>
-<!-- <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%;
@@ -30,8 +29,6 @@ if(!empty($mmi))
 			   
 	 </style>
      <div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-      
     <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
@@ -49,7 +46,7 @@ if(!empty($mmi))
 		       
 			 <div class="box-body">
               <div>
-                <table class="table table-bordered table-hover" style="font-size: 12px;" id="cc">
+                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
                    <thead>
                      <tr>
 				       
@@ -57,6 +54,7 @@ if(!empty($mmi))
 					   <th>Material Name</th>
 					   <th>UOM</th>
 					   <th>Category</th>
+					   <th>HSNCODE</th>
 					   
 					 
                       </tr>
@@ -72,7 +70,7 @@ if(!empty($mmi))
 				        <td><span><?php echo $rel->MaterialName?></span></td>
 						<td><span><?php echo $rel->UOM?></span></td>
 						<td><span><?php echo $rel->Category?></span></td>
-						
+						<td><span><?php echo $rel->HSNCODE?></span></td>
 					   
 					   
 					
@@ -93,15 +91,16 @@ if(!empty($mmi))
         <!-- /.col -->
       </div>
       </section>
-</div>
+    </div>
+
+
+	<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 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> 
 	
 
@@ -112,15 +111,19 @@ $(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: [
+         buttons: [
+            
             {
                 extend: 'excelHtml5',
 				footer: 'true',
+				//messageTop: $('h3').text(),
 				title: 'Report - Material Master - Item Wise',
                 exportOptions: {
                     columns: ':visible'
+					
                 }
             },
+            
             'colvis'
         ]
     } );

application/views/Report_Material_Master_ReceiptValue.php

@@ -7,11 +7,8 @@ if(!empty($mmr))
 }
 ?>
 
-<!-- <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%;
@@ -30,183 +27,123 @@ if(!empty($mmr))
                            }
 		    .btn-success {
 								background-color: #5d0411;
-
 								border-color: #5d0411;
-
 							}					   
 		 
 			   
 	 </style>
-   <!-- <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script> -->
+	 <div class="content-wrapper">
-<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>
-<div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-      
     <section class="content"><br/>  
-
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Material Master - Receipt Value</b> <br><br>
+              <center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Material Master - Receipt Value</b>
+			  <br><br>
 			  <?php
 			  
-			  
-
 			  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 ' ';
-
 			  }
-			  ?></p></h3></center>
+			 
+			  ?>
+			  </p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
 		    <div class="panel-body">
 
-
-
                     <form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
 
                         <div class="form-group has-feedback">
 						
+						
+						
                        <div class="col-md-2">
-
 							 <label for="to_date">
-
                                 <?php echo 'Year'; ?>
-
                             </label>
-
                             <div class="input-group">
-
                                  <select class="form-control" id="financialyear" name="financialyear">
-
 								 <option value="">Select Year</option>
-
 								 <?php 
 								 
 								
 								  foreach($finyear as $item):
 										 
-										 
-
 										 {?>
 										
-										
-
 										<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
 										
 												 
-
-												 
-
 										 <?php } endforeach; ?>
 								  
-								  
-
 								   </select>
-
 							   </div>
-
                             </div>
-
 								<div class="col-md-2">
-
 								<label for="to_date">
-
                                 <?php echo 'Month'; ?>
-
                                 </label>
-
                                 <div class="input-group">
-
                                  <select class="form-control" id="month" name="month">
-
 								  <option value="">Select Month</option>
-
 								 <option value="January">January</option>
-
 								 <option value="February">February</option>
-
 								 <option value="March">March</option>
-
 								 <option value="April">April</option>
-
 								 <option value="May">May</option>
-
 								 <option value="June">June</option>
-
 								 <option value="July">July</option>
-
 								 <option value="August">August</option>
-
 								 <option value="September">September</option>
-
 								 <option value="October">October</option>
-
 								 <option value="November">November</option>
-
 								 <option value="December">December</option>
-
 								 </select>
-
+                              </div>
                             </div>
 						
-                            </div>
+             
+                     
+					
+
+             
                       
 						<div class="col-md-2 col-md-offset-0"><br>
-
                         <input type="submit" class="btn btn-success" name="btn_submit" style="padding:10px;"
-
                                value="View Report">
                         
-                        
-
 							</div>  
-
 							</div>  
-
                     </form>
+
+               
+
             </div>	
            	
 			 
 		       
-			 
-		       
 			 <div class="box-body">
               <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:12.5px;">
+                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
                    <thead>
                      <tr>
 				       <th>Month</th>
                        <th>Material Code</th>
 					   <th>Material Name</th>
 					   <th>UOM</th>
-					   <th>Average Rate</th>
+					   <th>Average Rate ( <i class="fa fa-rupee " ></i>)</th>
 					   
 					   
 					 
@@ -229,6 +166,8 @@ if(!empty($mmr))
 						$tot= $tot + number_format($rel->Average_Rate,2,'.','');
 						echo number_format($rel->Average_Rate,2,'.','')?></span></td>
 					   
+					   
+					
 					  </tr>
 			           <?php
 					    }
@@ -238,19 +177,12 @@ if(!empty($mmr))
 			        </tbody>
 					<tfoot>
 					<td style="text-align:center"><?php 
-
 					$t='Total';
-
 					echo $t;?></td>
-
 					<td><?php echo '';?></td>
-
 					<td><?php echo '';?></td>
-
 					<td><?php echo '';?></td>
-
 					<td style="text-align:right"><?php echo number_format($tot,2,'.','');?></td>
-
 					</tfoot>
 			      </table>
 			 
@@ -261,14 +193,16 @@ if(!empty($mmr))
         </div>
         <!-- /.col -->
       </div>
-  </section>.
+	  </section>
-</div>
+    </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.4.2/js/dataTables.buttons.min.js"></script>
-<script src="https://cdn.datatables.net/buttons/1.3.1/js/buttons.html5.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/buttons/1.3.1/js/buttons.print.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/jszip/3.1.3/jszip.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,20 +213,21 @@ $(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: [
+        buttons: [
+            
             {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-       //title: 'Report - Material Master - ReceiptValue',
 				title: $('h3').text(),
                 exportOptions: {
                     columns: ':visible'
+					
                 }
             },
-   'colvis'
-]
             
+            'colvis'
+        ]
     } );
 } );
  $('#mySelect').on('change',function(){

application/views/Report_Material_Master_SupplierWise.php

@@ -1,14 +1,12 @@
 
-
 <?php
 if(!empty($mms))
 {
 
 }
 ?>
-<!-- <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">
 
+<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 {
@@ -24,14 +22,14 @@ if(!empty($mms))
 		    div.dt-buttons {
                             position: relative;
                             float: right;
-
                            }
-		 
+            .btn-success {
+								background-color: #5d0411;
+								border-color: #5d0411;
+							}		
 			   
 	 </style>
      <div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-      
     <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
@@ -98,10 +96,8 @@ if(!empty($mms))
       </div>
       
     </section>
+    </div>
 
-</div>
-
-	  <!-- <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>
@@ -109,7 +105,7 @@ if(!empty($mms))
 	<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> 
+<script> 
 	
 
 // Bootstrap datepicker
@@ -119,18 +115,21 @@ $(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: [
+         buttons: [
+            
             {
                 extend: 'excelHtml5',
 				footer: 'true',
+				//messageTop: $('h3').text(),
 				title: 'Report - Material Master - SupplierWise',
                 exportOptions: {
                     columns: ':visible'
+					
                 }
             },
+            
             'colvis'
         ]
-
     } );
 } );
  $('#mySelect').on('change',function(){

application/views/Report_POreleased.php

@@ -6,10 +6,9 @@ if(!empty($rel_po))
 
 }
 ?>
-<!-- <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%;
@@ -45,264 +44,147 @@ if(!empty($rel_po))
             <div class="box-header with-border">
               <center><h3 class="box-title"><p style="color:#5d0411"><b>Order Value - Released</b>
 			  <br><br>
-
 			  <?php
 			  
-			  
-
 			  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;
-
 			  }
-
 		      if($this->input->post('total_order_value_From') && $this->input->post('total_order_value_To')){
-
 				   $tfrm = $this->input->post('total_order_value_From');
-
 		           $tt = $this->input->post('total_order_value_To');  
-
 				  echo 'Total Order Value between'.' '.'RS.'.$tfrm.'-to-'.'RS.'.$tt;
-
 			  }
-
+			  ?>
-			  ?></p></h3></center>
+			  </p></h3></center>
 			</div>
 			<!-- /.box-header -->
-            <!-- <div class="row">
-		   <div class="col-md-6">
-			 <div class="input-group input-daterange input" >
-                   <div class="input-group-addon"><b>Total Order Value From:</b></div>
-                   <input type="number" id="min" class="form-control date-range-filter"  placeholder="From:">
-                   <div class="input-group-addon"><b>to</b></div>
-                   <input type="number" id="max" class="form-control date-range-filter"  placeholder="To:">
-		           <div class="input-group-addon"> <a   onclick="Reset()"><b>Clear</b></a></div>
-             </div>
-           </div>
-		  
-		    <div class="col-md-6">
-			 <div class="input-group input-daterange input">
-                   <div class="input-group-addon"><b>Released 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:">
-		           <div class="input-group-addon"> <a   onclick="Reset()"  ><b>Clear</b></a></div>
-             </div>
-           </div> 
-        </div>			 -->
            	<div class="panel-body">
 
                     <form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
 
                         <div class="form-group has-feedback">
+						
+						
+						
                        <div class="col-md-2">
-
 							 <label for="to_date">
-
                                 <?php echo 'Year'; ?>
-
                             </label>
-
                             <div class="input-group">
-
                                  <select class="form-control" id="financialyear" name="financialyear">
-
 								 <option value="">Select Year</option>
-
 								 <?php 
 								 
+								
 								  foreach($finyear as $item):
 										 
 										 {?>
 										
 										<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
 										
+												 
 										 <?php } endforeach; ?>
 								  
-								  
-
 								   </select>
-
 							   </div>
-
                             </div>
-
 								<div class="col-md-2">
-
 								<label for="to_date">
-
                                 <?php echo 'Month'; ?>
-
                                 </label>
-
                                 <div class="input-group">
-
                                  <select class="form-control" id="month" name="month">
-
 								  <option value="">Select Month</option>
-
 								 <option value="January">January</option>
-
 								 <option value="February">February</option>
-
 								 <option value="March">March</option>
-
 								 <option value="April">April</option>
-
 								 <option value="May">May</option>
-
 								 <option value="June">June</option>
-
 								 <option value="July">July</option>
-
 								 <option value="August">August</option>
-
 								 <option value="September">September</option>
-
 								 <option value="October">October</option>
-
 								 <option value="November">November</option>
-
 								 <option value="December">December</option>
-
 								 </select>
-
                               </div>
-
                             </div>
-
 						<div class="col-md-2">
-
 						    <label for="total_order_value_From">
-
                                 <?php echo 'Total Order Value From'; ?>
-
                             </label>
-
                             <div class="input-group">
-
                                 <input name="total_order_value_From" id="total_order_value_From" style="padding:4px;">
-
                             </span>
-
+                            </div>
                         </div>
 
-                        </div>
              
                        <div class="col-md-2">
-
 					        <label for="total_order_value_To">
-
                                 <?php echo 'Total Order Value To'; ?>
-
                             </label>  
-
                             <div class="input-group">
-
                                 <input name="total_order_value_To" id="total_order_value_To" style="padding:4px;">
-
                              </span>
-
                             </div>
                        
-                       
-
 						</div>
-
 						<div class="col-md-2">
-
 						    <label for="from_date">
-
                                 <?php echo 'From Date'; ?>
-
                             </label>
-
                             <div class="input-group">
-
                                 <input name="from_date" id="max-date" class="form-control datepicker">
-
                                 <span class="input-group-addon">
-
                                     <i class="fa fa-calendar fa-fw"></i>
-
                             </span>
-
                             </div>
-
                         </div>
 
              
-
-             
-
                        <div class="col-md-2">
-
 					        <label for="to_date">
-
                                 <?php echo 'To Date'; ?>
-
                             </label>  
-
                             <div class="input-group">
-
                                 <input name="to_date" id="min-date" class="form-control datepicker">
-
                                 <span class="input-group-addon">
-
                                     <i class="fa fa-calendar fa-fw"></i>
-
                             </span>
-
-                            </div>
-
-                       
-
-						</div>
-
-						<div class="col-md-2 col-md-offset-10"><br>
-
-                        <input type="submit" class="btn btn-success" name="btn_submit" value="View Report">
-
-                        
-
                             </div>
                        
 						</div>
+						<div class="col-md-2 col-md-offset-11"><br>
+                        <input type="submit" class="btn btn-success" name="btn_submit"
+                               value="View Report">
                         
+							</div>  
+							</div>  
                     </form>
 
+               
+
             </div>		
 			 
 		        
 			 <div class="box-body">
               <div>
-                <table class="table table-bordered table-hover" id="req" >
+                <table class="table table-bordered table-hover" id="req" style="font-size:14px;">
                    <thead>
                      <tr>
 				       <th>PO No</th>
@@ -310,12 +192,14 @@ if(!empty($rel_po))
 					   <th>PO Date</th>
 					   <th>Released Date</th>
 					   <th>Requested Department</th>
-                       <th>Total Order Value</th>
+                       <th>Total Order Value &nbsp;( <i class="fa fa-rupee "></i>)</th>
                        
                       </tr>
                     </thead>
 				    <tbody>
-				       <?php  $tot=0.00; if(!empty($rel_po)){
+				       <?php 
+					   $tot=0.00;
+					   if(!empty($rel_po)){
 					   foreach($rel_po as $rel)
 					    {				
 					   ?> 
@@ -325,9 +209,8 @@ if(!empty($rel_po))
 				        <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 $rel->TotalOrderValue?></span></td> -->
 					    <td align="right"><span><?php 
-						$tot= $tot+number_format($rel->TotalOrderValue,2,'.','');
+						$tot= $tot + number_format($rel->TotalOrderValue,2,'.','');
 						echo number_format($rel->TotalOrderValue,2,'.','')?></span></td>
 					   
 					
@@ -339,23 +222,14 @@ if(!empty($rel_po))
 					   ?>
 			        </tbody>
 					<tfoot>
-
 					<td style="text-align:center"><?php 
-
 					$t='Total';
-
 					echo $t;?></td>
-
 					<td><?php echo '';?></td>
-
 					<td><?php echo '';?></td>
-
 					<td><?php echo '';?></td>
-
 					<td><?php echo '';?></td>
-
 					<td style="text-align:right"><?php echo number_format($tot,2,'.','');?></td>
-
 					</tfoot>
 			      </table>
 			 
@@ -368,7 +242,7 @@ if(!empty($rel_po))
       </div>
 	  </section>
     </div>
-      <!-- <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>
@@ -387,16 +261,18 @@ $(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: 'excelHtml5',
 				footer: 'true',
-                title: $('h3').text(),
-                //title: 'Report - Released PO',
 				//messageTop: $('h3').text(),
+				title: $('h3').text(),
                 exportOptions: {
                     columns: ':visible'
+					
                 }
             },
+            
             'colvis'
         ]
     } );
@@ -493,13 +369,14 @@ $.fn.dataTable.ext.search.push(
 );
  
 $(document).ready(function() {
+    //var table = $('#qdetails').DataTable();
      
     // Event listener to the two range filtering inputs to redraw on input
     $('#min, #max').keyup( function() {
         table.draw();
     } );
 } );
-
+//for clear button
 function Reset()
 {
 	 $('#min').val('');
@@ -508,5 +385,11 @@ function Reset()
 	 $('#max-date').val('');
 }
 
+
+
+
+
+
+
 	</script>
 	

application/views/Report_attach_inward.php

@@ -278,7 +278,7 @@ if(!empty($mms))
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
 
 
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>

application/views/Report_consolidate.php

@@ -1,14 +1,24 @@
-<!-- <link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"> -->
+
+
+<script>
+ $(document).ready(function () {
+	 
+	  $("#client_name").select2();
+	 
+	  
+                
+            }); 
+</script>
+
 <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;
@@ -23,6 +33,20 @@
 								background-color: #5d0411;
 								border-color: #5d0411;
 							}	
+ th{ white-space: nowrap; }
+		   td{ white-space: wrap; }
+		   .dataTable > thead > tr > th[class*="sort"]:after{
+    content: "" !important;
+}
+
+table.dataTable thead > tr > th.sorting_asc, 
+table.dataTable thead > tr > th.sorting_desc, 
+table.dataTable thead > tr > th.sorting, 
+table.dataTable thead > tr > td.sorting_asc, 
+table.dataTable thead > tr > td.sorting_desc, 
+table.dataTable thead > tr > td.sorting {
+    padding-right: inherit;
+}							
 		 
 			   
 	 </style>
@@ -46,7 +70,9 @@
 				  $ab=$this->input->post('financialyear'); 
 				  echo '('.$ab.')';
 			  }
-			  ?></p></h3></center>
+		   
+			  ?>
+			  </p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -55,7 +81,7 @@
                     <form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
 
                         <div class="form-group has-feedback">
-						<div class="col-md-3">
+						<div class="col-md-4">
 						    <label for="client_name">
                                 <?php echo 'Supplier'; ?>
                             </label>
@@ -100,20 +126,21 @@
 							   </div>
                             </div>
 					
-                        <div class="col-md-2"><br>
+                        <div class="col-md-2">
+						<br>
 							 <label><input type="radio" name="colorRadio" id="value" onclick="toggleTables('2')" value="tab"> Value</label>
                              <label><input type="radio" name="colorRadio" id="qty" onclick="toggleTables('1')" value="ta" checked> Quantity</label>
                            
                             </div>
              
                      
-						<div class="col-md-2"><br>
+						<div class="col-md-2 "><br>
                         <input type="submit" class="btn btn-success" name="btn_submit"
                                value="View Report">
                         
 							</div>  
 							</div>  
-                    </for	m>
+                    </form>
 
                
 
@@ -121,23 +148,23 @@
            	
 			  <div class="box-body" style="display:block" id="a">
 	 
-	           <table class="table table-bordered table-hover" id="tab" style="font-size:10.4px;">
+	           <table class="table table-bordered table-hover" id="tab" style="font-size:14px;">
                         <thead>
                         <tr>
-							 <th style="text-align:center;">Supplier</th>
+							 <th style="text-align:center;">Supplier Name</th>
-							 <th style="text-align:center;">Product</th>
+							 <th style="text-align:center;">Material Name</th>
-							<th style="text-align:center;">April</th>
+							<th style="text-align:center;">Apr</th>
                             <th style="text-align:center;">May</th>
-                            <th style="text-align:center;">June</th>
+                            <th style="text-align:center;">Jun</th>
-							<th style="text-align:center;">July</th>
+							<th style="text-align:center;">Jul</th>
-							<th style="text-align:center;">August</th>
+							<th style="text-align:center;">Aug</th>
-							 <th style="text-align:center;">September</th>
+							 <th style="text-align:center;">Sep</th>
-							 <th style="text-align:center;">October</th>
+							 <th style="text-align:center;">Oct</th>
-							 <th style="text-align:center;">November</th>
+							 <th style="text-align:center;">Nov</th>
-							 <th style="text-align:center;">December</th> 
+							 <th style="text-align:center;">Dec</th> 
-							 <th style="text-align:center;">January</th>
+							 <th style="text-align:center;">Jan</th>
-							 <th style="text-align: center;">February</th>
+							 <th style="text-align: center;">Feb</th>
-							 <th style="text-align: center;">March</th>
+							 <th style="text-align: center;">Mar</th>
 							 <th style="text-align: center;">Total</th>
                              
                         </tr>
@@ -168,48 +195,78 @@
 							 <td style="text-align:left;"><?php 
 							if(!empty($result->material_name)) { echo $result->material_name ; } else {echo "-";}
 							?></td>
-							<td style="text-align:right;"><?php $apr= $apr + round($result->April); ?>
+							<td style="text-align:right;"><?php 
+							$apr= $apr + round($result->April);
+							?>
 							<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'April';?>"><?php echo round($result->April);?> </a>
 							</td>
-							<td style="text-align:right;"><?php $may= $may + round($result->May);?>
+							<td style="text-align:right;"><?php 
-							<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'May';?>"><?php echo round($result->May);?> </a></td>
+							$may= $may + round($result->May);
-							<td style="text-align:right;"><?php $jun= $jun + round($result->June);?>
+							?>
+							<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'May';?>"><?php echo round($result->May);?> </a>
+							</td>
+							<td style="text-align:right;"><?php 
+							$jun= $jun + round($result->June);
+							?>
 							 <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'June';?>"><?php echo round($result->June);?> </a>
 							 </td>
-							<td style="text-align:right;"><?php $jul= $jul + round($result->July);?>
+							<td style="text-align:right;"><?php 
+							$jul= $jul + round($result->July);
+							?>
 							<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'July';?>"><?php echo round($result->July);?> </a>
 							</td>
-							<td style="text-align:right;"><?php $aug= $aug + round($result->August); ?>
+							<td style="text-align:right;"><?php 
+							$aug= $aug + round($result->August);
+							?>
 							<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'August';?>"><?php echo round($result->August);?> </a>
 							</td>
-							<td style="text-align:right;"><?php $sep= $sep + round($result->September); ?>
+							<td style="text-align:right;"><?php 
+							$sep= $sep + round($result->September);
+							?>
 							<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'September';?>"><?php echo round($result->September);?> </a>
 							</td>
-							<td style="text-align:right;"><?php $oct= $oct + round($result->October); ?>
+							<td style="text-align:right;"><?php 
+							$oct= $oct + round($result->October);
+							 ?>
 							 <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'October';?>"><?php echo round($result->October);?> </a>
 							 </td>
-							<td style="text-align:right;"><?php $nov= $nov + round($result->November); ?>
+							<td style="text-align:right;"><?php 
+							$nov= $nov + round($result->November);
+							 ?>
 							 <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'November';?>"><?php echo round($result->November);?> </a>
 							 </td>
-							<td style="text-align:right;"><?php $dec= $dec + round($result->December); ?>
+							<td style="text-align:right;"><?php 
+							$dec= $dec + round($result->December);
+							?>
 							 <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'December';?>"><?php echo round($result->December);?> </a>
 							 </td>
-							<td style="text-align:right;"><?php $jan= $jan + round($result->January); ?>
+							<td style="text-align:right;"><?php 
+							$jan= $jan + round($result->January);
+							?>
 							 <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'January';?>"><?php echo round($result->January);?> </a>
 							 </td>
-							<td style="text-align:right;"><?php $feb= $feb + round($result->February); ?>
+							<td style="text-align:right;"><?php 
+							$feb= $feb + round($result->February);
+							?>
 							 <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'February';?>"><?php echo round($result->February);?> </a>
 							 </td>
-							<td style="text-align:right;"><?php $mar= $mar + round($result->March); ?>
+							<td style="text-align:right;"><?php 
+							$mar= $mar + round($result->March);
+							?>
 							 <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'March';?>"><?php echo round($result->March);?> </a>
 							 </td>
-							 <td style="text-align:right;"><?php $tot= $tot + round($result->qtotal); ?>
+							 <td style="text-align:right;"><?php 
-							 <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo round($result->qtotal);?> </a>
+							$tot= $tot + round($result->qtotal);
+							?>
+							 <a href="<?= base_url() ?>report/consolidate_year?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo round($result->qtotal);?> </a>
 							 </td>
 						</tr>
 						
 					<?php
+					
 					} 
+					
+					
 					?>
                         </tbody>
 						<tfoot  width="100%">
@@ -345,31 +402,35 @@
 						</tr>
 						
 						</tfoot>
-				<?php  }  ?>
+						<?php
+					
+					} 
+					
+					?>
                     </table>
                
                 </div>
 	<div class="box-body" id="b" style="display:none">
 	 
 	 		
-                    <table class="table table-bordered table-hover"  style="font-size:10.4px;" id="ta">
+                    <table class="table table-bordered table-hover"  style="font-size:14px;" id="ta">
                         <thead>
                         <tr>
-							 <th style="text-align:center;">Supplier</th>
+							 <th style="text-align:center;">Supplier Name</th>
-							 <th style="text-align:center;">Product</th>
+							 <th style="text-align:center;">Material Name</th>
-							<th style="text-align:center;">April</th>
+							<th style="text-align:center;">Apr &nbsp;(<i class="fa fa-rupee "  ></i>)</th>
-                            <th style="text-align:center;">May</th>
+                            <th style="text-align:center;">May &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-                            <th style="text-align:center;">June</th>
+                            <th style="text-align:center;">Jun &nbsp;(<i class="fa fa-rupee "></i>)</th>
-							<th style="text-align:center;">July</th>
+							<th style="text-align:center;">Jul &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-							<th style="text-align:center;">August</th>
+							<th style="text-align:center;">Aug &nbsp;(<i class="fa fa-rupee "></i>)</th>
-							 <th style="text-align:center;">September</th>
+							 <th style="text-align:center;">Sep &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-							 <th style="text-align:center;">October</th>
+							 <th style="text-align:center;">Oct &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-							 <th style="text-align:center;">November</th>
+							 <th style="text-align:center;">Nov &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-							 <th style="text-align:center;">December</th> 
+							 <th style="text-align:center;">Dec &nbsp;(<i class="fa fa-rupee " ></i>)</th> 
-							 <th style="text-align:center;">January</th>
+							 <th style="text-align:center;">Jan &nbsp;(<i class="fa fa-rupee "  ></i>)</th>
-							 <th style="text-align: center;">February</th>
+							 <th style="text-align: center;">Feb &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-							 <th style="text-align: center;">March</th>
+							 <th style="text-align: center;">Mar &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-							 <th style="text-align: center;">Total</th>
+							 <th style="text-align: center;">Total &nbsp;(<i class="fa fa-rupee "  ></i>)</th>
                              
                         </tr>
                         </thead>
@@ -398,44 +459,70 @@
 							 <td style="text-align:left;"><?php 
 							if(!empty($result->material_name)) { echo $result->material_name ; } else {echo "-";}
 							?></td>
-							<td style="text-align:right;"><?php $apr= $apr + number_format($result->vApril,2,'.',''); ?>
+							<td style="text-align:right;"><?php 
+							$apr= $apr + number_format($result->vApril,2,'.','');
+							?>
 							<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'April';?>"><?php echo number_format($result->vApril,2,'.','');?> </a>
 							</td>
-							<td style="text-align:right;"><?php $may= $may + number_format($result->vMay,2,'.',''); ?>
+							<td style="text-align:right;"><?php 
+							$may= $may + number_format($result->vMay,2,'.','');
+							?>
 							<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'May';?>"><?php echo number_format($result->vMay,2,'.','');?> </a>
 							</td>
-							<td style="text-align:right;"><?php $jun= $jun + number_format($result->vJune,2,'.',''); ?>
+							<td style="text-align:right;"><?php 
+							$jun= $jun + number_format($result->vJune,2,'.','');
+							?>
 							 <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'June';?>"><?php echo number_format($result->vJune,2,'.','');?> </a>
 							 </td>
-							<td style="text-align:right;"><?php $jul= $jul + number_format($result->vJuly,2,'.',''); ?>
+							<td style="text-align:right;"><?php 
+							$jul= $jul + number_format($result->vJuly,2,'.','');
+							?>
 							<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'July';?>"><?php echo number_format($result->vJuly,2,'.','');?> </a>
 							</td>
-							<td style="text-align:right;"><?php $aug= $aug + number_format($result->vAugust,2,'.',''); ?>
+							<td style="text-align:right;"><?php 
+							$aug= $aug + number_format($result->vAugust,2,'.','');
+							?>
 							<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'August';?>"><?php echo number_format($result->vAugust,2,'.','');?> </a>
 							</td>
-							<td style="text-align:right;"><?php $sep= $sep + number_format($result->vSeptember,2,'.',''); ?>
+							<td style="text-align:right;"><?php 
+							$sep= $sep + number_format($result->vSeptember,2,'.','');
+							?>
 							<a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'September';?>"><?php echo number_format($result->vSeptember,2,'.','');?> </a>
 							</td>
-							<td style="text-align:right;"><?php $oct= $oct + number_format($result->vOctober,2,'.',''); ?>
+							<td style="text-align:right;"><?php 
+							$oct= $oct + number_format($result->vOctober,2,'.','');
+							 ?>
 							 <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'October';?>"><?php echo number_format($result->vOctober,2,'.','');?> </a>
 							 </td>
-							<td style="text-align:right;"><?php $nov= $nov + number_format($result->vNovember,2,'.',''); ?>
+							<td style="text-align:right;"><?php 
+							$nov= $nov + number_format($result->vNovember,2,'.','');
+							 ?>
 							 <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'November';?>"><?php echo number_format($result->vNovember,2,'.','');?> </a>
 							 </td>
-							<td style="text-align:right;"><?php $dec= $dec + number_format($result->vDecember,2,'.',''); ?>
+							<td style="text-align:right;"><?php 
+							$dec= $dec + number_format($result->vDecember,2,'.','');
+							?>
 							 <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'December';?>"><?php echo number_format($result->vDecember,2,'.','');?> </a>
 							 </td>
-							<td style="text-align:right;"><?php $jan= $jan + number_format($result->vJanuary,2,'.',''); ?>
+							<td style="text-align:right;"><?php 
+							$jan= $jan + number_format($result->vJanuary,2,'.','');
+							?>
 							 <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'January';?>"><?php echo number_format($result->vJanuary,2,'.','');?> </a>
 							 </td>
-							<td style="text-align:right;"><?php $feb= $feb + number_format($result->vFebruary,2,'.',''); ?>
+							<td style="text-align:right;"><?php 
+							$feb= $feb + number_format($result->vFebruary,2,'.','');
+							?>
 							 <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'February';?>"><?php echo number_format($result->vFebruary,2,'.','');?> </a>
 							 </td>
-							<td style="text-align:right;"><?php $mar= $mar + number_format($result->vMarch,2,'.',''); ?>
+							<td style="text-align:right;"><?php 
+							$mar= $mar + number_format($result->vMarch,2,'.','');
+							?>
 							 <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'March';?>"><?php echo number_format($result->vMarch,2,'.','');?> </a>
 							 </td>
-							 <td style="text-align:right;"><?php $tot= $tot + number_format($result->vtotal,2,'.',''); ?>
+							 <td style="text-align:right;"><?php 
-							 <a href="<?= base_url() ?>report/consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo number_format($result->vtotal,2,'.','');?> </a>
+							$tot= $tot + number_format($result->vtotal,2,'.','');
+							?>
+							 <a href="<?= base_url() ?>report/consolidate_year?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo number_format($result->vtotal,2,'.','');?> </a>
 							 </td>
 						</tr>
 						
@@ -579,7 +666,12 @@
 						</tr>
 						
 						</tfoot>
-				<?php } ?>
+						<?php
+					
+					} 
+					
+					
+					?>
                     </table>
                 
                 </div>
@@ -589,20 +681,17 @@
         </div>
         <!-- /.col -->
       </div>
-  </form>
+	  </section>
-</div>
+    </div>
-</div>
+
-</div>
+
-</div>
-</section>
-</div>
-	  <!-- <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> 
 	
 
@@ -612,20 +701,22 @@ $(document).ready(function() {
     table = $('#tab').DataTable( {
         "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
 "<'row'<'col-md-6'><'col-md-6'>>" +
-"<'table-responsive'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
+"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
-buttons: [
+       buttons: [
+            
             {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-		//title: 'REPORT-Consolidate(Quantity)',
 				title: $('h3').text(),
                 exportOptions: {
                     columns: ':visible'
+					
                 }
             },
+            
             'colvis'
-]
+        ]
     } );
 } );
 $(document).ready(function() {
@@ -634,24 +725,20 @@ $(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: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-				//title: 'REPORT-Consolidate(Value)',
 				title: $('h3').text(),
                 exportOptions: {
-				
                     columns: ':visible'
 					
                 }
-				
             },
+            
             'colvis'
-				
         ]
-				
-				
     } );
 } );
  

application/views/Report_consolidate_inward.php

@@ -9,9 +9,8 @@
                 
             }); 
 </script>
-<!-- <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">
 
+<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 {
@@ -30,15 +29,27 @@
 
                            }
 			 .btn-success {
-								background-color:#5d0411;
+								background-color: #5d0411;
-								border-color:#5d0411;
+								border-color: #5d0411;
 							}	
 
+		  th{ white-space: nowrap; }
+		   td{ white-space: wrap; }
+		   .dataTable > thead > tr > th[class*="sort"]:after{
+    content: "" !important;
+}
+
+table.dataTable thead > tr > th.sorting_asc, 
+table.dataTable thead > tr > th.sorting_desc, 
+table.dataTable thead > tr > th.sorting, 
+table.dataTable thead > tr > td.sorting_asc, 
+table.dataTable thead > tr > td.sorting_desc, 
+table.dataTable thead > tr > td.sorting {
+    padding-right: inherit;
+}
 			   
 	 </style>
 	 <div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-      
     <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
@@ -48,19 +59,15 @@
             <div class="box-header with-border">
               <center><h3 class="box-title"><p style="color:#5d0411"><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 -->
@@ -80,7 +87,6 @@
 								 <?php 
 								foreach($cust as $item):
 										 
-										 
 										 {?>
 										
 										<option value="<?php echo $item->SupplierName;?>"><?php echo $item->SupplierName ;  ?></option>
@@ -142,7 +148,7 @@
                         <thead>
                         <tr>
 							 <th style="text-align:center;">Supplier Name</th>
-							 <th style="text-align:center;">Material Name</th>
+							 <th style="white-space: wrap;">Material Name</th>
 							<th style="text-align:center;">Apr</th>
                             <th style="text-align:center;">May</th>
                             <th style="text-align:center;">Jun</th>
@@ -185,43 +191,69 @@
 							 <td style="text-align:left;"><?php 
 							if(!empty($result->material_name)) { echo $result->material_name ; } else {echo "-";}
 							?></td>
-							<td style="text-align:right;"><?php $apr= $apr + round($result->April); ?>
+							<td style="text-align:right;"><?php 
+							$apr= $apr + round($result->April);
+							?>
 							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'April';?>"><?php echo round($result->April);?> </a>
 							</td>
-							<td style="text-align:right;"><?php $may= $may + round($result->May); ?>
+							<td style="text-align:right;"><?php 
+							$may= $may + round($result->May);
+							?>
 							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'May';?>"><?php echo round($result->May);?> </a>
 							</td>
-							<td style="text-align:right;"><?php $jun= $jun + round($result->June); ?>
+							<td style="text-align:right;"><?php 
+							$jun= $jun + round($result->June);
+							?>
 							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'June';?>"><?php echo round($result->June);?> </a>
 							 </td>
-							<td style="text-align:right;"><?php $jul= $jul + round($result->July); ?>
+							<td style="text-align:right;"><?php 
+							$jul= $jul + round($result->July);
+							?>
 							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'July';?>"><?php echo round($result->July);?> </a>
 							</td>
-							<td style="text-align:right;"><?php $aug= $aug + round($result->August); ?>
+							<td style="text-align:right;"><?php 
+							$aug= $aug + round($result->August);
+							?>
 							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'August';?>"><?php echo round($result->August);?> </a>
 							</td>
-							<td style="text-align:right;"><?php $sep= $sep + round($result->September); ?>
+							<td style="text-align:right;"><?php 
+							$sep= $sep + round($result->September);
+							?>
 							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'September';?>"><?php echo round($result->September);?> </a>
 							</td>
-							<td style="text-align:right;"><?php $oct= $oct + round($result->October); ?>
+							<td style="text-align:right;"><?php 
+							$oct= $oct + round($result->October);
+							 ?>
 							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'October';?>"><?php echo round($result->October);?> </a>
 							 </td>
-							<td style="text-align:right;"><?php $nov= $nov + round($result->November); ?>
+							<td style="text-align:right;"><?php 
+							$nov= $nov + round($result->November);
+							 ?>
 							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'November';?>"><?php echo round($result->November);?> </a>
 							 </td>
-							<td style="text-align:right;"><?php $dec= $dec + round($result->December); ?>
+							<td style="text-align:right;"><?php 
+							$dec= $dec + round($result->December);
+							?>
 							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'December';?>"><?php echo round($result->December);?> </a>
 							 </td>
-							<td style="text-align:right;"><?php $jan= $jan + round($result->January); ?>
+							<td style="text-align:right;"><?php 
+							$jan= $jan + round($result->January);
+							?>
 							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'January';?>"><?php echo round($result->January);?> </a>
 							 </td>
-							<td style="text-align:right;"><?php $feb= $feb + round($result->February); ?>
+							<td style="text-align:right;"><?php 
+							$feb= $feb + round($result->February);
+							?>
 							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'February';?>"><?php echo round($result->February);?> </a>
 							 </td>
-							<td style="text-align:right;"><?php $mar= $mar + round($result->March); ?>
+							<td style="text-align:right;"><?php 
-							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'April';?>"><?php echo round($result->April);?> </a>
+							$mar= $mar + round($result->March);
+							?>
+							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'March';?>"><?php echo round($result->March);?> </a>
 							 </td>
-							 <td style="text-align:right;"><?php $tot= $tot + round($result->qtotal); ?>
+							 <td style="text-align:right;"><?php 
+							$tot= $tot + round($result->qtotal);
+							?>
 							 <a href="<?= base_url() ?>report/i_consolidate_year?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo round($result->qtotal);?> </a>
 							 </td>
 						</tr>
@@ -366,7 +398,12 @@
 						</tr>
 						
 						</tfoot>
-						<?php } ?>
+						<?php
+					
+					} 
+					
+					
+					?>
                     </table>
                
                 </div>
@@ -416,62 +453,73 @@
 						    <td style="text-align:left;">
 							<a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo $result->supplier_name;?> </a>
 							</td>
-							
 							 <td style="text-align:left;"><?php 
 							if(!empty($result->material_name)) { echo $result->material_name ; } else {echo "-";}
+							?></td>
+							<td style="text-align:right;"><?php 
+							$apr= $apr + number_format($result->vApril,2,'.','');
 							?>
-							</td>
-							
-							<td style="text-align:right;"><?php $apr= $apr + number_format($result->vApril,2,'.',''); ?>
 							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'April';?>"><?php echo number_format($result->vApril,2,'.','');?> </a>
 							</td>
-							
+							<td style="text-align:right;"><?php 
-							<td style="text-align:right;"><?php $may= $may + number_format($result->vMay,2,'.',''); ?>
+							$may= $may + number_format($result->vMay,2,'.','');
+							?>
 							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'May';?>"><?php echo number_format($result->vMay,2,'.','');?> </a>
 							</td>
-							
+							<td style="text-align:right;"><?php 
-							<td style="text-align:right;"><?php $jun= $jun + number_format($result->vJune,2,'.',''); ?>
+							$jun= $jun + number_format($result->vJune,2,'.','');
+							?>
 							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'June';?>"><?php echo number_format($result->vJune,2,'.','');?> </a>
 							 </td>
-							
+							<td style="text-align:right;"><?php 
-							<td style="text-align:right;"><?php $jul= $jul + number_format($result->vJuly,2,'.',''); ?>
+							$jul= $jul + number_format($result->vJuly,2,'.','');
+							?>
 							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'July';?>"><?php echo number_format($result->vJuly,2,'.','');?> </a>
 							</td>
-							
+							<td style="text-align:right;"><?php 
-							<td style="text-align:right;"><?php $aug= $aug + number_format($result->vAugust,2,'.',''); ?>
+							$aug= $aug + number_format($result->vAugust,2,'.','');
+							?>
 							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'August';?>"><?php echo number_format($result->vAugust,2,'.','');?> </a>
 							</td>
-							
+							<td style="text-align:right;"><?php 
-							<td style="text-align:right;"><?php $sep= $sep + number_format($result->vSeptember,2,'.',''); ?>
+							$sep= $sep + number_format($result->vSeptember,2,'.','');
+							?>
 							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'September';?>"><?php echo number_format($result->vSeptember,2,'.','');?> </a>
 							</td>
-							
+							<td style="text-align:right;"><?php 
-							<td style="text-align:right;"><?php $oct= $oct + number_format($result->vOctober,2,'.',''); ?>
+							$oct= $oct + number_format($result->vOctober,2,'.','');
+							 ?>
 							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'October';?>"><?php echo number_format($result->vOctober,2,'.','');?> </a>
 							 </td>
-							
+							<td style="text-align:right;"><?php 
-							<td style="text-align:right;"><?php $nov= $nov + number_format($result->vNovember,2,'.',''); ?>
+							$nov= $nov + number_format($result->vNovember,2,'.','');
+							 ?>
 							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'November';?>"><?php echo number_format($result->vNovember,2,'.','');?> </a>
 							 </td>
-							
+							<td style="text-align:right;"><?php 
-							<td style="text-align:right;"><?php $dec= $dec + number_format($result->vDecember,2,'.',''); ?>
+							$dec= $dec + number_format($result->vDecember,2,'.','');
+							?>
 							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'December';?>"><?php echo number_format($result->vDecember,2,'.','');?> </a>
 							 </td>
-							
+							<td style="text-align:right;"><?php 
-							<td style="text-align:right;"><?php $jan= $jan + number_format($result->vJanuary,2,'.',''); ?>
+							$jan= $jan + number_format($result->vJanuary,2,'.','');
+							?>
 							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'January';?>"><?php echo number_format($result->vJanuary,2,'.','');?> </a>
 							 </td>
-							
+							<td style="text-align:right;"><?php 
-							<td style="text-align:right;"><?php $feb= $feb + number_format($result->vFebruary,2,'.',''); ?>
+							$feb= $feb + number_format($result->vFebruary,2,'.','');
+							?>
 							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'February';?>"><?php echo number_format($result->vFebruary,2,'.','');?> </a>
 							 </td>
-							
+							<td style="text-align:right;"><?php 
-							<td style="text-align:right;"><?php $mar= $mar + number_format($result->vMarch,2,'.',''); ?>
+							$mar= $mar + number_format($result->vMarch,2,'.','');
+							?>
 							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'March';?>"><?php echo number_format($result->vMarch,2,'.','');?> </a>
 							 </td>
-							
+							 <td style="text-align:right;"><?php 
-							<td style="text-align:right;"><?php $tot= $tot + number_format($result->vtotal,2,'.',''); ?>
+							$tot= $tot + number_format($result->vtotal,2,'.','');
-								 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo number_format($result->vtotal,2,'.','');?> </a>
+							?>
+							 <a href="<?= base_url() ?>report/i_consolidate_year?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo number_format($result->vtotal,2,'.','');?> </a>
 							 </td>
 						</tr>
 						
@@ -615,7 +663,12 @@
 						</tr>
 						
 						</tfoot>
-												<?php } ?>
+						<?php
+					
+					} 
+					
+					
+					?>
                     </table>
                 
                 </div>
@@ -626,44 +679,43 @@
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
 
-	  <!-- <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://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/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/pdfmake.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.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.html5.min.js"></script>
-<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
-	
+$('.DataTables_sort_icon').remove();	
 
 // Bootstrap datepicker
 // Set up your table
 $(document).ready(function() {
     table = $('#tab').DataTable( {
+		"responsive": true,
+"bAutoWidth": true,
         "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: [
+         buttons: [
+            
             {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-			//title: 'REPORT-Consolidate(Quantity)',
 				title: $('h3').text(),
                 exportOptions: {
-			
                     columns: ':visible'
 					
                 }
-			
             },
+            
             'colvis'
-			
         ]
-
     } );
 } );
 $(document).ready(function() {
@@ -671,24 +723,24 @@ $(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: [
+         buttons: [
+            
             {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-			//title: 'REPORT-Consolidate(Value)',
 				title: $('h3').text(),
                 exportOptions: {
-			
                     columns: ':visible'
 					
                 }
-			
             },
+            
             'colvis'
-			
+        ],
-					 ]
+		columns:[
-
+    { id:"col1",  width:2 }
+]
     } );
 } );
  

application/views/Report_consolidate_m.php

@@ -6,7 +6,7 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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;}
@@ -150,9 +150,9 @@ if(!empty($mms))
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
+
 
-<!-- <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>
@@ -176,7 +176,6 @@ $(document).ready(function() {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-				//title: 'REPORT-Consolidate',
 				title: $('h3').text(),
                 exportOptions: {
                     columns: ':visible'

application/views/Report_consolidate_month.php

@@ -6,9 +6,8 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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">
 
+<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 {
@@ -41,7 +40,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:#5d0411"><b>Report - Consolidate Month(<?php
+              <center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Consolidate Category-Wise(<?php
 			  $m = $this->input->get('m');
 			  echo $m;
 			  ?>)</b></p></h3></center>
@@ -162,15 +161,15 @@ if(!empty($mms))
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
 
-	  <!-- <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://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/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/pdfmake.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.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.html5.min.js"></script>
-<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -183,23 +182,20 @@ $(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: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-			//title: 'REPORT-Consolidate month-Wise',
 				title: $('h3').text(),
                 exportOptions: {
-			
                     columns: ':visible'
 					
                 }
-			
             },
+            
             'colvis'
-			
         ]
-
     } );
 } );
  $('#mySelect').on('change',function(){

application/views/Report_consolidate_month_inward.php

@@ -6,7 +6,7 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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;}
@@ -32,6 +32,8 @@ if(!empty($mms))
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -77,7 +79,6 @@ if(!empty($mms))
 					  <tr>
 					 
                        <td><span>
-					   
 					   <a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab;?>&sid=<?php echo $rel->sid;?>&mid=<?php echo $rel->mid;?>&month=<?php echo $m;?>"><?php echo $rel->supplier_name;?> </a>
 					   </span></td>
 					   <td><span><?php echo $rel->material_name;?></span></td>
@@ -148,8 +149,11 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+	  </section>
+    </div>
+
+
 
-<!-- <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>
@@ -173,7 +177,6 @@ $(document).ready(function() {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-				//title: 'REPORT - Consolidate Inward',
 				title: $('h3').text(),
                 exportOptions: {
                     columns: ':visible'

application/views/Report_consolidate_raw.php

@@ -9,9 +9,8 @@
                 
             }); 
 </script>
-<!-- <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">
 
+<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 {
@@ -33,12 +32,25 @@
 								background-color: #5d0411;
 								border-color: #5d0411;
 							}
+ th{ white-space: nowrap; }
+		   td{ white-space: wrap; }
+		   .dataTable > thead > tr > th[class*="sort"]:after{
+    content: "" !important;
+}
+
+table.dataTable thead > tr > th.sorting_asc, 
+table.dataTable thead > tr > th.sorting_desc, 
+table.dataTable thead > tr > th.sorting, 
+table.dataTable thead > tr > td.sorting_asc, 
+table.dataTable thead > tr > td.sorting_desc, 
+table.dataTable thead > tr > td.sorting {
+    padding-right: inherit;
+}							
 		 
 			   
 	 </style>
-<div class="content-wrapper">
+	 <div class="content-wrapper">
-<!-- Content Header (Page header) -->
+    <section class="content"><br/>  
-<section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -48,19 +60,12 @@
               <center><h3 class="box-title"><p style="color:#5d0411"><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>
@@ -396,7 +401,12 @@
 						</tr>
 						
 						</tfoot>
-												<?php } ?>
+						<?php
+					
+					} 
+					
+					
+					?>
                     </table>
                
                 </div>
@@ -447,81 +457,81 @@
 							</td>
 							<td style="text-align:right;">
 							<?php 
-							$apr= $apr +  number_format($result->vApril ,2,'.','');
+							$apr= $apr + number_format($result->vApril,2,'.','');
 							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'April';?>"><?php echo  number_format($result->vApril ,2,'.','');?> </a>
+							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'April';?>"><?php echo number_format($result->vApril,2,'.','');?> </a>
 							</td>
 							<td style="text-align:right;">
 							<?php 
-							$may= $may +  number_format($result->vMay ,2,'.','');
+							$may= $may + number_format($result->vMay,2,'.','');
 							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'May';?>"><?php echo  number_format($result->vMay ,2,'.','');?> </a>
+							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'May';?>"><?php echo number_format($result->vMay,2,'.','');?> </a>
 							</td>
 							<td style="text-align:right;">
 							<?php 
-							$jun= $jun +  number_format($result->vJune ,2,'.','');
+							$jun= $jun + number_format($result->vJune,2,'.','');
 							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'June';?>"><?php echo  number_format($result->vJune ,2,'.','');?> </a>
+							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'June';?>"><?php echo number_format($result->vJune,2,'.','');?> </a>
 							</td>
 							<td style="text-align:right;">
 							<?php 
-							$jul= $jul +  number_format($result->vJuly ,2,'.','');
+							$jul= $jul + number_format($result->vJuly,2,'.','');
 							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'July';?>"><?php echo  number_format($result->vJuly ,2,'.','');?> </a>
+							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'July';?>"><?php echo number_format($result->vJuly,2,'.','');?> </a>
 							</td>
 							<td style="text-align:right;">
 							<?php 
-							$aug= $aug +  number_format($result->vAugust ,2,'.','');
+							$aug= $aug + number_format($result->vAugust,2,'.','');
 							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'August';?>"><?php echo  number_format($result->vAugust ,2,'.','');?> </a>
+							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'August';?>"><?php echo number_format($result->vAugust,2,'.','');?> </a>
 							</td>
 							<td style="text-align:right;">
 							<?php 
-							$sep= $sep + number_format($result->vSeptember ,2,'.','');
+							$sep= $sep + number_format($result->vSeptember,2,'.','');
 							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'September';?>"><?php echo  number_format($result->vSeptember ,2,'.','');?> </a>
+							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'September';?>"><?php echo number_format($result->vSeptember,2,'.','');?> </a>
 							</td>
 							<td style="text-align:right;">
 							<?php 
-							$oct= $oct +  number_format($result->vOctober ,2,'.','');
+							$oct= $oct + number_format($result->vOctober,2,'.','');
 							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'October';?>"><?php echo  number_format($result->vOctober ,2,'.','');?> </a>
+							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'October';?>"><?php echo number_format($result->vOctober,2,'.','');?> </a>
 							</td>
 							<td style="text-align:right;">
 							<?php 
-							$nov= $nov +  number_format($result->vNovember ,2,'.','');
+							$nov= $nov + number_format($result->vNovember,2,'.','');
 							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'November';?>"><?php echo  number_format($result->vNovember ,2,'.','');?> </a>
+							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'November';?>"><?php echo number_format($result->vNovember,2,'.','');?> </a>
 							</td>
 							<td style="text-align:right;">
 							<?php 
-							$dec= $dec +  number_format($result->vDecember ,2,'.','');
+							$dec= $dec + number_format($result->vDecember,2,'.','');
 							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'December';?>"><?php echo  number_format($result->vDecember ,2,'.','');?> </a>
+							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'December';?>"><?php echo number_format($result->vDecember,2,'.','');?> </a>
 							</td>
 							<td style="text-align:right;">
 							<?php 
-							$jan= $jan +  number_format($result->vJanuary ,2,'.','');
+							$jan= $jan + number_format($result->vJanuary,2,'.','');
 							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'January';?>"><?php echo  number_format($result->vJanuary ,2,'.','');?> </a>
+							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'January';?>"><?php echo number_format($result->vJanuary,2,'.','');?> </a>
 							</td>
 							<td style="text-align:right;">
 							<?php 
-							$feb= $feb +  number_format($result->vFebruary ,2,'.','');
+							$feb= $feb + number_format($result->vFebruary,2,'.','');
 							?>
-						    <a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'February';?>"><?php echo  number_format($result->vFebruary ,2,'.','');?> </a>
+						    <a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'February';?>"><?php echo number_format($result->vFebruary,2,'.','');?> </a>
 							</td>
 							<td style="text-align:right;">
 							<?php 
-							$mar= $mar +  number_format($result->vMarch ,2,'.','');
+							$mar= $mar + number_format($result->vMarch,2,'.','');
 							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'March';?>"><?php echo  number_format($result->vMarch ,2,'.','');?> </a>
+							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'March';?>"><?php echo number_format($result->vMarch,2,'.','');?> </a>
 							</td>
 							 <td style="text-align:right;">
 							 <?php 
-							$tot= $tot +  number_format($result->vtotal ,2,'.','');
+							$tot= $tot + number_format($result->vtotal,2,'.','');
 							?>
-							 <a href="<?= base_url() ?>report/rawi_consolidate_year?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>"><?php echo  number_format($result->vtotal ,2,'.','');?> </a>
+							 <a href="<?= base_url() ?>report/rawi_consolidate_year?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>"><?php echo number_format($result->vtotal,2,'.','');?> </a>
 							 </td>
 						</tr>
 						
@@ -658,7 +668,12 @@
 						</tr>
 						
 						</tfoot>
-						<?php } ?>
+						<?php
+					
+					} 
+					
+					
+					?>
                     </table>
                 
                 </div>
@@ -669,15 +684,15 @@
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
 
-	  <!-- <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://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/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/pdfmake.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.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.html5.min.js"></script>
-<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -689,24 +704,21 @@ $(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: [
+        buttons: [
+            
             {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-			//title: 'REPORT-Consolidate-Category(Quantity)',
 				title: $('h3').text(),
                 exportOptions: {
-			
                     columns: ':visible'
 					
                 }
-			
             },
+            
             'colvis'
-			
         ]
-       
     } );
 } );
 $(document).ready(function() {
@@ -714,22 +726,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: [
+        buttons: [
+            
             {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-			//title: 'REPORT-Consolidate-Category(Quantity)',
 				title: $('h3').text(),
                 exportOptions: {
-			
                     columns: ':visible'
 					
                 }
-			
             },
-	'colvis'
             
+            'colvis'
         ]
     } );
 } );

application/views/Report_consolidate_y.php

@@ -6,7 +6,7 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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;}
@@ -79,7 +79,6 @@ if(!empty($mms))
 					  <tr>
 					 
                        <td><span>
-					   
 					   <a href="<?= base_url() ?>report/link_purchase?sid=<?php echo $rel->sid;?>&ab=<?php echo $ab;?>&mid=<?php echo $rel->mid;?>"><?php echo $rel->supplier_name;?> </a>
 					   
 					   </span></td>
@@ -152,9 +151,9 @@ if(!empty($mms))
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
+
 
-<!-- <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>
@@ -178,7 +177,6 @@ $(document).ready(function() {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-				//title: 'REPORT-Consolidate',
 				title: $('h3').text(),
                 exportOptions: {
                     columns: ':visible'

application/views/Report_consolidate_year.php

@@ -6,9 +6,8 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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">
 
+<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 {
@@ -163,15 +162,15 @@ if(!empty($mms))
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
 
-<!-- <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://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/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/pdfmake.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.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.html5.min.js"></script>
-<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
 
 <script> 
 	
@@ -183,22 +182,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: [
+        buttons: [
+            
             {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-			//title: 'REPORT-Consolidate Category-Wise',
 				title: $('h3').text(),
                 exportOptions: {
-			
                     columns: ':visible'
 					
                 }
-			
             },
-	'colvis'
             
+            'colvis'
         ]
     } );
 } );

application/views/Report_consolidate_year_inward.php

@@ -6,7 +6,7 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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;}
@@ -32,6 +32,8 @@ if(!empty($mms))
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -149,8 +151,11 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+	  </section>
+    </div>
+
+
 
-<!-- <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTabsles.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>
@@ -174,7 +179,6 @@ $(document).ready(function() {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-				//title: 'REPORT - Consolidate Inward',
 				title: $('h3').text(),
                 exportOptions: {
                     columns: ':visible'

application/views/Report_costcenter.php

@@ -1,3 +1,5 @@
+
+
 <?php
 //print_r($budget);die();
 if(!empty($ccrpt))
@@ -5,11 +7,9 @@ if(!empty($ccrpt))
 
 }
 ?>
-<!-- <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%;
@@ -35,6 +35,10 @@ if(!empty($ccrpt))
                             padding: 3%;
                                     
                           }
+						  .btn-success {
+								background-color: #5d0411;
+								border-color: #5d0411;
+							}
 			   
 	 </style>
 	 <div class="content-wrapper">
@@ -49,15 +53,16 @@ if(!empty($ccrpt))
             <div class="box-header with-border">
               <center><h3 class="box-title"><p style="color:#5d0411"><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">
+			  
+                      
                       <center> 
 					  <div class="panel-body">
 					  
@@ -138,43 +143,44 @@ if(!empty($ccrpt))
 	  </section>
     </div>
 
-<!-- <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> 
 	 
 
-      // Bootstrap datepicker
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-      // Set up your table
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-      $(document).ready(function() {
+	<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> 
+	
+
+// Bootstrap datepicker
+// Set up your table
+$(document).ready(function() {
     table = $('#cc').DataTable( {
         "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
-      "<'row'<'col-md-6'><'col-md-6'>>" +
+"<'row'<'col-md-6'><'col-md-6'>>" +
-      "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
+"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
        buttons: [
-                    {
             
+            {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-        				//title: 'REPORT-CostCentre',
 				title: $('h3').text(),
                 exportOptions: {
                     columns: ':visible'
-                        }
 					
+                }
             },
             
             'colvis'
-        
         ]
     } );
-      } );
+} );
 
 
  $('#mySelect').on('change',function(){
@@ -185,10 +191,11 @@ if(!empty($ccrpt))
         .draw();
     });
    function Reset()
-      {
+{
 	 $('#mySelect').val('');
 	
-      }
+}
 
 
 	</script>
+	

application/views/Report_cumulative.php

@@ -6,9 +6,8 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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">
 
+<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 {
@@ -43,30 +42,23 @@ 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:#5d0411"><b>Report - Cumulative</b>(<i>
+              <center><h3 class="box-title"><p style="color:#5d0411"><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 -->
 			
 		    <div class="box-body">
               <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:12px;">
+                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
                    <thead>
 				    <tr>
 					<?php
@@ -77,30 +69,30 @@ if(!empty($mms))
 							}
 					 $ab=$yearl;
 					?>
-					     <th style="text-align:center" rowspan="2">Supplier</th>
+					     <th style="text-align:center" rowspan="2">Supplier Name</th>
-                         <th  style="text-align:center" rowspan="2">Product</th>
+                         <th  style="text-align:center" rowspan="2">Material Name</th>
 						 <th  style="text-align:center" colspan="2"><?php echo date('d-m-Y'); ?></th> 
 						  <th  style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th> 
 						  <th  style="text-align:center" colspan="2"><?php echo $ab; ?></th> 						 
 						 </tr>
                      <tr>
 				       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value</th>
+					   <th style="text-align:center">Value &nbsp;(<i class="fa fa-rupee "></i>)</th>
 					    <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value</th>
+					   <th style="text-align:center">Value &nbsp;(<i class="fa fa-rupee "></i>)</th>
 					    <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value</th>
+					   <th style="text-align:center">Value &nbsp;(<i class="fa fa-rupee "></i>)</th>
 					 
                       </tr>
                     </thead>
 				    <tbody>
 				       <?php if(!empty($cum)){
-					   $yqt=0;
+					   $yqt=0.00;
-					   $yvt=0;
+					   $yvt=0.00;
-					   $mqt=0;
+					   $mqt=0.00;
-					   $mvt=0;
+					   $mvt=0.00;
-					   $tqt=0;
+					   $tqt=0.00;
-					   $tvt=0;
+					   $tvt=0.00;
 						
 					if (date('m') >= 4) {
 								$yearl = date('Y').'-'.(date('Y')+1);
@@ -121,20 +113,20 @@ if(!empty($mms))
 						$tqt= $tqt + round($rel->tquantity);
 						echo anchor('report/cum_day/'.$rel->sid . '/' . $rel->mid,round($rel->tquantity));?></span></td>
 						<td style="text-align:right"><span><?php 
-						$tvt= $tvt + round($rel->ttotal);
+						$tvt= $tvt + number_format($rel->ttotal,2,'.','');
-						echo anchor('report/cum_day/'.$rel->sid . '/' . $rel->mid,round($rel->ttotal));?></span></td>
+						echo anchor('report/cum_day/'.$rel->sid . '/' . $rel->mid,number_format($rel->ttotal,2,'.',''));?></span></td>
 						<td style="text-align:right"><span><?php 
 						$mqt= $mqt + round($rel->mquantity);
 						echo anchor('report/cum_month/'.$rel->sid . '/' . $rel->mid,round($rel->mquantity));?></span></td>
 						<td style="text-align:right"><span><?php 
-						$mvt= $mvt + round($rel->mtotal);
+						$mvt= $mvt + number_format($rel->mtotal,2,'.','');
-						echo anchor('report/cum_month/'.$rel->sid . '/' . $rel->mid,round($rel->mtotal));?></span></td>
+						echo anchor('report/cum_month/'.$rel->sid . '/' . $rel->mid,number_format($rel->mtotal,2,'.',''));?></span></td>
 						<td style="text-align:right"><span><?php 
 						$yqt= $yqt + round($rel->quantity);
 						echo anchor('report/cum_year/'.$rel->sid . '/' . $rel->mid,round($rel->quantity));?></span></td>
 						<td style="text-align:right"><span><?php 
-						$yvt= $yvt + round($rel->total);
+						$yvt= $yvt + number_format($rel->total,2,'.','');
-						echo anchor('report/cum_year/'.$rel->sid . '/' . $rel->mid,round($rel->total));?></span></td>
+						echo anchor('report/cum_year/'.$rel->sid . '/' . $rel->mid,number_format($rel->total,2,'.',''));?></span></td>
 					   
 					   
 					
@@ -172,7 +164,7 @@ if(!empty($mms))
 									<strong>
 									<?php 
 									 {
-									 echo $tvt;
+									 echo number_format($tvt,2,'.','');
 									
 									  } 
 									 ?>  
@@ -192,7 +184,7 @@ if(!empty($mms))
 										<strong>
 										<?php 
 										 {
-										 echo $mvt;
+										 echo number_format($mvt,2,'.','');
 										
 										  } 
 										 ?> 
@@ -212,7 +204,7 @@ if(!empty($mms))
 										<strong>
 										<?php 
 										 {
-										 echo $yvt;
+										 echo number_format($yvt,2,'.','');
 										
 										  } 
 										 ?> 
@@ -236,11 +228,10 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
-
 	  </section>
-</div>
+    </div>
+
 
-	  <!-- <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>
@@ -258,25 +249,21 @@ $(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: [
             
-buttons: [ {
+            {
-        
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-        				//title: 'REPORT-Cumulative',
 				title: $('h3').text(),
                 exportOptions: {
                     columns: ':visible'
 					
-        
                 }
-        
             },
             
             'colvis'
         ]
-      
     } );
 } );
  $('#mySelect').on('change',function(){

application/views/Report_cumulative_day.php

@@ -1,11 +1,12 @@
 
+
 <?php
 if(!empty($mms))
 {
 
 }
 ?>
-<!-- <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;}
@@ -31,6 +32,8 @@ if(!empty($mms))
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -43,17 +46,17 @@ if(!empty($mms))
 			
 		    <div class="box-body">
               <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:12px;">
+                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
                    <thead>
 				    <tr>
 					
-					     <th style="text-align:center" rowspan="2">Supplier</th>
+					     <th style="text-align:center" rowspan="2">Supplier Name</th>
-                         <th  style="text-align:center" rowspan="2">Product</th>
+                         <th  style="text-align:center" rowspan="2">Material Name</th>
 						 <th  style="text-align:center" colspan="2"><?php echo date('d-m-Y'); ?></th> 
 						 </tr>
                      <tr>
 				       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value</th>
+					   <th style="text-align:center">Value &nbsp;(<i class="fa fa-rupee "></i>)</th>
 					    
 					 
                       </tr>
@@ -79,6 +82,7 @@ if(!empty($mms))
 						$tvt= $tvt + number_format($rel->ttotal,2,'.','');
 						echo number_format($rel->ttotal,2,'.','');?></span></td>
 						
+					
 					  </tr>
 			           <?php
 					    }
@@ -113,7 +117,6 @@ if(!empty($mms))
 									<strong>
 									<?php 
 									 {
-									 
 									 echo number_format($tvt,2,'.','');
 									
 									  } 
@@ -139,8 +142,10 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+	  </section>
+    </div>
+
 
-	  <!-- <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>
@@ -159,17 +164,16 @@ $(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: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-								//title: 'REPORT-Cumulative',
 				title: $('h3').text(),
                 exportOptions: {
                     columns: ':visible'
 					
                 }
-				
             },
             
             'colvis'

application/views/Report_cumulative_day_inward.php

@@ -6,7 +6,7 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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;}
@@ -32,13 +32,15 @@ if(!empty($mms))
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Cumulative - Inward (<?php echo date('d-m-Y');?>)</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Cumulative - Inward(<?php echo date('d-m-Y'); ?>)</b></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -140,8 +142,10 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+	  </section>
+    </div>
+
 
-	  <!-- <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>
@@ -159,18 +163,17 @@ $(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: [
+        buttons: [
+            
             {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-								//title: 'REPORT-Cumulative Day Inward',
 				title: $('h3').text(),
                 exportOptions: {
                     columns: ':visible'
 					
                 }
-				
             },
             
             'colvis'

application/views/Report_cumulative_day_raw.php

@@ -6,7 +6,7 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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;}
@@ -33,8 +33,6 @@ if(!empty($mms))
 			   
 	 </style>
 	 <div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-      
     <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
@@ -42,7 +40,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:#5d0411"><b>Report - Cumulative Today (Category-Wise)</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Cumulative-Category-Wise(<?php echo date('d-m-Y'); ?>)</b></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -155,8 +153,9 @@ if(!empty($mms))
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
-	  <!-- <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>
@@ -174,17 +173,17 @@ $(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: [
+        buttons: [
+            
             {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-								//title: 'REPORT-Cumulative Day',
 				title: $('h3').text(),
                 exportOptions: {
                     columns: ':visible'
-								}
 					
+                }
             },
             
             'colvis'

application/views/Report_cumulative_inward.php

@@ -6,9 +6,8 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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">
 
+<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 {
@@ -31,10 +30,9 @@ if(!empty($mms))
 								border-color: #5d0411;
 							}			   
 		 
+			   
 	 </style>
 	 <div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-      
     <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
@@ -42,22 +40,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:#5d0411"><b>Report - Cumulative -inward(<i>
+              <center><h3 class="box-title"><p style="color:#5d0411"><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>)</b></p></h3></center>
+			  </i>)</p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -233,13 +225,10 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
-      <!--content-wrapper-->
 	  </section>
-</div>
+    </div>
 
 
-
-	  <!-- <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>
@@ -257,24 +246,21 @@ $(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: [
+         buttons: [
+            
             {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-						//title: 'REPORT-Cumulative-Inward',
 				title: $('h3').text(),
                 exportOptions: {
-		
                     columns: ':visible'
 					
                 }
-		
             },
             
             'colvis'
-]
+        ]
-
     } );
 } );
  $('#mySelect').on('change',function(){

application/views/Report_cumulative_month.php

@@ -6,9 +6,8 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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">
 
+<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 {
@@ -33,29 +32,31 @@ if(!empty($mms))
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Cumulative Month (<?php echo date('F'); ?>)</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Cumulative Month(<?php echo date('F'); ?>)</b></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
 		    <div class="box-body">
               <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:12px;">
+                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
                    <thead>
 				    <tr>
 					
-					     <th style="text-align:center" rowspan="2">Supplier</th>
+					     <th style="text-align:center" rowspan="2">Supplier Name</th>
-                         <th  style="text-align:center" rowspan="2">Product</th>
+                         <th  style="text-align:center" rowspan="2">Material Name</th>
 						 <th  style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th> 
 						 </tr>
                      <tr>
 				       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value</th>
+					   <th style="text-align:center">Value &nbsp;(<i class="fa fa-rupee "></i>)</th>
 					    
 					 
                       </tr>
@@ -63,7 +64,7 @@ if(!empty($mms))
 				    <tbody>
 				       <?php if(!empty($cum_month)){
 					   $tqt=0;
-					   $tvt=0.00;
+					   $tvt=0;
 					  if (date('m') >= 4) {
 								$yearl = date('Y').'-'.(date('Y')+1);
 							} else {
@@ -88,7 +89,6 @@ if(!empty($mms))
 						echo number_format($rel->ttotal,2,'.','');?></span></td>
 						
 					
-					
 					  </tr>
 			           <?php
 					    }
@@ -148,8 +148,10 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+	  </section>
+    </div>
+
 
-	  <!-- <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>
@@ -167,24 +169,21 @@ $(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: [
+        buttons: [
+            
             {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-						//title: 'REPORT-Cumulative Month',
 				title: $('h3').text(),
                 exportOptions: {
-		
                     columns: ':visible'
 					
                 }
-		
             },
             
             'colvis'
-]
+        ]
-
     } );
 } );
  $('#mySelect').on('change',function(){

application/views/Report_cumulative_month_inward.php

@@ -6,9 +6,8 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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">
 
+<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 {
@@ -33,13 +32,15 @@ if(!empty($mms))
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Cumulative Month -Inward (<?php echo date('F'); ?>)</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Cumulative Month - Inward(<?php echo date('F'); ?>)</b></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -147,8 +148,11 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+	  </section>
+    </div>
+
+
 
-	  <!-- <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>
@@ -166,24 +170,21 @@ $(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: [
+       buttons: [
+            
             {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-						//title: 'REPORT-Cumulative Month-Inward',
 				title: $('h3').text(),
                 exportOptions: {
-		
                     columns: ':visible'
 					
                 }
-		
             },
             
             'colvis'
-]
+        ]
-
     } );
 } );
  $('#mySelect').on('change',function(){

application/views/Report_cumulative_month_raw.php

@@ -6,9 +6,8 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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">
 
+<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 {
@@ -34,8 +33,6 @@ if(!empty($mms))
 			   
 	 </style>
 	 <div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-      
     <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
@@ -43,25 +40,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:#5d0411"><b>Report - Cumulative Month Category-Wise (<i>
+              <center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Cumulative Month-Category-Wise(<?php echo date('F'); ?>)</b></p></h3></center>
-
-			  <?php
-
-			  if (date('m') >= 4) {
-
-								$yearl = date('Y').'-'.(date('Y')+1);
-
-							} else {
-
-								$yearl = (date('Y')-1).'-'.date('Y');
-
-							}
-
-					 echo $yearl;
-
-			  ?>
-
-			  </i>)</b></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -183,7 +162,7 @@ if(!empty($mms))
 	  </section>
     </div>
 
-	  <!-- <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>
@@ -201,24 +180,21 @@ $(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: [
+        buttons: [
+            
             {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-						//title: 'REPORT-Cumulative-Category Wise',
 				title: $('h3').text(),
                 exportOptions: {
-		
                     columns: ':visible'
 					
                 }
-		
             },
             
             'colvis'
-]
+        ]
-
     } );
 } );
  $('#mySelect').on('change',function(){

application/views/Report_cumulative_raw.php

@@ -6,7 +6,7 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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;}
@@ -33,8 +33,6 @@ if(!empty($mms))
 			   
 	 </style>
 	 <div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-      
     <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
@@ -42,23 +40,15 @@ 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:#5d0411"><b>Report - Cumulative - Category Wise</b>(<i>
+              <center><h3 class="box-title"><p style="color:#5d0411"><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 -->
@@ -244,9 +234,9 @@ if(!empty($mms))
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
+
 
-	  <!-- <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>
@@ -264,25 +254,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: [
+         buttons: [
             
             {
-
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-				//title: 'REPORT-Cumulative-Category Wise',
 				title: $('h3').text(),
                 exportOptions: {
-
                     columns: ':visible'
 					
                 }
-
             },
             
             'colvis'
-
         ]
     } );
 } );

application/views/Report_cumulative_year.php

@@ -6,9 +6,8 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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">
 
+<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 {
@@ -33,36 +32,32 @@ if(!empty($mms))
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Cumulative Year</b></b>(<i>
+              <center><h3 class="box-title"><p style="color:#5d0411"><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 -->
 			
 		    <div class="box-body">
               <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:12px;">
+                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
                    <thead>
 				    <tr>
 					<?php
@@ -73,13 +68,13 @@ if(!empty($mms))
 							}
 					 $ab=$yearl;
 					?>
-					     <th style="text-align:center" rowspan="2">Supplier</th>
+					     <th style="text-align:center" rowspan="2">Supplier Name</th>
-                         <th  style="text-align:center" rowspan="2">Product</th>
+                         <th  style="text-align:center" rowspan="2">Material Name</th>
 						 <th  style="text-align:center" colspan="2"><?php echo $ab; ?></th> 
 						 </tr>
                      <tr>
 				       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value</th>
+					   <th style="text-align:center">Value &nbsp;( <i class="fa fa-rupee " ></i>)</th>
 					    
 					 
                       </tr>
@@ -170,8 +165,10 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+	  </section>
+    </div>
+
    
-	  <!-- <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>
@@ -189,23 +186,21 @@ $(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: [
+        buttons: [
+            
             {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-						//title: 'REPORT-Cumulative-Year',
 				title: $('h3').text(),
                 exportOptions: {
-		
                     columns: ':visible'
 					
                 }
-		
             },
             
             'colvis'
-]
+        ]
     } );
 } );
  $('#mySelect').on('change',function(){

application/views/Report_cumulative_year_inward.php

@@ -6,7 +6,7 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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;}
@@ -32,6 +32,8 @@ if(!empty($mms))
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -39,23 +41,14 @@ if(!empty($mms))
           <div class="box box-info">
             <div class="box-header with-border">
               <center><h3 class="box-title"><p style="color:#5d0411"><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 -->
@@ -170,8 +163,10 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+	  </section>
+    </div>
+
  
-	  <!-- <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>
@@ -189,23 +184,21 @@ $(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: [
+         buttons: [
+            
             {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-						//title: 'REPORT-Cumulative-Year-Inward',
 				title: $('h3').text(),
                 exportOptions: {
-		
                     columns: ':visible'
 					
                 }
-		
             },
             
             'colvis'
-]
+        ]
     } );
 } );
  $('#mySelect').on('change',function(){

application/views/Report_cumulative_year_raw.php

@@ -6,7 +6,7 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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;}
@@ -33,8 +33,6 @@ if(!empty($mms))
 			   
 	 </style>
 	 <div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-      
     <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
@@ -42,25 +40,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:#5d0411"><b>Report - Cumulative Year - Category Wise </b>(<i>
+              <center><h3 class="box-title"><p style="color:#5d0411"><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>
-			  </i>)</b></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			
@@ -185,9 +174,10 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
-</section>
+	  </section>
-</div>
+    </div>
-	  <!-- <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>
@@ -205,23 +195,22 @@ $(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: [
+         buttons: [
+            
             {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-						//title: 'REPORT-Cumulative-Year - Category Wise',
 				title: $('h3').text(),
                 exportOptions: {
-		
                     columns: ':visible'
 					
                 }
-		
             },
             
             'colvis'
-]    } );
+        ]
+    } );
 } );
  $('#mySelect').on('change',function(){
        

application/views/Report_month_wise.php

@@ -6,7 +6,7 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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;}
@@ -33,24 +33,27 @@ if(!empty($mms))
 			   
 	 </style>
 	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Month-wise (<?php echo $mont; ?>) </b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Month-wise(<?php echo $mont; ?>)</b></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			<div class="box-body">
               <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:12px;">
+                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
                    <thead>
                      <tr>
-				       <th style="text-align:center">Supplier</th>
+				       <th style="text-align:center">Supplier Name</th>
-                       <th style="text-align:center">Product</th>
+                       <th style="text-align:center">Material Name</th>
 					   <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Total Value</th>
+					   <th style="text-align:center">Total Value &nbsp;( <i class="fa fa-rupee " ></i>)</th>
 					   
 					 
                       </tr>
@@ -72,7 +75,7 @@ if(!empty($mms))
 						<td><span><?php echo $rel->material_name;?></span></td>
 						<td style="text-align:right"><span><?php 
 						$tr3= $tr3 + round($rel->quantity);
-						echo $rel->quantity;?></span></td>
+						echo round($rel->quantity);?></span></td>
 						<td style="text-align:right"><span><?php 
 						$tr4= $tr4 + number_format($rel->total,2,'.','');
 						echo number_format($rel->total,2,'.','');?></span></td>
@@ -127,9 +130,10 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+	  </section>
     </div>
 
-	  <!-- <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>
@@ -147,27 +151,21 @@ $(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: [
+       buttons: [
             
             {
-
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-				//title: 'Report - Month Wise',
 				title: $('h3').text(),
                 exportOptions: {
-
                     columns: ':visible'
 					
                 }
-
             },
             
             'colvis'
-
         ]
-
     } );
 } );
  $('#mySelect').on('change',function(){

application/views/Report_month_wise_inward.php

@@ -6,7 +6,7 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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;}
@@ -33,8 +33,6 @@ if(!empty($mms))
 			   
 	 </style>
 	 <div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-      
     <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
@@ -131,8 +129,9 @@ if(!empty($mms))
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
-	  <!-- <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>
@@ -150,27 +149,21 @@ $(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: [
+        buttons: [
             
             {
-
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-				//title: 'Report - Month Wise Inward',
 				title: $('h3').text(),
                 exportOptions: {
-
                     columns: ':visible'
 					
                 }
-
             },
             
             'colvis'
-
         ]
-
     } );
 } );
  $('#mySelect').on('change',function(){

application/views/Report_openorder.php

@@ -6,7 +6,7 @@ if(!empty($open_po))
 
 }
 ?>
-<!-- <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;}
@@ -31,7 +31,6 @@ if(!empty($open_po))
 							}				   
 		 
 			   
-			   
 	 </style>
 	 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
@@ -43,112 +42,70 @@ if(!empty($open_po))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#5d0411"><b>Open Orders - Pending</b><br><br>
+              <center><h3 class="box-title"><p style="color:#5d0411"><b>Open Orders - Pending</b>
+			  <br><br>
 			  <?php
 			  
 			  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;
-
 			  }
-
 		      if($this->input->post('total_order_value_From') && $this->input->post('total_order_value_To')){
-
 				   $tfrm = $this->input->post('total_order_value_From');
-
 		           $tt = $this->input->post('total_order_value_To');  
-
 				  echo 'Total Order Value between'.' '.'RS.'.$tfrm.'-to-'.'RS.'.$tt;
-
 			  }
-			  ?></p></h3></center>
+			  ?>
+			  </p></h3></center>
 			</div>
 			<!-- /.box-header -->
-            <!-- <div class="row">
-		   <div class="col-md-6">
-			 <div class="input-group input-daterange input" >
-                   <div class="input-group-addon"><b>Total Order Value From:</b></div>
-                   <input type="number" id="min" class="form-control date-range-filter"  placeholder="From:">
-                   <div class="input-group-addon"><b>to</b></div>
-                   <input type="number" id="max" class="form-control date-range-filter"  placeholder="To:">
-		           <div class="input-group-addon"> <a   onclick="Reset()"><b>Clear</b></a></div>
-             </div>
-           </div>
-		   <div class="col-md-6">
-			 <div class="input-group input-daterange input">
-                   <div class="input-group-addon"><b>Created 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:">
-		           <div class="input-group-addon"> <a   onclick="Reset()"  ><b>Clear</b></a></div>
-             </div>
-           </div>
-        </div>			 -->
            	<div class="panel-body">
+
                     <form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
+
                         <div class="form-group has-feedback">
 						
+						
+						
                        <div class="col-md-2">
-
 							 <label for="to_date">
-
                                 <?php echo 'Year'; ?>
-
                             </label>
-
                             <div class="input-group">
                                  <select class="form-control" id="financialyear" name="financialyear">
-
 								 <option value="">Select Year</option>
-
 								 <?php 
 								 
+								
 								  foreach($finyear as $item):
+										 
 										 {?>
+										
 										<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
 										
+												 
 										 <?php } endforeach; ?>
 								  
 								   </select>
-
 							   </div>
-
                             </div>
-
 								<div class="col-md-2">
-
 								<label for="to_date">
-
                                 <?php echo 'Month'; ?>
-
                                 </label>
-
                                 <div class="input-group">
-
                                  <select class="form-control" id="month" name="month">
 								  <option value="">Select Month</option>
 								 <option value="January">January</option>
@@ -164,140 +121,99 @@ if(!empty($open_po))
 								 <option value="November">November</option>
 								 <option value="December">December</option>
 								 </select>
-
                               </div>
-
                             </div>
-
 						<div class="col-md-2">
-
 						    <label for="total_order_value_From">
-
                                 <?php echo 'Total Order Value From'; ?>
                             </label>
-
                             <div class="input-group">
-
                                 <input name="total_order_value_From" id="total_order_value_From" style="padding:4px;">
-
                             </span>
-
+                            </div>
                         </div>
 
-                        </div>             
              
                        <div class="col-md-2">
-
 					        <label for="total_order_value_To">
-
                                 <?php echo 'Total Order Value To'; ?>
-
                             </label>  
-
                             <div class="input-group">
-
                                 <input name="total_order_value_To" id="total_order_value_To" style="padding:4px;">
-
                              </span>
-
                             </div>
                        
-                       
-
 						</div>
-
 						<div class="col-md-2">
-
 						    <label for="from_date">
-
                                 <?php echo 'From Date'; ?>
-
                             </label>
-
                             <div class="input-group">
-
                                 <input name="from_date" id="max-date" class="form-control datepicker">
-
                                 <span class="input-group-addon">
-
                                     <i class="fa fa-calendar fa-fw"></i>
-
                             </span>
-
+                            </div>
                         </div>
 
-                        </div>
+             
                        <div class="col-md-2">
-
 					        <label for="to_date">
-
                                 <?php echo 'To Date'; ?>
-
                             </label>  
-
                             <div class="input-group">
-
                                 <input name="to_date" id="min-date" class="form-control datepicker">
-
                                 <span class="input-group-addon">
-
                                     <i class="fa fa-calendar fa-fw"></i>
-
                             </span>
-
-                            </div>
                             </div>
                        
+						</div>
 						<div class="col-md-2 col-md-offset-11"><br>
-
                         <input type="submit" class="btn btn-success" name="btn_submit"
-
                                value="View Report">
                         
 							</div>  
-
 							</div>  
-
                     </form>
 
                
+
             </div>	
 			 
+		       
 			 <div class="box-body">
               <div>
-                <table class="table table-bordered table-hover" id="req" >
+                <table class="table table-bordered table-hover" id="req" style="font-size:14px;">
                    <thead>
                      <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</th>
+                       <th>Total Order Value &nbsp;( <i class="fa fa-rupee "></i>)</th>
                        
                       </tr>
                     </thead>
 				    <tbody>
-				       <?php  $tot=0.00; if(!empty($open_po)){
+				       <?php 
+					    $tot=0.00;
+					   if(!empty($open_po)){
 					   foreach($open_po as $rel)
 					    {				
 					   ?> 
 					  <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> -->
 					    <td align="right"><span><?php 
-
 						$tot= $tot + number_format($rel->TotalOrderValue,2,'.','');
-
 						echo number_format($rel->TotalOrderValue,2,'.','')?></span></td>
 					   
 					
-					   
-					
 					  </tr>
 			           <?php
 					    }
@@ -306,23 +222,14 @@ if(!empty($open_po))
 					   ?>
 			        </tbody>
 					<tfoot>
-
 					<td style="text-align:center"><?php 
-
 					$t='Total';
-
 					echo $t;?></td>
-
 					<td><?php echo '';?></td>
-
 					<td><?php echo '';?></td>
-
 					<td><?php echo '';?></td>
-
 					<td><?php echo '';?></td>
-
 					<td style="text-align:right"><?php echo number_format($tot,2,'.','');?></td>
-
 					</tfoot>
 			      </table>
 			 
@@ -334,8 +241,9 @@ if(!empty($open_po))
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
-      <!-- <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>
@@ -353,26 +261,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: [
-buttons: [
             
             {
-
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-        //title: 'Report - Open Order-Pending',
 				title: $('h3').text(),
                 exportOptions: {
-
                     columns: ':visible'
 					
                 }
-
             },
             
             'colvis'
-
         ]
     } );
 } );

application/views/Report_pending_purchase.php

@@ -15,7 +15,7 @@ if(!empty($mms))
                 
             }); 
 </script>
-<!-- <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;}
@@ -35,8 +35,8 @@ if(!empty($mms))
 
                            }
 			 .btn-success {
-								background-color:#5d0411;
+								background-color: #5d0411;
-								border-color:#5d0411;
+								border-color: #5d0411;
 							}			   
 		 
 			   
@@ -382,9 +382,9 @@ if(!empty($mms))
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
+
 
-<!-- <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>
@@ -408,7 +408,6 @@ $(document).ready(function() {
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-				//title: 'REPORT-Pending Purchase Order',
 				title: $('h3').text(),
                 exportOptions: {
                     columns: ':visible'

application/views/Report_purchase.php

@@ -15,7 +15,7 @@ if(!empty($mms))
                 
             }); 
 </script>
-<!-- <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;}
@@ -38,6 +38,19 @@ if(!empty($mms))
 								background-color: #5d0411;
 								border-color: #5d0411;
 							}	
+  th, td { white-space: nowrap; }
+   .dataTable > thead > tr > th[class*="sort"]:after{
+    content: "" !important;
+}
+
+table.dataTable thead > tr > th.sorting_asc, 
+table.dataTable thead > tr > th.sorting_desc, 
+table.dataTable thead > tr > th.sorting, 
+table.dataTable thead > tr > td.sorting_asc, 
+table.dataTable thead > tr > td.sorting_desc, 
+table.dataTable thead > tr > td.sorting {
+    padding-right: inherit;
+}		
 		 
 			   
 	 </style>
@@ -219,13 +232,12 @@ if(!empty($mms))
 			 
 		       
 			 <div class="box-body">
-              <div>
+              <div class = "table-responsive">
-                <table class="table table-bordered table-hover" width="100%"id="cc" style="font-size:10px !important;">
+                <table class="table table-bordered" id="cc" style="font-size:12px !important;">
                    <thead>
                      <tr>
-				       <th style="text-align:center">PO NO</th>
+				       <th style="text-align:center">PO No</th>
                        <th style="text-align:center">Date</th>
-					   <th style="text-align:center">Time</th>
 					   <th style="text-align:center">Material Name</th>
 					   <th style="text-align:center">Supplier Name</th>
 					   <th style="text-align:center">Quantity</th>
@@ -239,6 +251,7 @@ if(!empty($mms))
 					   <th style="text-align:center">Discount &nbsp;(<i class="fa fa-rupee " ></i>)</th>
 					   <th style="text-align:center">Freight &nbsp;(<i class="fa fa-rupee " ></i>)</th>
 					   <th style="text-align:center">Package &nbsp;(<i class="fa fa-rupee " ></i>)</th>
+					   <th style="text-align:center">Insurance &nbsp;(<i class="fa fa-rupee " ></i>)</th>
 					   <th style="text-align:center">Total &nbsp;(<i class="fa fa-rupee "></i>)</th>
 					 
                       </tr>
@@ -255,6 +268,7 @@ if(!empty($mms))
 						$tot_dis = 0;
 						$tot_frg = 0;
 						$tot_pac = 0;
+						$tot_inc = 0;
 						$tot_tot = 0;
 						
 					   foreach($purchase as $rel)
@@ -265,7 +279,6 @@ if(!empty($mms))
 						<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>
 						<td><span><?php echo $rel->supplier_name;?></span></td>
 						<td style="text-align:right"><span><?php 
@@ -301,6 +314,9 @@ if(!empty($mms))
 						$tot_pac= $tot_pac + $rel->Package;
 						echo $rel->Package;?></span></td>
 						<td style="text-align:right"><span><?php 
+						$tot_inc= $tot_inc + $rel->insurance;
+						echo $rel->insurance;?></span></td>
+						<td style="text-align:right"><span><?php 
 						$tot_tot= $tot_tot + round($rel->total,2);
 						echo number_format($rel->total,2,'.','');?></span></td>
 					   
@@ -329,6 +345,7 @@ if(!empty($mms))
 								 ?>  
 								</strong>	 
 								</td>  
+								
 								<td class="amount"><strong>
 								 <?php 
 								 {
@@ -337,14 +354,6 @@ if(!empty($mms))
 								  } 
 								 ?> 
                                 </strong>								 
-								</td>	
-								<td class="amount"><strong>
-								 <?php 					
-								 {
-								 //echo  format_currency($tot_rate,2,'.','');
-								  } 
-								 ?> 
-                                </strong>								 
 								</td>	
 								<td class="amount"><strong>
 								 <?php 
@@ -437,6 +446,16 @@ if(!empty($mms))
 												 </strong></td>
 												  <td class="amount" style="text-align:right"> 
 												<strong>
+												<?php 
+												 {
+												 echo number_format($tot_inc,2,'.','');
+												
+												  } 
+												  
+												 ?>  
+												 </strong></td>
+												<td class="amount" style="text-align:right"> 
+												<strong>
 												<?php 
 												 {
 												 echo number_format($tot_tot,2,'.','');
@@ -465,9 +484,8 @@ if(!empty($mms))
         <!-- /.col -->
       </div>
       </section>
-</div>
+    </div>
 
-<!-- <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>
@@ -484,14 +502,13 @@ $(document).ready(function() {
     table = $('#cc').DataTable( {
         "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
 "<'row'<'col-md-6'><'col-md-6'>>" +
-"<'table-responsive'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
+"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
         buttons: [
             
             {
                 extend: 'excelHtml5',
 				footer: 'true',
-				messageTop:'Report Purchase',
+				messageTop: 'Report Purchase',
-				//title: 'Report - Purchase',
 				title: $('h3').text(),
                 exportOptions: {
                     columns: ':visible'

application/views/Report_purchase_inward.php

@@ -1,3 +1,5 @@
+
+
 <?php
 if(!empty($mms))
 {
@@ -13,9 +15,11 @@ if(!empty($mms))
                 
             }); 
 </script>
-<!-- <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> 
+
+<style> 
 	 .dataTables_filter input {padding: 4px;}
           .dataTables_filter {
                             width: 50%;
@@ -36,12 +40,23 @@ if(!empty($mms))
 								background-color: #5d0411;
 								border-color: #5d0411;
 							}	
+  th, td { white-space: nowrap; }
+    .dataTable > thead > tr > th[class*="sort"]:after{
+    content: "" !important;
+}
+
+table.dataTable thead > tr > th.sorting_asc, 
+table.dataTable thead > tr > th.sorting_desc, 
+table.dataTable thead > tr > th.sorting, 
+table.dataTable thead > tr > td.sorting_asc, 
+table.dataTable thead > tr > td.sorting_desc, 
+table.dataTable thead > tr > td.sorting {
+    padding-right: inherit;
+}
 		
 			   
 	 </style>
 	 <div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-      
     <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
@@ -49,58 +64,36 @@ 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:#5d0411"><b>Report - Purchase-Inward</b><br><br>
+              <center><h3 class="box-title"><p style="color:#5d0411"><b>Inward Details</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 -->
@@ -234,30 +227,33 @@ if(!empty($mms))
             </div>
            	
 			 
+                        <span style="color:red;">*Insurance field not included </span>
+                        
+						
 		       
 			 <div class="box-body">
-              <div>
+              <div class = "table-responsive">
-			  <table class="table table-bordered table-hover" id="cc" style="font-size:10px !important;">
+                <table   id="cc" class="table table-bordered" cellspacing="0"  style="font-size:12px !important;">
                    <thead>
                      <tr>
-				       <th style="text-align:center">PO No</th>
+				       <th>PO No</th>
-                       <th style="text-align:center">Date</th>
+                       <th>Date</th>
-					   <th style="text-align:center">Time</th>
+					   <th>Time</th>
-					   <th style="text-align:center">Material Name</th>
+					   <th>Material Name</th>
-					   <th style="text-align:center;">Category</th>
+					   <th>Category</th>
-					   <th style="text-align:center">Supplier Name</th>
+					   <th>Supplier Name</th>
-					   <th style="text-align:center">Quantity</th>
+					   <th>Qty</th>
-					   <th style="text-align:center">UOM</th>
+					   <th>UOM</th>
-					   <th style="text-align:center">Rate &nbsp;(<i class="fa fa-rupee "></i>)</th>
+					   <th>Rate &nbsp;(<i class="fa fa-rupee "></i>)</th>
-					   <th style="text-align:center">Value &nbsp;(<i class="fa fa-rupee " ></i>)</th>
+					   <th>Value &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-					    <th style="text-align:center">Exchange Rate</th>
+					    <th>Exchange Rate</th>
-					   <th style="text-align:center">SGST &nbsp;(<i class="fa fa-rupee " ></i>)</th>
+					   <th>SGST &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-					   <th style="text-align:center">CGST &nbsp;(<i class="fa fa-rupee " ></i>)</th>
+					   <th>CGST &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-					   <th style="text-align:center">IGST &nbsp;(<i class="fa fa-rupee " ></i>)</th>
+					   <th>IGST &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-					   <th style="text-align:center">Discount &nbsp;(<i class="fa fa-rupee " ></i>)</th>
+					   <th>Discount &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-					   <th style="text-align:center">Freight &nbsp;(<i class="fa fa-rupee " ></i>)</th>
+					   <th>Freight &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-					   <th style="text-align:center">Package &nbsp;(<i class="fa fa-rupee " ></i>)</th>
+					   <th>Package &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-					   <th style="text-align:center">Total &nbsp;(<i class="fa fa-rupee "></i>)</th>
+					   <th>Total &nbsp;(<i class="fa fa-rupee "></i>)</th>
 					 
                       </tr>
                     </thead>
@@ -273,6 +269,7 @@ if(!empty($mms))
 						$tot_dis = 0;
 						$tot_frg = 0;
 						$tot_pac = 0;
+						//$tot_inc = 0;
 						$tot_tot = 0;
 						
 					   foreach($purchase as $rel)
@@ -319,9 +316,11 @@ if(!empty($mms))
 						<td style="text-align:right"><span><?php 
 						$tot_pac= $tot_pac + $rel->Package;
 						echo $rel->Package;?></span></td>
+						
 						<td style="text-align:right"><span><?php 
 						$tot_tot= $tot_tot + round($rel->total,2);
-						
+						?>
+						<?php 
 						if(!empty($rel->file)){ ?>
 						<a target="_blank" href="<?php echo  base_url().'uploads/BillFiles/'?><?php echo $rel->file ?>" data-toggle="tooltip" data-placement="left" title="Attachment Available for Download/View"><?php echo number_format($rel->total,2,'.','');?></a>	
 						<?php
@@ -330,6 +329,7 @@ if(!empty($mms))
 							echo number_format($rel->total,2,'.','');
 						}
 						?>
+						
 						</span></td>
 					   
 					   
@@ -456,6 +456,7 @@ if(!empty($mms))
 												  
 												 ?>  
 												 </strong></td>
+												 
 												<td class="amount" style="text-align:right"> 
 												<strong>
 												<?php 
@@ -486,15 +487,16 @@ if(!empty($mms))
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
+
 
-	  <!-- <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> 
 	
 
@@ -502,28 +504,30 @@ if(!empty($mms))
 // Set up your table
 $(document).ready(function() {
     table = $('#cc').DataTable( {
+		
+      
+        "autoWidth": false,
+    orderCellsTop: true,
+      
+      
+    
         "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>>",
+"<'row'<'col-md-12't>><'row'<'col-md-2'i><'col-md-10'p>>",
-buttons: [
+        buttons: [
             
             {
-
                 extend: 'excelHtml5',
 				footer: 'true',
-        //messageTop: $('h3').text(),
 				messageTop: 'Report Purchase-Inward',
 				title: $('h3').text(),
                 exportOptions: {
-
                     columns: ':visible'
 					
                 }
-
             },
             
             'colvis'
-
         ]
 		
     } );
@@ -580,11 +584,8 @@ buttons: [
 	
 }
 $(document).ready(function(){
-
     $('[data-toggle="tooltip"]').tooltip();   
-
 });
-
 	</script>
 	
 	

application/views/Report_supplier.php

@@ -6,7 +6,16 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"> -->
+<script>
+ $(document).ready(function () {
+	 
+	  $("#client_name").select2();
+	 
+	  
+                
+            }); 
+</script>
+
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
       <style> 
           .dataTables_filter input {padding: 4px;}
@@ -42,49 +51,29 @@ 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:#5d0411;"><b>Report - Purchase-SupplierWise</b><br><br>
+              <center><h3 class="box-title"><p style="color:#5d0411"><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>
@@ -96,7 +85,7 @@ if(!empty($mms))
                     <form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
 
                         <div class="form-group has-feedback">
-						<div class="col-md-4">
+						<div class="col-md-2">
 						    <label for="client_name">
                                 <?php echo 'Supplier'; ?><span style="color:red;">* </span>
                             </label>
@@ -117,10 +106,10 @@ if(!empty($mms))
 							   </div>
                         </div>  
 						 
-						<br><br><br><br>
+						 
                        <div class="col-md-2">
 							 <label for="to_date">
-                                <?php echo 'year'; ?>
+                                <?php echo 'Year'; ?>
                             </label>
                             <div class="input-group">
                                  <select class="form-control" id="financialyear" name="financialyear">
@@ -162,7 +151,7 @@ if(!empty($mms))
 								 </select>
                               </div>
                             </div>
-						<div class="col-md-4">
+						<div class="col-md-2">
 						    <label for="from_date">
                                 <?php echo 'From Date'; ?>
                             </label>
@@ -175,7 +164,7 @@ if(!empty($mms))
                         </div>
 
              
-                       <div class="col-md-4">
+                       <div class="col-md-2">
 					        <label for="to_date">
                                 <?php echo 'To Date'; ?>
                             </label>  
@@ -187,7 +176,7 @@ if(!empty($mms))
                             </div>
                        
 						</div>
-						<div class="col-md-2 col-md-offset-10" style="padding:3%;">
+						<div class="col-md-2"><br>
                         <input type="submit" class="btn btn-success" name="btn_submit"
                                value="View Report">
                         
@@ -203,14 +192,14 @@ if(!empty($mms))
 		       
 			 <div class="box-body">
               <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:12px;">
+                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
                    <thead>
                      <tr>
-				       <th style="text-align:center">Supplier</th>
+				       <th style="text-align:center">Supplier Name</th>
-					   <th style="text-align:center">Count</th>
+					   <th style="text-align:center">PO Count</th>
 					   <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value</th>
+					   <th style="text-align:center">Value &nbsp;(<i class="fa fa-rupee "></i>)</th>
-					   <th style="text-align:center">Total</th>
+					   
 					 
                       </tr>
                     </thead>
@@ -238,11 +227,9 @@ if(!empty($mms))
 						$tot_qty= $tot_qty + round($rel->quantity);
 						echo round($rel->quantity);?></span></td>
 						<td style="text-align:right"><span><?php 
-						$tot_value= $tot_value + round($rel->value);
+						$tot_value= $tot_value + $rel->value;
-						echo round($rel->value);?></span></td>
+						echo number_format($rel->value,2,'.','');?></span></td>
-						<td style="text-align:right"><span><?php 
+						
-						$tot_tot= $tot_tot + round($rel->total);
-						echo round($rel->total);?></span></td>
 					   
 					   
 					
@@ -280,22 +267,13 @@ if(!empty($mms))
 									<strong>
 									<?php 
 									 {
-									 echo $tot_value;
+									 echo number_format($tot_value,2,'.','');
 									
 									  } 
 									 ?>  
 									</strong>
 									</td>
-										<td class="amount" style="text-align:right">
-										<strong>
-										<?php 
-										 {
-										 echo $tot_tot;
 										
-										  } 
-										 ?> 
-										</strong>
-										</td>
 											
 												
 						</tr>
@@ -315,15 +293,16 @@ if(!empty($mms))
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
+
 
-	  <!-- <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> 
 	
 
@@ -334,25 +313,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: [
+       buttons: [
             
             {
-
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-		//title: 'Report - Supplier-Wise',
 				title: $('h3').text(),
                 exportOptions: {
-
                     columns: ':visible'
 					
                 }
-
             },
             
             'colvis'
-
         ]
     } );
 } );

application/views/Report_supplier_inward.php

@@ -15,7 +15,7 @@ if(!empty($mms))
                 
             }); 
 </script>
-<!-- <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;}
@@ -39,10 +39,9 @@ if(!empty($mms))
 								border-color: #5d0411;
 							}			   
 		 
+			   
 	 </style>
 	 <div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-      
     <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
@@ -51,55 +50,30 @@ if(!empty($mms))
           <div class="box box-info">
             <div class="box-header with-border">
               <center><h3 class="box-title"><p style="color:#5d0411"><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 -->
@@ -315,15 +289,16 @@ if(!empty($mms))
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
+
 
-	  <!-- <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> 
 	
 
@@ -334,25 +309,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: [
+        buttons: [
             
             {
-
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-		//title: 'Report - Supplier-Wise-Inward',
 				title: $('h3').text(),
                 exportOptions: {
-
                     columns: ':visible'
 					
                 }
-
             },
             
             'colvis'
-
         ]
     } );
 } );

application/views/Report_totalorders.php

@@ -1,10 +1,12 @@
+
+
 <?php
 if(!empty($Total))
 {
 
 }
 ?>
-<!-- <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;}
@@ -24,41 +26,37 @@ if(!empty($Total))
 
                            }
 						   .btn-success {
-								background-color:#5d0411;
+								background-color: #5d0411;
 								border-color: #5d0411;
-
 							}	
 		 
 			   
 	 </style> 
-	 <div class="content-wrapper">
+<div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-      
     <section class="content"><br/>  
-
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#5d0411"><b>Total Orders</b> <br><br>
+              <center><h3 class="box-title"><p style="color:#5d0411"><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">
 			  
+                      
                       <center> 
 					  <div class="panel-body">
 					  <form method="post" action=" ">
@@ -67,21 +65,27 @@ if(!empty($Total))
 					 <option value="">Select Budget Year</option>
 					 <?php 
 					 foreach($finyear as $item):
+							 
 							{?>
 							
 							<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
 							
+							         
 							 <?php } endforeach; ?>
 					  
 					   </select></div>
 					   <div class="col-md-2">
-					  <input type="submit" class="btn btn-success" id="year" name="btn_submit" value="View Report"></div>
+                        <input type="submit" class="btn btn-success" id="year" name="btn_submit"
+                               value="View Report"></div>
                           </form>
-						</div><!--panelbody-->
+						  </div>
 							</center>
                  
+           	
            </div>
            	
+			 
+		       
 			 <div class="box-body">
               <div>
                 <table class="table table-bordered table-hover" id="req" style="font-size:14px;">
@@ -100,10 +104,14 @@ if(!empty($Total))
 					   <th>MRIR Approved</th>
 					   <th>Service completed</th>
 					   
+					   
+					   
+					   
+                       
+                       
                       </tr>
                     </thead>
 				    <tbody>
-				  
 				       <?php if(!empty($Total)){
 					   foreach($Total as $rel)
 					    {				
@@ -137,16 +145,17 @@ if(!empty($Total))
         </div>
         <!-- /.col -->
       </div>
-</section>
+	  </section>
-</div>
+    </div>
+
 
-	<!-- <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,30 +166,25 @@ $(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: [
+        buttons: [
             
             {
-
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-				//title: 'Report - TotalOrders',
 				title: $('h3').text(),
                 exportOptions: {
-
                     columns: ':visible'
 					
                 }
-
             },
             
             'colvis'
-
         ]
-
     } );
 } );
 
 
 
 	</script>
+	

application/views/Report_year_wise.php

@@ -6,7 +6,7 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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;}
@@ -45,21 +45,13 @@ if(!empty($mms))
               <center><h3 class="box-title"><p style="color:#5d0411"><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 -->
@@ -73,8 +65,6 @@ if(!empty($mms))
 					  <select class="form-control" id="financialyear" name="financialyear">
 					 <option value="">Select Year</option>
 					 <?php 
-					 
-					
 					 foreach($finyear as $item):
 							 
 							{?>
@@ -85,7 +75,6 @@ if(!empty($mms))
 							 <?php } endforeach; ?>
 					  
 					   </select>
-
 						</div>
 						<div class="col-md-2">
                         <input type="submit" class="btn btn-success" id="year" name="btn_submit"   value="View Report">
@@ -102,12 +91,12 @@ if(!empty($mms))
                ?>						   
 			 <div class="box-body">
               <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:12px;">
+                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
                    <thead>
                      <tr>
 				       <th style="text-align:center">Month-Year</th>
                        <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Total Value</th>
+					   <th style="text-align:center">Total Value &nbsp;(<i class="fa fa-rupee " ></i>)</th>
 					   
 					 
                       </tr>
@@ -115,7 +104,7 @@ if(!empty($mms))
 				    <tbody>
 				       <?php 
 					  $tr3=0;
-					  $tr4=0; 
+					  $tr4=00; 
 					   foreach($year as $rel)
 					    {				
 					   ?> 
@@ -170,8 +159,8 @@ if(!empty($mms))
 									<strong>
 									<?php 
 									 {
-									 //echo $tr4;
 									 echo number_format($tr4,2,'.','');
+									
 									  } 
 									 ?>  
 									</strong>
@@ -195,17 +184,30 @@ if(!empty($mms))
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
+
+
 
-	  <!-- <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> 
 
+<script> 
+	jQuery.extend( jQuery.fn.dataTableExt.oSort, {
+    "date-range-pre": function ( a ) {
+        var monthArr = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
+        return monthArr.indexOf(a); 
+    },
+     "date-range-asc": function ( a, b ) {
+        return ((a < b) ? -1 : ((a > b) ? 1 : 0));
+    },
+     "date-range-desc": function ( a, b ) {
+        return ((a < b) ? 1 : ((a > b) ? -1 : 0));
+    }
+} );
 
 // Bootstrap datepicker
 // Set up your table
@@ -214,25 +216,23 @@ $(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: [
+        buttons: [
             
             {
-
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-		//title: 'Report - YearWise',
 				title: $('h3').text(),
                 exportOptions: {
-
                     columns: ':visible'
 					
                 }
-
             },
             
             'colvis'
-
+        ],
+		columnDefs: [
+       { type: 'date-range', targets: 0 }
     ]
     } );
 } );

application/views/Report_year_wise_inward.php

@@ -6,7 +6,7 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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;}
@@ -30,10 +30,9 @@ if(!empty($mms))
 								border-color: #5d0411;
 							}
 
+			   
 	 </style>
 	 <div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-      
     <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
@@ -42,15 +41,11 @@ if(!empty($mms))
           <div class="box box-info">
             <div class="box-header with-border">
               <center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Year-Wise-Inward</b><br><br>
-
 			  <?php
 			  
 			  if($this->input->post('financialyear')){
-
 				  $ab=$this->input->post('financialyear'); 
-
 				  echo '('.$ab.')';
-
 				  echo ' ';
 				  
 			  }
@@ -119,7 +114,7 @@ if(!empty($mms))
                                  $new = date('M-y', $da);
 								 $pass = date('Y-m-d',$da);
 								  $ab=$this->input->post('financialyear'); 
-								 //echo $new;
+								 //echo $rel->CreatedDate;
 							?>
 							
 						<a href="<?= base_url() ?>report/imonth_wise?ab=<?php echo $ab;?>&dat=<?php echo $pass;?>"><?php echo $new;?></a>
@@ -187,17 +182,30 @@ if(!empty($mms))
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
-	  <!-- <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> 
 
+<script> 
 	
+jQuery.extend( jQuery.fn.dataTableExt.oSort, {
+    "date-range-pre": function ( a ) {
+        var monthArr = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
+        return monthArr.indexOf(a); 
+    },
+     "date-range-asc": function ( a, b ) {
+        return ((a < b) ? -1 : ((a > b) ? 1 : 0));
+    },
+     "date-range-desc": function ( a, b ) {
+        return ((a < b) ? 1 : ((a > b) ? -1 : 0));
+    }
+} );
 // Bootstrap datepicker
 // Set up your table
 $(document).ready(function() {
@@ -205,25 +213,23 @@ $(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: [
+         buttons: [
             
             {
-
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-		//title: 'Report - YearWise',
 				title: $('h3').text(),
                 exportOptions: {
-
                     columns: ':visible'
 					
                 }
-
             },
             
             'colvis'
-
+        ],
+		columnDefs: [
+       { type: 'date-range', targets: 0 }
     ]
     } );
 } );

application/views/Report_year_wise_total.php

@@ -6,7 +6,7 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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;}
@@ -26,30 +26,32 @@ if(!empty($mms))
 
                            }
 			 .btn-success {
-								background-color: #3c8dbc;
+								background-color: #5d0411;
-								border-color: #3c8dbc;
+								border-color: #5d0411;
 							}			   
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
         <!-- 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-Total(<?php echo $year; ?>)</b></p></h3></center>
+              <center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Year-wise-Total(<?php echo $year; ?>)</b></p></h3></center>
 			</div>
 			<!-- /.box-header -->
 			<div class="box-body">
               <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:12px;">
+                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
                    <thead>
                      <tr>
-				       <th style="text-align:center">Supplier</th>
+				       <th style="text-align:center">Supplier Name</th>
-                       <th style="text-align:center">Product</th>
+                       <th style="text-align:center">Material Name</th>
 					   <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Total Value</th>
+					   <th style="text-align:center">Total Value &nbsp;(<i class="fa fa-rupee "></i>)</th>
 					   
 					 
                       </tr>
@@ -127,16 +129,19 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+	  </section>
+    </div>
+
+
 
-	  <!-- <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> 
 
+<script> 
 	
 
 // Bootstrap datepicker
@@ -146,19 +151,17 @@ $(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: [
+       buttons: [
             
             {
-
                 extend: 'excelHtml5',
 				footer: 'true',
-		title: $('h3').text(),
 				//messageTop: $('h3').text(),
-		//title: 'Report - YearWise-Total',
+				title: $('h3').text(),
                 exportOptions: {
                     columns: ':visible'
-        }
 					
+                }
             },
             
             'colvis'

application/views/Report_year_wise_total_inward.php

@@ -6,7 +6,7 @@ if(!empty($mms))
 
 }
 ?>
-<!-- <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;}
@@ -32,6 +32,8 @@ if(!empty($mms))
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -127,15 +129,19 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+	  </section>
+    </div>
+
+
 
-	  <!-- <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> 
+
+<script> 
 	
 
 // Bootstrap datepicker
@@ -145,27 +151,21 @@ $(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: [
+        buttons: [
             
             {
-
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-		//title: 'Report - YearWise-Total-Inward',
 				title: $('h3').text(),
                 exportOptions: {
-
                     columns: ':visible'
 					
                 }
-
             },
             
             'colvis'
-
         ]
-
     } );
 } );
  $('#mySelect').on('change',function(){

application/views/report_emp.php

@@ -3,7 +3,7 @@
 <?php
 //print_r($fy);die();
 ?>
-<!-- <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;}
@@ -34,6 +34,8 @@
 			   
 	 </style>
 	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
     <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
@@ -204,9 +206,9 @@
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
+
 
-<!-- <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>

application/views/report_pendingreqst.php

@@ -6,7 +6,7 @@ if(!empty($pending_list))
 
 }
 ?>
-<!-- <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;}
@@ -30,12 +30,8 @@ if(!empty($pending_list))
 								border-color: #5d0411;
 							}	
 			   
-		  
-			   
 	 </style>
 	 <div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-      
     <section class="content"><br/>  
  <div class="row"style="min-height: 600px;">
         <!-- Left col -->
@@ -43,78 +39,35 @@ if(!empty($pending_list))
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#5d0411"><b>Total Pending Requests</b> <br><br>
+              <center><h3 class="box-title"><p style="color:#5d0411"><b>Total Pending Requests</b>
-
+			   <br><br>
 			  <?php
 			  
-			  
-
 			  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;
-
 			  }
-
 		      if($this->input->post('aging_from') && $this->input->post('aging_to')){
-
 				   $tfrm = $this->input->post('aging_from');
-
 		           $tt = $this->input->post('aging_to');  
-
 				  echo 'Aging between'.' '.$tfrm.'-to-'.$tt.' '.'days';
-
 			  }
-
+			  ?>
-			  ?></p></h3></center>
+			  </p></h3></center>
 			</div>
 			<!-- /.box-header -->
-            <!--<div class="row">
-		   <div class="col-md-6">
-			 <div class="input-group input-daterange input" >
-                   <div class="input-group-addon"><b>Aging From:</b></div>
-                   <input type="number" id="min" class="form-control date-range-filter"  placeholder="From:">
-                   <div class="input-group-addon"><b>To</b></div>
-                   <input type="number" id="max" class="form-control date-range-filter"  placeholder="To:">
-		           <div class="input-group-addon"> <a   onclick="Reset()"><b>Clear</b></a></div>
-             </div>
-           </div>
-		   <div class="col-md-6">
-			 <div class="input-group input-daterange input">
-                   <div class="input-group-addon"><b>Request 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:">
-		           <div class="input-group-addon"> <a   onclick="Reset()"  ><b>Clear</b></a></div>
-             </div>
-           </div>
-        </div>	-->		
-			 
            	<div class="panel-body">
 
                     <form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
@@ -122,183 +75,113 @@ if(!empty($pending_list))
                         <div class="form-group has-feedback">
 						
 						
+						
                        <div class="col-md-2">
-
 							 <label for="to_date">
-
                                 <?php echo 'Year'; ?>
-
                             </label>
-
                             <div class="input-group">
-
                                  <select class="form-control" id="financialyear" name="financialyear">
-
 								 <option value="">Select Year</option>
-
 								 <?php 
 								 
+								
 								  foreach($finyear as $item):
 										 
 										 {?>
 										
 										<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
 										
+												 
 										 <?php } endforeach; ?>
 								  
 								   </select>
-
 							   </div>
-
                             </div>
-
 								<div class="col-md-2">
-
 								<label for="to_date">
-
                                 <?php echo 'Month'; ?>
-
                                 </label>
-
                                 <div class="input-group">
-
                                  <select class="form-control" id="month" name="month">
-
 								  <option value="">Select Month</option>
-
 								 <option value="January">January</option>
-
 								 <option value="February">February</option>
-
 								 <option value="March">March</option>
-
 								 <option value="April">April</option>
-
 								 <option value="May">May</option>
-
 								 <option value="June">June</option>
-
 								 <option value="July">July</option>
-
 								 <option value="August">August</option>
-
 								 <option value="September">September</option>
-
 								 <option value="October">October</option>
-
 								 <option value="November">November</option>
-
 								 <option value="December">December</option>
-
 								 </select>
-
                               </div>
-
                             </div>
-
 						<div class="col-md-2">
-
 						    <label for="Aging_From">
-
                                 <?php echo 'Aging From'; ?>
-
                             </label>
-
                             <div class="input-group">
-
                                 <input name="aging_from" id="aging_from" style="padding:4px;">
-
                             </span>
-
+                            </div>
                         </div>
 
-                        </div>
              
                        <div class="col-md-2">
-
 					        <label for="Aging_To">
-
                                 <?php echo 'Aging To'; ?>
-
                             </label>  
-
                             <div class="input-group">
-
                                 <input name="aging_to" id="aging_to" style="padding:4px;">
-
                              </span>
-
                             </div>
                        
-                       
-
 						</div>
-
 						<div class="col-md-2">
-
 						    <label for="from_date">
-
                                 <?php echo 'From Date'; ?>
-
                             </label>
-
                             <div class="input-group">
-
                                 <input name="from_date" id="max-date" class="form-control datepicker">
-
                                 <span class="input-group-addon">
-
                                     <i class="fa fa-calendar fa-fw"></i>
-
                             </span>
-
                             </div>
-
                         </div>
 
              
                        <div class="col-md-2">
-
 					        <label for="to_date">
-
                                 <?php echo 'To Date'; ?>
-
                             </label>  
-
                             <div class="input-group">
-
                                 <input name="to_date" id="min-date" class="form-control datepicker">
-
                                 <span class="input-group-addon">
-
                                     <i class="fa fa-calendar fa-fw"></i>
-
                             </span>
-
                             </div>
                        
-                       
-
 						</div>
-
 						<div class="col-md-2 col-md-offset-11"><br>
-
                         <input type="submit" class="btn btn-success" name="btn_submit"
-
                                value="View Report">
                         
-                        
-
 							</div>  
-
 							</div>  
-
                     </form>
+
+               
+
             </div>
 			 
+		       
 			 <div class="box-body">
               <div>
-                <table class="table table-bordered table-hover" id="req" >
+                <table class="table table-bordered table-hover" id="req" style="font-size:14px;">
                    <thead>
                      <tr>
 				       <th>Requistion Date</th>
@@ -340,15 +223,18 @@ if(!empty($pending_list))
         <!-- /.col -->
       </div>
 	  </section>
-</div>
+    </div>
-      <!-- <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>
+
+<script> 
+	
 
 // Bootstrap datepicker
 // Set up your table
@@ -357,27 +243,21 @@ $(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: [
+        buttons: [
             
             {
-
                 extend: 'excelHtml5',
 				footer: 'true',
 				//messageTop: $('h3').text(),
-		//title: 'Report - Pending Request',
 				title: $('h3').text(),
                 exportOptions: {
-
                     columns: ':visible'
 					
                 }
-
             },
             
             'colvis'
-
         ]
-
     } );
 } );
 //dateFormat: 'dd-mm-yy'

application/views/reportmasterlist_inward.php

@@ -9,8 +9,7 @@
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-       <!-- <center>Inward Product Test Reports List</center> -->
+       <center>Inward Product Test Reports List</center>
-       <center><?php echo $pageTitle; ?> Inward Product Test Reports List</center>
       </h1>
     </section>
     <section class="content">
@@ -60,7 +59,14 @@
 							
 							//print_r($data);echo "</br></br>";
 						?>	
-						 <tr> <td><a href="<?php echo base_url()?>quality/viewIndInwardReport/<?php echo $data->testreport_id ?>"><?php echo $data->testreport_id?></a></td> <td><?php echo $data->IGRNO?></td> <td><?php echo $data->IGRItemNo?></td><td style="text-align:right;"><?php echo date_format(date_create($data->batchdate),'d-m-Y');?></td><td><?php echo $data->SupplierName;?></td><td><?php echo $data->Materialname;?></td></tr> 
+						 <tr> <td><a href="<?php echo base_url()?>quality/viewIndInwardReport/<?php echo $data->testreport_id ?>"><?php echo $data->testreport_id?></a>
+						 <?php if(!empty($data->document))
+						 {
+						  ?>
+						 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a target="_blank" href="<?php echo base_url()?>uploads/QAD/<?php echo $data->document ?>"><span class="fa fa-file-o"></span></a>
+						 <?php } ?>
+						 
+						 </td> <td><?php echo $data->IGRNO?></td> <td><?php echo $data->IGRItemNo?></td><td style="text-align:right;"><?php echo date_format(date_create($data->batchdate),'d-m-Y');?></td><td><?php echo $data->SupplierName;?></td><td><?php echo $data->Materialname;?></td></tr> 
 						<?php	
 						}
 					}
@@ -80,3 +86,21 @@
         </div>
     </section>
 </div>
+<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
+<script type="text/javascript">
+    $(function () {
+  
+    $('#testspecifications').DataTable({
+      "paging": true,
+      "lengthChange": true,
+      "searching": true,
+      "ordering": true,
+     "aaSorting": [[ 0, "asc" ]],
+      "info": true,
+      "autoWidth": true,
+	  
+     
+    }); 
+  });
+  
+</script>