diff --git a/application/controllers/CostCenter.php b/application/controllers/CostCenter.php
index f6317b5f..5559e336 100755
--- a/application/controllers/CostCenter.php
+++ b/application/controllers/CostCenter.php
@@ -243,8 +243,7 @@ class CostCenter extends BaseController
     {
 
 
-      if($this->DEPCode == FINANCE )
-       {
+     
             $this->form_validation->set_rules('CostCode','CostCode','trim|required');
             $this->form_validation->set_rules('CostName','CostName','trim|required');            
          
@@ -331,15 +330,7 @@ class CostCenter extends BaseController
             }
 
 
-         }  
-
-
-         else
-         {
-            //$this->loadViews("access");
-            $this->load->view('access');
-
-         }
+        
         
     }
 
@@ -447,12 +438,12 @@ class CostCenter extends BaseController
      */
     function deletecost()
     {
-        if($this->isAdmin() == TRUE)
-        {
-            echo(json_encode(array('status'=>'access')));
-        }
-        else
-        {
+        // if($this->isAdmin() == TRUE)
+        // {
+        //     echo(json_encode(array('status'=>'access')));
+        // }
+        // else
+        // {
             $CostCenterID = $this->input->Costst('CostCentreID');
             $cost = array('CreateDate'=>date('Y-m-d H:i:sa'));
             
@@ -460,7 +451,7 @@ class CostCenter extends BaseController
             
             if ($result > 0) { echo(json_encode(array('status'=>TRUE))); }
             else { echo(json_encode(array('status'=>FALSE))); }
-        }
+        //}
     }
     
 	function export_cost(){
diff --git a/application/controllers/companycontroller.php b/application/controllers/companycontroller.php
index edd7ad0f..7af4fbf2 100755
--- a/application/controllers/companycontroller.php
+++ b/application/controllers/companycontroller.php
@@ -221,12 +221,12 @@ class companycontroller extends BaseController
     {
     	//die();
 		// $data['payment'] = $this->companydetailsmodel->getpayment(); 
-		 if($this->isAdmin() == TRUE)
-            {
-                $this->loadThis();
-            }
-		else
-		{
+		//  if($this->isAdmin() == TRUE)
+  //           {
+  //               $this->loadThis();
+  //           }
+		// else
+		// {
 			
 
 			$PictureName = $this->input->post('Image'); 
@@ -317,7 +317,7 @@ class companycontroller extends BaseController
                 
                 
                // redirect('companyview');			
-		}
+		//}
 	} 
 
 	
diff --git a/application/controllers/department.php b/application/controllers/department.php
index 897c8657..90321a64 100755
--- a/application/controllers/department.php
+++ b/application/controllers/department.php
@@ -39,12 +39,12 @@ class department extends BaseController
      */
     function departmentListing()
     {
-         if($this->isAdmin() == TRUE)
-        {
-            $this->loadThis();
-        }
-        else
-        {
+        //  if($this->isAdmin() == TRUE)
+        // {
+        //     $this->loadThis();
+        // }
+        // else
+        // {
             $this->load->model('department_model');
         
             //$searchText = $this->input->post('searchText');
@@ -57,7 +57,7 @@ class department extends BaseController
             $this->global['pageTitle'] = 'Siddharth Industries : Department Listing';
             
             $this->loadViews("departmentListing", $this->global, $data, NULL);
-        }
+        //}
     }
 	/**
      * This function is used to load the add new supplier    */
diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php
index bbe77473..d4545408 100755
--- a/application/controllers/employeedetails.php
+++ b/application/controllers/employeedetails.php
@@ -388,19 +388,19 @@ echo "<script>alert('Record Not Saved!');</script>";redirect('employeeListing','
             $data['Department'] = $this->employeedetails_model->getDepartment();
        $this->global['pageTitle'] = 'Siddharth : Add New Employee';
 
-       if($this->role == ROLE_ADMIN || $this->DEPCode == HR)
-        {
+       // if($this->role == ROLE_ADMIN || $this->DEPCode == HR)
+       //  {
 
 
             $this->loadViews("addemployee", $this->global, $data, NULL);
 
             
-         }
+         // }
          
-         else
-         {
-            $this->loadViews("access", $this->global, $data, NULL);
-         }   
+         // else
+         // {
+         //    $this->loadViews("access", $this->global, $data, NULL);
+         // }   
         
     } 
   /**
diff --git a/application/controllers/rawmaterialdetails.php b/application/controllers/rawmaterialdetails.php
index 8bfc8637..fec56302 100755
--- a/application/controllers/rawmaterialdetails.php
+++ b/application/controllers/rawmaterialdetails.php
@@ -241,12 +241,12 @@ class rawmaterialdetails extends BaseController
      */
     function editRawmaterial()
     {
-        if($this->isAdmin() == TRUE)
-        {
-            $this->loadThis();          
-        }
-        else
-        {
+        // if($this->isAdmin() == TRUE)
+        // {
+        //     $this->loadThis();          
+        // }
+        // else
+        // {
            $RawmaterialID = $this->input->post('MaterialCode');
             $this->form_validation->set_rules('MaterialName','Material Name','trim|required|');
             $this->form_validation->set_rules('MaterialType','MaterialType','trim');
@@ -334,7 +334,7 @@ class rawmaterialdetails extends BaseController
                 
                
             }
-        }
+        //}
     }
 
     /** this function can be use for excel report **/
diff --git a/application/controllers/report.php b/application/controllers/report.php
index cf9147a3..c39398a4 100755
--- a/application/controllers/report.php
+++ b/application/controllers/report.php
@@ -44,18 +44,11 @@ class report extends BaseController
        
 	   //print_r($data);
 		
-	   if($this->DEPCode == MANAGEMENT)
-      {
+	   
 	  
 	   $this->loadviews("report_pendingreqst",$this->global,$data, NULL);
 
-	  }
-
 	  
-	  	else
-      {
-        $this->loadViews("access", $this->global, $data, NULL);
-      }
     }
      public function releasedPO()
     {
@@ -81,14 +74,9 @@ class report extends BaseController
 	  
         $data['finyear']=$this->dahsboard_Model->report_finyear();
 	   
-	   if($this->DEPCode == MANAGEMENT)
-      {
+	  
 	   $this->loadviews("Report_POreleased",$this->global,$data, NULL);
-	  }
-	  	else
-      {
-        $this->loadViews("access", $this->global, $data, NULL);
-      }
+	  
 
     }
 	public function openorderPO()
@@ -116,15 +104,9 @@ class report extends BaseController
         $data['finyear']=$this->dahsboard_Model->report_finyear();
        
 	   
-	   if($this->DEPCode == MANAGEMENT)
-      {
+	   
 	   $this->loadviews("Report_openorder",$this->global,$data, NULL);
-	  }
-
-	  else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	  
 
     }
 	public function TotalOrd()
@@ -141,15 +123,9 @@ class report extends BaseController
 		}
 	  $data['finyear']=$this->dahsboard_Model->report_finyear();
 
-	  if($this->DEPCode == MANAGEMENT)
-      {
+	 
 	   $this->loadviews("Report_totalorders",$this->global,$data, NULL);
-	   }
-
-	   else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	   
 
     }
 	public function ccr()
@@ -169,16 +145,10 @@ class report extends BaseController
 	   }
 	    $data['finyear']=$this->dahsboard_Model->report_finyear();
 
-	    if($this->DEPCode == MANAGEMENT)
-      {
+	   
 		
 	    $this->loadviews("Report_costcenter",$this->global,$data, NULL);
-	  }
-
-	   else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	  
 		
 	   //print_r($data);
 
@@ -192,16 +162,10 @@ class report extends BaseController
 	  
        $data['mms']=$this->dahsboard_Model->report_MMSupplier();
 	   
