diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php
index 2b0372e1..89ac2deb 100755
--- a/application/controllers/employeedetails.php
+++ b/application/controllers/employeedetails.php
@@ -224,6 +224,8 @@ class employeedetails extends BaseController
         $this->form_validation->set_rules('panno', 'panno', 'trim|min_length[10]|max_length[10]');
         $this->form_validation->set_rules('passportno', 'passportno', 'trim|min_length[9]|max_length[9]');
         $this->form_validation->set_rules('accountno', 'accountno', 'trim|min_length[10]|max_length[20]');
+        $this->form_validation->set_rules('pfno', 'pfno', 'trim|min_length[22]|max_length[22]');
+        $this->form_validation->set_rules('esino', 'esino', 'trim|min_length[10]|max_length[10]');
         
             
         if($this->form_validation->run() == FALSE)
@@ -281,6 +283,9 @@ class employeedetails extends BaseController
         $driverlicense = strtoupper($this->input->post ( 'driverlicense' ));
         $licenseExpiryDate = $this->input->post ( 'licenseExpiryDate' );
         $VoterID = strtoupper($this->input->post ( 'voterID' ));
+        $PFno = $this->input->post('pfno'); 
+        $ESIno = $this->input->post('esino'); 
+        $Nominee = $this->input->post('nomineename');
         $createdby = $this->session->userdata ( 'userId' );
         
         if($licenseExpiryDate != '')
@@ -320,8 +325,10 @@ class employeedetails extends BaseController
                   'IsActive'=>$IsActive,'ProfilePic'=>$Picture,'Reference_Name'=>$referredby,
                   'Reference_ContactNumber'=>$referrercontno,'Remarks'=>$addinfo,'CreatedBy'=>$createdby,
                   'personalEmailId'=>$comEmailId,'DriverLicense'=>$driverlicense,
-                  'LicenseValidtill'=>$License_ExpiryDate,'VoterID'=>$VoterID);    
-                        $this->load->model('employeedetails_model');
+                  'LicenseValidtill'=>$License_ExpiryDate,'VoterID'=>$VoterID,'PFNO'=>$PFno,'ESI'=>$ESIno,
+                  'NomineeDetails'=>$Nominee);    
+                        //$this->load->model('employeedetails_model');
+                //print_r($Employee);die();
                 $result = $this->employeedetails_model->addNewemployee($Employee);
                 
                 if($result > 0)
@@ -593,6 +600,9 @@ echo "<script>alert('Record Not Saved!');</script>";redirect('employeeListing','
         $this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]');
         $this->form_validation->set_rules('passportno', 'passportno', 'trim|min_length[9]|max_length[9]');
         $this->form_validation->set_rules('accountno', 'accountno', 'trim|min_length[10]|max_length[20]');
