diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php
index 7269cbdc..ee177f99 100755
--- a/application/controllers/employeedetails.php
+++ b/application/controllers/employeedetails.php
@@ -154,6 +154,48 @@ class employeedetails extends BaseController
         return true;
     }
 }
+
+
+	/* To Check the Pan Number is exists in the database or not */
+      function Pan_validate()
+      {
+     // alert('validation pan');   
+        
+          $PanNo = $this->input->post('panno');
+         
+          $query = $this->employeedetails_model->checkPANExists($PanNo);
+          if (count($query)> 0)
+          {
+             $this->form_validation->set_message('checkPanValidate', 'The Entered PAN Number is  already exists in the Database.');
+             return false;
+          }
+          else
+          {
+              return true;
+          }
+      }
+
+
+     /* To Check the Pan Number is exists in the database or not */
+      function Aadhar_validate()
+      {
+     alert('validation aadhar validation');   
+        $AadharNo = $this->input->post('aadharno');
+		$this->load->model('employeedetails_model');
+		$query = $this->employeedetails_model->checkAadharExists($AadharNo);
+				
+          if (count($query)> 0)
+          {
+             $this->form_validation->set_message('checkAadharValidate', 'The Entered Aadhar Number is  already exists in the Database.');
+             return false;
+          }
+          else
+          {
+              return true;
+          }
+      }
+
+
 	/**
      * This function is used to save the  new Employee form in the database 
 	 */
@@ -175,11 +217,11 @@ class employeedetails extends BaseController
 				$this->form_validation->set_rules('MartialStatus', 'MartialStatus', 'callback_Martial_validate'); 		
 				$this->form_validation->set_rules('bloodgroup', 'bloodgroup', 'callback_Blood_validate');	
 				$this->form_validation->set_rules('emergencycontactnumber', 'emergencycontactnumber', 'trim|required|min_length[10]|max_length[10]');
-			    $this->form_validation->set_rules('desigination', 'Desigination', 'callback_Des_validate');				
+			   $this->form_validation->set_rules('desigination', 'Desigination', 'callback_Des_validate');				
 				$this->form_validation->set_rules('departmentname', 'departmentname', 'callback_Dep_validate');				
 			    $this->form_validation->set_rules('eduqualifaction', 'eduqualifaction', 'callback_select_validate');				
 				$this->form_validation->set_rules('referrercontno', 'referrercontno', 'trim|min_length[10]|max_length[10]');
-				$this->form_validation->set_rules('aadharno', 'aadharno', 'trim|min_length[12]|max_length[12]');
+        $this->form_validation->set_rules('aadharno', 'aadharno', 'trim|min_length[12]|max_length[12]');
 				$this->form_validation->set_rules('panno', 'panno', 'trim|min_length[10]|max_length[10]');
 				$this->form_validation->set_rules('passportno', 'passportno', 'trim|min_length[8]|max_length[8]');
 				$this->form_validation->set_rules('accountno', 'accountno', 'trim|min_length[10]|max_length[20]');
@@ -334,17 +376,65 @@ echo "<script>alert('Record Not Saved!');</script>";
 		  print_r($query);	
 		    
 	}
+	 function checkPAN()
+    {
+    
+          $id = $this->input->post('id');
+          $this->load->model('employeedetails_model');
+          $query = $this->employeedetails_model->checkPANExists($id );
+          $query =  $query[0]['PANNo'];               
+          print_r($query);          
+                  
+    }
 
+    function checkAadharNo()
+    {
+    
+          $id = $this->input->post('id');
+          $this->load->model('employeedetails_model');
+          $query = $this->employeedetails_model->checkAadharExists($id );
+          $query =  $query[0]['AadharNo'];               
+          print_r($query);          
+                  
+    }
+	
+
+     /* To Check the Pan Number is exists in the database or not for the selected Supplier */
+      function Pan_validate_emp()     {   
+    
+          $Empid = $this->input->post('employeeid');   
+          $PanNo = $this->input->post('panno');
+          $this->load->model('employeedetails_model');
+          $query = $this->employeedetails_model->checkPANExists($PanNo,$Empid);
+          if (count($query)> 0)
+          {
+             $this->form_validation->set_message('Pan_validate_emp', 'The Entered PAN Number is already exists in the Database.');
+             return false;
+          }
+          else
+          {
+              return true;
+          }
+      }
+    
+  // To Check the Aadhar Number is exists in the database or not for the selected Employee 
+       function Aadhar_validate_emp()     {   
+				$Empid = $this->input->post('employeeid');
+				$AadharNo = $this->input->post('aadharno');
+				$this->load->model('employeedetails_model');
+				$query = $this->employeedetails_model->checkAadharExists($AadharNo,$Empid);
+				if (count($query)> 0)
+				{
+					$this->form_validation->set_message('Aadhar_validate_emp', 'The Entered Aadhar Number is exists in the Database.');
+					return false;
+				}
+				else
+				{
+					return true;
+				}
+      }
+	
 
-	function CheckAadhar()
-	{
-		  $id = $this->input->post('id');
-		  $this->load->model('employeedetails_model');
-		  $query = $this->employeedetails_model->checkAadharExists($id );
-		  $query =  $query[0]['AadharNo']; 
-		  print_r($query);	
-		    
-	}
 	
     function pageNotFound()
     {
@@ -432,7 +522,7 @@ echo "<script>alert('Record Not Saved!');</script>";
 		  $Empid = $this->input->post('employeeid');
 	      $EmailId = $this->input->post('emailid');
 		 
-		  $this->load->model('employeedetails_model');
+		  
 		  $query = $this->employeedetails_model->checkMailExists($EmailId, $Empid);
 		  if (count($query)> 0)
 		  {
@@ -444,23 +534,6 @@ echo "<script>alert('Record Not Saved!');</script>";
 			  return true;
 		  }
 	  }
