diff --git a/application/views/addemployee.php b/application/views/addemployee.php
index 6de6c7d3..0d997f07 100644
--- a/application/views/addemployee.php
+++ b/application/views/addemployee.php
@@ -167,7 +167,7 @@ $(function() {
     $("#DateofBirth").datepicker({
 	minDate : new Date(mindt,1,1),
 	maxDate : new Date(maxdt,1,1),
-	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,
+	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
 
 
 });
@@ -179,7 +179,7 @@ $(function() {
 
 
 });
-	  $("#ValidTill").datepicker({dateFormat: 'mm/dd/yy',minDate :'now',changeMonth: true, changeYear: true,
+	  $("#ValidTill").datepicker({dateFormat: 'mm/dd/yy',minDate :'now',changeMonth: true, changeYear: true,yearRange: '-0:+100'
 });
 	 
 });
@@ -261,7 +261,7 @@ function onlyAlphabets(evt) {
                     <!-- form start -->
 					 
                	 
-<form role="form" id="addemployee" action="<?php echo base_url() ?>Employeedetails/AddNewEmployee" method="post"  enctype="multipart/form-data"> 
+<form role="form" id="addemployee" action="<?php echo base_url() ?>employeedetails/AddNewEmployee" method="post"  enctype="multipart/form-data"> 
  
   <div class="row">
     <div class="col-md-10 col-md-offset-1"   style="border:3px solid #3c8dbc;">
@@ -304,11 +304,11 @@ function onlyAlphabets(evt) {
             <div class="col-md-6 pad"><span>Contact Number</span><span class="badge">*</span>
               <input type="text" name="ContactNumber" onchange="return getMobileValidation();"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" id="ContactNumber" required  pattern="(.){10,10}" maxlength="10"  class="form-control">
             </div>
-            <div class="col-md-6 pad"><span>Email ID</span>
+            <div class="col-md-6 pad"><span>Email ID</span><span class="badge">*</span>
               <input type="email" name="emailid" id="emailid" required    maxlength="100" class="form-control">
             </div>
             
-            <div class="col-md-6 pad"><span>Gender</span>
+            <div class="col-md-6 pad"><span>Gender</span><span class="badge">*</span>
               <select id="gender" name="gender" type="text" required class="form-control">
                 <option value="-1">Select Gender</option>
 			  <?php
@@ -325,7 +325,7 @@ function onlyAlphabets(evt) {
               </select>
             </div>
 			
-            <div class="col-md-6 pad"><span>Marital Status</span>
+            <div class="col-md-6 pad"><span>Marital Status</span><span class="badge">*</span>
               <select  id="MartialStatus" name="MartialStatus" type="text" required placeholder="Marital status" class="form-control">
                 <option value="-1">Select Marital Status</option>
 			   <?php
@@ -343,7 +343,7 @@ function onlyAlphabets(evt) {
             </div>
            
   
-		  <div class="col-md-6 pad"><span>Blood group</span>
+		  <div class="col-md-6 pad"><span>Blood group</span><span class="badge">*</span>
 			<select id="bloodgroup" name="bloodgroup"  required class="form-control">
 			  <option value="-1">Select Blood group</option>
       <?php
@@ -394,7 +394,7 @@ function onlyAlphabets(evt) {
           <!-- Text input-->
           <div class="form-group">
             <div class="col-md-6"><span>Emergency Contact Name</span><span class="badge">*</span>
-              <input type="text" id="emergencycontactname" onkeypress="return onlyAlphabets(event);" maxlength="100" required name="emergencycontactname" placeholder="Emergency Contact Name" class="form-control">
+              <input type="text" id="emergencycontactname" onkeypress="return onlyAlphabets(event);" maxlength="100" required name="emergencycontactname"  class="form-control">
             </div>
             <div class="col-md-6"><span>Emergency Contact Number</span><span class="badge">*</span>
               <input type="text" id="emergencycontactnumber" min_length="5" required name="emergencycontactnumber" onchange="return getValidEmergencyNumber();" onkeypress="return event.charCode >= 48 && event.charCode <= 57" maxlength="10"  class="form-control">
@@ -426,7 +426,7 @@ function onlyAlphabets(evt) {
               </select>
              
             </div>
-            <div class="col-md-3"><span>Department</span>
+            <div class="col-md-3"><span>Department</span><span class="badge">*</span>
                <select type="text" id="departmentname" name="departmentname" required  class="form-control">               
 				 <option value="-1">Select Department</option>
       <?php
@@ -443,7 +443,7 @@ function onlyAlphabets(evt) {
               </select>
 			  
             </div>
-            <div class="col-md-3"><span>Date Of Joining</span>
+            <div class="col-md-3"><span>Date Of Joining</span><span class="badge">*</span>
               <input  id="dateofjoining" name="dateofjoining"   onkeypress="return false;" maxlength="10" required  class="form-control">
             </div>
 			<div class="col-md-3"><span>Previous Years of Experience</span>
@@ -452,7 +452,7 @@ function onlyAlphabets(evt) {
           </div>
 		  
 		  <div class="form-group">
-            <div class="col-md-3"><span>Qualification</span>
+            <div class="col-md-3"><span>Qualification</span><span class="badge">*</span>
               <select type="text"  id="eduqualifaction" name="eduqualifaction" required class="form-control">
                <option value="-1">Select Qualification</option>
       <?php
@@ -486,7 +486,7 @@ function onlyAlphabets(evt) {
 		  
           <div class="form-group">
             <div class="col-md-3"><span>Account Number</span>
-              <input type="text" id="accountno" onkeypress="return event.charCode >= 48 && event.charCode <= 57" maxlength="15"  name="accountno" class="form-control">
+              <input type="text" id="accountno" onkeypress="return event.charCode >= 48 && event.charCode <= 57" maxlength="20"  name="accountno" class="form-control">
             </div>
             <div class="col-md-3"><span>IFSC Code</span> 
               <input type="text" id="ifsccode" name="ifsccode" maxlength="10" class="form-control">
@@ -694,7 +694,7 @@ function Validate()
 			data:{id:id},
 			
 			type:"POST",
-			url:"<?php echo base_url();?>Employeedetails/CheckEmail",
+			url:"<?php echo base_url();?>employeedetails/CheckEmail",
 			success:function(data) {
 				if(data)
 			{
@@ -706,7 +706,7 @@ function Validate()
 	             	}
 			else 
 				{
-				    window.location = 'Employeedetails/employeeListing';	
+				    window.location = 'employeedetails/employeeListing';	
 				}
 				     
 			}						
diff --git a/application/views/addsupplier.php b/application/views/addsupplier.php
index 63e477d9..2fa32565 100644
--- a/application/views/addsupplier.php
+++ b/application/views/addsupplier.php
@@ -1,29 +1,5 @@
  <script>
-//Call to ajax existing PAN
- $('#PAN').change(function() {
-    
- var id = $('#PAN').val();
-		
-		 $.ajax({
-			data:{id:id},
-			
-			type:"POST",
-			url:"<?php echo base_url();?>supplier/checkPAN",
-			success:function(data) {
-				if(data)
-			{
-				alert( data+""+" already supplier existing change Status");
-				window.location = 'supplier/supplierListing';
-				
-		      //$('#PAN').val(data);
-			}
-								
-			
-		}
-		
-		});	
-  
-});
+
 //Email Validate
 function validateEmail() {
  var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
@@ -91,10 +67,33 @@ function validatePAN() {
 					return true;
 				}
 			}
+			else
+			{
+				alert('Please Enter PAN Number');
+				return (false);
+			}
 			
 }
-
-function getMobileValidation() {
+function validateECCNumber() {
+ var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}(?=.*[A-Za-z]).{2,}(?=.*[0-9]).{3,}$/;
+          
+			var ECC = $('#Exciseregistration').val();
+			
+			if(ECC != '')
+			{
+				if (reg.test(ECC) == false) 
+				{
+					alert('Please Enter Valid Excise Control Code Number');
+					return (false);
+				}
+				else
+				{
+					return true;
+				}
+			}
+			
+}
+function getContactNumberValidation() {
 	var contactNumber = $('#ContactNumber').val().length;
 	if(contactNumber < 10)
 	{
@@ -106,16 +105,20 @@ function getMobileValidation() {
 		return true;
 	}
 }
-function getValidEmergencyNumber() {
-	var contactNumber = $('#emergencycontactnumber').val().length;
-	if(contactNumber < 10)
+function getValidAlternateNumber() 
+{
+	var contactNumber = $('#AlternateContactNumber').val().length;
+	if(!empty($('#AlternateContactNumber').val()))
 	{
-		alert('Please Enter valid Emergency Contact Number');
-		return false;
-	}
-	else
-	{
-		return true;
+		if(contactNumber < 10)
+		{
+			alert('Please Enter valid Alternate Contact Number');
+			return false;
+		}
+		else
+		{
+			return true;
+		}
 	}
 }
  
@@ -181,7 +184,7 @@ function onlyAlphabets(evt) {
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-       <center> ADD NEW SUPPLIER DETAILS</center>
+       <center> Siddharth Industries -  New Supplier Details</center>
        
       </h1>
 	  	  
@@ -209,27 +212,27 @@ function onlyAlphabets(evt) {
         <fieldset>
 		 
           <!-- Form Name -->
-          <legend>Supplier Information</legend>
+          <legend>Supplier Information</legend> 
       		        
             <div class="col-md-3 pad">
 			<span for="SupplierName">Supplier Name</span><span class="badge">*</span>
-            <input type="text" name="SupplierName" onkeypress="return onlyAlphabets(event);" maxlength="100" id="supplierName" placeholder="Supplier Name" class="form-control" required>
+            <input type="text" name="SupplierName" onkeypress="return onlyAlphabets(event);" maxlength="100" id="supplierName"  class="form-control" required>
 			
             </div>
              
             <div class="col-md-3 pad">
 				<span for="ContactNumber">Contact Number</span><span class="badge">*</span>             
-				<input type="text" name="ContactNumber" onchange="return getMobileValidation();"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" id="ContactNumber" required placeholder="Contact Number" pattern="(.){10,10}" maxlength="10"  class="form-control">
+				<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">
             </div>
 			
 			<div class="col-md-3 pad"> 
 				<span for="AlternateContactNumber">Alternate Contact Number</span>
-				<input type="text" name="AlternateContactNumber" onchange="return getMobileValidation();"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" id="AlternateContactNumber" placeholder="Alternate Contact Number" pattern="(.){10,10}" maxlength="10"  class="form-control">
+				<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">
             </div>
 			
 			<div class="col-md-3 pad">
 				<span for="EmailAddress">Email ID</span><span class="badge">*</span>
-				<input type="email" name="emailid" id="emailid" required  placeholder="Email ID"  maxlength="100" class="form-control">
+				<input type="email" name="emailid" id="emailid" required  maxlength="100" class="form-control">
             </div>
              
 
@@ -237,64 +240,66 @@ function onlyAlphabets(evt) {
           <!-- Form Name -->
           <legend>Address Details</legend>
           <!-- Text input-->
-          <div class="form-group">
+          
             <div class="col-md-12"><span for="Address2">Address</span><span class="badge">*</span>
-                <input type="text" class="form-control required" placeholder="Address" id="Address" name="Address" maxlength="250" required>
+                <input type="text" class="form-control required" id="Address" name="Address" maxlength="500" required>
             </div>
-          </div>
+      
  
-          <!-- Text input-->
-          <div class="form-group">
-            <div class="col-md-12"><span for="CollectrateAddress">Colletrate Address</span><span class="badge">*</span>
-            <input type="text"  class="form-control " id="CollectrateAddress" placeholder="Colletrate Address" name="CollectrateAddress" maxlength="255" required>
-            </div>
-          </div>
-          <!-- Text input-->
+          
   
           
           <legend>Tax Related Data</legend>
           <!-- Text input-->
 		  
-          <div class="form-group">
-		    <div class="col-md-4">
-			   <span for="PAN">PAN</span>
-                <input type="text" id="panno"  maxlength="10"  name="panno" placeholder="PAN Number" onchange="validatePAN();" class="form-control">
+         
+		    <div class="col-md-3 pad">
+			   <span for="PAN">PAN</span> <span class="badge">*</span>
+                <input type="text" id="panno"  maxlength="10" pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}"  name="panno" required  onchange="validatePAN();" class="form-control">
 		    </div>
-			
-			<div class="col-md-4">			
+			 <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">
+            </div>	
+			<div class="col-md-3 pad">			
 			    <span for="UANumber">UA Number</span>
-                <input type="text"  class="form-control" placeholder="UA Number"pattern="^\d{12}$" id="UANumber" name="UANumber" maxlength="12">
+                <input type="text"  class="form-control" pattern="^\d{12}$" id="UANumber" name="UANumber" maxlength="12">
             </div>
 			
-            <div class="col-md-4">			
+            <div class="col-md-3 pad">			
 			<span for="Exciseregistration">Excise Registration</span>
-                <input type="text"  class="form-control required" placeholder="Excise Registration" id="Exciseregistration" name="Exciseregistration" minlength="10" maxlength="10">
+                <input type="text"  class="form-control required"  onchange="validateECCNumber();" id="Exciseregistration" name="Exciseregistration" minlength="15" maxlength="15" pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}(?=.*[A-Za-z]).{2,}(?=.*[0-9]).{3,}">
             </div>
 			
-            <div class="col-md-4">
-			<span for="TIN">TIN</span>
-                <input type="text"  class="form-control required" placeholder="TIN Number" id="TIN" pattern="^\d{2}-\d{7}$"name="TIN" minlength="10" maxlength="10">
-            </div>
+           
 			
-            <div class="col-md-4">
+			 
+            <div class="col-md-3">
 			<span for="GSTNo">GST Number</span>
-                <input type="text"  class="form-control " id="GSTNo" placeholder="GST Number" name="GSTNo" maxlength="10">
+                <input type="text"  class="form-control " id="GSTNo"  name="GSTNo" maxlength="10">
             </div>
 			
-			<div class="col-md-4">
+			<div class="col-md-3">
 			<span for="Range">GST Range</span>
-                <input type="text"  class="form-control " id="Range"  placeholder="GST Range" name="GSTRange" maxlength="10">
+                <input type="text"  class="form-control " id="GSTRange"   name="GSTRange" maxlength="10">
             </div>
-          </div>
+			<!-- Text input-->
+        
+            <div class="col-md-6"><span for="CollectrateAddress">Collectrate Address</span>
+            <input type="text"  class="form-control " id="CollectrateAddress"  name="CollectrateAddress" maxlength="500" >
+            </div>
+        
+          <!-- Text input-->
+         
 		  
 		   <legend>Payment Details</legend>
           <!-- Text input-->
 		  
-        <div class="form-group">
+       
             <div class="col-md-3">
-			    <span for="payablefrom">Payable From</span>
+			    <span for="payablefrom">Payable Terms</span>
 				    <select class="form-control required" id="PaymentTerms" name="PaymentTerms">
-					    <option >Select Payment method</option>
+					    <option value="Date of invoice" >Select Payment method</option>
 							<?php
 							if(!empty($payment))
 							{
@@ -311,15 +316,15 @@ function onlyAlphabets(evt) {
 			
             <div class="col-md-3">
 			  <span for="PayableAT">Payable AT</span>
-              <input type="text"  placeholder="Payable AT" class="form-control required" id="PayableAT" name="PayableAT">	 
+              <input type="text"   class="form-control required" id="PayableAT" name="PayableAT">	 
             </div>
 			
             <div class="col-md-3"><span>Payment Date</span><br/>
-				<label class="radio-inline"><input type="radio" name="before">Before</label>
-				<label class="radio-inline"><input type="radio" name="after">After</label>
+				<label class="radio-inline"><input type="radio" name="Payment"  value="Before">Before</label>
+				<label class="radio-inline"><input type="radio" name="Payment" value="After">After</label>
             </div>
 			 
-        </div>
+  
 	   
 
           <div class="form-group">
@@ -372,4 +377,52 @@ function onlyAlphabets(evt) {
     </section>
     
 </div>
+<script>
+function Validate()
+{
+	if(!validatePAN())
+	{
+		return false;
+		$('#panno').focus();
+	}
+}
 
+//Call to ajax existing PAN
+ $('#panno').change(function() {
+    
+ var id = $('#panno').val();
+		if(id != '')
+		{
+		 $.ajax({
+			data:{id:id},
+			
+			type:"POST",
+			url:"<?php echo base_url();?>supplier/checkPAN",
+			success:function(data) {
+				if(data)
+			{
+				
+			var answer = confirm(data+""+" supplier details is already exists in the database.Do you want to change the SUPPLIER details?")
+				if (answer) {        
+	                $('#panno').val('');
+					$('#panno').focus();
+	             	}
+			else 
+				{
+					alert('Please edit the supplier details in the Edit screen and change the supplier status to Active');
+				    window.location = 'supplier/supplierListing';	
+				}					
+			
+		      }
+			}
+		
+		});	
+		}
+		else
+		{
+			alert('Please enter the PAN Number');
+			$('#panno').focus();
+		}
+  
+});
+</script>
diff --git a/application/views/editEmployee.php b/application/views/editEmployee.php
index 49d36cca..d81e38d9 100644
--- a/application/views/editEmployee.php
+++ b/application/views/editEmployee.php
@@ -9,7 +9,7 @@
 		$ContactNumber	='';
 		$EmailId = '';
 		$BloodGroup ='';
-		$MartialStatus = '';
+		$MartialStatus= '';
 		$DateofJoining = '';
 		$PreviousYearsOfExp = '';
 		$Designation = '';
@@ -55,7 +55,7 @@ if(!empty($EmpDetails))
 		$ContactNumber	= $Emp->ContactNumber;
 		$EmailId = $Emp->EmailId;
 		$BloodGroup = $Emp->BloodGroup;
-		$MartialStatus = $Emp->MartialStatus;
+		$MartialStatus =$Emp->MartialStatus;
 		$DateofJoining = $Emp->DateofJoining;
 		$dtDOJ = new DateTime($DateofJoining);
 		$DOJ =  $dtDOJ ->format('Y-m-d');
@@ -341,7 +341,7 @@ $(function() {
     $("#DateofBirth").datepicker({
 	minDate : new Date(mindt,1,1),
 	maxDate : new Date(maxdt,1,1),
-	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,
+	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
 
 
 });
@@ -352,7 +352,7 @@ $(function() {
 
 
 });
-	  $("#ValidTill").datepicker({dateFormat: 'mm/dd/yy',minDate :'now',changeMonth: true, changeYear: true,
+	  $("#ValidTill").datepicker({dateFormat: 'mm/dd/yy',minDate :'now',changeMonth: true, changeYear: true,yearRange: '-0:+100'
 });
 	 
 });
@@ -419,7 +419,7 @@ function ValidatePassport()
                     <!-- form start -->
 					 
                	 
-<form role="form" id="addemployee" action="<?php echo base_url() ?>Employeedetails/UpdateEmployee" method="post"  enctype="multipart/form-data"> 
+<form role="form" id="addemployee" action="<?php echo base_url() ?>employeedetails/UpdateEmployee" method="post"  enctype="multipart/form-data"> 
  
   <div class="row">
     <div class="col-md-10 col-md-offset-1"   style="border:3px solid #3c8dbc;">
@@ -458,17 +458,17 @@ function ValidatePassport()
               <input  id="DateofBirth" required name="DateofBirth" value="<?php echo $DOB  ; ?>"  maxlength="10" placeholder="Date Of Birth" onchange="getAge();" class="form-control">
             </div>
  			 
-			<div class="col-md-6 pad"><span>Age</span>
+			<div class="col-md-6 pad"><span>Age</span><span class="badge">*</span>
               <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">
             </div>
-            <div class="col-md-6 pad"><span>Email ID</span>
+            <div class="col-md-6 pad"><span>Email ID</span><span class="badge">*</span>
               <input type="mail" name="emailid"  value="<?php echo $EmailId  ; ?>" id="emailid" placeholder="Email ID" maxlength="100" class="form-control">
             </div>
             
-            <div class="col-md-6 pad"><span>Gender</span>
+            <div class="col-md-6 pad"><span>Gender</span><span class="badge">*</span>
               <select id="gender" name="gender" type="text" placeholder="Gender" required class="form-control">
                 <option  value="<?php echo $Gender  ; ?>"><?php echo $Gender; ?></option>
 			  <?php
@@ -485,9 +485,9 @@ function ValidatePassport()
               </select>
             </div>
 			
-            <div class="col-md-6 pad"><span>Marital Status</span>
+            <div class="col-md-6 pad"><span>Marital Status</span><span class="badge">*</span>
               <select  id="MartialStatus" name="MartialStatus" type="text" required placeholder="Marital status" class="form-control">
-                <option  value="<?php echo $MaritalStatus  ; ?>"><?php echo $MartialStatus; ?></option>
+                <option  value="<?php echo $MartialStatus?>"><?php echo $MartialStatus; ?></option>
 			   <?php
 								if(!empty($MartialList))
                                             {
@@ -503,7 +503,7 @@ function ValidatePassport()
             </div>
            
   
-		  <div class="col-md-6 pad"><span>Blood group</span>
+		  <div class="col-md-6 pad"><span>Blood group</span><span class="badge">*</span>
 			<select id="bloodgroup" name="bloodgroup"  required class="form-control">
 			  <option  value="<?php echo $BloodGroup   ; ?>"><?php echo $BloodGroup  ?></option>
       <?php
@@ -569,7 +569,7 @@ function ValidatePassport()
           <!-- Text input-->
 		  
           <div class="form-group">
-            <div class="col-md-3"><span>Designation</span>
+            <div class="col-md-3"><span>Designation</span><span class="badge">*</span>
 			 <select type="text" id="desigination" name="desigination"  required class="form-control">
                <option  value="<?php echo $Designation ; ?>"><?php echo $Designation;   ?></option>
       <?php
@@ -586,7 +586,7 @@ function ValidatePassport()
               </select>
              
             </div>
-            <div class="col-md-3"><span>Department</span>
+            <div class="col-md-3"><span>Department</span><span class="badge">*</span>
                <select type="text" id="departmentname" name="departmentname" required  class="form-control">               
 				<option  value="<?php echo $Departmentcode; ?>"><?php echo $Departmentcode." - ".$DepartmentName ;?></option>
       <?php
@@ -603,7 +603,7 @@ function ValidatePassport()
               </select>
 			  
             </div>
-            <div class="col-md-3"><span>Date Of Joining</span>
+            <div class="col-md-3"><span>Date Of Joining</span><span class="badge">*</span>
               <input  id="dateofjoining" name="dateofjoining"   value="<?php echo $DOJ; ?>"  maxlength="10" required placeholder="Date Of Joining" class="form-control">
             </div>
 			<div class="col-md-3"><span>Previous Years of Experience</span>
@@ -612,7 +612,7 @@ function ValidatePassport()
           </div>
 		  
 		  <div class="form-group">
-            <div class="col-md-3"><span>Qualification</span>
+            <div class="col-md-3"><span>Qualification</span><span class="badge">*</span>
               <select type="text"  id="eduqualifaction" name="eduqualifaction" required class="form-control">
                <option  value="<?php echo $Edu_Qualification; ?>"><?php echo $Edu_Qualification ;   ?></option>
       <?php
@@ -645,7 +645,7 @@ function ValidatePassport()
 		  
           <div class="form-group">
             <div class="col-md-3"><span>Account Number</span> 
-              <input type="text" id="accountno" onkeypress="return event.charCode >= 48 && event.charCode <= 57" maxlength="15"  name="accountno" placeholder="Account Number" class="form-control" value="<?php echo $BankAccountNo  ; ?>">
+              <input type="text" id="accountno" onkeypress="return event.charCode >= 48 && event.charCode <= 57" maxlength="20"  name="accountno" placeholder="Account Number" class="form-control" value="<?php echo $BankAccountNo  ; ?>">
             </div>
             <div class="col-md-3"><span>IFSC Code</span> 
               <input type="text" id="ifsccode" name="ifsccode" placeholder="IFSC Code" maxlength="10" class="form-control" value="<?php echo $IFSCCode ; ?>">
@@ -676,19 +676,7 @@ function ValidatePassport()
             </div>
           </div>
 		  
-		  <legend>Additional Information</legend>
-          <!-- Text input-->
-          <div class="form-group">
-            <div class="col-md-12"><span>Additional Information</span>
-              <input type="text" id="addinfo" name="addinfo" placeholder="Additional Information" class="form-control" value="<?php echo $Remarks  ; ?>">
-            </div>
-          </div>
-		 <div class="form-group">
-             <div class="col-md-12">	   
-			 <span class="control-label">Select File(s)</span>
-			 <input id="input" name="input" type="file" class="file" multiple data-show-upload="false" data-show-caption="true"style="width:100%;padding: 0.35%;">
-	     </div>
-        </div>
+		  
 		  
 		  
 		  <!-- Command -->
@@ -698,7 +686,7 @@ function ValidatePassport()
               <div class="pull-right">
 			  <a href="<?php echo base_url() ?>employeeListing" class="btn btn-info" id="cancel"  value="Cancel">Cancel</a>
               
-                <input type="submit" onclick="Validate();" class="btn btn-primary"></button>
+                <input type="submit" onclick="Validate();"  class="btn btn-primary">
               </div>
             </div>
           </div>
@@ -756,7 +744,7 @@ function ValidatePassport()
 			data:{id:id},
 			
 			type:"POST",
-			url:"<?php echo base_url();?>Employeedetails/CheckEmail",
+			url:"<?php echo base_url();?>employeedetails/CheckEmail",
 			success:function(data) {
 				if(data)
 			{
diff --git a/application/views/editSupplier.php b/application/views/editSupplier.php
new file mode 100644
index 00000000..30acce6c
--- /dev/null
+++ b/application/views/editSupplier.php
@@ -0,0 +1,471 @@
+ <?php
+
+$SupplierID = '';
+$SupplierName = '';
+$Address = '';
+$ContactNumber = '';
+$AlternateContactNumber = '';
+$EmailAddress = '';
+$TIN = '';
+$PAN = '';
+$GSTNO = '';
+$GSTRange = '';
+$CollectrateAddress = '';
+$UANumber = '';
+$PaymentTerms = '';
+$PaymentDays = '';
+$PayableAT = '';
+$IsActive = '';
+
+
+if(!empty($supplier))
+{
+    foreach ($supplier as $uf)
+    {
+        $SupplierID = $uf->SupplierID;
+        $SupplierName = $uf->SupplierName;
+        $Address = $uf->Address;
+        $ContactNumber = $uf->ContactNumber;
+        $AlternateContactNumber = $uf->AlternateContactNumber;
+        $EmailAddress = $uf->EmailAddress;
+        $Exiseregistration = $uf->Exiseregistration;
+        $TIN = $uf->TIN;
+        $PAN = $uf->PAN;
+        $GSTNO = $uf->GSTNO;
+        $GSTRange = $uf->GSTRange;
+        $CollectrateAddress = $uf->CollectrateAddress;
+        $UANumber = $uf->UANumber;
+        $PaymentTerms = $uf->PaymentTerms;
+        $PaymentDays = $uf->PaymentDays;
+        $PayableAT = $uf->PayableAT;      
+         $chk = $uf->IsActive;  
+		 
+		 if($chk == 1)
+		 {
+			 $IsActive = 'checked';
+		 }
+		 else
+		 {
+			 $IsActive = '';
+		 }
+    }
+}
+
+
+?>
+ <script>
+
+//Email Validate
+function validateEmail() {
+ var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
+          
+			var email = $('#EmailAddress').val();
+			if(email != "")
+			{
+            if (reg.test(email) == false) 
+            {
+                alert('Please Enter Valid Email Address');
+                return (false);
+            }
+			else
+			{
+				return true;
+			}
+			}
+}  
+  function blockKeyPress(evt)
+{
+	 var charCode = (evt.which) ? evt.which : evt.keyCode;
+	 alert(charCode);
+			if(charCode == 8 || charCode == 46 )
+       
+			{
+				return false;
+			}
+			else
+			{
+				return false;
+			}
+}
+
+ function isNumberKey(evt)
+       {
+          var charCode = (evt.which) ? evt.which : evt.keyCode;
+          if (charCode != 46 && charCode > 31 
+            && (charCode < 48 || charCode > 57))
+             return false;
+
+          return true;
+       }
+	   
+//PAN Validate 
+function validatePAN() {
+ var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}$/;
+          
+			var PAN = $('#panno').val();
+			
+			if(PAN != '')
+			{
+				if (reg.test(PAN) == false) 
+				{
+					alert('Please Enter Valid PAN Number');
+					return (false);
+				}
+				else
+				{
+					return true;
+				}
+			}
+			else
+			{
+				alert('Please Enter PAN Number');
+				return (false);
+			}
+			
+}
+function validateECCNumber() {
+ var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}(?=.*[A-Za-z]).{2,}(?=.*[0-9]).{3,}$/;
+          
+			var ECC = $('#Exciseregistration').val();
+			
+			if(ECC != '')
+			{
+				if (reg.test(ECC) == false) 
+				{
+					alert('Please Enter Valid Excise Control Code Number');
+					return (false);
+				}
+				else
+				{
+					return true;
+				}
+			}
+			
+}
+function getContactNumberValidation() {
+	var contactNumber = $('#ContactNumber').val().length;
+	if(contactNumber < 10)
+	{
+		alert('Please Enter valid Contact Number');
+		return false;
+	}
+	else
+	{
+		return true;
+	}
+}
+function getValidAlternateNumber() 
+{
+	var contactNumber = $('#AlternateContactNumber').val().length;
+	if(!empty($('#AlternateContactNumber').val()))
+	{
+		if(contactNumber < 10)
+		{
+			alert('Please Enter valid Alternate Contact Number');
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+}
+ 
+function validateEmail() {
+			var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
+          
+			var email = $('#emailid').val();
+			
+			if(email != '')
+			{
+            if (reg.test(email) == false) 
+            {
+                alert('Please Enter Valid Email Address');
+                return (false);
+            }
+			else
+			{
+				return true;
+			}
+			}
+			else
+			{
+				alert('Please Enter email id');
+			}
+			
+} 
+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{
+ color:#00c0ef ! important;
+ } 
+ 
+   .pad{
+	   padding-bottom:1%;
+   }
+    .badge
+   {
+	   color:red; background-color:#fff;
+   }
+ </style>
+<div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+    <section class="content-header">
+      <h1>
+       <center> Siddharth Industries - <?php echo  $SupplierID;  ?>   DETAILS</center>
+       
+      </h1>
+	  	  
+    </section>
+    
+    <section class="content">
+    <div style="text-align:right;">
+    <a href="<?php echo base_url() ?>supplierListing" class="btn btn-primary" value="Back"/>Back</a>
+	</div>
+	<br/>
+        <div class="row">
+            <!-- left column -->
+            <div class="col-md-12">
+              <!-- general form elements -->
+                               
+                
+                <div class="box box-primary">
+                     
+                <!-- form start -->
+                    
+   
+    <div class="row">
+    <div class="col-md-10 col-md-offset-1"   style="border:3px solid #3c8dbc;">
+      <form class="form-horizontal" role="form" id="UpdateSupplier" action="<?php echo base_url() ?>editsupplier" method="post" role="form">
+        <fieldset>
+		 
+          <!-- Form Name -->
+          <legend>Supplier Information</legend> 
+      		<div class="col-md-2 pad">
+			<span for="SupplierID">Supplier ID</span>
+            <input type="text" name="SupplierID" id="SupplierID"  class="form-control" readonly  value="<?php echo $SupplierID;?>">   
+			</div>
+            <div class="col-md-4 pad">
+			<span for="SupplierName">Supplier Name</span><span class="badge">*</span>
+            <input type="text" name="SupplierName" onkeypress="return onlyAlphabets(event);" maxlength="100" id="supplierName"  class="form-control" required value="<?php echo $SupplierName;?>">
+			
+			  </div>
+             
+            <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;?>">
+            </div>
+			
+			<div class="col-md-2 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;?>" >
+            </div>
+			
+			<div class="col-md-2 pad">
+				<span for="EmailAddress">Email ID</span><span class="badge">*</span>
+				<input type="email" name="emailid" id="emailid" required  maxlength="100" class="form-control" value="<?php echo $EmailAddress;?>">
+            </div>
+             <div class="col-md-12">
+			</br><input type="checkbox" id="isactive"  <?php echo $IsActive;?>   name="isactive" > IsActive </div>
+<!-- Address Section -->
+          <!-- Form Name -->
+          <legend>Address Details</legend>
+          <!-- Text input-->
+         
+            <div class="col-md-12"><span for="Address2">Address</span><span class="badge">*</span>
+                <input type="text" class="form-control required" id="Address" name="Address" maxlength="500" required value="<?php echo $Address;?>">
+            </div>
+                
+  
+          
+          <legend>Tax Related Data</legend>
+          <!-- Text input-->
+		  
+         
+		    <div class="col-md-3 pad">
+			   <span for="PAN">PAN</span> <span class="badge">*</span>
+                <input type="text" id="panno"  maxlength="10"  name="panno" required  onchange="validatePAN();" class="form-control" value="<?php echo $PAN;?>">
+		    </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">
+            </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;?>">
+            </div>
+			
+            <div class="col-md-3 pad">			
+			<span for="Exciseregistration">Excise Registration</span>
+                <input type="text"  class="form-control required"  onchange="validateECCNumber();" id="Exciseregistration" name="Exciseregistration" minlength="15" maxlength="15" value="<?php echo $Exiseregistration;?>">
+            </div>	
+            <div class="col-md-3">
+			<span for="GSTNo">GST Number</span>
+                <input type="text"  class="form-control " value="<?php echo $GSTNO;?>" id="GSTNo"  name="GSTNo" maxlength="10">
+            </div>
+			
+			<div class="col-md-3">
+			<span for="Range">GST Range</span>
+                <input type="text"  class="form-control " id="GSTRange"  value="<?php echo $GSTRange;?>"  name="GSTRange" maxlength="10">
+            </div>
+			<!-- Text input-->
+        
+            <div class="col-md-6"><span for="CollectrateAddress">Collectrate Address</span>
+            <input type="text"  class="form-control " id="CollectrateAddress"  value="<?php echo $CollectrateAddress;?>"  name="CollectrateAddress" maxlength="500" >
+            </div>
+			
+            
+         
+          <!-- Text input-->
+		   <legend>Payment Details</legend>
+          <!-- Text input-->
+		  
+       
+            <div class="col-md-3">
+			    <span for="payablefrom">Payable Terms</span>
+				    <select class="form-control required" id="PaymentTerms" name="PaymentTerms">
+					    <option value="<?php echo $PaymentTerms;?>" ><?php echo $PaymentTerms;?></option>
+							<?php
+							if(!empty($payment))
+							{
+								foreach ($payment as $rl)
+								{									
+									?>
+									<option value="<?php echo $rl->ConfigValue ?>"><?php echo $rl->ConfigValue ?></option>
+									<?php
+									
+								}
+							}
+							?>
+					</select>
+            </div>
+			
+            <div class="col-md-3">
+			  <span for="PayableAT">Payable AT</span>
+              <input type="text"   class="form-control required" value="<?php echo $PayableAT;?>" id="PayableAT" name="PayableAT">	 
+            </div>
+			
+            <div class="col-md-3"><span>Payment Date</span><br/>
+				<label class="radio-inline"><input type="radio" name="Payment"  <?php echo($PaymentDays?'checked="checked"':''); ?>   value="Before">Before</label>
+				<label class="radio-inline"><input type="radio" name="Payment" <?php echo($PaymentDays?'checked="checked"':''); ?>  value="After">After</label>
+            </div>
+			 
+     
+	   
+
+          <div class="form-group">
+            <div class="col-md-3 col-md-offset-9">
+              <div class="pull-right">
+               <input type="reset" id="reset" onclick="resetphoto();"  class="btn btn-info" value="Reset" />
+                <input type="submit" onclick="validate();"   class="btn btn-primary">
+              </div>
+            </div>
+          </div>
+        </fieldset>
+      </form>
+    </div><!-- /.col-lg-12 -->
+</div><!-- /.row -->
+    
+                        
+                     
+                </div>
+            </div>
+            <div class="col-md-4">
+                <?php
+                    $this->load->helper('form');
+                    $error = $this->session->flashdata('error');
+                    if($error)
+                    {
+                ?>
+                <div class="alert alert-danger alert-dismissable">
+                    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+                    <?php echo $this->session->flashdata('error'); ?>                    
+                </div>
+                <?php } ?>
+                <?php  
+                    $success = $this->session->flashdata('success');
+                    if($success)
+                    {
+                ?>
+                <div class="alert alert-success alert-dismissable">
+                    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+                    <?php echo $this->session->flashdata('success'); ?>
+                </div>
+                <?php } ?>
+                
+                <div class="row">
+                    <div class="col-md-12">
+                        <?php echo validation_errors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>'); ?>
+                    </div>
+                </div>
+            </div>
+        </div>    
+    </section>
+    
+</div>
+<script>
+function Validate()
+{
+	if(!validatePAN())
+	{
+		return false;
+		$('#panno').focus();
+	}
+}
+
+//Call to ajax existing PAN
+ $('#panno').change(function() {
+    
+ var id = $('#panno').val();
+		if(id != '')
+		{
+		 $.ajax({
+			data:{id:id},
+			
+			type:"POST",
+			url:"<?php echo base_url();?>supplier/checkPAN",
+			success:function(data) {
+				if(data)
+			{
+				
+			var answer = confirm(data+""+" supplier details is already exists in the database.Do you want to change the SUPPLIER details?")
+				if (answer) {        
+	                $('#panno').val('');
+					$('#panno').focus();
+	             	}
+			else 
+				{
+					alert('Please edit the supplier details in the Edit screen and change the supplier status to Active');
+				    window.location = 'supplier/supplierListing';	
+				}					
+			
+		      }
+			}
+		
+		});	
+		}
+		else
+		{
+			alert('Please enter the PAN Number');
+			$('#panno').focus();
+		}
+  
+});
+</script>
diff --git a/application/views/employeeListing.php b/application/views/employeeListing.php
index 1bd33ab8..006f4a57 100644
--- a/application/views/employeeListing.php
+++ b/application/views/employeeListing.php
@@ -58,7 +58,7 @@ speed:500
                         {
                     ?>
                     <tr>
-					<td><u><a   href="<?php echo base_url().'Employeedetails/ViewEmployee/?EmpID='.$record->EmpID; ?>" data-toggle="tooltip" title="<?php echo $record->EmpID; ?>  -  Click here to view Employee details"><?php echo $record->EmpID ?> </a></u></td>                      
+					<td><u><a   href="<?php echo base_url().'employeedetails/ViewEmployee/?EmpID='.$record->EmpID; ?>" data-toggle="tooltip" title="<?php echo $record->EmpID; ?>  -  Click here to view Employee details"><?php echo $record->EmpID ?> </a></u></td>                      
                       <td><?php echo $record->FirstName .' , '. $record->LastName; ?></td>                                 
                       <td><?php echo $record->ContactNumber ?></td>
                       <td><?php echo $record->EmailId ?></td>                      
diff --git a/application/views/supplierListing.php b/application/views/supplierListing.php
index 2bfc2989..e5a35b07 100644
--- a/application/views/supplierListing.php
+++ b/application/views/supplierListing.php
@@ -2,7 +2,7 @@
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-       <center> SUPPLIER LISTING</center>
+       <center>Siddharth Industries Supplier Details</center>
         
       </h1>
     </section>
@@ -18,7 +18,7 @@
             <div class="col-xs-12">
               <div class="box">
                 <div class="box-header">
-                    <center><h3 class="box-title">Supplier List</h3></center>
+                    <center><h3 class="box-title"></h3></center>
                     <div class="box-tools">
                         <form action="<?php echo base_url() ?>supplierListing" method="POST" id="searchList">
                             <div class="input-group">
@@ -37,21 +37,14 @@
                       <th>Supplier Name</th>
                       <th>Address</th>
                       <th>Contact Number</th>
-                      <th>Alternate Contact Number</th>
                       <th>Email Address</th>
                       <th>Exiseregistration</th>
                       <th>TIN</th>
                       <th>PAN</th>
                       <th>GSTNO</th>
                       <th>GSTRange</th>
-                      <th>CollectrateAddress</th>
                       <th>UANumber</th>
                       <th>PaymentTerms</th>
-                      <th>PaymentDays</th>
-                      <th>PayableAT</th>
-                      <th>Create Date</th>
-                      <th>Action</th>
-                      
                     </tr>
                     <?php
                     if(!empty($userRecords))
@@ -60,29 +53,21 @@
                         {
                     ?>
                     <tr>
-                      <td><?php echo $record->SupplierID ?></td>
+                       <td><u><a   href="<?php echo base_url().'supplier/viewsupplier/?SID='.$record->SupplierID.'&Payment='.$record->PaymentTerms ?>" data-toggle="tooltip" title="<?php echo $record->SupplierID; ?>  -  Click here to view Supplier details"><?php echo $record->SupplierID ?> </a></u></td> 
                       <td><?php echo $record->SupplierName ?></td>
                       <td><?php echo $record->Address ?></td>
                       <td><?php echo $record->ContactNumber ?></td>
-                      <td><?php echo $record->AlternateContactNumber ?></td>
+                      
                       <td><?php echo $record->EmailAddress ?></td>
                       <td><?php echo $record->Exiseregistration ?></td>
                       <td><?php echo $record->TIN ?></td>
                       <td><?php echo $record->PAN ?></td>
                       <td><?php echo $record->GSTNO ?></td>
                       <td><?php echo $record->GSTRange ?></td>
-                      <td><?php echo $record->CollectrateAddress ?></td>
+                     
                       <td><?php echo $record->UANumber ?></td>
-                      <td><?php echo $record->PaymentTerms ?></td>
-                      <td><?php echo $record->PaymentDays ?></td>
-                      <td><?php echo $record->PayableAT ?></td>
-                      <td><?php echo $record->CreatedDate ?></td>
-                      
-                      <td>
-                          <a href="<?php echo base_url().'supplier/editOldsupplier/'.$record->SupplierID; ?>"><i class="fa fa-pencil"></i>&nbsp;&nbsp;&nbsp;</a>
-						  <a href="<?php echo base_url().'supplier/viewsupplier/'.$record->SupplierID; ?>"><i class="fa fa-eye"></i>&nbsp;&nbsp;&nbsp;</a>
-                         <!-- <a href="#" data-userid="<?php echo $record->userId; ?>" class="deleteUser"><i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;</a>-->
-                      </td>
+                      <td><?php echo $record->PaymentTerms ?></td>           
+                    
                     </tr>
                     <?php
                         }