+        $this->form_validation->set_rules('pfno', 'pfno', 'trim|min_length[22]|max_length[22]');
+        $this->form_validation->set_rules('esino', 'esino', 'trim|min_length[10]|max_length[10]');
+        
         
         if($this->form_validation->run() == FALSE)
             {
@@ -605,11 +615,24 @@ echo "<script>alert('Record Not Saved!');</script>";redirect('employeeListing','
         $this->load->model('employeedetails_model');
           $EmpId =  $this->input->post('employeeid'); 
         $PictureName = $this->input->post('Image'); 
+        $ModifyPictureName = $this->input->post('ModifyImage'); 
                 
             if ($PictureName != '')
         {
           //echo  'Exists';
-          $Picture = $PictureName;  
+          //$Picture = $PictureName; 
+          if(strlen($ModifyPictureName) == 0)
+          {
+            //echo  'Exists But Not replace';
+            $Picture = $PictureName;  
+          }
+          else
+          {
+            //echo  'Exists But Replace';
+            $Picture = $ModifyPictureName;
+            //$Picture = $this->editimage($ModifyPictureName);  
+            //$Picture = $this->add($ModifyPictureName);
+          } 
         }
         else
         {
@@ -662,7 +685,11 @@ echo "<script>alert('Record Not Saved!');</script>";redirect('employeeListing','
         $driverlicense = strtoupper($this->input->post ( 'Driverlicense' ));
         $licenseExpiryDate = $this->input->post ( 'LicenseExpiryDate' );
         $VoterID = strtoupper($this->input->post ( 'VoterID' ));
-                $chked =  $this->input->post('isactive');
+        $pfno = strtoupper($this->input->post('pfno')); 
+        //$uano = $this->input->post('uano'); 
+        $esino = $this->input->post('esino');
+        $Nominee = $this->input->post('nomineename'); 
+        $chked =  $this->input->post('isactive');
         // echo 'chkvalue'.  $chked ;
           if( $chked != '')
           {
@@ -697,8 +724,21 @@ echo "<script>alert('Record Not Saved!');</script>";redirect('employeeListing','
         }
         
         //echo $DOB;
-                $Employee = array('FirstName'=>$FirstName, 'LastName'=>$LastName,'FatherName'=>$FatherName,'Gender'=>$Gender,'DateofBirth'=>$DOB,'ContactNumber'=>$ContactNumber,'EmailId'=>$EmailId,'BloodGroup'=>$BloodGroup,'MartialStatus'=>$MartialStatus,'DateofJoining'=>$DOJ,'PreviousYearsOfExp'=>$Previousexperience,'Designation'=>$desigination,'Departmentcode'=>$departmentCode,'PresentAddress'=>$CurrentAddress,'PermanentAddress'=>$permanentaddress,'EmergencyContactName'=>$emergencycontactname,'EmergencyContactNumber'=>$emergencycontactnumber,'Edu_Qualification'=>$eduqualifaction,'Additional_Qualification'=>$addqualification,'AadharNo'=>$aadharno,'PANNo'=>$panno,'BankAccountNo'=>$accountno,'IFSCCode'=>$ifsccode,'BankBranchName'=>$bankbranchname,'BankAddress'=>$bankaddress,'PassportNo'=>$passportno,'Passport_Valid_till'=>$Valid,'IsActive'=>$IsActive,'ProfilePic'=>$Picture,'Reference_Name'=>$referredby,'Reference_ContactNumber'=>$referrercontno,'Remarks'=>$addinfo,'UpdatedBY'=>$UpdatedBY,'personalEmailId'=>$comEmailId,'DriverLicense'=>$driverlicense,'LicenseValidtill'=>$License_ExpiryDate,'VoterID'=>$VoterID);    
-         
+                $Employee = array('FirstName'=>$FirstName, 'LastName'=>$LastName,'FatherName'=>$FatherName,'Gender'=>$Gender,
+                                  'DateofBirth'=>$DOB,'ContactNumber'=>$ContactNumber,'EmailId'=>$EmailId,
+                                  'BloodGroup'=>$BloodGroup,'MartialStatus'=>$MartialStatus,'DateofJoining'=>$DOJ,
+                                  'PreviousYearsOfExp'=>$Previousexperience,'Designation'=>$desigination,
+                                  'Departmentcode'=>$departmentCode,'PresentAddress'=>$CurrentAddress,
+                                  'PermanentAddress'=>$permanentaddress,'EmergencyContactName'=>$emergencycontactname,
+                                  'EmergencyContactNumber'=>$emergencycontactnumber,'Edu_Qualification'=>$eduqualifaction,
+                                  'Additional_Qualification'=>$addqualification,'AadharNo'=>$aadharno,'PANNo'=>$panno,
+                                  'BankAccountNo'=>$accountno,'IFSCCode'=>$ifsccode,'BankBranchName'=>$bankbranchname,
+                                  'BankAddress'=>$bankaddress,'PassportNo'=>$passportno,'Passport_Valid_till'=>$Valid,
+                                  'IsActive'=>$IsActive,'ProfilePic'=>$Picture,'Reference_Name'=>$referredby,
+                                  'Reference_ContactNumber'=>$referrercontno,'Remarks'=>$addinfo,'UpdatedBY'=>$UpdatedBY,
+                                  'personalEmailId'=>$comEmailId,'DriverLicense'=>$driverlicense,'LicenseValidtill'=>$License_ExpiryDate,
+                                  'VoterID'=>$VoterID,'PFNO'=>$pfno,'ESI'=>$esino,'NomineeDetails'=>$Nominee);    
+         //print_r($Employee);die();
                 $result = $this->employeedetails_model->UpdateEmployee($Employee,$EmpId);
                 
                 if($result > 0)
@@ -767,7 +807,7 @@ echo  "<script>alert('Record Not Updated!');</script>"; redirect('employeeListin
         $this->excel->getActiveSheet()->setCellValue('AE5', 'IsActive');
         $this->excel->getActiveSheet()->setCellValue('AF5', 'PFNO');
         $this->excel->getActiveSheet()->setCellValue('AG5', 'ESI');
-        $this->excel->getActiveSheet()->setCellValue('AH5', 'UANO');
+        $this->excel->getActiveSheet()->setCellValue('AH5', 'Nominee Name');
         $this->excel->getActiveSheet()->setCellValue('AI5', 'PF_Balance');
         $this->excel->getActiveSheet()->setCellValue('AJ5', 'PF_Bal_On');
         $this->excel->getActiveSheet()->setCellValue('AK5', 'Remarks');
diff --git a/application/views/addemployee.php b/application/views/addemployee.php
index 6d340526..5037a973 100755
--- a/application/views/addemployee.php
+++ b/application/views/addemployee.php
@@ -89,18 +89,18 @@ $(function(){
 function alpha(evt) {
     var k;
     document.all ? k = evt.keyCode : k = evt.which;
-    return ((k > 64 && k < 91) || (k > 96 && k < 123) || k == 8 || k == 33 || (k >= 48 && k <= 57));
+    return ((k > 64 && k < 91) || (k > 96 && k < 123) || k == 8 || k == 32 || k == 33 || (k >= 48 && k <= 57));
 }
      
 //PAN Validate 
 function validatePAN() {
- var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}$/;
-          
-      var PAN = $('#panno').val();
+ //var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}$/;
+ var regpan = /^([a-zA-Z]){5}([0-9]){4}([a-zA-Z]){1}?$/;         
+var PAN = $('#panno').val();
       
       if(PAN != '')
       {
-        if (reg.test(PAN) == false) 
+        if (regpan.test(PAN) == false) 
         {
           alert('Please Enter Valid PAN Number');
           return (false);
@@ -365,7 +365,46 @@ function onlyAlphabets(evt) {
     }
 
 
-    
+function validatePF() {
+ var regpf = /^([a-zA-Z]){5}([0-9]){17}$/;         
+
+          
+      var PF = $('#pfno').val();
+      
+      if(PF != '')
+      {
+        if (regpf.test(PF) == false) 
+        {
+          alert('Please Enter Valid PF Number');
+          return (false);
+        }
+        else
+        {
+          return true;
+        }
+      }
+      
+}
+
+function validateESI() {
+ var reg = /(?=.*[0-9]).{10,}$/;
+          
+      var ESI = $('#esino').val();
+      
+      if(ESI != '')
+      {
+        if (reg.test(ESI) == false) 
+        {
+          alert('Please Enter Valid ESI Number');
+          return (false);
+        }
+        else
+        {
+          return true;
+        }
+      }
+      
+}
 
 </script>
  <style>
@@ -678,10 +717,10 @@ function onlyAlphabets(evt) {
               <input type="text" id="aadharno" name="aadharno" maxlength="14" onchange="ValidateAadhar();" class="form-control" onkeypress="return isNumberKey(event)">
             </div>
             <div class="col-md-3"><span>PAN Number</span> 
-              <input type="text" id="panno"  maxlength="10" style="text-transform:uppercase" name="panno"  onchange="validatePAN();" class="form-control">
+              <input type="text" id="panno"  maxlength="10" style="text-transform:uppercase" name="panno"  onchange="validatePAN();" class="form-control" pattern="([a-zA-Z]){5}([0-9]){4}([a-zA-Z]){1}" title=" 5 character,4 Digit Numbers,1 character (ex:ABCDE1234A) " onkeypress="return alpha(event);">
             </div>
             <div class="col-md-3"><span>Passport Number</span>
-               <input type="text" id="passportno"  maxlength="9" onchange="ValidatePassport();" name="passportno" style="text-transform:uppercase" class="form-control" pattern="[A-PR-WY]{1}[1-9]{1}\d{1}\s\d{4}[1-9]{1}" title="The first digit or the last digit will never be 0
+               <input type="text" id="passportno"  maxlength="9" onchange="ValidatePassport();" name="passportno" style="text-transform:uppercase" class="form-control" pattern="[aA-prPR-wyWY]{1}[1-9]{1}\d{1}\s\d{4}[1-9]{1}" title="The first digit or the last digit will never be 0
     The first character cannot be Q, X or Z. (eg:A12 34567)" onkeypress="return alpha(event);">
             </div>
       <div class="col-md-3"><span>Passport Expiry Date</span>
@@ -691,10 +730,10 @@ function onlyAlphabets(evt) {
 
           <div class="col-md-12 pad">
            <div class="col-md-3"><span>Voter ID</span> 
-              <input type="text" id="VoterID" name="voterID" maxlength="12"   class="form-control" onkeypress="return alpha(event);" style="text-transform: uppercase">
+              <input type="text" id="VoterID" name="voterID" maxlength="12" class="form-control" style="text-transform: uppercase" >
             </div>
             <div class="col-md-3"><span>Driving License</span> 
-              <input type="text" id="Driverlicense" onchange="validateDriverLicense();" style="text-transform:uppercase" pattern="[a-zA-Z]{2}[0-9]{2}\s[0-9]{11}" title="EX:TN82 12345678900"maxlength="16"  name="driverlicense"  class="form-control" onkeypress="return alpha(event);">
+              <input type="text" id="Driverlicense" onchange="validateDriverLicense();" style="text-transform:uppercase" pattern="[a-zA-Z]{2}[0-9]{2}\s[0-9]{11}" title="EX:TN82 12345678900" maxlength="16"  name="driverlicense"  class="form-control" onkeypress="return alpha(event);">
             </div>
            
       <div class="col-md-3"><span>Driving License Expiry Date</span>
@@ -702,6 +741,32 @@ function onlyAlphabets(evt) {
             </div>
 
           </div>
+
+          <legend>Employee benefits</legend>
+          <!-- Text input-->
+      
+          <div class="col-md-12 pad">
+            <div class="col-md-6"><span>PF Number</span> 
+              <input type="text" id="pfno" name="pfno" maxlength="22"  onchange="validatePF();" class="form-control" style="text-transform:uppercase" pattern="([a-zA-Z]){5}([0-9]){17}" title=" 5 Character and 17 Digit number (ex:ABCDE12345678901234567)" onkeypress="return alpha(event);">
+            </div>
+            <div class="col-md-6"><span>ESI Number</span> 
+              <input type="text" id="esino" name="esino" maxlength="10"  onchange="validateESI();" class="form-control"  title=" 10 digit number" onkeypress="return isNumberKey(event)">
+            </div>
+            <!-- <div class="col-md-4"><span>UA Number</span>
+               <input type="text" id="uano"  maxlength="12" name="uano" class="form-control">
+            </div> -->
+          </div>
+
+          <legend>Nominee Details</legend>
+          <!-- Text input-->
+      
+          <div class="col-md-12 pad">
+            <div class="col-md-12"><span>Nominee</span> 
+              <input type="text" id="nomineename" name="nomineename" maxlength="255" class="form-control">
+              <!-- <textarea id="nomineename" name="nomineename" maxlength="255" class="form-control" rows="3" cols="50"></textarea> -->
+            </div>
+          </div>
+          
       
             
       <!-- Command -->
diff --git a/application/views/companyview.php b/application/views/companyview.php
index bf06838a..67fb1209 100755
--- a/application/views/companyview.php
+++ b/application/views/companyview.php
@@ -192,12 +192,13 @@ function validateEmail() {
 }
 function validatePAN() {
  //var reg = /(?=.*[A-Z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Z]).{1,}$/;
-        var reg = /(?=.*[a-zA-Z]).{5}(?=.*[0-9]).{4}(?=.*[a-zA-Z]).{1}$/;  
+ //var reg = /(?=.*[a-zA-Z]).{5}(?=.*[0-9]).{4}(?=.*[a-zA-Z]).{1}$/; 
+      var regpan = /^([a-zA-Z]){5}([0-9]){4}([a-zA-Z]){1}?$/;      
 			var PAN = $('#PAN').val();
 			
 			if(PAN != '')
 			{
-				if (reg.test(PAN) == false) 
+				if (regpan.test(PAN) == false) 
 				{
 					alert('Please Enter Valid PAN Number');
 					return (false);
@@ -210,7 +211,7 @@ function validatePAN() {
 			
 }
 function validateGST() {
-var reg = /(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}$/;
+var reg = /^([0-9]).{2}([A-Za-z]).{5}([0-9]).{4}([A-Za-z]).{1}([0-9]).{1}([Zz]).{1}([A-Za-z0-9]).{1}?$/;
          //alert('gst');
             var GST = $('#GSTNO').val();
             
@@ -286,13 +287,13 @@ function getMobileValidation(){
         }
       }
 function ValidateExno() {
- var reg = /(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[A-Za-z]).{2}(?=.*[0-9]).{3}$/;
-          
+
+  var regexno = /^([a-zA-Z]){5}([0-9]){4}([a-zA-Z]){1}([A-Za-z]).{2}([0-9]).{3}?$/;     
       var ECC = $('#ExiseRegistration1').val();
       
       if(ECC != '')
       {
-        if (reg.test(ECC) == false) 
+        if (regexno.test(ECC) == false) 
         {
           alert('Please Enter Valid Excise Control Code Number');
           return (false);
@@ -410,7 +411,7 @@ function ValidateAlternateContact(){
                	 
 <form role="form" id="addemployee" action="<?php echo base_url()?>Updatecompany" method="post"  enctype="multipart/form-data">
   <div class="row">
-    <div class="col-md-10 col-md-offset-1"   style="border:3px solid #3c8dbc;">
+    <div class="col-md-10 col-md-offset-1">   <!-- style="border:3px solid #3c8dbc;"> -->
       <form class="form-horizontal" role="form" >
         <fieldset>
 		 
@@ -431,43 +432,50 @@ function ValidateAlternateContact(){
 		   </div>
 		   
 		   <div class="col-md-9">
-           
-            <div class="col-md-6 pad">
-			<span>CompanyID</span><span class="badge">*</span>
+          
+          <div class="col-md-12">
+            <div class="col-md-6 pad"><span>CompanyID</span><span class="badge">*</span>
               <input type="text" name="CompanyID"  maxlength="100" id="CompanyID"  value="<?php echo $CompID;?>"  class="form-control" readonly>
             </div>
              
             <div class="col-md-6 pad"><span>CompanyName</span><span class="badge">*</span>
               <input type="text" name="CompanyName" onkeypress="return onlyAlphabets(event);"  maxlength="100" id="CompanyName"  class="form-control" required  value="<?php echo $CompanyName;?>">
             </div>
-      
-       <div class="col-md-6 pad"><span>ContactNumber</span><span class="badge">*</span>
+          </div>
+          
+          <div class="col-md-12">
+            <div class="col-md-6 pad"><span>ContactNumber</span><span class="badge">*</span>
               <input type="text" name="ContactNumber" onchange="getMobileValidation();" id="ContactNumber" maxlength="12" class="form-control"  value="<?php echo $ContactNumber;?>" required onkeypress="return isNumberKey(event)">
             </div>
       
-      <div class="col-md-6 pad"><span>AlternateContactNumber</span><span class="badge">*</span>
-               <input type="text" name="AlternateContactNumber" onchange="ValidateAlternateContact();" id="AlternateContactNumber" maxlength="12" 
-        class="form-control" value="<?php echo $AlternateContactNumber;?>" required>
-      </div>
-      
-       
-      <div class="col-md-6 pad"><span>Email Address</span>
+            <div class="col-md-6 pad"><span>AlternateContactNumber</span><span class="badge">*</span>
+               <input type="text" name="AlternateContactNumber" onchange="ValidateAlternateContact();" id="AlternateContactNumber" maxlength="12" class="form-control" value="<?php echo $AlternateContactNumber;?>" required>
+            </div>
+          </div>
+          
+          <div class="col-md-12">
+            <div class="col-md-6 pad"><span>Email Address</span>
               <input type="email"  name="EmailAddress"  onchange="validateEmail();"id="EmailAddress" class="form-control" value="<?php echo $EmailAddress;?>">
             </div>
-            
-            
+               
             <div class="col-md-6 pad"><span>Excise Registration</span><span class="badge">*</span>
                <input type="text" name="Exiseregistration1" id="ExiseRegistration1"   maxlength="15" class="form-control" value="<?php echo $Exiseregistration ;?>" pattern="(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[A-Za-z]).{2}(?=.*[0-9]).{3}" required onchange="ValidateExno();" style="text-transform: uppercase">
             </div>
+          </div>
+         
+          <div class="col-md-12">
             <div class="col-md-6 pad"><span>Company Website</span><span class="badge">*</span>
               <input type="text" name="companywebsite" id="companywebsite"   maxlength="100" class="form-control" value="<?php echo $companywebsite ;?>"  required>
             </div>
-      <div class="col-md-3 pad"><span>Financial Year StartON</span><span class="badge">*</span>
+            
+            <div class="col-md-3 pad"><span>Financial Year StartON</span><span class="badge">*</span>
               <input name="financialstart" id="financialstart"   maxlength="10" class="form-control" value="<?php echo $financialstart ;?>"  required>
             </div>
-      <div class="col-md-3 pad"><span>Financial Year EndON</span><span class="badge">*</span>
+            
+            <div class="col-md-3 pad"><span>Financial Year EndON</span><span class="badge">*</span>
               <input name="financialend" id="financialend"   maxlength="10" class="form-control" value="<?php echo $financialend ;?>"  required>
             </div>
+          </div>
 </div>
       
          
@@ -476,56 +484,56 @@ function ValidateAlternateContact(){
           <!-- Form Name -->
           <legend>Address Details</legend>
           <!-- Text input-->
-          <div class="form-group">
-            <div class="col-md-12"><span>Address</span><span class="badge">*</span>
-              <input type="text" id="Address" name="Address" maxlength="500"    class="form-control" value="<?php echo $Address;?>"  required>
+          <!-- <div class="form-group"> -->
+          <div class="col-md-12">
+            <div class="col-md-12 pad"><span>Address</span><span class="badge">*</span>
+              <input type="text" id="Address" name="Address" maxlength="500" class="form-control" value="<?php echo $Address;?>"  required>
             </div>
           </div>
+          <!-- </div> -->
        <br>
           <!-- Text input-->
          
           <!-- Text input-->
-          
+      
 
 
-
-          
-       
 <!-- profile Section -->
           <!-- Form Name -->
           <legend>Tax Related Data</legend>
           <!-- Text input-->
       
          <div class="form-group">
-     
-        <div class="col-md-3">
-          <span for="payablefrom" style="width =25%";>Payable Terms</span>
-            <select class="form-control required" id="PaymentTerms" name="PaymentTerms" onchange="payment_hidden();">
-              <option value="<?php echo $PaymentTerms;?>" ><?php echo $PaymentTerms;?></option>
-              <?php
-              if(!empty($payment))
-              {
-                foreach ($payment as $rl)
-                {
-                  ?>
-                  <option value="<?php echo $rl->PaymentID ?>"><?php echo $rl->PaymentTerms ?></option>
-                  <?php
-                }
-              }
-              ?>
-          </select>
-           <input type="hidden" id="paymentid" name="paymentid" value="<?php echo $PaymentId;?>" >
-            </div>
-      </div>
+          <div class="col-md-12">
+             <div class="col-md-3">
+               <span for="payablefrom" style="width =25%";>Payable Terms</span>
+                 <select class="form-control required" id="PaymentTerms" name="PaymentTerms" onchange="payment_hidden();">
+                   <option value="<?php echo $PaymentTerms;?>" ><?php echo $PaymentTerms;?></option>
+                    <?php
+                      if(!empty($payment))
+                      {
+                        foreach ($payment as $rl)
+                        {
+                    ?>
+                          <option value="<?php echo $rl->PaymentID ?>"><?php echo $rl->PaymentTerms ?></option>
+                    <?php
+                         }
+                      }
+                    ?>
+                  </select>
+                    <input type="hidden" id="paymentid" name="paymentid" value="<?php echo $PaymentId;?>" >
+                </div>
+            
            <!--<div class="col-md-3">
-        <span for="PayableAT">Payable AT</span>
-              <input type="text"   class="form-control required" id="PayableAT" name="PayableAT"  value="<?php echo $PayableAT;?>" required>   
-            </div>-->
+                  <span for="PayableAT">Payable AT</span>
+                    <input type="text"   class="form-control required" id="PayableAT" name="PayableAT"  value="<?php echo $PayableAT;?>" required>   
+                </div>-->
       
           <!-- <div class="col-md-3"><span>Payment Date</span><br/>
-        <label class="radio-inline"><input type="radio" name="PaymentDays"  value="Before">Before</label>
-        <label class="radio-inline"><input type="radio" name="PaymentDays" value="After">After</label>
-            </div>-->
+                  <label class="radio-inline"><input type="radio" name="PaymentDays"  value="Before">Before</label>
+                  <label class="radio-inline"><input type="radio" name="PaymentDays" value="After">After</label>
+                </div>-->
+          </div>
             
       </div>
           
@@ -543,32 +551,33 @@ function ValidateAlternateContact(){
           
       
           <div class="form-group">
-            <div class="row">
-       <div class="col-md-3"><span>UANumber</span>
-              <input type="text" id="UANumber" name="UANumber" maxlength="10" class="form-control" value="<?php echo $UANumber;?>" style="text-transform: uppercase">
+            <div class="col-md-12 pad">
+
+                <div class="col-md-3"><span>UANumber</span>
+                   <input type="text" id="UANumber" name="UANumber" maxlength="10" class="form-control" value="<?php echo $UANumber;?>" style="text-transform: uppercase">
+                 </div>
+                <div class="col-md-3"><span>TIN Number</span> 
+                    <input type="text" id="TIN" name="TIN" maxlength="11"   class="form-control" value="<?php echo $TIN;?>" pattern="(.){11,11}" onkeypress="return isNumberKey(event)"  title="Please Enter 11 digit Number">
+                </div>
+                <div class="col-md-3"><span>PAN Number</span><span class="badge">*</span> 
+                     <input type="text" id="PAN"  maxlength="10"  name="PAN"  onchange="validatePAN();" class="form-control" style="text-transform: uppercase" value="<?php echo $PAN;?>"  pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}" required>
+                </div>
+                <div class="col-md-3"><span>GST Number</span><span class="badge">*</span>
+                      <input type="text" id="GSTNO"  maxlength="15" onchange="validateGST();" name="GSTNO" class="form-control" style="text-transform: uppercase" value="<?php echo $GSTNO;?>" pattern="(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}" required title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and should be 'Z' only and 1 Number">
+                </div>
             </div>
-            <div class="col-md-3"><span>TIN Number</span> 
-              <input type="text" id="TIN" name="TIN" maxlength="11"   class="form-control" value="<?php echo $TIN;?>" pattern="(.){11,11}" onkeypress="return isNumberKey(event)"  title="Please Enter 11 digit Number">
-            </div>
-            <div class="col-md-3"><span>PAN Number</span><span class="badge">*</span> 
-              <input type="text" id="PAN"  maxlength="10"  name="PAN"  onchange="validatePAN();" class="form-control" style="text-transform: uppercase" value="<?php echo $PAN;?>"  pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}" required>
-            </div>
-            <div class="col-md-3"><span>GST Number</span><span class="badge">*</span>
-               <input type="text" id="GSTNO"  maxlength="15" onchange="validateGST();" name="GSTNO" class="form-control" style="text-transform: uppercase" value="<?php echo $GSTNO;?>" pattern="(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}" required title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and should be 'Z' only and 1 Number">
-            </div>
-      </div>
      
       <br>
       
-      <div class="row">
-      <div class="col-md-3"><span>GST Range</span>
+          <div class="col-md-12 pad">
+              <div class="col-md-3"><span>GST Range</span>
                <input type="text" id="GSTRange" name="GSTRange" maxlength="100"  class="form-control" value="<?php echo $GSTRange;?>">
-          </div>
-       <div class="form-group">
-            <div class="col-md-9"><span>Collectrate Address</span><span class="badge">*</span>
-              <input type="text" id="CollectrateAddress" required name="CollectrateAddress"  maxlength="500"   class="form-control" value="<?php echo $CollectrateAddress;?>" required >
-            </div>
-          </div>
+              </div>
+              <!-- <div class="form-group"> -->
+              <div class="col-md-9"><span>Collectrate Address</span><span class="badge">*</span>
+                 <input type="text" id="CollectrateAddress" required name="CollectrateAddress"  maxlength="500"   class="form-control" value="<?php echo $CollectrateAddress;?>" required >
+             </div>
+             <!-- </div> -->
           </div>
       
 
@@ -576,10 +585,10 @@ function ValidateAlternateContact(){
 <br>
 <br>
          <legend>Upload File</legend>
-     <div class="row">
+     <div class="col-md-12 pad">
      <div  class="col-md-3"><span>File Description</span>
     
-     <select class="form-control required" id="filedescription" name="filedescription">
+        <select class="form-control required" id="filedescription" name="filedescription">
               <option value="CERTIFICATION" >Select File Type</option>
               <?php
               if(!empty($filetype))
@@ -593,18 +602,14 @@ function ValidateAlternateContact(){
               }
               ?>
           </select>
-          </div>
-       
-              
-            
+      </div>
+      
 <br>
 
        <div class="col-md-3" "box-header">                                              
                 
                 <input type = "file"  size = "20" input accept=".docx,.pdx,.doc.JPG,.PNG" onchange="readURL(this,1);"   id="images" name="images"/>  
                 <label for="images">Select Company file<br/><small>(only .pdf,.excel,.doc,.png,.jpg)</small></label>
-        
- 
                
         </div>
     </div>
@@ -612,8 +617,7 @@ function ValidateAlternateContact(){
             <div class="col-md-3 col-md-offset-9">
               <div class="pull-right">
                 
-                            <input type="submit" id="submit" onclick="valid();" class="btn btn-primary" value="Submit" />
-                           
+                <input type="submit" id="submit" onclick="valid();" class="btn btn-primary" value="Submit" />           
                            
               </div>
             </div>
diff --git a/application/views/editEmployee.php b/application/views/editEmployee.php
index 670b5026..605ec30c 100755
--- a/application/views/editEmployee.php
+++ b/application/views/editEmployee.php
@@ -39,9 +39,13 @@
 		$DOB = '';
 		$DOJ = '';
 		$personalEmailId='';
-$DriverLicense='';
-$LicenseValidtill='';
-$VoterID='';
+		$DriverLicense='';
+		$LicenseValidtill='';
+		$VoterID='';
+		$pfno = '';
+		$esino = '';
+		$nominee ='';
+
 if(!empty($EmpDetails))
 {
     foreach ($EmpDetails as $Emp)
@@ -99,6 +103,10 @@ if(!empty($EmpDetails))
 		$personalEmailId = $Emp->personalEmailId;
 		$DriverLicense = $Emp->DriverLicense;
 		$VoterID = $Emp->VoterID;
+		$pfno = $Emp->PFNO;
+		$esino = $Emp->ESI;
+		$nominee=$Emp->NomineeDetails;
+
 			
 		if($Emp->LicenseValidtill != '' && $Emp->LicenseValidtill != '0000-00-00 00:00:00')
 		{
@@ -139,6 +147,7 @@ if(!empty($EmpDetails))
                 };
 
                 reader.readAsDataURL(input.files[0]);
+                $('#ModifyImage').val(input.files[0]['name']);
             }
         }
 		
@@ -180,13 +189,14 @@ $(function(){
 //PAN Validate 
 //PAN Validate 
 function validatePAN() {
- var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}$/;
+ //var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}$/;
+  var regpan = /^([a-zA-Z]){5}([0-9]){4}([a-zA-Z]){1}?$/;
           
 			var PAN = $('#panno').val();
 			
 			if(PAN != '')
 			{
-				if (reg.test(PAN) == false) 
+				if (regpan.test(PAN) == false) 
 				{
 					alert('Please Enter Valid PAN Number');
 					return (false);
@@ -443,7 +453,65 @@ function validatecomEmail() {
 			}
 			}
 			
-}  
+}
+function validateESI() {
+ var reg = /(?=.*[0-9]).{10,}$/;
+          
+			var ESI = $('#esino').val();
+			
+			if(ESI != '')
+			{
+				if (reg.test(ESI) == false) 
+				{
+					alert('Please Enter Valid ESI Number');
+					return (false);
+				}
+				else
+				{
+					return true;
+				}
+			}
+			
+}
+function validatePF() {
+  var regpf = /^([a-zA-Z]){5}([0-9]){17}?$/;
+          
+      var PF = $('#pfno').val();
+      
+      if(PF != '')
+      {
+        if (regpf.test(PF) == false) 
+        {
+          alert('Please Enter Valid PF Number');
+          return (false);
+        }
+        else
+        {
+          return true;
+        }
+      }
+      
+}
+function validateUA() {
+ var reg = /(?=.*[0-9]).{12,}$/;
+          
+			var UA = $('#uano').val();
+			
+			if(UA != '')
+			{
+				if (reg.test(UA) == false) 
+				{
+					alert('Please Enter Valid UA Number');
+					return (false);
+				}
+				else
+				{
+					return true;
+				}
+			}
+			
+}
+
 function getAge() {
 	
   var  dateString =  $("#DateofBirth").val();
@@ -616,6 +684,7 @@ function onlyAlphabets(evt) {
                 <label for="photo">Select profile picture<br/><small>(only .jpg or .png)</small></label>
 	
                 <input type="hidden" name="Image" id="Image"  value="<?php echo $ProfilePic ; ?>" class="form-control" readonly>
+                <input type="hidden" name="ModifyImage" id="ModifyImage"    class="form-control" readonly>
                 <input type="text" name="employeeid" id="employeeid"  value="<?php echo $EmpID ; ?>" placeholder="Employee ID" class="form-control" readonly>
                  
                  <input type="checkbox" id="isactive" <?php echo $IsActive;?> name="isactive" value="1"> IS ACTIVE
@@ -878,7 +947,7 @@ function onlyAlphabets(evt) {
               <input type="text" id="aadharno" name="aadharno"  maxlength="14"  placeholder="Aadhar Number" onchange="ValidateAadhar();"  class="form-control num" value="<?php echo $AadharNo  ; ?>" title=" : 12 digit number"><!-- onkeypress="return isNumberKey(event)"> -->
             </div>
             <div class="col-md-3"><span>PAN Number</span>
-              <input type="text" id="panno"  style="text-transform: uppercase" maxlength="10" name="panno" placeholder="PAN Number" onchange="validatePAN();" class="form-control" value="<?php echo $PANNo  ; ?>" onkeypress="return alpha(event);">
+              <input type="text" id="panno"  style="text-transform: uppercase" maxlength="10" name="panno" placeholder="PAN Number" onchange="validatePAN();" class="form-control" value="<?php echo $PANNo  ; ?>" onkeypress="return alpha(event);" pattern="([a-zA-Z]){5}([0-9]){4}([a-zA-Z]){1}" title=" 5 character,4 Digit Numbers,1 character (ex:ABCDE1234A) ">
             </div>
             <div class="col-md-3"><span>Passport Number</span> 
               <input type="text" id="passportno" name="passportno"  maxlength="9" placeholder="Passport Number" onkeypress="return alpha(event);" onchange="ValidatePassport();"  class="form-control" value="<?php echo $PassportNo ; ?>" pattern="[A-PR-WY]{1}[1-9]{1}\d{1}\s\d{4}[1-9]{1}" title="The first digit or the last digit will never be 0
@@ -908,6 +977,34 @@ function onlyAlphabets(evt) {
           </div>
 		  
 
+		  <legend>Employee benefits</legend>
+          <!-- Text input-->
+      
+          <div class="form-group">
+          	<div class="col-md-12 pad">
+            <div class="col-md-6"><span>PF Number</span>
+               <input type="text" id="pfno" name="pfno"  maxlength="22" onchange="validatePF();" class="form-control"  placeholder="PF Number" pattern="([a-zA-Z]){5}([0-9]){17}" title="Please Enter 5 Character and 17 digit numbers format" value ="<?php echo $pfno ; ?>" style="text-transform:uppercase;" onkeypress="return alpha(event);">
+            </div>
+            <div class="col-md-6"><span>ESI Number</span> 
+              <input type="text" id="esino" name="esino" maxlength="10"  onchange="validateESI();" class="form-control" placeholder="ESI Number" title="Please Enter 10 digit numbers format" value="<?php echo $esino ;?>" onkeypress="return isNumberKey(event)">
+            </div>
+            <!-- <div class="col-md-4"><span>UA Number</span>
+               <input type="text" id="uano"  maxlength="12" placeholder="UA Number" onchange="ValidateUA();" name="uano" class="form-control" title= "please Enter 12 digits number format" value = "<?php echo $uano ; ?>">
+             </div> -->
+          </div>
+         </div>
+
+          <legend>Nominee Details</legend>
+          <!-- Text input-->
+      
+          <div class="col-md-12 pad">
+            <div class="col-md-12"><span>Nominee</span> 
+              <input type="text" id="nomineename" name="nomineename" maxlength="250" class="form-control" placeholder="Nominee Name" value="<?php echo $nominee ;?>"> 
+           <!-- rows="3" cols="50" -->
+            </div>
+          </div>
+
+
 		  
 		
 		  <!-- Command -->