-	  // function checkAadharEmp()
-	  // {   
-		 //  $Empid = $this->input->post('employeeid');
-	  //     $AadharNo = $this->input->post('aadharno');
-		
-		 //  $this->load->model('employeedetails_model');
-		 //  $query = $this->employeedetails_model->checkAadharExists($AadharNo,$Empid)
-		 //  if (count($query)> 0)
-		 //  {
-			//  $this->form_validation->set_message('checkAadharEmp', 'The Entered Aadhar Number is exists in the Database.');
-			//   return false;
-		 //  }
-		 //  else
-		 //  {
-			//   return true;
-		 //  }
-	  // }
 	 /* To Update the employee details*/
 	function UpdateEmployee()
     {
@@ -477,18 +550,15 @@ echo "<script>alert('Record Not Saved!');</script>";
 				$this->form_validation->set_rules('emailid', 'emailid', 'trim|required|valid_email|callback_checkMailEmp');
 				$this->form_validation->set_rules('gender', 'gender', 'callback_Gender_validate');	
 				$this->form_validation->set_rules('MartialStatus', 'MartialStatus', 'callback_Martial_validate'); 
-			
 				$this->form_validation->set_rules('bloodgroup', 'bloodgroup', 'callback_Blood_validate');	
-				
 				$this->form_validation->set_rules('emergencycontactnumber', 'emergencycontactnumber', 'trim|required|min_length[10]|max_length[10]');
-				
-			    $this->form_validation->set_rules('desigination', 'Desigination', 'callback_Des_validate');				
+			   $this->form_validation->set_rules('desigination', 'Desigination', 'callback_Des_validate');				
 				$this->form_validation->set_rules('departmentname', 'departmentname', 'callback_Dep_validate');				
-			    $this->form_validation->set_rules('eduqualifaction', 'eduqualifaction', 'callback_select_validate');				
+			   $this->form_validation->set_rules('eduqualifaction', 'eduqualifaction', 'callback_select_validate');				
 				$this->form_validation->set_rules('referrercontno', 'referrercontno', 'trim|min_length[10]|max_length[10]');
-				$this->form_validation->set_rules('aadharno', 'aadharno', 'trim|min_length[12]|max_length[12]');
-				$this->form_validation->set_rules('panno', 'panno', 'trim|min_length[10]|max_length[10]');
-				$this->form_validation->set_rules('passportno', 'passportno', 'trim|min_length[8]|max_length[8]');
+				$this->form_validation->set_rules('aadharno', 'aadharno', 'trim|max_length[12]|callback_Aadhar_validate_emp');
+				$this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]|callback_Pan_validate_emp');
+        $this->form_validation->set_rules('passportno', 'passportno', 'trim|min_length[8]|max_length[8]');
 				$this->form_validation->set_rules('accountno', 'accountno', 'trim|min_length[10]|max_length[20]');
 				
 				if($this->form_validation->run() == FALSE)
@@ -596,7 +666,7 @@ echo "<script>alert('Record Not Saved!');</script>";
 				//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);    
                 
-				print_r($Employee);die();
+				//print_r($Employee);die();
                 $result = $this->employeedetails_model->UpdateEmployee($Employee,$EmpId);
                 
                 if($result > 0)
diff --git a/application/controllers/rawmaterialdetails.php b/application/controllers/rawmaterialdetails.php
index 61129d02..fde0ee7d 100755
--- a/application/controllers/rawmaterialdetails.php
+++ b/application/controllers/rawmaterialdetails.php
@@ -317,7 +317,7 @@ class rawmaterialdetails extends BaseController
                     
                 $RawMaterial = array();
                 $RawMaterial = array('MaterialName'=>$MaterialName,'MaterialType'=>$MaterialType,'UpdatedBy'=>$UpdatedBy, 'UOM'=>$UOM,'IsActive' => $IsActive,'Category'=>$MaterialCategory,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'HSNCODE'=>$HSNcode);//,'RMCode'=>$rmcode);
-                print_r($RawMaterial);//die();
+                //print_r($RawMaterial);//die();
                 $result = $this->rawmaterialdetails_model->editRawmaterial($RawMaterial, $MaterialCode);
             
                 if($result == true)
diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php
index 4ec8a5aa..01b89cfc 100755
--- a/application/controllers/supplier.php
+++ b/application/controllers/supplier.php
@@ -200,7 +200,7 @@ class supplier extends BaseController
                 $GSTRange = $this->input->post('GSTRange');
                 $CollectrateAddress = $this->input->post('CollectrateAddress');
                 $UANumber = $this->input->post('UANumber');
-                $PaymentTerms = $this->input->post('paymentname');
+                //$PaymentTerms = $this->input->post('paymentname');
                 //$Payment = $this->input->post('Payment');
                 //$PayableAT = $this->input->post('PayableAT');
                 $CSTNo = $this->input->post('CSTNo');
@@ -234,7 +234,7 @@ class supplier extends BaseController
                 $PaymentId = $this->input->post('paymentid');
                 
             
-                $supplier = array('SupplierName'=>$SupplierName, 'Address'=>$Address, 'ContactNumber'=>$ContactNumber, 'AlternateContactNumber'=> $AlternateContactNumber,'EmailAddress'=>$EmailAddress,'Exiseregistration'=>$Exiseregistration,'TIN'=>$TIN,'PAN'=>$PAN,'GSTNo'=>$GSTNo,'GSTRange'=>$GSTRange,'CollectrateAddress'=>$CollectrateAddress,'UANumber'=>$UANumber,'PaymentTerms'=>$PaymentTerms,'PaymentID'=>$PaymentId,'CSTNo'=>$CSTNo,'CSTDate'=>$CSTDate,'CSTNo'=>$CSTNo,'CSTDate'=>$CSTDate,'Cert_EMS'=>$EMSNo, 'Cert_TS'=>$TSNo, 'Cert_IMS'=>$IMSNo, 'Cert_ISO'=>$ISONo, 'Cert_OSHAS'=>$OSHASNo, 'BankAcNumber'=>$accno, 'IFSCCode'=>$ifsc, 'BranchName'=>$branchname, 'BankAddress'=>$bankaddress,'Createdby'=>$Createdby,'IsService'=>$service,'IsMaintanance'=>$maintenance,'IsRawMaterial'=>$rawmaterial); //,'PaymentDays'=>$Payment,'PayableAT'=>$PayableAT);    
+                $supplier = array('SupplierName'=>$SupplierName, 'Address'=>$Address, 'ContactNumber'=>$ContactNumber, 'AlternateContactNumber'=> $AlternateContactNumber,'EmailAddress'=>$EmailAddress,'Exiseregistration'=>$Exiseregistration,'TIN'=>$TIN,'PAN'=>$PAN,'GSTNo'=>$GSTNo,'GSTRange'=>$GSTRange,'CollectrateAddress'=>$CollectrateAddress,'UANumber'=>$UANumber,'PaymentID'=>$PaymentId,'CSTNo'=>$CSTNo,'CSTDate'=>$CSTDate,'CSTNo'=>$CSTNo,'CSTDate'=>$CSTDate,'Cert_EMS'=>$EMSNo, 'Cert_TS'=>$TSNo, 'Cert_IMS'=>$IMSNo, 'Cert_ISO'=>$ISONo, 'Cert_OSHAS'=>$OSHASNo, 'BankAcNumber'=>$accno, 'IFSCCode'=>$ifsc, 'BranchName'=>$branchname, 'BankAddress'=>$bankaddress,'Createdby'=>$Createdby,'IsService'=>$service,'IsMaintanance'=>$maintenance,'IsRawMaterial'=>$rawmaterial); //,'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$Payment,'PayableAT'=>$PayableAT);    
                 //print_r($supplier);die();
                 $result = $this->supplier_model->addNewsupplier($supplier);
 