-	    if($this->DEPCode == MANAGEMENT)
-      {
+	   
 	  
 	   $this->loadviews("Report_Material_Master_SupplierWise",$this->global,$data, NULL);
-	  }
-      
-        else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	  
 
 
     }
@@ -215,16 +179,8 @@ class report extends BaseController
        $data['mmi']=$this->dahsboard_Model->report_MMItem();
 	   
 
-	    if($this->DEPCode == MANAGEMENT)
-      {
 	  
-	   $this->loadviews("Report_Material_Master_ItemWise",$this->global,$data, NULL);
-      }
-
-       else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	  
     }
 	public function MM_ReceiptValue()
     {
@@ -241,15 +197,9 @@ class report extends BaseController
        $data['mmr']=$this->dahsboard_Model->report_MMReceiptValue($fa,$aa,$m);
 		}
 		$data['finyear']=$this->dahsboard_Model->report_finyear();
-	   if($this->DEPCode == MANAGEMENT)
-      {
+	  
 	   $this->loadviews("Report_Material_Master_ReceiptValue",$this->global,$data, NULL);
-	  }
-
-	  else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	  
 
 
     }
@@ -275,15 +225,9 @@ 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();
-	   if($this->DEPCode == MANAGEMENT)
-      {
+	  
 	   $this->loadviews("Report_purchase",$this->global,$data, NULL);
-      }
-
-      else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+      
 
 
     }
@@ -330,16 +274,10 @@ class report extends BaseController
        $data['purchase']=$this->dahsboard_Model->report_purchase_link($cname,$prod,$fa,$aa,$m,$frm,$t,$sid,$mid,$d);
 	   }
 
-	   if($this->DEPCode == MANAGEMENT)
-      {
+	   
 	  
 	   $this->loadviews("Report_purchase",$this->global,$data, NULL);
-	  }
-
-	  else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	  
 
 
 
@@ -361,16 +299,10 @@ class report extends BaseController
 	   }
 	    $data['finyear']=$this->dahsboard_Model->report_finyear();
 
-	     if($this->DEPCode == MANAGEMENT)
-      {
+	   
 		
 	    $this->loadviews("Report_year_wise",$this->global,$data, NULL);
-      }
-
-       else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+      
 
 
     }
@@ -387,15 +319,9 @@ class report extends BaseController
 		 $data['mont']=$mon;	
 	   $data['month']=$this->dahsboard_Model->report_month_wise($month);
 
-	   if($this->DEPCode == MANAGEMENT)
-      {
+	   
 	   $this->loadviews("Report_month_wise",$this->global,$data, NULL);
-	  }
-
-	  else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	 
 
 
     }
@@ -412,15 +338,9 @@ class report extends BaseController
 		 $data['year']=$month;	
 	   $data['ytotal']=$this->dahsboard_Model->report_year_wise_total($a,$b);
   
-       if($this->DEPCode == MANAGEMENT)
-      {
+       
 	   $this->loadviews("Report_year_wise_total",$this->global,$data, NULL);
-	  }
-     
-     else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	 
 
     }
 	
@@ -446,16 +366,10 @@ class report extends BaseController
 	   $data['cust']=$this->dahsboard_Model->customer_name();
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
 	   
-	   if($this->DEPCode == MANAGEMENT)
-      {
+	  
 	  
 	   $this->loadviews("Report_supplier",$this->global,$data, NULL);
-	  }
-
-	  else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	 
 
     }
 	public function consolidate()
@@ -476,16 +390,10 @@ 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();
-	   if($this->DEPCode == MANAGEMENT)
-      {
+	   
 	  
 	   $this->loadviews("Report_consolidate",$this->global,$data, NULL);
-	  }
-
-	  else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	  
 
 
 
@@ -510,14 +418,9 @@ class report extends BaseController
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
        $data['spurchse']=$this->dahsboard_Model->consolidate_month($m,$sid,$mid,$fa,$aa);
 	   // print_r( $data['spurchse']);
-	    if($this->DEPCode == MANAGEMENT)
-      {	
+	  
 	   $this->loadviews("Report_consolidate_m",$this->global,$data, NULL);
-	   }
-	   else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	  
 
     }
 	public function consolidate_year()
@@ -539,14 +442,9 @@ class report extends BaseController
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
        $data['spurchse']=$this->dahsboard_Model->consolidate_year($sid,$mid,$fa,$aa);
 	   // print_r( $data['spurchse']);
-	    if($this->DEPCode == MANAGEMENT)
-      {	
+	   
 	   $this->loadviews("Report_consolidate_y",$this->global,$data, NULL);
-	   }
-	   else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	  
 
     }
      public function cumulative()
@@ -558,15 +456,9 @@ class report extends BaseController
       
        $data['cum']=$this->dahsboard_Model->report_cumulative();
     
-      if($this->DEPCode == MANAGEMENT)
-      {
+     
 	   $this->loadviews("Report_cumulative",$this->global,$data, NULL);
-	  }
 
-	  else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
 
 
     }
@@ -636,15 +528,9 @@ 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();
-	  if($this->DEPCode == MANAGEMENT)
-      {
+	 
 	   $this->loadviews("Report_purchase_inward",$this->global,$data, NULL);
-	  }
-
-	   else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	  
 
 
 
@@ -715,16 +601,10 @@ class report extends BaseController
 	   }
 	    $data['finyear']=$this->dahsboard_Model->report_finyear();
 
-       if($this->DEPCode == MANAGEMENT)
-      {	    
+          
 		
 	    $this->loadviews("Report_year_wise_inward",$this->global,$data, NULL);
-	  }
-
-	  else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	 
     }
     
     public function imonth_wise()
@@ -779,17 +659,11 @@ class report extends BaseController
 	   $data['cust']=$this->dahsboard_Model->customer_name();
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
 
-	    if($this->DEPCode == MANAGEMENT)
-      {	
+	   
 	  
 	   $this->loadviews("Report_supplier_inward",$this->global,$data, NULL);
 
-	 }
-
-	 else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	 
 
 
 
@@ -812,15 +686,9 @@ 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();
-	    if($this->DEPCode == MANAGEMENT)
-      {	
+	   
 	   $this->loadviews("Report_consolidate_inward",$this->global,$data, NULL);
-	   }
-	   else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
-
+	   
     }
 	public function i_consolidate_month()
     {
@@ -842,14 +710,9 @@ class report extends BaseController
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
        $data['spurchse']=$this->dahsboard_Model->i_consolidate_month($m,$sid,$mid,$fa,$aa);
 	   // print_r( $data['spurchse']);
-	    if($this->DEPCode == MANAGEMENT)
-      {	
+	   
 	   $this->loadviews("Report_consolidate_month_inward",$this->global,$data, NULL);
-	   }
-	   else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	   
 
     }
 	public function i_consolidate_year()
@@ -871,14 +734,13 @@ 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']);
-	    if($this->DEPCode == MANAGEMENT)
-      {	
+	   
 	   $this->loadviews("Report_consolidate_year_inward",$this->global,$data, NULL);
-	   }
-	   else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	  //  }
+	  //  else
+	  // {
+	  //   $this->loadViews("access", $this->global, $data, NULL);	
+	  // }
 
     }
      public function icumulative()
@@ -890,15 +752,9 @@ class report extends BaseController
       
        $data['cum']=$this->dahsboard_Model->ireport_cumulative();
 
-       if($this->DEPCode == MANAGEMENT)
-      {	
+     	
 	   $this->loadviews("Report_cumulative_inward",$this->global,$data, NULL);
-	  }
-
-	   else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	 
 
 
     }
@@ -954,15 +810,9 @@ class report extends BaseController
       
        $data['cum']=$this->dahsboard_Model->rawi_report_cumulative();
 
-       if($this->DEPCode == MANAGEMENT)
-      {	
+      
 	   $this->loadviews("Report_cumulative_raw",$this->global,$data, NULL);
-	  }
-
-	   else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	 
 
 
     }
