diff --git a/application/controllers/payslip.php b/application/controllers/payslip.php
index 92a1736f..76870bc6 100644
--- a/application/controllers/payslip.php
+++ b/application/controllers/payslip.php
@@ -17,7 +17,7 @@ class payslip extends BaseController
 	 public function __construct()
     {
         parent::__construct();
-        $this->load->model('Payroll_model');
+        $this->load->model('payroll_model');
 		 $this->load->library('form_validation');
         $this->isLoggedIn();   
     }
@@ -39,8 +39,8 @@ class payslip extends BaseController
 	public function viewGenerator()
     { 
 	//echo 'inside funtion';
-		$Data['Payon'] = $this->Payroll_model->getPayOn();
-		$Data['Emplist'] = $this->Payroll_model->getEmployeelist();
+		$Data['Payon'] = $this->payroll_model->getPayOn();
+		$Data['Emplist'] = $this->payroll_model->getEmployeelist();
 		
 		
         $this->global['pageTitle'] = 'Siddharth : Payroll Generater';
@@ -63,6 +63,23 @@ class payslip extends BaseController
         return true;
     }
 }
+
+function getEmployee()
+{
+	
+	   $id = $this->input->post('id');
+		
+		  $result = $this->payroll_model->getEmployeelist($id );
+	  $HTML="";
+
+   if($result->num_rows() > 0){
+     foreach($result->result() as $list){
+       $HTML.="<option value='".$list->EmpId."'>".$list->EmpId."-".$list->Fname."</option>";
+     }
+   }
+   echo $HTML;
+}
+
 /* Validation for PayOn  Dropdown
 	*/
 	function  PayOn_validate($selectValue)