@@ -338,7 +338,7 @@ class supplier extends BaseController
                 $PaymentId = $this->input->post('paymentid');
 
                 $supplier = array();
-                $supplier = array('SupplierName'=>$SupplierName, 'Address'=>$Address, 'ContactNumber'=>$ContactNumber, 'AlternateContactNumber'=> $AlternateContactNumber,'EmailAddress'=>$EmailAddress,'Exiseregistration'=>$Exiseregistration,'TIN'=>$TIN,'PAN'=>$PAN,'GSTNo'=>$GSTNo,'GSTRange'=>$GSTRange,'CollectrateAddress'=>$CollectrateAddress,'UANumber'=>$UANumber,'PaymentTerms'=>$PaymentTerms,'PaymentID'=>$PaymentId,'CSTNo'=>$CSTNo,'CSTDate'=>$CSTDate,'Cert_EMS'=>$EMSNo, 'Cert_TS'=>$TSNo, 'Cert_IMS'=>$IMSNo, 'Cert_ISO'=>$ISONo, 'Cert_OSHAS'=>$OSHASNo, 'BankAcNumber'=>$accno, 'IFSCCode'=>$ifsc, 'BranchName'=>$branchname, 'BankAddress'=>$bankaddress,'UpdatedBy'=>$UpdatedBy,'IsActive'=>$IsActive,'IsService'=>$service,'IsMaintanance'=>$maintanance,'IsRawMaterial'=>$rawmaterial); //'PaymentDays'=>$Payment);
+                $supplier = array('SupplierName'=>$SupplierName, 'Address'=>$Address, 'ContactNumber'=>$ContactNumber, 'AlternateContactNumber'=> $AlternateContactNumber,'EmailAddress'=>$EmailAddress,'Exiseregistration'=>$Exiseregistration,'TIN'=>$TIN,'PAN'=>$PAN,'GSTNo'=>$GSTNo,'GSTRange'=>$GSTRange,'CollectrateAddress'=>$CollectrateAddress,'UANumber'=>$UANumber,'PaymentID'=>$PaymentId,'CSTNo'=>$CSTNo,'CSTDate'=>$CSTDate,'Cert_EMS'=>$EMSNo, 'Cert_TS'=>$TSNo, 'Cert_IMS'=>$IMSNo, 'Cert_ISO'=>$ISONo, 'Cert_OSHAS'=>$OSHASNo, 'BankAcNumber'=>$accno, 'IFSCCode'=>$ifsc, 'BranchName'=>$branchname, 'BankAddress'=>$bankaddress,'UpdatedBy'=>$UpdatedBy,'IsActive'=>$IsActive,'IsService'=>$service,'IsMaintanance'=>$maintanance,'IsRawMaterial'=>$rawmaterial); //'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$Payment);
                 //SupplierID, SupplierName, Address, ContactNumber, AlternateContactNumber, EmailAddress, Exiseregistration, TIN, PAN, CSTNO, CSTDate, GSTNO, GSTRange, CollectrateAddress, UANumber, PaymentTerms, PaymentDays, PayableAT, Cert_EMS, Cert_TS, Cert_IMS, Cert_ISO, Cert_OSHAS, BankAcNumber, IFSCCode, BranchName, BankAddress, Createdby, UpdatedBy, Updatedon, CreatedOn, IsActive);    
                 // print_r($supplier);die();
                  $result = $this->supplier_model->UpdateSupplier($supplier, $supplierID);
diff --git a/application/models/employeedetails_model.php b/application/models/employeedetails_model.php
index 43fc60ec..a9c3148a 100755
--- a/application/models/employeedetails_model.php
+++ b/application/models/employeedetails_model.php
@@ -135,7 +135,7 @@ function addNewemployee($Employee)
 		}   
     }
 	
-    function checkAadharExists($AadharNo='',$Empid='')
+    function checkAadharExists($AadharNo,$Empid='')
     {
         $this->db->select('AadharNo');
         $this->db->from('T_Employee_Details');
@@ -150,6 +150,22 @@ function addNewemployee($Employee)
             return $query->result_array();
         }   
     }