@@ -1021,14 +871,9 @@ class report extends BaseController
 		$data['material']=$this->dahsboard_Model->category();
 	   $data['cust']=$this->dahsboard_Model->customer_name();
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
-	    if($this->DEPCode == MANAGEMENT)
-      {	
+	    
 	   $this->loadviews("Report_consolidate_raw",$this->global,$data, NULL);
-	   }
-	   else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	  
 
     }
 	public function rawi_consolidate_month()
@@ -1049,14 +894,9 @@ class report extends BaseController
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
        $data['spurchse']=$this->dahsboard_Model->rawi_consolidate_month($m,$cat,$sup,$fa,$aa);
 	   // print_r( $data['spurchse']);
-	    if($this->DEPCode == MANAGEMENT)
-      {	
+	   
 	   $this->loadviews("Report_consolidate_month",$this->global,$data, NULL);
-	   }
-	   else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	  
 
     }
 	public function rawi_consolidate_year()
@@ -1076,14 +916,9 @@ class report extends BaseController
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
        $data['spurchse']=$this->dahsboard_Model->rawi_consolidate_year($cat,$sup,$fa,$aa);
 	   // print_r( $data['spurchse']);
-	    if($this->DEPCode == MANAGEMENT)
-      {	
+	   	
 	   $this->loadviews("Report_consolidate_year",$this->global,$data, NULL);
-	   }
-	   else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	  
 
     }
 	public function pending_purchase()
@@ -1111,14 +946,9 @@ class report extends BaseController
 	   $data['finyear']=$this->dahsboard_Model->report_finyear();
       
 	   // print_r( $data['spurchse']);
-	    if($this->DEPCode == MANAGEMENT)
-      {	
+	   
 	   $this->loadviews("Report_pending_purchase",$this->global,$data, NULL);
-	   }
-	   else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	  
 
     }
 	public function per()
@@ -1139,14 +969,9 @@ class report extends BaseController
       $data['per']=$this->dahsboard_Model->per($fa,$aa,$m);
      
 	   // print_r( $data['spurchse']);
-	    if($this->DEPCode == MANAGEMENT)
-      {	
+	    
 	   $this->loadviews("report_emp",$this->global,$data, NULL);
-	   }
-	   else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	  
 
     }
 	public function cashbook()
@@ -1179,16 +1004,9 @@ class report extends BaseController
        // $data['todayincome']=$this->dahsboard_Model->today_data_income();
        // $data['todayexpense']=$this->dahsboard_Model->today_data_expense();
 
-		if($this->DEPCode == MANAGEMENT)
-      {	
+		
 	    $this->loadviews("reportcashbook",$this->global,$data, NULL);
-	  }
-
-	   else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
-
+	 
     }
 	
 	public function monthexpenses()
@@ -1202,15 +1020,9 @@ class report extends BaseController
 	  // $data['monthlyincreport']=$this->dahsboard_Model->monthincomereport();
 	  $data['Indiancurrency']=$this->dahsboard_Model->INRSymbol();
 
-	  if($this->DEPCode == MANAGEMENT)
-      {	
+	 	
 	   $this->loadviews("cashbookmonthlyexpenses",$this->global,$data, NULL);
-	  }
-
-       else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+	 
 
 
     }
@@ -1230,15 +1042,9 @@ class report extends BaseController
 		//print_r($data['finyear']);
 	   $data['Indiancurrency']=$this->dahsboard_Model->INRSymbol();
 	  
-	  if($this->DEPCode == MANAGEMENT)
-      {	
+	 	
 	   $this->loadviews("cashbookyearlyexpenses",$this->global,$data, NULL);
- 	  }
-
- 	  else
-	  {
-	    $this->loadViews("access", $this->global, $data, NULL);	
-	  }
+ 	  
 
     }
      public function cashbookdepartment()
diff --git a/application/controllers/user.php b/application/controllers/user.php
index b4e4d8bb..191c2abb 100755
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -990,19 +990,19 @@ function attendanceyear($empID ='')
      */
     function userListing()
     {
-        if($this->isAdmin() == TRUE)
-        {
-            $this->loadThis();
-        }
-        else
-        {           
+        // if($this->isAdmin() == TRUE)
+        // {
+        //     $this->loadThis();
+        // }
+        // else
+        // {           
          
             $data['userRecords'] = $this->user_model->userListing();
             
             $this->global['pageTitle'] = 'Siddharth : User Listing';
             
             $this->loadViews("users", $this->global, $data, NULL);
-        }
+        //}
     }
 	
 
@@ -1011,12 +1011,12 @@ function attendanceyear($empID ='')
      */
     function addNew()
     {
-        if($this->isAdmin() == TRUE)
-        {
-            $this->loadThis();
-        }
-        else
-        {            		
+        // if($this->isAdmin() == TRUE)
+        // {
+        //     $this->loadThis();
+        // }
+        // else
+        // {            		
 			$data['EmpList'] = $this->user_model->getAllEmployees();
             
 			$data['roles'] = $this->user_model->getUserRoles();
@@ -1026,7 +1026,7 @@ function attendanceyear($empID ='')
             $this->global['pageTitle'] = 'Siddharth : Add New User';
 
             $this->loadViews("addNew", $this->global, $data, NULL);
-        }
+       // }
     }
 
     /**
@@ -1197,12 +1197,12 @@ function Adduserdepartment()
      */
     function editOld($UserId = '')
     {
-        if($this->isAdmin() == TRUE )
-        {
-            $this->loadThis();
-        }
-        else
-        {
+        // if($this->isAdmin() == TRUE )
+        // {
+        //     $this->loadThis();
+        // }
+        // else
+        // {
             if($UserId == '')
             {
                // redirect('userListing');
@@ -1227,7 +1227,7 @@ function Adduserdepartment()
             $this->global['pageTitle'] = 'Siddharth : Edit User';
             
             $this->loadViews("editOld", $this->global, $data, NULL);
-        }
+        //}
     }
     
     
@@ -1236,12 +1236,12 @@ function Adduserdepartment()
      */
     function editUser()
     {
-        if($this->isAdmin() == TRUE)
-        {
-            $this->loadThis();
-        }
-        else
-        {
+        // if($this->isAdmin() == TRUE)
+        // {
+        //     $this->loadThis();
+        // }
+        // else
+        // {
 			$userId =   $this->input->post('EmpList'); 
             $this->form_validation->set_rules('EmpList','EmpList','trim|callback_Employee_validateS');
 			  $this->form_validation->set_rules('role','role','trim|callback_Role_validate');        
@@ -1283,7 +1283,7 @@ function Adduserdepartment()
                 
                redirect('userListing');
             }
-        }
+        //}
     }
 
 
diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index bbdd4b0f..316bfad7 100755
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -155,46 +155,76 @@ $(function() {
           <div class="navbar-custom-menu collapse navbar-collapse" id="myNavbar">
             <ul class="nav navbar-nav" style="font-size: 13px;">
               <!-- User Account: style can be found in dropdown.less -->
-			 <!--  <?php print_r($DepAccesslist);?> -->
+		<!--   <?php print_r($DepAccesslist);?>  -->
              <li class="treeview">
               <a href="<?php echo base_url(); ?>dashboard">
                 <i class="fa fa-dashboard"></i> <span>Dashboard</span> 
               </a>
             </li>
+         
 
- <!-- <?php print_r($DepAccesslist);?> -->
-
+          <!-- 
              <li class="treeview">
-					  <span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> Requisition<span class="caret"></span></span> 
-						<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
+				<a href="<?php echo base_url(); ?>userListing">
+					<i class="fa fa-users"></i>
+					<span>Users</span>
+				</a>
+			</li> -->
+			<?php if($DEPCode == ADMIN){?>
 
-                          <li class="treeview">
-								  <a href="<?php echo base_url(); ?>Requisition">
-									<i class="fa fa-arrow-circle-up"></i>
-									<span>Raise Requisition </span>
-								  </a>
-						 </li>   
+			 <li class="treeview">
+				<a href="<?php echo base_url(); ?>userListing">
+					<i class="fa fa-users"></i>
+					<span>Users</span>
+				</a>
+			</li>
 
-						 <li class="treeview">
-								  <a href="<?php echo base_url(); ?>UpdatePOStatus">
-									<i class="fa fa-arrow-circle-up"></i>
-									<span>Update Service PO Status </span>
-								  </a>
-						</li>
+			<?php }?>
 
-						<li class="treeview">
-								  <a href="<?php echo base_url(); ?>ApproveRequisition">
-									<i class="fa fa-thumbs-o-up"></i>
-									<span>Approve Requisition </span>
-								  </a>
-						</li>
 
-                      <!--    <?php print_r($DepAccesslist);?> -->
-						<?php foreach($DepAccesslist as $dep){?>
+			 <li class="treeview">
+				<span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> Requisition<span class="caret"></span></span> 
+				<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
+
+                    <li class="treeview">
+						<a href="<?php echo base_url(); ?>Requisition">
+						<i class="fa fa-arrow-circle-up"></i>
+						<span>Raise Requisition </span>
+						</a>
+					</li>   
+
+					<li class="treeview">
+						<a href="<?php echo base_url(); ?>UpdatePOStatus">
+						<i class="fa fa-arrow-circle-up"></i>
+						<span>Update Service PO Status </span>
+						</a>
+					</li>
+
+					<li class="treeview">
+						<a href="<?php echo base_url(); ?>ApproveRequisition">
+						<i class="fa fa-thumbs-o-up"></i>
+						<span>Approve Requisition </span>
+						</a>
+					</li>
+
+					<?php if(empty($DepAccesslist)){?>
+					<?php if($DEPCode == PURCHASE){?>
+					 
+					 <li class="treeview">
+						<a href="<?php echo base_url(); ?>CreatePO">
+						<i class="fa fa-empire"></i>
+						<span>Purchase Order From Requisition</span>
+						</a>
+					</li>
+
+					<?php }?>
+                    <?}
+                    else{?>
+                    <?php foreach($DepAccesslist as $dep){?>
 
 						<?php $assd=$dep->AssDep; 
 
-						if($assd == PURCHASE || $DEPCode == PURCHASE){?>
+						if($assd == PURCHASE){?>
 
 
                                   <li class="treeview">
@@ -203,62 +233,176 @@ $(function() {
 									<span>Purchase Order From Requisition</span>
 								  </a>
 								</li>
-                    <?} break;}?>
-                    
-						</ul>
+                    <?}}?>
+
+                    <?}?>   
+				</ul>
 			</li>
 
 
-          <li class="treeview">
-                      <span id="menu" data-toggle="dropdown" ><i class="fa fa-check-square-o"></i> Store Requisition<span class="caret"></span></span> 
-                        <ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
+           <li class="treeview">
+            <span id="menu" data-toggle="dropdown" ><i class="fa fa-check-square-o"></i> Store Requisition<span class="caret"></span></span> 
+            <ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
 
-                        <li class="treeview">
-							  <a href="<?php echo base_url(); ?>storerequisition">
+                    <li class="treeview">
+					<a href="<?php echo base_url(); ?>storerequisition">
+						<i class="fa fa-upload"></i>
+						<span>Store Requisition</span>
+					</a>
+					</li>
+
+
+					<li class="treeview">   
+					<a href="<?php echo base_url(); ?>approvalstorerequisitionslip">
+						<i class="fa fa-eye"></i>
+						<span>Approve Store Requisition</span>
+					</a>
+					</li>
+
+
+					<?php if(empty($DepAccesslist)){?>
+					<?php if($DEPCode == STORE || $DEPCode == FINANCE){?>
+					 
+						<li class="treeview">
+							<a href="<?php echo base_url(); ?>batchcard/HourlyListing">
 								<i class="fa fa-upload"></i>
-								<span>Store Requisition</span>
-							  </a>
-							</li>
+								<span>Batchcard - HourlyListing</span>
+							</a>
+						</li>
 
+						<li class="treeview">
+							<a href="<?php echo base_url(); ?>batchcard/dailyListing">
+								<i class="fa fa-upload"></i>
+								<span>Batchcard - DailyListing</span>
+							</a>
+					    </li>
 
-							<li class="treeview">   
-							  <a href="<?php echo base_url(); ?>approvalstorerequisitionslip">
+					    <li class="treeview">
+						    <a href="<?php echo base_url(); ?>batchcard/getStockDetails">
+								<i class="fa fa-upload"></i>
+								<span>Batchcard - StockDetails</span>
+							</a>
+					    </li>
+					    <?php if($DEPCode == STORE){?>
+					    <li class="treeview">
+							<a href="<?php echo base_url(); ?>storerequisitionlisting">
 								<i class="fa fa-eye"></i>
-								<span>Approve Store Requisition</span>
-							  </a>
-							</li>
+								<span>Store Requisition Listing</span>
+							 </a>
+					    </li>
+					    <?php }?>
 
-						<!-- 	<li class="treeview">
-						  <a href="<?php echo base_url(); ?>userListing">
-							<i class="fa fa-users"></i>
-							<span>Users</span>
-						  </a>
-						</li> -->
+					<?php }?>
 
-                        </ul>
+                    <?}
+                    else{?>
+                    <?php foreach($DepAccesslist as $dep){?>
+
+						<?php $assd=$dep->AssDep; 
+
+						if($assd == STORE){?>
+
+						<li class="treeview">
+							<a href="<?php echo base_url(); ?>batchcard/HourlyListing">
+								<i class="fa fa-upload"></i>
+								<span>Batchcard - HourlyListing</span>
+							</a>
+						</li>
+
+						<li class="treeview">
+							<a href="<?php echo base_url(); ?>batchcard/dailyListing">
+								<i class="fa fa-upload"></i>
+								<span>Batchcard - DailyListing</span>
+							</a>
+					    </li>
+
+					    <li class="treeview">
+						    <a href="<?php echo base_url(); ?>batchcard/getStockDetails">
+								<i class="fa fa-upload"></i>
+								<span>Batchcard - StockDetails</span>
+							</a>
+					    </li>
+					    <li class="treeview">
+							<a href="<?php echo base_url(); ?>storerequisitionlisting">
+								<i class="fa fa-eye"></i>
+								<span>Store Requisition Listing</span>
+							 </a>
+					    </li>
+
+
+                                 
+                    <?}}?>
+
+                    <?}?>   
+
+
+			</ul>
            </li>
 
+          
+          <?php if(empty($DepAccesslist)){?>
+          <?php if($DEPCode == FINANCE || $DEPCode == SALES || $DEPCode == HR || $DEPCode == SYSTEM_ADMIN){;?>
 
-
-          <?php $check=0; ?>
-		   <?php foreach($DepAccesslist as $dep){
-		   	$assd= $dep->AssDep;
-
-		   	if($assd == FINANCE || $assd == HR || $assd == SALES || $assd == SYSTEM_ADMIN || $DEPCode == FINANCE || $DEPCode == HR || $DEPCode ==SALES){ $check= $check+1;?>
-
-		   
-            <li class="treeview">	
-
-               
-				<span id="menu" data-toggle="dropdown"><i class="fa fa-database" aria-hidden="true"></i>  Master Details<span class="caret"></span></span> 
+          <li class="treeview">
+          <span id="menu" data-toggle="dropdown"><i class="fa fa-database" aria-hidden="true"></i>  Master Details<span class="caret"></span></span> 
 				<ul class="dropdown-menu" role="menu" aria-labelledby="menu1"> 
-			
-            
-				
-                 <?php foreach($DepAccesslist as $dep){
+                 <?php if($DEPCode == FINANCE){?>
+                 <li class="treeview">
+						 <a href="<?php echo base_url(); ?>costListing" >
+							<i class="fa fa-cart-plus"></i>
+							<span class="nav-label">Cost Details</span>
+						  </a>
+						</li>
+						
+						<li class="treeview">
+						  <a href="<?php echo base_url(); ?>assetListing" >
+							<i class="fa fa-cogs"></i>
+							<span class="nav-label">Asset Details</span>
+						  </a>
+						</li>
+
+
+                 <?php }?> 
+
+                 <?php if($DEPCode == HR){?>
+
+						
+						<li class="treeview">
+						  <a href="<?php echo base_url(); ?>employeeListing" >
+							<i class="fa fa-user-circle"></i>
+							<span class="nav-label">Employee Details</span>
+						  </a>
+						</li>
+
+                 <?php }?>
+
+                 <?php if($DEPCode == SALES){?>
+
+                  <li class="treeview">
+				     <a href="<?php echo  base_url(); ?>supplierListing" >
+					    <i class="fa fa-user-secret"></i>
+						<span class="nav-label">Supplier Details</span>
+					  </a>
+				 </li>
+
+                 <?php }?>
+	            </ul>			
+		  </li>
+          <?php }?>
+          <?php }
+
+          else {?>
+          <?php $check=0;?>
+          <?php foreach($DepAccesslist as $dep){ $assd= $dep->AssDep;
+
+          	if($assd == FINANCE || $assd == HR || $assd == SALES || $assd == SYSTEM_ADMIN || $DEPCode == FINANCE || $DEPCode == HR || $DEPCode ==SALES){ $check= $check+1;?>
+
+          	<li class="treeview">
+          	<span id="menu" data-toggle="dropdown"><i class="fa fa-database" aria-hidden="true"></i>  Master Details<span class="caret"></span></span> 
+				<ul class="dropdown-menu" role="menu" aria-labelledby="menu1"> 
+                 <?php foreach($DepAccesslist as $dep){ $check2=0;
                  	$assd= $dep->AssDep;?>
-                       
-					<?php if($assd == SALES || $assd == SYSTEM_ADMIN ||$DEPCode ==SALES){ ?>
+                 	<?php if($assd == SALES || $assd == SYSTEM_ADMIN ||$DEPCode ==SALES){ $check2=1; ?>
 
 				     <li class="treeview">
 						  <a href="<?php echo  base_url(); ?>supplierListing" >
@@ -269,10 +413,15 @@ $(function() {
 		
 					<?php }?>
 
+                 <?php if($check2 == 1){break;} }?>
 
-					<?php if($assd == FINANCE || $DEPCode == FINANCE){ ?>
 
-				    <li class="treeview">
+
+                 <?php foreach($DepAccesslist as $dep){ $check1=0;
+                 	$assd= $dep->AssDep;?>
+                 	<?php if($assd == FINANCE || $DEPCode == FINANCE){ $check2=1; ?>
+
+				     <li class="treeview">
 						 <a href="<?php echo base_url(); ?>costListing" >
 							<i class="fa fa-cart-plus"></i>
 							<span class="nav-label">Cost Details</span>
@@ -288,10 +437,15 @@ $(function() {
 		
 					<?php }?>
 
+                 <?php if($check2 == 1){break;} }?>
 
-				   <?php if($assd == HR || $assd == SYSTEM_ADMIN || $DEPCode == HR){ ?>
 
-				   <li class="treeview">
+
+                 <?php foreach($DepAccesslist as $dep){ $check1=0;
+                 	$assd= $dep->AssDep;?>
+                 	<?php if($assd == HR || $assd == SYSTEM_ADMIN || $DEPCode == HR){ $check2=1; ?>
+
+				      <li class="treeview">
 						  <a href="<?php echo base_url(); ?>companyview" >
 							<i class="fa fa-industry"></i>
 							<span class="nav-label">Company Master</span>
@@ -304,14 +458,9 @@ $(function() {
 							<span class="nav-label">Employee Details</span>
 						  </a>
 						</li>
-		
-					<?php }?>
 
-
-
-					 <?php if($assd == SYSTEM_ADMIN){ ?>
-
-				   <li class="treeview">
+						<?php if($assd == SYSTEM_ADMIN){?>
+						 <li class="treeview">
 						  <a href="<?php echo base_url(); ?>configlisting" >
 							<i class="fa fa-file-text"></i>
 							<span class="nav-label">Config Master</span>
@@ -337,63 +486,285 @@ $(function() {
 							<span>Users</span>
 						  </a>
 						</li>
+
+						<?php }?>
 		
-					<?php }?> 
+					<?php }?>
 
-                   <?php }?>
-
-                
-
-
-               </ul>
-            </li>
-		   	<? if($check ==1){break;} }
-
-		   	}?>
+                 <?php if($check2 == 1){break;} }?>
 
 
 
 
 
 
+                </ul>
+          	</li>
+          <?php }?>
+          <?php if ($check == 1){break;}}?>
+          <?php }?>   
 
-		   	          <?php $check=0; $check1=0; $check2=0;?>
-		   <?php foreach($DepAccesslist as $dep){
-		   	$assd= $dep->AssDep;
-
-		   	if($assd == QUALITY || $assd == STORE || $assd == ADMIN || $DEPCode == QUALITY || $DEPCode == STORE || $DEPCode == ADMIN){ $check= $check+1;?>
-
-		   
-            <li class="treeview">	
-
-               
-				<span id="menu" data-toggle="dropdown" ><i class="fa fa-check-square-o"></i> Inspection<span class="caret"></span></span> 
-				<ul class="dropdown-menu" role="menu" aria-labelledby="menu1"> 
-
-		   <?php foreach($DepAccesslist as $dep){
-		   	$assd= $dep->AssDep;?>	
+        
 
 
-		     <?php if($assd == ADMIN || $DEPCode == ADMIN){ $check1 =1;?>	
-			
-                <li class="treeview">
-							  <a href="<?php echo base_url(); ?>Addigr">
-								<i class="fa fa-upload"></i>
-								<span>Inward Gate Register Entry</span>
+         <?php if(empty($DepAccesslist)){?>
+         <?php if($DEPCode == PURCHASE || $DEPCode == FINANCE || $DEPCode == MANAGEMENT){?>
+         <li class="treeview">
+         <span id="menu" data-toggle="dropdown"><i class="fa fa-first-order"></i> Purchase order<span class="caret"></span></span> 
+			  	<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
+			  	<?if($DEPCode == FINANCE){?>
+			  		<li class="treeview">
+						<a href="<?php echo base_url(); ?>POApproval">
+							<i class="fa fa-users"></i>
+							<span>Approve Purchase Order</span>
+							</a>
+					</li>  
+                <?php }?>
+
+                <?php if($DEPCode == MANAGEMENT){?>
+
+                		<li class="treeview">
+                          <a href="<?php echo base_url(); ?>PORelease">
+                            <i class="fa fa-history"></i>
+                            <span>Release Purchase Order</span>
+                          </a>
+                        </li>
+
+                <?php }?>
+
+
+                <?php if($DEPCode == PURCHASE){?>
+                      <li class="treeview">
+						  <a href="<?php echo base_url(); ?>EmergencyPO">
+							<i class="fa fa-ambulance"></i>
+							<span>Emergency Purchase Order  </span>
+						  </a>
+						</li>
+
+						<li class="treeview">
+							<a href="<?php echo base_url(); ?>purchaseorderListing">
+								<i class="fa fa-list"></i>
+								<span>Purchase Order List  </span>
+							</a>
+						</li>
+								
+						<li class="treeview">
+						  <a href="<?php echo base_url(); ?>amendmentpurchaseorder">
+							<i class="fa fa-ambulance"></i>
+							<span>Amendment Purchase Order  </span>
+						  </a>
+						</li>
+
+
+
+                <?php }?>
+
+                </ul> 
+         </li>      
+        <?php }?>
+         <?php }
+
+         if($DEPCode == PURCHASE)
+         {?>
+
+             <li class="treeview">
+                              <a href="<?php echo base_url(); ?>AdvanceRequest">
+                                <i class="fa fa-dashboard"></i> <span>Advance Request</span> 
+                              </a>
+                        </li>
+        <? }
+
+         else{  $check =0;?> 
+         <?php foreach($DepAccesslist as $dep){
+         	$assd= $dep->AssDep;
+         	if($assd == PURCHASE || $assd == FINANCE || $assd ==  MANAGEMENT || $DEPCode == PURCHASE || $DEPCode == FINANCE || $DEPCode == MANAGEMENT){ $check = $check+1;?>
+
+         	<li class="treeview">
+         		<span id="menu" data-toggle="dropdown"><i class="fa fa-first-order"></i> Purchase order<span class="caret"></span></span> 
+			  	<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
+                <?php foreach($DepAccesslist as $dep){$assd= $dep->AssDep; $check1=1;?>
+
+                <?php if($assd == FINANCE || $DEPCode == FINANCE){ $check1=2;?>
+
+				     <li class="treeview">
+								  <a href="<?php echo base_url(); ?>POApproval">
+									<i class="fa fa-users"></i>
+									<span>Approve Purchase Order</span>
+								  </a>
+					</li>
+		
+					<?php } if($check1 ==2){break;}?>
+
+			  	<?php }?>
+
+			  	<?php foreach($DepAccesslist as $dep){$assd= $dep->AssDep; $check1=1;?>
+
+                <?php if($assd == MANAGEMENT || $DEPCode == MANAGEMENT){ $check1=2;?>
+
+				     <li class="treeview">
+                          <a href="<?php echo base_url(); ?>PORelease">
+                            <i class="fa fa-history"></i>
+                            <span>Release Purchase Order</span>
+                          </a>
+                        </li>
+		
+					<?php } if($check1 ==2){break;}?>
+
+			  	<?php }?>
+
+
+			  	<?php foreach($DepAccesslist as $dep){$assd= $dep->AssDep; $check1=1;?>
+
+                <?php if($assd == PURCHASE || $DEPCode == PURCHASE){ $check1=2;?>
+
+				    <li class="treeview">
+						  <a href="<?php echo base_url(); ?>EmergencyPO">
+							<i class="fa fa-ambulance"></i>
+							<span>Emergency Purchase Order  </span>
+						  </a>
+						</li>
+
+						<li class="treeview">
+							<a href="<?php echo base_url(); ?>purchaseorderListing">
+								<i class="fa fa-list"></i>
+								<span>Purchase Order List  </span>
+							</a>
+						</li>
+								
+						<li class="treeview">
+						  <a href="<?php echo base_url(); ?>amendmentpurchaseorder">
+							<i class="fa fa-ambulance"></i>
+							<span>Amendment Purchase Order  </span>
+						  </a>
+						</li>
+		
+					<?php } if($check1 ==2){break;}?>
+
+			  	<?php }?>
+   
+
+
+                </ul>
+         	</li>
+
+
+         	<?php foreach($DepAccesslist as $dep){$assd= $dep->AssDep; $check1=1;?>
+
+                <?php if($assd == PURCHASE || $DEPCode == PURCHASE){ $check1=2;?>
+
+				      <li class="treeview">
+                              <a href="<?php echo base_url(); ?>AdvanceRequest">
+                                <i class="fa fa-dashboard"></i> <span>Advance Request</span> 
+                              </a>
+                        </li>
+		
+					<?php } if($check1 ==2){break;}?>
+
+			  	<?php }?>
+           
+
+
+          <?php   }?>
+         <?php if($check == 1){break;} }?>
+         <?php }?>
+
+            
+
+					<?php if(empty($DepAccesslist)){?>
+					<?php if($DEPCode == FINANCE){?>
+					<li class="treeview">
+					<span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> Billing <span class="caret"></span></span> 
+						<ul class="dropdown-menu" role="menu" aria-labelledby="menu3">
+						<li class="treeview">
+                            <a href="<?php echo base_url(); ?>ViewMRIRBilling">
+                            <i class="fa fa-dashboard"></i> <span>MRIR Billing</span> 
+                            </a>
+                        </li>
+						<li class="treeview">
+							<a href="<?php echo base_url(); ?>ServicePOBilling">
+							<i class="fa fa-keyboard-o"></i>
+							<span>Service PO Billing</span>
+							</a>
+						</li>
+					   
+					    </ul>
+					</li>
+
+					<li class="treeview">
+					<span id="menu" data-toggle="dropdown" ><i class="fa fa-money"></i> Cash Book <span class="caret"></span></span> 
+						<ul class="dropdown-menu" role="menu" aria-labelledby="menu3">
+						 	<li class="treeview">
+                              <a href="<?php echo base_url(); ?>cashbook/CashbookList">
+                                <i class="fa fa-vcard"></i> <span>Account Master</span> 
+                              </a>
+                        	</li>
+							<li class="treeview">
+							  <a href="<?php echo base_url(); ?>ViewIncomeExpense">
+							  <i class="fa fa-credit-card"></i><span>Receipt and Payment</span>
 							  </a>
-				</li>
-				<li class="treeview">
-							  <a href="<?php echo base_url(); ?>ViewigrDetails">
-								<i class="fa fa-upload"></i>
-								<span>View Inward Gate Register</span>
-							  </a>
-				</li>
-			 <?php  }?>
+							</li>
+								
+								
+						</ul> 
+					</li>	
+					<?php }?>
+					<?php }
+					else{?>
+					<?php $check =0 ;?>
+                    <?php foreach($DepAccesslist as $dep){ 
+                    	$assd= $dep->AssDep;
 
-             <?php if($assd == STORE || $assd == QUALITY || $DEPCode == STORE || $DEPCode ==QUALITY){?>
+                    if($assd == FINANCE || $DEPCode == FINANCE){ $check = $check+1;?>
+                    <li class="treeview">
+					  <span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> Billing <span class="caret"></span></span> 
+						<ul class="dropdown-menu" role="menu" aria-labelledby="menu3">
+						 <li class="treeview">
+                            <a href="<?php echo base_url(); ?>ViewMRIRBilling">
+                            <i class="fa fa-dashboard"></i> <span>MRIR Billing</span> 
+                            </a>
+                        </li>
+						<li class="treeview">
+							<a href="<?php echo base_url(); ?>ServicePOBilling">
+							<i class="fa fa-keyboard-o"></i>
+							<span>Service PO Billing</span>
+							</a>
+						</li>
+								
+								
+						</ul> 
+					</li>
 
 
                     <li class="treeview">
+                     <span id="menu" data-toggle="dropdown" ><i class="fa fa-money"></i> Cash Book <span class="caret"></span></span> 
+						<ul class="dropdown-menu" role="menu" aria-labelledby="menu3">
+						<li class="treeview">
+                            <a href="<?php echo base_url(); ?>cashbook/CashbookList">
+                            <i class="fa fa-vcard"></i> <span>Account Master</span> 
+                            </a>
+                        </li>
+						<li class="treeview">
+							<a href="<?php echo base_url(); ?>ViewIncomeExpense">
+							<i class="fa fa-credit-card"></i>
+							<span>Receipt and Payment</span>
+							</a>
+						</li>
+
+						</ul>
+                    </li>
+                     <?php }?>
+					<?php if($check ==1){break;}}}?>
+
+
+
+					<?php if(empty($DepAccesslist)){
+
+						if($DEPCode == STORE || $DEPCode == QUALITY || $DEPCode == ADMIN){?>
+						<li class="treeview">
+                        <span id="menu" data-toggle="dropdown" ><i class="fa fa-check-square-o"></i> Inspection<span class="caret"></span></span> 
+				        <ul class="dropdown-menu" role="menu" aria-labelledby="menu1">
+				        <?php if($DEPCode == STORE || $DEPCode == QUALITY){?> 
+                        <li class="treeview">
 							  <a href="<?php echo base_url(); ?>Viewigr">
 								<i class="fa fa-eye"></i>
 								<span>View Inward Gate Register</span>
@@ -425,176 +796,242 @@ $(function() {
 								<i class="fa fa-hand-o-down"></i>
 								<span>Inward Material Test Report</span>
 							  </a>
-							</li>
+							</li> 
+
+                         
+                            <li class="treeview">
+							  <a href="<?php echo base_url(); ?>Addigr">
+								<i class="fa fa-upload"></i>
+								<span>Inward Gate Register Entry</span>
+							  </a>
+				            </li>
+				            <li class="treeview">
+							  <a href="<?php echo base_url(); ?>ViewigrDetails">
+								<i class="fa fa-upload"></i>
+								<span>View Inward Gate Register</span>
+							  </a>
+				            </li>
+
+							<?php }?>
 
 
-		  
-               <?} if($check1==1){break;}?> 
-                 
-               <?}?>
-               </ul>
-            </li>
-		   	<? if($check ==1){break;} }}?>
-
-
-       
-
-		   	   <?php foreach($DepAccesslist as $dep){
-							$assd= $dep->AssDep;?>
-							<?php if($assd == STORE || $DEPCode == STORE){?>
+				        </ul>
+                        </li>
+                        <?php if($DEPCode == STORE){?>
                         <li class="treeview">
 							  <a href="<?php echo base_url(); ?>Stock">
 								<i class="fa fa-dashboard"></i> <span>Stock Details</span> 
 							  </a>
 						</li>
 
-							<?php }?>
+                        <?php }?> 
+                     <?php }?>
+                    <?php }
 
-						<?php }?>
+                    else{?>
+                    <?php $check=0;?>
+                    <?php foreach($DepAccesslist as $dep){ 
+                    	$assd= $dep->AssDep;
+
+                    	//echo $assd;
+
+                    if($assd == STORE || $DEPCode == QUALITY || $assd == QUALITY || DEPCode == STORE){ $check = $check+1;?>
+                    <li class="treeview">
+                    <span id="menu" data-toggle="dropdown" ><i class="fa fa-check-square-o"></i> Inspection<span class="caret"></span></span> 
+				        <ul class="dropdown-menu" role="menu" aria-labelledby="menu1">
+
+				            <li class="treeview">
+							  <a href="<?php echo base_url(); ?>Viewigr">
+								<i class="fa fa-eye"></i>
+								<span>View Inward Gate Register</span>
+							  </a>
+							</li>
+
+							<li class="treeview">
+							  <a href="<?php echo base_url(); ?>ViewMRIR">
+								<i class="fa fa-upload"></i>
+								<span>View Material Inspection Report</span>
+							  </a>
+							</li>
+							<li class="treeview">
+							  <a href="<?php echo base_url(); ?>quality">
+								<i class="fa fa-list-alt"></i>
+								<span>Product Test Specification Master</span>
+							  </a>
+							</li>
+							<li class="treeview">
+							  <a href="<?php echo base_url(); ?>qualityreportlist">
+								<i class="fa fa-table"></i>
+								<span>Product Test Report</span>
+							  </a>
+							</li>
+							
+							<li class="treeview">
+							  <a href="<?php echo base_url(); ?>qualityreportlistinward">
+								<i class="fa fa-hand-o-down"></i>
+								<span>Inward Material Test Report</span>
+							  </a>
+							</li> 
+
+                         
+                            <li class="treeview">
+							  <a href="<?php echo base_url(); ?>Addigr">
+								<i class="fa fa-upload"></i>
+								<span>Inward Gate Register Entry</span>
+							  </a>
+				            </li>
+				            <li class="treeview">
+							  <a href="<?php echo base_url(); ?>ViewigrDetails">
+								<i class="fa fa-upload"></i>
+								<span>View Inward Gate Register</span>
+							  </a>
+				            </li>
+                    
+
+                        </ul>
+                    </li>
+                    <?php }?>
+                    <?php if($check ==1){break;}}}?>
 
 
 
-
-		  
-				  
-
-
-               
-             <?php $check =0;?>
-			<?php foreach($DepAccesslist as $dep){
-			$assd= $dep->AssDep;
-
-			if($assd == PURCHASE || $assd == FINANCE || $assd ==  MANAGEMENT || $DEPCode == PURCHASE || $DEPCode == FINANCE || $DEPCode == MANAGEMENT) {  $check= $check+1;?>
-
-			<li class="treeview">
-               <span id="menu" data-toggle="dropdown"><i class="fa fa-first-order"></i> Purchase order<span class="caret"></span></span> 
-			  	<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
-
-                <?php foreach($DepAccesslist as $dep){
-                 	$assd= $dep->AssDep;?>
-
-                 	<?php if($assd == FINANCE || $DEPCode == FINANCE){?>
-
-				     <li class="treeview">
-								  <a href="<?php echo base_url(); ?>POApproval">
-									<i class="fa fa-users"></i>
-									<span>Approve Purchase Order</span>
-								  </a>
-					</li>
-		
-					<?php }?>
-
-
-					<?php if($assd == MANAGEMENT || $DEPCode == MANAGEMENT){?>
-
-				     <li class="treeview">
-                          <a href="<?php echo base_url(); ?>PORelease">
-                            <i class="fa fa-history"></i>
-                            <span>Release Purchase Order</span>
-                          </a>
-                        </li>
-		
-					<?php }?>
-                
-
-
-                    <?php if($assd == PURCHASE || $DEPCode == PURCHASE){?>
-						<li class="treeview">
-						  <a href="<?php echo base_url(); ?>EmergencyPO">
-							<i class="fa fa-ambulance"></i>
-							<span>Emergency Purchase Order  </span>
-						  </a>
-						</li>
-
-						<li class="treeview">
-								  <a href="<?php echo base_url(); ?>purchaseorderListing">
-									<i class="fa fa-list"></i>
-									<span>Purchase Order List  </span>
-								  </a>
-								</li>
-								
-						<li class="treeview">
-						  <a href="<?php echo base_url(); ?>amendmentpurchaseorder">
-							<i class="fa fa-ambulance"></i>
-							<span>Amendment Purchase Order  </span>
-						  </a>
-						</li>
-		
-					<?php }?>
-                                
-                  <?php }?>
-
-			  	</ul>
-            </li>
-
-
-           
-            <?php if($check ==1){break;} }}?>
-
-
-            <?php foreach($DepAccesslist as $dep){
-							$assd= $dep->AssDep;?>
-							<?php if($assd == PURCHASE || $DEPCode == PURCHASE){?>
-                         <li class="treeview">
-                              <a href="<?php echo base_url(); ?>AdvanceRequest">
-                                <i class="fa fa-dashboard"></i> <span>Advance Request</span> 
-                              </a>
-                        </li>
-
-							<?php }?>
-
-						<?php }?>
-
-
-                      <?php foreach($DepAccesslist as $dep){
-							$assd= $dep->AssDep;?>
-							<?php if($assd == FINANCE || $DEPCode == FINANCE){?>
-                         <li class="treeview">
-					  <span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> Billing <span class="caret"></span></span> 
+                    <?php if(empty($DepAccesslist)){?>
+                    <?php if($DEPCode == HR){?>
+                    <li class="treeview">
+                    <span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> PaySlip <span class="caret"></span></span> 
 						<ul class="dropdown-menu" role="menu" aria-labelledby="menu3">
-						 <li class="treeview">
-                              <a href="<?php echo base_url(); ?>ViewMRIRBilling">
-                                <i class="fa fa-dashboard"></i> <span>MRIR Billing</span> 
-                              </a>
-                        </li>
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>ServicePOBilling">
+						<li class="treeview">
+								  <a href="<?php echo base_url(); ?>monthlypay">
 									<i class="fa fa-keyboard-o"></i>
-									<span>Service PO Billing</span>
+									<span>Monthly Pay Information</span>
 								  </a>
 								</li>
-								
-								
-						</ul> 
-					</li>
-
-
-
-					<li class="treeview">
-					  <span id="menu" data-toggle="dropdown" ><i class="fa fa-money"></i> Cash Book <span class="caret"></span></span> 
-						<ul class="dropdown-menu" role="menu" aria-labelledby="menu3">
-						 <li class="treeview">
-                              <a href="<?php echo base_url(); ?>cashbook/CashbookList">
-                                <i class="fa fa-vcard"></i> <span>Account Master</span> 
-                              </a>
-                        </li>
+								<!-- <li class="treeview">
+								  <a href="<?php echo base_url(); ?>ExcelUpload2">
+									<i class="fa fa-upload"></i>
+									<span>Monthly Pay Upload</span>
+								  </a>
+								</li> -->
 								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>ViewIncomeExpense">
-									<i class="fa fa-credit-card"></i>
-									<span>Receipt and Payment</span>
+								  <a href="<?php echo base_url(); ?>ViewPay">
+									<i class="fa fa-money"></i>
+									<span>PaySlip Generator</span>
+								  </a>
+								</li>
+								<li class="treeview">
+								  <a href="<?php echo base_url(); ?>PaysilpListing" >
+									<i class="fa fa-credit-card-alt"></i> <span>Edit Payslip</span> 
+								  </a>
+								</li>
+								<li class="treeview">
+                                  <a href="<?php echo base_url(); ?>emppayListings" >
+                                    <i class="fa fa-credit-card"></i> <span>Employee Salary Details</span> 
+                                  </a>
+                                </li>
+								<li class="treeview">
+								  <a href="<?php echo base_url(); ?>BankReport" >
+									<i class="fa fa-table"></i> <span>Bank Report</span> 
 								  </a>
 								</li>
 								
+								<li class="treeview">
+								  <a href="<?php echo base_url(); ?>publicholidays" >
+									<i class="fa fa-calendar"></i> <span>Public Holidays</span> 
+								  </a>
+								</li>
+								<li class="treeview">
+								  <a href="<?php echo base_url(); ?>loanreports" >
+									<i class="fa fa-list-alt"></i> <span>Loan Reports</span> 
+								  </a>
+								</li>
+
+								<li class="treeview">
+								  <a href="<?php echo base_url(); ?>bonusreports" >
+									<i class="fa fa-list-alt"></i> <span>Incentives and Bonus Reports</span> 
+								  </a>
+								</li>
+
+						</ul>
+                    </li>
+                    <?php }?>
+                    <?php }
+                    else{?>
+                    <?php $check =0;?>
+                     <?php foreach($DepAccesslist as $dep){ 
+                    	$assd= $dep->AssDep;
+                    if($assd == HR || $DEPCode == HR){ $check = $check+1;?>
+                    <li class="treeview">
+                    <span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> PaySlip <span class="caret"></span></span> 
+						<ul class="dropdown-menu" role="menu" aria-labelledby="menu3">
+
+								<li class="treeview">
+								<a href="<?php echo base_url(); ?>monthlypay">
+									<i class="fa fa-keyboard-o"></i>
+									<span>Monthly Pay Information</span>
+								</a>
+								</li>
+								<li class="treeview">
+								  <a href="<?php echo base_url(); ?>ViewPay">
+									<i class="fa fa-money"></i>
+									<span>PaySlip Generator</span>
+								  </a>
+								</li>
+								<li class="treeview">
+								  <a href="<?php echo base_url(); ?>PaysilpListing" >
+									<i class="fa fa-credit-card-alt"></i> <span>Edit Payslip</span> 
+								  </a>
+								</li>
+								<li class="treeview">
+                                  <a href="<?php echo base_url(); ?>emppayListings" >
+                                    <i class="fa fa-credit-card"></i> <span>Employee Salary Details</span> 
+                                  </a>
+                                </li>
+								<li class="treeview">
+								  <a href="<?php echo base_url(); ?>BankReport" >
+									<i class="fa fa-table"></i> <span>Bank Report</span> 
+								  </a>
+								</li>
 								
-						</ul> 
-					</li>
+								<li class="treeview">
+								  <a href="<?php echo base_url(); ?>publicholidays" >
+									<i class="fa fa-calendar"></i> <span>Public Holidays</span> 
+								  </a>
+								</li>
+								<li class="treeview">
+								  <a href="<?php echo base_url(); ?>loanreports" >
+									<i class="fa fa-list-alt"></i> <span>Loan Reports</span> 
+								  </a>
+								</li>
 
-							<?php }?>
+								<li class="treeview">
+								  <a href="<?php echo base_url(); ?>bonusreports" >
+									<i class="fa fa-list-alt"></i> <span>Incentives and Bonus Reports</span> 
+								  </a>
+								</li>
 
-						<?php }?>
+                        
+                        </ul>
+                    </li> 
+                    <?php }?>
+  
+                    <? if($check ==1){break;} }?>
+                    <?php }?>
+   
 
+                  <?php if(empty($DepAccesslist)){?>
+					<?php if($DEPCode == MANAGEMENT){?>
+					 <li class="treeview">
+                   		<a href="<?php echo base_url(); ?>reports">
+                			<i class="fa fa-dashboard"></i> <span>ReportList</span> 
+              			</a>
+            		</li>
 
-                    	<?php foreach($DepAccesslist as $dep){
+                 <?php }?>
+                 <?php }
+
+                 else{?>
+
+                 <?php foreach($DepAccesslist as $dep){
 							$assd= $dep->AssDep;?>
 							<?php if($assd == MANAGEMENT || $DEPCode == MANAGEMENT){?>
                               <li class="treeview">
@@ -606,44 +1043,18 @@ $(function() {
 							<?php }?>
 
 						 <?php }?>
+                  
+                 <?php }?>
 
 
 
 
-
-						<?php foreach($DepAccesslist as $dep){
-							$assd= $dep->AssDep;?>
-							<?php if($assd == SYSTEM_ADMIN){?>
-                              <li class="treeview">
-                   				<span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> Attendance<span class="caret"></span></span> <ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
-                                
-                                 <li class="treeview">
-								  <a href="<?php echo base_url(); ?>attendance">
-									<i class="fa fa-refresh fa-spin "></i>
-									<span>Monthly Attendance</span>
-								  </a>
-								</li>
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>permissionlist">
-									<i class="fa fa-user-circle "></i>
-									<span>Permission Slip</span>
-								  </a>
-								</li>
-
-              				  </ul>	 
-            				  </li>
-
-							<?php }?>
-
-						<?php }?>
+         
 
 
 
 
 
-     
-
-
 
 
 
diff --git a/application/views/revenuepopdf.php b/application/views/revenuepopdf.php
index 08a8d6a8..0b715d70 100755
--- a/application/views/revenuepopdf.php
+++ b/application/views/revenuepopdf.php
@@ -305,12 +305,13 @@ $OrderValue =  (( $SubTotalAmount + $AfterCGST +$AfterIGST+$AfterSGST +$Insuranc
 			   { 
 			     echo $rec->LineAmend ;			
 			   }
-            } }?> 
+            } ?> 
               <tr>						
 						<td style="text-align: center;"><strong>Total</strong></td>
          <td style="text-align: center;" rowspan="2"><b>Current Total Order :<?php echo $AmendmentPDF[0]->partenttotalorder ?></b></td>
          <td style="text-align: center;" rowspan="2"><b>Revised Total Order :<?php echo $AmendmentPDF[0]->TotalOrderValue ?></b></td>
 		 </tr>
+		 <?php } ?>
              
 			</tbody>