@@ -105,7 +122,7 @@ class payslip extends BaseController
 				if($All != '')
 				{
 					
-					$result = $this->Payroll_model->getEmpAll();	
+					$result = $this->payroll_model->getEmpAll();	
 					if($result > 0 )
 					{               
 						for($i=0;$i <count($result) ;$i++ )
@@ -113,7 +130,7 @@ class payslip extends BaseController
 							 
 							$EmpID =  $result[$i]['EmpId'];
 						  
-							$Data['PayDetails'] = $this->Payroll_model->GetPayslipdata($Payon,$EmpID);
+							$Data['PayDetails'] = $this->payroll_model->GetPayslipdata($Payon,$EmpID);
 							$Data['Count'] = $i;
 							
 							$this->load->View("payslipgenerateprint", $Data );
@@ -125,7 +142,7 @@ class payslip extends BaseController
 				else
 				{
 					$EmpID = $this->input->post('Employee');
-					$Data['PayDetails'] = $this->Payroll_model->GetPayslipdata($Payon,$EmpID);
+					$Data['PayDetails'] = $this->payroll_model->GetPayslipdata($Payon,$EmpID);
 				
 					$this->load->View("payslipgenerateprint",  $Data );
 					
@@ -225,17 +242,18 @@ class payslip extends BaseController
 						$createdby = $this->session->userdata ( 'userId' );
 						$Totaldays 		= $sheet->getCell('I'.$i)->getValue();
 						
-						$FileExists = $this->Payroll_model->checkFileDetailsExists($PayOn);
+						$FileExists = $this->payroll_model->checkFileDetailsExists($PayOn);
 						
 						 if (count($FileExists)== 0)
 						 {
 							 $FileDetails = array('PayOn'=>$PayOn,'TotalNoofDays'=>$Totaldays,'FileName'=>$PayrollFileName,'CreatedBy'=>$createdby);
-							 $result = $this->Payroll_model->UploadFileName($FileDetails);
+							 $result = $this->payroll_model->UploadFileName($FileDetails);
 						 }
 						 else
 						 {
 							  $FileDetailsupdate = array('TotalNoofDays'=>$Totaldays,'FileName'=>$PayrollFileName,'CreatedBy'=>$createdby);
-							  $result = $this->Payroll_model->UpdateFileName($FileDetailsupdate,$PayOn);
+							  $result = $this->payroll_model->UpdateFileName($FileDetailsupdate,$PayOn);
+							  $this->payroll_model->deleteFileData($PayOn);							  
 						 }
 						
 						
@@ -271,22 +289,11 @@ class payslip extends BaseController
 							//echo  $EmpId ;
 							 if( $EmpId != '')
 							 {
-							 if (count($FileExists)== 0)
-							{
-								 $FileData = array('PayOn'=>$PayOn,'EmpID'=>$EmpId,'NoofDaysWorked'=>$NoOfWorkingdays,'ActualSalary'=>$ActualSalary,'PerDaySalary'=>$PerDaySalary,'WorkedSalary'=>$WorkedSalary,'BasicPlusDA'=>$BasicAndDA,'HRA'=>$HRA,'OTWages'=>$OTWages,'OTperHours'=>$OTPerHours,'OTSalary'=>$OTSalary,'ESIGrossSalary'=>$GrosssSalary,'EmployeeESI'=>$ESI,'PF'=>$PF,'TotalDeduction'=>$ESIAndPF,'SalaryAsPerPF'=>$SalaryAsPerPF,'FoodAllowance'=>$FoodAllowance,'Incentive'=>$Incentive,'TotalSalary'=>$TotalSalary,'Advance'=>$Advance,'BalanceAdvance'=>$BalanceAdvance,'LessAdvance'=>$LessAdvance,'Remarks'=>$Signature,'BankAccountNumber'=>$BankAccountnumber,'PFNumber'=>$PFnumber,'ESINumber'=>$ESInumber,'UANNO'=>$UAnumber);
-								 
-								 $result = $this->Payroll_model->UploadFileData($FileData);
-								 
-							} 
-							else
-							{
-								$FileDataupload = array('EmpID'=>$EmpId,'NoofDaysWorked'=>$NoOfWorkingdays,'ActualSalary'=>$ActualSalary,'PerDaySalary'=>$PerDaySalary,'WorkedSalary'=>$WorkedSalary,'BasicPlusDA'=>$BasicAndDA,'HRA'=>$HRA,'OTWages'=>$OTWages,'OTperHours'=>$OTPerHours,'OTSalary'=>$OTSalary,'ESIGrossSalary'=>$GrosssSalary,'EmployeeESI'=>$ESI,'PF'=>$PF,'TotalDeduction'=>$ESIAndPF,'SalaryAsPerPF'=>$SalaryAsPerPF,'FoodAllowance'=>$FoodAllowance,'Incentive'=>$Incentive,'TotalSalary'=>$TotalSalary,'Advance'=>$Advance,'BalanceAdvance'=>$BalanceAdvance,'LessAdvance'=>$LessAdvance,'Remarks'=>$Signature,'BankAccountNumber'=>$BankAccountnumber,'PFNumber'=>$PFnumber,'ESINumber'=>$ESInumber,'UANNO'=>$UAnumber);
-								
-								 $result = $this->Payroll_model->UpdateFiledata($FileDataupload,$PayOn,$EmpId);
-								
-							  }
-							 }
+							 
+								 $FileData = array('PayOn'=>$PayOn,'EmpID'=>$EmpId,'NoofDaysWorked'=>$NoOfWorkingdays,'ActualSalary'=>$ActualSalary,'PerDaySalary'=>$PerDaySalary,'WorkedSalary'=>$WorkedSalary,'BasicPlusDA'=>$BasicAndDA,'HRA'=>$HRA,'OTWages'=>$OTWages,'OTperHours'=>$OTPerHours,'OTSalary'=>$OTSalary,'ESIGrossSalary'=>$GrosssSalary,'EmployeeESI'=>$ESI,'PF'=>$PF,'TotalDeduction'=>$ESIAndPF,'SalaryAsPerPF'=>$SalaryAsPerPF,'FoodAllowance'=>$FoodAllowance,'Incentive'=>$Incentive,'TotalSalary'=>$TotalSalary,'Advance'=>$Advance,'BalanceAdvance'=>$BalanceAdvance,'LessAdvance'=>$LessAdvance,'Remarks'=>$Signature,'BankAccountNumber'=>$BankAccountnumber,'PFNumber'=>$PFnumber,'ESINumber'=>$ESInumber,'UANNO'=>$UAnumber);								 
+								 $result = $this->payroll_model->UploadFileData($FileData);				 
 							
+							 }							
 						}
 						
 					    $data['Success']	=  "<script>alert('File Uploaded Successfully!');</script>";