+    function checkPANExists($PANNo,$Empid='')
+    {
+        $this->db->select('PANNo');
+        $this->db->from('T_Employee_Details');
+        $this->db->where('PANNo',$PANNo);
+         if ($Empid != '')
+        {
+            $this->db->where('EmpID  !=',$Empid);
+        }
+        $query = $this->db->get();
+        if ($query->num_rows > 0) {
+            return $query->result_array();
+        }       
+    
+           }
+
 
 	function checkPhotoExists($Pic)
     {
diff --git a/application/models/supplier_model.php b/application/models/supplier_model.php
index ee01924c..dc8de2f8 100755
--- a/application/models/supplier_model.php
+++ b/application/models/supplier_model.php
@@ -12,9 +12,9 @@ class supplier_model extends CI_Model
      */
     function supplierListing()
     {
-        $this->db->select('BaseT.SupplierID, BaseT.SupplierName, BaseT.Address,  BaseT.ContactNumber,  BaseT.AlternateContactNumber,BaseT.EmailAddress,BaseT.Exiseregistration, BaseT.TIN, BaseT.PAN,,BaseT.GSTNO,BaseT.GSTRange,BaseT.CollectrateAddress,BaseT.UANumber,BaseT.PaymentTerms,BaseT.PaymentDays,BaseT.PayableAT,BaseT.CreatedOn,BaseT.PaymentID');//,pmt.Details');
+        $this->db->select('BaseT.SupplierID, BaseT.SupplierName, BaseT.Address,  BaseT.ContactNumber,  BaseT.AlternateContactNumber,BaseT.EmailAddress,BaseT.Exiseregistration, BaseT.TIN, BaseT.PAN,,BaseT.GSTNO,BaseT.GSTRange,BaseT.CollectrateAddress,BaseT.UANumber,BaseT.CreatedOn,BaseT.PaymentID,pmt.PaymentTerms');//,BaseT.PaymentTerms,BaseT.PaymentDays,BaseT.PayableAT,pmt.Details');
         $this->db->from('T_SupplierDetailsN as BaseT');
-        //$this->db->join('T_PaymentTerms as pmt', 'pmt.PaymentID = BaseT.PaymentTerms','left');
+        $this->db->join('T_PaymentTerms as pmt', 'pmt.PaymentID = BaseT.PaymentID','left');
      
         $query = $this->db->get();
         
@@ -114,10 +114,11 @@ function addNewsupplier($supplier)
      */
      function getSupplierInfo($supplierID='')
     {
-        $this->db->select('*');
-        $this->db->from('T_SupplierDetailsN');
-        //$this->db->join('T_PaymentTerms ')       
-        $this->db->where('SupplierID', $supplierID);
+        $this->db->select('SD.*,PT.PaymentTerms');
+        //$this->db->select('SD.SupplierID, SD.SupplierName, SD.Address, SD.ContactNumber, SD.AlternateContactNumber, SD.EmailAddress, SD.Exiseregistration, SD.TIN, SD.PAN, SD.CSTNO, SD.CSTDate, SD.GSTNO, SD.GSTRange, SD.CollectrateAddress, SD.UANumber, SD.Cert_EMS, SD.Cert_TS, SD.Cert_IMS, SD.Cert_ISO, SD.Cert_OSHAS, SD.BankAcNumber, SD.IsService, SD.IsMaintanance, SD.IsRawMaterial, SD.IFSCCode, SD.BranchName, SD.BankAddress, SD.IsActive, SD.PaymentID,PT.PaymentTerms');
+        $this->db->from('T_SupplierDetailsN SD');
+        $this->db->join('T_PaymentTerms PT','PT.PaymentID = SD.PaymentID','left');       
+        $this->db->where('SD.SupplierID', $supplierID);
         $query = $this->db->get();
        // print_r($this->db->last_query());
         return $query->result();
diff --git a/application/views/addRawMaterial.php b/application/views/addRawMaterial.php
index 00716c6e..68ed4a48 100755
--- a/application/views/addRawMaterial.php
+++ b/application/views/addRawMaterial.php
@@ -1,4 +1,13 @@
 <script>
+function isNumberKey(evt)
+       {
+          var charCode = (evt.which) ? evt.which : evt.keyCode;
+          if (charCode != 46 && charCode > 31 
+            && (charCode < 48 || charCode > 57))
+             return false;
+
+          return true;
+       }
  
 
 function BlockSpecial(evt) {
@@ -22,6 +31,23 @@ function BlockSpecial(evt) {
         return true;
         }
     }
+    function onlyAlphabets(evt) {
+        var charCode;
+        if (window.event)
+            charCode = window.event.keyCode;  //for IE
+        else
+            charCode = evt.which;  //for firefox
+        if (charCode == 32) //for &lt;space&gt; symbol
+            return true;
+        if (charCode > 31 && charCode < 65) //for characters before 'A' in ASCII Table
+            return false;
+        if (charCode > 90 && charCode < 97) //for characters between 'Z' and 'a' in ASCII Table
+            return false;
+        if (charCode > 122) //for characters beyond 'z' in ASCII Table
+            return false;
+        return true;
+    }
+
 
 </script>
 <div class="content-wrapper" style="min-height: 537px;">
@@ -163,7 +189,7 @@ function BlockSpecial(evt) {
                                 <div class="col-md-3">
                                     <div class="form-group">
                                         <label for="conversionfactor">Conversion Factor</label>
-                                        <input type="text" class="form-control" id="conversionfactor"  name="conversionfactor" maxlength="255">
+                                        <input type="text" class="form-control" id="conversionfactor"  name="conversionfactor" maxlength="255" onkeypress="return onlyAlphabets(event);">
                                     </div>
                                 </div>
                                 <div class="col-md-3">
@@ -190,7 +216,7 @@ function BlockSpecial(evt) {
                                         <div class="col-md-3">
                                     <div class="form-group">
                                         <label for="HSNcode">HSN code</label>
-                                        <input type="text" class="form-control" id="HSNcode"  name="HSNcode" maxlength="255">
+                                        <input type="text" class="form-control" id="HSNcode" onkeypress="return isNumberKey(event)"   name="HSNcode" maxlength="255">
                                     </div>
                                 </div>
                             <div class="col-md-6">
diff --git a/application/views/addemployee.php b/application/views/addemployee.php
index 2ea036ee..f36bb760 100755
--- a/application/views/addemployee.php
+++ b/application/views/addemployee.php
@@ -488,7 +488,7 @@ function onlyAlphabets(evt) {
           <!-- Text input-->
           <div class="col-md-12 pad">
             <div class="col-md-12"><span>Current Address</span><span class="badge">*</span>
-              <input type="text" id="currentaddress" required title="Enter more then 20 letters" name="currentaddress"  pattern=".{20,500}"  maxlength="500" class="form-control">
+              <input type="text" id="currentaddress" required name="currentaddress"  pattern=".{0,500}"  maxlength="500" class="form-control">
             </div>
           </div>
 		   <div class="col-md-12 pad">
@@ -499,7 +499,7 @@ function onlyAlphabets(evt) {
           <!-- Text input-->
           <div class="col-md-12 pad">
             <div class="col-md-12"><span>Permanent Address</span><span class="badge">*</span>
-              <input type="text" id="permanentaddress" required title="Enter more then 20 letters"  name="permanentaddress" pattern=".{20,500}"  maxlength="500"   class="form-control">
+              <input type="text" id="permanentaddress" required name="permanentaddress" pattern=".{0,500}" maxlength="500" class="form-control">
             </div>
           </div>
           <!-- Text input-->
@@ -595,7 +595,7 @@ function onlyAlphabets(evt) {
             </div>
 			<div class="col-md-3"><span>Referrer Contact Number</span>
               <input type="text" id="referrercontno" name="referrercontno" onchange=" return getValidReferNumber();"
-		 maxlength="10" onkeypress="return event.charCode >= 48 && event.charCode <= 57"  class="form-control">
+		 maxlength="10" onkeypress="return isNumberKey(event)"  class="form-control">
             </div>
           </div>
           
@@ -604,7 +604,7 @@ function onlyAlphabets(evt) {
 		  
           <div class="col-md-12 pad">
             <div class="col-md-3"><span>Account Number</span>
-              <input type="text" id="accountno" onkeypress="return event.charCode >= 48 && event.charCode <= 57" maxlength="20"  name="accountno" class="form-control">
+              <input type="text" id="accountno" onkeypress="return isNumberKey(event)"  maxlength="20"  name="accountno" class="form-control">
             </div>
             <div class="col-md-3"><span>IFSC Code</span> 
               <input type="text" id="ifsccode" style="text-transform: uppercase" name="ifsccode" maxlength="12" class="form-control">
@@ -622,7 +622,7 @@ function onlyAlphabets(evt) {
 		  
           <div class="col-md-12 pad">
             <div class="col-md-3"><span>Aadhar Number</span> 
-              <input type="text" id="aadharno" name="aadharno" maxlength="12" onchange="ValidateAadhar();"  class="form-control">
+              <input type="text" id="aadharno" name="aadharno" maxlength="12" onchange="ValidateAadhar();" pattern="\d{12}" 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">
@@ -865,5 +865,84 @@ function Validate()
 		});	
 		}
   
+});
+
+ $('#panno').change(function() {
+    
+ var id = $('#panno').val();
+    if(id != '')
+    {
+     $.ajax({
+      data:{id:id},
+      
+      type:"POST",
+      url:"<?php echo base_url();?>employeedetails/checkPAN",
+      success:function(data) {
+        if(data)
+      {
+        
+      var answer = confirm(data + " " +" Employee details is already exists in the database.Do you want to change the Employee details?")
+        if (answer) 
+        {                                      
+                  $('#panno').val('');
+          $('#panno').focus();
+                    return false; 
+            }
+        else 
+        {
+          window.location = 'employeedetails/employeeListing'; 
+        }         
+      
+        }
+      }
+    
+    }); 
+    }
+    else
+    {
+      alert('Please enter the PAN Number');
+      $('#panno').focus();
+            return false;
+    }
+  
+});
+ 
+ $('#aadharno').change(function() {
+    
+ var id = $('#aadharno').val();
+    if(id != '')
+    {
+     $.ajax({
+      data:{id:id},
+      type:"POST",
+      url:"<?php echo base_url();?>employeedetails/checkAadharNo",
+      success:function(data) {
+      if(data)
+      {
+        
+      var answer = confirm(data + " " +" employee details is already exists in the database.Do you want to change the Employee details?")
+        if (answer) 
+        {                                      
+          $('#aadharno').val('');
+          $('#aadharno').focus();
+                    return false; 
+              }
+          else 
+        {
+            window.location = 'employeedetails/employeeListing';
+        }         
+      
+          }
+      }
+    
+    }); 
+    }
+    else
+    {
+      alert('Please enter the Aadhar Number');
+      $('#aadharno').focus();
+            return false;
+    }
+  
 });
 </script>
\ No newline at end of file
diff --git a/application/views/addsupplier.php b/application/views/addsupplier.php
index 99b4006d..0642d236 100755
--- a/application/views/addsupplier.php
+++ b/application/views/addsupplier.php
@@ -279,11 +279,11 @@ $(function() {
        
             <div class="col-md-3">
 				<span for="ContactNumber">Contact Number</span><span class="badge">*</span>             
-				<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" id="ContactNumber" required pattern="(.){10,10}" maxlength="10"  class="form-control" title="Please Enter 10 digit Number">
+				<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();"  onkeypress="return isNumberKey(event)"  id="ContactNumber" required pattern="(.){10,10}" maxlength="10"  class="form-control" title="Please Enter 10 digit Number">
             </div>
 		 	<div class="col-md-3"> 
 				<span for="AlternateContactNumber">Alternate Contact Number</span>
-				<input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" id="AlternateContactNumber"  pattern="(.){10,10}" maxlength="10"  class="form-control" title="Please Enter 10 digit Number">
+				<input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();"  onkeypress="return isNumberKey(event)"  id="AlternateContactNumber"  pattern="(.){10,10}" maxlength="10"  class="form-control" title="Please Enter 10 digit Number">
             </div>
 		 
 		<div class="col-md-3">
@@ -323,11 +323,11 @@ $(function() {
 		    </div>
 			 <div class="col-md-3 pad">
 			<span for="TIN">TIN</span><span class="badge">*</span>
-                <input type="text"  class="form-control required" pattern="(.){11,11}"  id="TIN" name="TIN" minlength="11" maxlength="11" onkeypress="return event.charCode >= 48 && event.charCode <= 57" required   title="Please Enter 11 digit Number">
+                <input type="text"  class="form-control required" pattern="(.){11,11}"  id="TIN" name="TIN" minlength="11" maxlength="11" onkeypress="return isNumberKey(event)"  required   title="Please Enter 11 digit Number">
             </div>	
 			<div class="col-md-3 pad">			
 			    <span for="UANumber">UA Number</span>
-                <input type="text"  class="form-control" pattern="^\d{12}$" id="UANumber" name="UANumber" maxlength="12" title="Please Enter 12 digit Number" >
+                <input type="text"  class="form-control" onkeypress="return isNumberKey(event)"  id="UANumber" name="UANumber" maxlength="12" title="Please Enter 12 digit Number" >
             </div>
 			
             <div class="col-md-3 pad">			
@@ -389,7 +389,7 @@ $(function() {
 		  
           <div class="col-md-12">
             <div class="col-md-3"><span>Account Number</span>
-            	<input type="text" id="accno" name="accno" maxlength="20" class="form-control" onkeypress='return event.charCode >= 48 && event.charCode <= 57'>
+            	<input type="text" id="accno" name="accno" maxlength="20" class="form-control" onkeypress="return isNumberKey(event)" >
             </div>
             <div class="col-md-3"><span>IFSC Code</span> 
               <input type="text" id="ifsc" name="ifsc" maxlength="12" class="form-control">
@@ -409,7 +409,7 @@ $(function() {
             <div class="col-md-12">
             <div class="col-md-3">
 			    <span for="payablefrom">Payable Terms</span>
-				    <select class="form-control required select2" id="PaymentTerms" name="PaymentTerms" onchange="payment_hidden();" > <!-- onchange="storeVal(this,'hiddenVal');"> --> 
+				    <select class="form-control required select2" id="Payment" name="Payment" onchange="payment_hidden();" > <!-- onchange="storeVal(this,'hiddenVal');"> --> 
 					    <option value="Date of invoice" >Select Payment method</option>
 							<?php
 							if(!empty($payment))
@@ -423,7 +423,7 @@ $(function() {
 							}
 							?>
 							<input type="hidden" id="paymentid" name="paymentid" value="" >
-							<input type="hidden" id="paymentname" name="paymentname" value=""> 
+							<!--<input type="hidden" id="paymentname" name="paymentname" value=""> -->
 					</select>
             </div>			
             </div>
@@ -477,7 +477,7 @@ $(function() {
 <script>
 function payment_hidden()
 {
-	 var term = document.getElementById("PaymentTerms");
+	 var term = document.getElementById("Payment");
      var termid = term.options[term.selectedIndex].value;
      var termname = term.options[term.selectedIndex].text;
      $("#paymentid").val(termid);
diff --git a/application/views/editEmployee.php b/application/views/editEmployee.php
index e766a7e5..d2aded18 100755
--- a/application/views/editEmployee.php
+++ b/application/views/editEmployee.php
@@ -87,7 +87,8 @@ if(!empty($EmpDetails))
 		$dtpassport = new DateTime($Passport_Valid_till);
 		$DOPassport =  $dtpassport ->format('Y-m-d');
 		}
-		$IsActive = $Emp->IsActive;
+		$isactive = $Emp->IsActive;
+		//print_r($isactive);
 		$ProfilePic = $Emp->ProfilePic;
 		$Reference_Name = $Emp->Reference_Name;
 		$Reference_ContactNumber = $Emp->Reference_ContactNumber;
@@ -102,7 +103,16 @@ if(!empty($EmpDetails))
 		 $License = new DateTime($Emp->LicenseValidtill);
 		 $LicenseValidtill =  $License ->format('Y-m-d');
 		}
-			//$dtLicenseValidtill = new DateTime($LicenseValidtill);
+		//$chk = $uf->IsActive;  		 
+		 if($isactive == 1)
+		 {
+			 $IsActive = 'checked';
+		 }
+		 else
+		 {
+			 $IsActive = '';
+		 }
+		// 	//$dtLicenseValidtill = new DateTime($LicenseValidtill);
 			//$LicenseValidtill =  $dtLicenseValidtill ->format('Y-m-d');
 						//$LicenseValidtill = $Emp->
     }
@@ -112,6 +122,8 @@ if(!empty($EmpDetails))
 ?>
 
 <script>
+
+
      function readURL(input) {
             if (input.files && input.files[0]) {
                 var reader = new FileReader();
@@ -156,6 +168,7 @@ $(function(){
           return true;
        }
 	   
+//PAN Validate 
 //PAN Validate 
 function validatePAN() {
  var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}$/;
@@ -174,20 +187,49 @@ function validatePAN() {
 					return true;
 				}
 			}
+			else
+			{
+				alert('Please Enter PAN Number');
+				return (false);
+			}
 			
 }
+
+
 function ValidateAadhar(){
-  var aadhar = $('#aadhar').val().length;
-	if(aadhar < 12)
-	{
-		alert('Please Enter valid Aadhar Number');
-		return false;
-	}
-	else
-	{
-		return true;
-	}
-} 
+  //alert('validation entered');
+  var reg = /^\d{12}$/
+  var aadhar = $('#aadharno').val();
+  var aadhar_count = $('#aadharno').val().length;
+  
+  if(aadhar != '' && aadhar_count != '')
+  {
+    //alert('this is aadhar :'+aadhar);
+    if(aadhar_count < 12)
+    {
+      //alert(aadhar1);
+      alert('Aadhar card should be in 12 digits');
+    }
+     else if(reg.test(aadhar)== false)
+     {
+      //alert('alskdjsakjf');
+       alert('Please Enter Valid Aadhar Number');
+     }
+     else
+     {
+      //alert('value inserted into database');
+       return true;
+     }
+  }
+  else
+  {
+    //alert('aadhar is blank');
+    alert('please Enter Aadhar number');
+
+  }
+}
+
+
 
 function validateDriverLicense() {
 			
@@ -302,27 +344,7 @@ function Validate()
 	 }
 	 else if(!getValidEmergencyNumber())
 	 { return;}
-	// if($("option:selected", $("#desigination")).val() == "-1")
-	// {
-	// 	alert('Please Select Desigination ');
- //    $("#desigination").focus();
-	// 	return false;
-	// }
-	// if($("option:selected", $("#departmentname")).val() == "-1")
-	// {
-	// 	alert('Please Select Department name');
- //    $("#departmentname").focus();
-	// 	return false;
-	// }
-	// if($("option:selected", $("#eduqualifaction")).val() == "-1")
-	// {
-	// 	alert('Please Select Qualification');
- //    $("#eduqualifaction").focus();
-	// 	return false;
-	// }
-	
-	
-	
+
 		
 	if($("#referrercontno").val().length > 0)
 	 {	
@@ -486,6 +508,23 @@ $(document).ready(function(){
          $("#eduqualifaction").select2();
        });
 
+function onlyAlphabets(evt) {
+        var charCode;
+        if (window.event)
+            charCode = window.event.keyCode;  //for IE
+        else
+            charCode = evt.which;  //for firefox
+        if (charCode == 32) //for &lt;space&gt; symbol
+            return true;
+        if (charCode > 31 && charCode < 65) //for characters before 'A' in ASCII Table
+            return false;
+        if (charCode > 90 && charCode < 97) //for characters between 'Z' and 'a' in ASCII Table
+            return false;
+        if (charCode > 122) //for characters beyond 'z' in ASCII Table
+            return false;
+        return true;
+    }
+
 </script>
  <style>
  legend{
@@ -549,25 +588,25 @@ $(document).ready(function(){
                 <input type="hidden" name="Image" id="Image"  value="<?php echo $ProfilePic ; ?>" 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" value="<?php echo $IsActive ; ?>" name="isactive" onclick="checkactive"> IsActive
+                 <input type="checkbox" id="isactive" <?php echo $IsActive;?> name="isactive" value="1"> IS ACTIVE
+              
         </div>
 		   </div>
 		   <div class="col-md-9">
            <div class="col-md-12">
             <div class="col-md-6 pad">
 			<span>First Name</span><span class="badge">*</span>
-              <input type="text" name="FirstName" maxlength="100" value="<?php echo $FirstName ; ?>" id="FirstName" placeholder="First Name" class="form-control" required>
+              <input type="text" name="FirstName" maxlength="100" value="<?php echo $FirstName ; ?>" id="FirstName" placeholder="First Name" class="form-control" required onkeypress="return onlyAlphabets(event);">
             </div>
              
             <div class="col-md-6 pad"><span>Last Name</span><span class="badge">*</span>
-              <input type="text" name="LastName"  maxlength="100" id="LastName" value="<?php echo $LastName ; ?>" placeholder="Last Name" class="form-control" required>
+              <input type="text" name="LastName"  maxlength="100" id="LastName" value="<?php echo $LastName ; ?>" placeholder="Last Name" class="form-control" required onkeypress="return onlyAlphabets(event);">
             </div>
         </div>
 
          <div class="col-md-12">
 			 <div class="col-md-6 pad"><span>Father / Husband  Name</span><span class="badge">*</span>
-              <input type="text" name="FatherName" id="FatherName" maxlength="200" value="<?php echo $FatherName ; ?>" placeholder="Father / Husband  Name" class="form-control" required>
+              <input type="text" name="FatherName" id="FatherName" maxlength="200" value="<?php echo $FatherName ; ?>" placeholder="Father / Husband  Name" class="form-control" required onkeypress="return onlyAlphabets(event);">
             </div>
 			<div class="col-md-6 pad"><span>Date Of Birth</span><span class="badge">*</span>
               <input  id="DateofBirth" required name="DateofBirth" value="<?php echo $DOB  ; ?>"  maxlength="10" placeholder="Date Of Birth" onchange="getAge();" class="form-control">
@@ -578,7 +617,7 @@ $(document).ready(function(){
               <input type="text"  name="age" placeholder="Age" id="age"  value="<?php echo $Age  ; ?>"  class="form-control" readonly>
             </div>
             <div class="col-md-6 pad"><span>Contact Number</span><span class="badge">*</span>
-              <input type="text" name="ContactNumber"  value="<?php echo $ContactNumber  ; ?>"  onchange="getMobileValidation();"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" id="ContactNumber" required placeholder="Contact Number" maxlength="10"  class="form-control">
+              <input type="text" name="ContactNumber"  value="<?php echo $ContactNumber  ; ?>"  onchange="getMobileValidation();"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" id="ContactNumber" required placeholder="Contact Number" maxlength="10" onkeypress="return isNumberKey(event)" class="form-control">
             </div>
         </div>
 
@@ -659,7 +698,7 @@ $(document).ready(function(){
           <div class="form-group">
           <div class="col-md-12 pad">
             <div class="col-md-12"><span>Current Address</span><span class="badge">*</span>
-              <input type="text" id="currentaddress" pattern=".{20,500}" title="Enter more then 20 letters" required name="currentaddress"maxlength="500" value="<?php echo $PresentAddress   ; ?>"    placeholder="Current Address" class="form-control">
+              <input type="text" id="currentaddress" pattern=".{1,500}"  required name="currentaddress" maxlength="500" value="<?php echo $PresentAddress   ; ?>"    placeholder="Current Address" class="form-control">
             </div>
             </div>
           </div>
@@ -674,7 +713,7 @@ $(document).ready(function(){
           <div class="form-group">
           <div class="col-md-12 pad">
             <div class="col-md-12"><span>Permanent Address</span><span class="badge">*</span>
-              <input type="text" id="permanentaddress" required name="permanentaddress"  pattern=".{20,500}" value="<?php echo $PermanentAddress; ?>" maxlength="500" title="Enter more then 20 letters" placeholder="Permanent Address " class="form-control">
+              <input type="text" id="permanentaddress" required name="permanentaddress"  pattern=".{0,500}" value="<?php echo $PermanentAddress; ?>" maxlength="500"  placeholder="Permanent Address " class="form-control">
             </div>
             </div>
           </div>
@@ -692,7 +731,7 @@ $(document).ready(function(){
               <input type="text" id="emergencycontactname" maxlength="100" required name="emergencycontactname" value="<?php echo $EmergencyContactName ; ?>" placeholder="Emergency Contact Name" class="form-control">
             </div>
             <div class="col-md-6"><span>Emergency Contact Number</span><span class="badge">*</span>
-              <input type="text" id="emergencycontactnumber" required name="emergencycontactnumber" onchange="getValidEmergencyNumber();" onkeypress="return event.charCode >= 48 && event.charCode <= 57" maxlength="10"  value="<?php echo $EmergencyContactNumber; ?>" placeholder="Emergency Contact Number" class="form-control">
+              <input type="text" id="emergencycontactnumber" required name="emergencycontactnumber" onchange="getValidEmergencyNumber();" onkeypress="return isNumberKey(event)" maxlength="10"  value="<?php echo $EmergencyContactNumber; ?>" placeholder="Emergency Contact Number" class="form-control">
             </div>
             </div>
              
@@ -775,7 +814,7 @@ $(document).ready(function(){
               <input type="text" id="referredby" name="referredby" value="<?php echo $Reference_Name ; ?>" placeholder="Referred By" maxlength="100" class="form-control">
             </div>
 			<div class="col-md-3"><span>Referrer Contact Number</span>
-              <input type="text" id="referrercontno" name="referrercontno" value="<?php echo $Reference_ContactNumber ; ?>" onchange="getValidReferNumber();" maxlength="10" onkeypress="return event.charCode >= 48 && event.charCode <= 57" placeholder="Referrer Contact Number" class="form-control">
+              <input type="text" id="referrercontno" name="referrercontno" value="<?php echo $Reference_ContactNumber ; ?>" onchange="getValidReferNumber();" maxlength="10" placeholder="Referrer Contact Number" class="form-control" onkeypress="return isNumberKey(event)">
             </div>
             </div>
           </div>
@@ -786,7 +825,7 @@ $(document).ready(function(){
           <div class="form-group">
           <div class="col-md-12 pad">
             <div class="col-md-3"><span>Account Number</span> 
-              <input type="text" id="accountno"  maxlength="20"  name="accountno" placeholder="Account Number" class="form-control" value="<?php echo $BankAccountNo  ; ?>">
+              <input type="text" id="accountno" maxlength="20"  name="accountno" placeholder="Account Number" class="form-control" value="<?php echo $BankAccountNo; ?>" onkeypress="return isNumberKey(event)">
             </div>
             <div class="col-md-3"><span>IFSC Code</span> 
               <input type="text" id="ifsccode" style="text-transform: uppercase"  name="ifsccode" placeholder="IFSC Code" maxlength="12" class="form-control" value="<?php echo $IFSCCode ; ?>">
@@ -910,6 +949,49 @@ $(document).ready(function(){
 			}						
 			
 		}
+		});	
+		}
+  
+});
+ $('#panno').change(function() {
+    
+ var id = $('#panno').val();
+    if(id != '')
+    {
+     $.ajax({
+      data:{id:id},
+      
+      type:"POST",
+      url:"<?php echo base_url();?>employeedetails/checkPAN",
+      success:function(data) {
+        if(data)
+        {alert( data+""+" Employee already exists in the database.Please Change the Pan Card Number");
+				return false;
+				//window.location = 'Employeedetails/employeeListing';	      
+			}						
+			
+		}
+		});	
+		}
+  
+});
+ $('#aadharno').change(function() {
+    
+ var id = $('#aadharno').val();
+    if(id != '')
+    {
+     $.ajax({
+      data:{id:id},
+      type:"POST",
+      url:"<?php echo base_url();?>employeedetails/checkAadharNo",
+      success:function(data) {
+      if(data)
+      {
+   			alert( data+""+" Employee already exists in the database.Please Change the Aadhar card Number");
+				return false;
+				//window.location = 'Employeedetails/employeeListing';	      
+			}						
+			}
 		
 		});	
 		}
diff --git a/application/views/editOldRawmaterial.php b/application/views/editOldRawmaterial.php
index 831cc673..6edb8a84 100755
--- a/application/views/editOldRawmaterial.php
+++ b/application/views/editOldRawmaterial.php
@@ -71,8 +71,32 @@ $(document).ready(function(){
     }
 
         
-}); 
+});
+function onlyAlphabets(evt) {
+        var charCode;
+        if (window.event)
+            charCode = window.event.keyCode;  //for IE
+        else
+            charCode = evt.which;  //for firefox
+        if (charCode == 32) //for &lt;space&gt; symbol
+            return true;
+        if (charCode > 31 && charCode < 65) //for characters before 'A' in ASCII Table
+            return false;
+        if (charCode > 90 && charCode < 97) //for characters between 'Z' and 'a' in ASCII Table
+            return false;
+        if (charCode > 122) //for characters beyond 'z' in ASCII Table
+            return false;
+        return true;
+    } 
+function isNumberKey(evt)
+       {
+          var charCode = (evt.which) ? evt.which : evt.keyCode;
+          if (charCode != 46 && charCode > 31 
+            && (charCode < 48 || charCode > 57))
+             return false;
 
+          return true;
+       }
 // $(function() {
 //     $('#MaterialCategory').change(function() {
 //         var x = $(this).val();
@@ -81,6 +105,23 @@ $(document).ready(function(){
 //     });
 // });
 
+function onlyAlphabets(evt) {
+        var charCode;
+        if (window.event)
+            charCode = window.event.keyCode;  //for IE
+        else
+            charCode = evt.which;  //for firefox
+        if (charCode == 32) //for &lt;space&gt; symbol
+            return true;
+        if (charCode > 31 && charCode < 65) //for characters before 'A' in ASCII Table
+            return false;
+        if (charCode > 90 && charCode < 97) //for characters between 'Z' and 'a' in ASCII Table
+            return false;
+        if (charCode > 122) //for characters beyond 'z' in ASCII Table
+            return false;
+        return true;
+    }
+
 
 function changeTextBox() {
     //alert('changeTextBox entered');
@@ -257,7 +298,7 @@ function changeTextBox() {
                                 <div class="col-md-3">
                                     <div class="form-group">
                                         <label for="conversionfactor">Conversion Factor</label>
-                                        <input type="text" class="form-control" id="conversionfactor"  name="conversionfactor" maxlength="255" value="<?php echo $conversionfactor;?>">
+                                        <input type="text" class="form-control" id="conversionfactor"  name="conversionfactor" maxlength="255" value="<?php echo $conversionfactor;?>" onkeypress="return onlyAlphabets(event);">
                                     </div>
                                 </div>
                                 <div class="col-md-3">
@@ -284,7 +325,7 @@ function changeTextBox() {
                                  <div class="col-md-3">
                                     <div class="form-group">  
                                         <label for="HSNcode">HSN code</label>
-                                        <input type="text" class="form-control" id="HSNcode"  name="HSNcode" maxlength="255" value="<?php echo $HSNcode; ?>">
+                                        <input type="text" class="form-control" id="HSNcode"  name="HSNcode" maxlength="255" value="<?php echo $HSNcode; ?>" onkeypress="return isNumberKey(event)" >
                                     </div>
                                 </div>  
                                     <div class="col-md-6">
diff --git a/application/views/editSupplier.php b/application/views/editSupplier.php
index 870b9711..d5a277cb 100755
--- a/application/views/editSupplier.php
+++ b/application/views/editSupplier.php
@@ -368,12 +368,12 @@ function onlyAlphabets(evt) {
              
             <div class="col-md-2 pad">
 				<span for="ContactNumber">Contact Number</span><span class="badge">*</span>             
-				<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" id="ContactNumber" required pattern="(.){10,10}" maxlength="10"  class="form-control" value="<?php echo $ContactNumber;?>" title="Please Enter 10 digit Number">
+				<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();"  onkeypress="return isNumberKey(event)"  id="ContactNumber" required pattern="(.){10,10}" maxlength="10"  class="form-control" value="<?php echo $ContactNumber;?>" title="Please Enter 10 digit Number">
             </div>
 			
 			<div class="col-md-3 pad"> 
 				<span for="AlternateContactNumber">Alternate Contact Number</span>
-				<input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" id="AlternateContactNumber"  pattern="(.){10,10}" maxlength="10"  class="form-control" value="<?php echo $AlternateContactNumber;?>"  title="Please Enter 10 digit Number">
+				<input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();"  onkeypress="return isNumberKey(event)"  id="AlternateContactNumber"  pattern="(.){10,10}" maxlength="10"  class="form-control" value="<?php echo $AlternateContactNumber;?>"  title="Please Enter 10 digit Number">
             </div>
 			
 			<div class="col-md-2 pad">
@@ -414,11 +414,11 @@ function onlyAlphabets(evt) {
 		    </div>
 			 <div class="col-md-3 pad">
 			<span for="TIN">TIN</span><span class="badge">*</span>
-                <input type="text"  class="form-control required"  value="<?php echo $TIN;?>"   pattern="(.){11,11}" id="TIN" name="TIN" minlength="11" maxlength="11"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" title="Please Enter 11 digit Number">
+                <input type="text"  class="form-control required"  value="<?php echo $TIN;?>"   pattern="(.){11,11}" id="TIN" name="TIN" minlength="11" maxlength="11"  onkeypress="return isNumberKey(event)"  title="Please Enter 11 digit Number">
             </div>
 			<div class="col-md-3 pad">			
 			    <span for="UANumber">UA Number</span>
-                <input type="text"  class="form-control" pattern="^\d{12}$" id="UANumber" name="UANumber" maxlength="12" value="<?php echo $UANumber;?>" title="Please Enter 12 digit Number">
+                <input type="text"  class="form-control" pattern="^\d{12}$" onkeypress="return isNumberKey(event)"  id="UANumber" name="UANumber" maxlength="12" value="<?php echo $UANumber;?>" title="Please Enter 12 digit Number">
             </div>
 			
             <div class="col-md-3 pad">			
@@ -486,7 +486,7 @@ function onlyAlphabets(evt) {
 		  
           <div class="col-md-12">
             <div class="col-md-3"><span>Account Number</span>
-              <input type="text" id="accno"  maxlength="20"  name="accno" value="<?php echo $accno;?>" class="form-control">
+              <input type="text" id="accno"  maxlength="20"  name="accno" value="<?php echo $accno;?>" class="form-control" onkeypress="return isNumberKey(event)" >
             </div>
             <div class="col-md-3"><span>IFSC Code</span> 
               <input type="text" id="ifsc" name="ifsc" value="<?php echo $IFSCCode;?>" class="form-control" maxlength="12" >
@@ -522,7 +522,7 @@ function onlyAlphabets(evt) {
 							}
 							?>
 							<input type="hidden" id="paymentid" name="paymentid" value="<?php echo $PaymentTerms;?>" >
-							<input type="hidden" id="paymentname" name="paymentname" value="<?php echo $PaymentId;?>"> 
+							<!--<input type="hidden" id="paymentname" name="paymentname" value="<?php echo $PaymentId;?>"> -->
 					</select>
             </div>	
             </div>