diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php
index 759a0521..94399b9b 100755
--- a/application/controllers/supplier.php
+++ b/application/controllers/supplier.php
@@ -179,7 +179,7 @@ class supplier extends BaseController
             $this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|max_length[13]');
             $this->form_validation->set_rules('emailid','emailid', 'valid_email|max_length[128]|required');
             $this->form_validation->set_rules('TIN','TIN','trim|required|max_length[11]');
-            $this->form_validation->set_rules('panno', 'panno', 'trim|required|max_length[10]|callback_checkPanValidate');
+            $this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]|callback_checkPanValidate');
             $this->form_validation->set_rules('GSTNo','GSTNo','trim|requried|max_length[15]|callback_checkGstValidate');
             
             if($this->form_validation->run() == FALSE)
@@ -273,7 +273,7 @@ class supplier extends BaseController
             $this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|max_length[13]');
             $this->form_validation->set_rules('emailid','emailid','valid_email|max_length[128]|required');
             $this->form_validation->set_rules('TIN','TIN','trim|required|max_length[11]');
-            $this->form_validation->set_rules('panno', 'panno', 'trim|required|max_length[10]|callback_checkPanValidateSupplier');
+            $this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]|callback_checkPanValidateSupplier');
             $this->form_validation->set_rules('GSTNo','GSTNo','trim|requried|max_length[15]|callback_checkGstValidateSupplier');
 
     
diff --git a/application/views/addsupplier.php b/application/views/addsupplier.php
index 2f66aa84..8222ea51 100755
--- a/application/views/addsupplier.php
+++ b/application/views/addsupplier.php
@@ -5,34 +5,34 @@
 function validateEmail() {
  var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
           
-			var email = $('#EmailAddress').val();
-			if(email != "")
-			{
+      var email = $('#EmailAddress').val();
+      if(email != "")
+      {
             if (reg.test(email) == false) 
             {
                 alert('Please Enter Valid Email Address');
                 return (false);
             }
-			else
-			{
-				return true;
-			}
-			}
+      else
+      {
+        return true;
+      }
+      }
 } 
 
   function blockKeyPress(evt)
 {
-	 var charCode = (evt.which) ? evt.which : evt.keyCode;
-	 alert(charCode);
-			if(charCode == 8 || charCode == 46 )
+   var charCode = (evt.which) ? evt.which : evt.keyCode;
+   alert(charCode);
+      if(charCode == 8 || charCode == 46 )
        
-			{
-				return false;
-			}
-			else
-			{
-				return false;
-			}
+      {
+        return false;
+      }
+      else
+      {
+        return false;
+      }
 }
 
  function isNumberKey(evt)
@@ -44,77 +44,77 @@ function validateEmail() {
 
           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);
-			}
-			
+      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 validateGST() {
- var reg = /(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}$/;
+ var reg = /(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}$/;
           //alert('gst');
-			var GST = $('#GSTNo').val();
-			
-			if(GST != '')
-			{
-				if (reg.test(GST) == false) 
-				{
-					alert('Please Enter Valid GST Number Format should be 22AAAAA1111S1Z1');
-					return (false);
-				}
-				else
-				{
-					return true;
-				}
-			}
-			else
-			{
-				alert('Please Enter GST Number');
-				return (false);
-			}
-			
+      var GST = $('#GSTNo').val();
+      
+      if(GST != '')
+      {
+        if (reg.test(GST) == false) 
+        {
+          alert('Please Enter Valid GST Number Format should be 12ABCDE1234A1Z1 or  12ABCDE1234A1ZA');
+          return (false);
+        }
+        else
+        {
+          return true;
+        }
+      }
+      else
+      {
+        alert('Please Enter GST 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;
-				}
-			}
-			
+      var ECC = $('#Exciseregistration').val();
+      
+      if(ECC != '')
+      {
+        if (reg.test(ECC) == false) 
+        {
+          alert('Please Enter Valid Excise Control Code Number');
+          return (false);
+        }
+        else
+        {
+          return true;
+        }
+      }
+      
 }
 
 
@@ -128,7 +128,7 @@ function getContactNumberValidation(){
          var mobilephone = /^[0-9]{10,12}$/.test(contactNumber);
 
          //alert('chennai telephone:'+telephone);//alert('other telephone:'+regex);
-       	 //alert('mobilephone:'+mobilephone);//alert('input value:'+contactNumber);
+         //alert('mobilephone:'+mobilephone);//alert('input value:'+contactNumber);
 
         if(contactNumber!=''){
          
@@ -148,7 +148,7 @@ function getContactNumberValidation(){
          else{
                 alert('Please Enter valid Contact Number ex: 044 12345678 , 0444 1234567,04444 123456 and 9876543210');//alert('need to change:'+contactNumber);
                 return false;
-        		}
+            }
         }
        else{
            
@@ -158,7 +158,7 @@ function getContactNumberValidation(){
         }
      }
 
-function getValidAlternateNumber()
+function getValidAlternateNumber() {
          
          var contactNumber = $('#AlternateContactNumber').val();
 
@@ -167,7 +167,7 @@ function getValidAlternateNumber()
          var mobilephone = /^[0-9]{10,12}$/.test(contactNumber);
 
          //alert('chennai telephone:'+telephone);//alert('other telephone:'+regex);
-       	 //alert('mobilephone:'+mobilephone);//alert('input value:'+contactNumber);
+         //alert('mobilephone:'+mobilephone);//alert('input value:'+contactNumber);
 
         if(contactNumber!=''){
          
@@ -187,7 +187,7 @@ function getValidAlternateNumber()
          else{
                 alert('Please Enter valid Contact Number ex: 044 12345678 , 0444 1234567,04444 123456 and 9876543210');//alert('need to change:'+contactNumber);
                 return false;
-        		}
+            }
         }
        else{
            
@@ -198,56 +198,56 @@ function getValidAlternateNumber()
      }
 
 // function getContactNumberValidation() {
-// 	var contactNumber = $('#ContactNumber').val().length;
-// 	if(contactNumber < 10)
-// 	{
-// 		alert('Please Enter valid Contact Number');
-// 		return false;
-// 	}
-// 	else
-// 	{
-// 		return true;
-// 	}
+//  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;
-// 		}
-// 	}
+//  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 reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
           
-			var email = $('#emailid').val();
-			
-			if(email != '')
-			{
+      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');
-			}
-			
+      else
+      {
+        return true;
+      }
+      }
+      else
+      {
+        alert('Please Enter email id');
+      }
+      
 }  
  
 
@@ -269,24 +269,33 @@ function onlyAlphabets(evt) {
             return false;
         return true;
     }
-	 
+   
 $(function() {
-	var d = new Date();
+  var d = new Date();
+
+  var month = d.getMonth();
+  var day = d.getDate();
+  var year = d.getFullYear()  ;
+  var SIAStartYear = year - 2015;
+  var mindt = year-70;
+  var maxdt =  year-15;
+  
+
+    $("#dateofCST").datepicker({
+  minDate : new Date(mindt,1,1),
+  maxDate : 'now',
+  dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
 
-	var month = d.getMonth();
-	var day = d.getDate();
-	var year = d.getFullYear()  ;
-	var SIAStartYear = year - 2015;
-	var mindt = year-70;
-	var maxdt =  year-15;
-	
-	 $("#dateofCST").datepicker({
-	//minDate : new Date(year-30,1,1),
-	maxDate :'now',
-	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
 
 });
+   
 });
+//$("#dateofCST").datepicker({
+  //minDate : new Date(year-30,1,1),
+ // maxDate :'now',
+ // dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+
+//});
 
  $(document).ready(function(){
          $("#PaymentTerms").select2();
@@ -302,14 +311,14 @@ $(function() {
  } 
   .form-group
  {
-	 padding-bottom:4%;
+   padding-bottom:4%;
    }
    .pad{
-	   padding-bottom:1%;
+     padding-bottom:1%;
    }
     .badge
    {
-	   color:red; background-color:#fff;
+     color:red; background-color:#fff;
    }
    
    
@@ -322,14 +331,14 @@ $(function() {
        <center> Siddharth Industries -  New Supplier 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>
+  <br/>
         <div class="row">
             <!-- left column -->
             <div class="col-md-12">
@@ -344,42 +353,42 @@ $(function() {
     <div class="row">
     <div class="col-md-10 col-md-offset-1"><br/>
       <form class="form-horizontal" role="form" id="addsupplier" action="<?php echo base_url() ?>addNewsupplier" method="post" role="form">
-           <div class="box-body">		 		 
+           <div class="box-body">        
           <!-- Form Name -->
           <legend>Supplier Information</legend> 
-      		        
+                  
         <div class="col-md-12">
         
-		
+    
             <div class="col-md-3">
-			<span for="SupplierName">Supplier Name</span><span class="badge">*</span>
+      <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>
-			
+      
             </div>
-			
+      
        
             <div class="col-md-3">
-				<span for="ContactNumber">Contact Number</span><span class="badge">*</span>             
-				<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();"  id="ContactNumber" required  maxlength="10"  class="form-control" title="Please Enter Contact Number (or) Telephone Number">
+        <span for="ContactNumber">Contact Number</span><span class="badge">*</span>             
+        <input type="text" name="ContactNumber" onchange="return getContactNumberValidation();"  id="ContactNumber" required  maxlength="13"  class="form-control" title="Please Enter Mobile Number (or) Telephone Number">
             </div>
-		 	<div class="col-md-3"> 
-				<span for="AlternateContactNumber">Alternate Contact Number</span>
-				<input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();"  id="AlternateContactNumber" maxlength="10"  class="form-control" title="Please Enter Contact Number (or) Telephone Number">
+      <div class="col-md-3"> 
+        <span for="AlternateContactNumber">Alternate Contact Number</span>
+        <input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();"  id="AlternateContactNumber" maxlength="13"  class="form-control" title="Please Enter Mobile Number (or) Telephone Number">
             </div>
-		 
-		<div class="col-md-3">
-				<span for="EmailAddress">Email ID</span><span class="badge">*</span>
-				<input type="email" name="emailid" id="emailid" required  maxlength="100" class="form-control">
+     
+    <div class="col-md-3">
+        <span for="EmailAddress">Email ID</span><span class="badge">*</span>
+        <input type="email" name="emailid" id="emailid" required  maxlength="100" class="form-control">
         </div>
         </div> 
         <div class="col-md-12">
-        	<div class="col-md-6"><span for="CollectrateAddress">Supplier Type</span><span class="badge">*</span> 
-		
-			<input type="checkbox" id="service"  name="service" value="<?php echo $service = (isset($_POST['service'])) ? 0 : 1;?>"> <b>SERVICE </b>
-			<input type="checkbox" id="rawmaterial" name="rawmaterial" value="<?php echo $rawmaterial = (isset($_POST['rawmaterial'])) ? 0 : 1;?>"> <b>RAW MATERIALS </b>
-			<input type="checkbox" id="maintanance" name="maintanance" value="<?php echo $maintanance = (isset($_POST['maintanance'])) ? 0 : 1;?>"> <b>MAINTENANCE </b>
-			</div>
-		
+          <div class="col-md-6"><span for="SupplierType">Supplier Type</span><!--<span class="badge">*</span>--> 
+    
+      <input type="checkbox" id="service"  name="service" value="<?php echo $service = (isset($_POST['service'])) ? 0 : 1;?>"> <b>SERVICE </b>
+      <input type="checkbox" id="rawmaterial" name="rawmaterial" value="<?php echo $rawmaterial = (isset($_POST['rawmaterial'])) ? 0 : 1;?>"> <b>RAW MATERIALS </b>
+      <input type="checkbox" id="maintanance" name="maintanance" value="<?php echo $maintanance = (isset($_POST['maintanance'])) ? 0 : 1;?>"> <b>MAINTENANCE </b>
+      </div>
+    
         </div>    
 
 <!-- Address Section -->
@@ -390,87 +399,87 @@ $(function() {
             <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>
             </div>
-			</div>
+      </div>
  
           
   
           
           <legend>Tax Related Data</legend>
           <!-- Text input-->
-		      <div class="col-md-12"  >     
-		    <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" style="text-transform:uppercase;" onchange="validatePAN();" requried class="form-control" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character should be in caps)">
-		    </div>
-			 <div class="col-md-3 pad">
-			<span for="TIN">TIN</span><span class="badge">*</span>
+          <div class="col-md-12"  >     
+        <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" style="text-transform:uppercase;" onchange="validatePAN();"  class="form-control" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character should be in caps)">
+        </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 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" onkeypress="return isNumberKey(event)"  id="UANumber" name="UANumber" maxlength="12" title="Please Enter 12 digit Number" >
+            </div>  
+      <div class="col-md-3 pad">      
+          <span for="UANumber">UA Number</span>
+                <input type="text"  class="form-control" id="UANumber" name="UANumber" maxlength="15" title="Please Enter Valid UA Number" >
             </div>
-			
-            <div class="col-md-3 pad">			
-			<span for="Exciseregistration">Excise Registration</span>
+      
+            <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" pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}(?=.*[A-Za-z]).{2,}(?=.*[0-9]).{3,}" title="Please enter PAN Number and EM/ED option and 3 digit Numbers format" style="text-transform:uppercase;">
             </div>
-			</div>
-		 <div class="col-md-12"  > 
-			<div class="col-md-3 pad">
-			<span for="GSTNo">CST Number</span>
+      </div>
+     <div class="col-md-12"  > 
+      <div class="col-md-3 pad">
+      <span for="GSTNo">CST Number</span>
                 <input type="text"  class="form-control " id="CSTNo"  name="CSTNo" maxlength="15">
             </div>
-			 <div class="col-md-3 pad"><span>CST Registration Date</span>
+       <div class="col-md-3 pad"><span>CST Registration Date</span>
               <input  id="dateofCST" name="dateofCST"   onkeypress="return false;" maxlength="10"   class="form-control">
-            </div>		 		  
+            </div>          
             <div class="col-md-3 pad">
-			<span for="GSTNo">GST Number</span><span class="badge">*</span>    
-                <input type="text" id="GSTNo" name="GSTNo" class="form-control"  maxlength="15" required onchange="validateGST();" style="text-transform:uppercase;" pattern="(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}"  title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 1 Character and 1 Number">
-            </div>			
-			<div class="col-md-3 pad">
-			<span for="Range">GST Range</span><span class="badge">*</span>    
-                <input type="text"  class="form-control " id="GSTRange"   name="GSTRange" maxlength="10" required>
+      <span for="GSTNo">GST Number</span><span class="badge">*</span>    
+                <input type="text" id="GSTNo" name="GSTNo" class="form-control"  maxlength="15" required onchange="validateGST();" style="text-transform:uppercase;" pattern="(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}"  title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' and 1 Number or Character">
+            </div>      
+      <div class="col-md-3 pad">
+      <span for="Range">GST Range</span><!--<span class="badge">*</span>-->
+                <input type="text"  class="form-control " id="GSTRange"   name="GSTRange" maxlength="15">
             </div>
-			<!-- Text input-->        
+      <!-- Text input-->        
             <div class="col-md-6  pad"><span for="CollectrateAddress">Collectrate Address</span>
             <input type="text"  class="form-control " id="CollectrateAddress"  name="CollectrateAddress" maxlength="500" >
             </div>
-			
-		</div>
+      
+    </div>
           <!-- Text input-->
-		   <legend>Certification Details</legend>	
-		   <div class="col-md-12">
-			<div class="col-md-5" style="padding:0px;">		   
-					<div class="col-md-6  "><span for="EMSNo">EMS Number</span>
-						<input type="text"  class="form-control " id="EMSNo"  name="EMSNo" maxlength="15">
-					</div>
-					 <div class="col-md-6"><span for="TSNo">TS Number</span>
-					  <input  type="text" class="form-control " id="TSNo" name="TSNo"  maxlength="10">
-					</div>	
-				</div>
-				<div class="col-md-5" style="padding:0px;">
-					<div class="col-md-6">
-					<span for="IMSNo">IMS Number</span>     
-						<input type="text"  class="form-control " id="IMSNo"  name="IMSNo" maxlength="10">
-					</div>			
-					<div class="col-md-6">
-					<span for="ISONo">ISO Number</span>     
-						<input type="text"  class="form-control " id="ISONo"   name="ISONo" maxlength="10">
-					</div>
-				</div>
-				<div class="col-md-2 ">			
-					 <span for="OSHASNo">OHSAS Number</span>
-						<input type="text"  class="form-control " id="OSHASNo"  name="OSHASNo" maxlength="10">
-					
-				</div>
-			</div>
-			  <legend>Bank Details</legend>
+       <legend>Certification Details</legend> 
+       <div class="col-md-12">
+      <div class="col-md-5" style="padding:0px;">      
+          <div class="col-md-6  "><span for="EMSNo">EMS Number</span>
+            <input type="text"  class="form-control " id="EMSNo"  name="EMSNo" maxlength="15">
+          </div>
+           <div class="col-md-6"><span for="TSNo">TS Number</span>
+            <input  type="text" class="form-control " id="TSNo" name="TSNo"  maxlength="10">
+          </div>  
+        </div>
+        <div class="col-md-5" style="padding:0px;">
+          <div class="col-md-6">
+          <span for="IMSNo">IMS Number</span>     
+            <input type="text"  class="form-control " id="IMSNo"  name="IMSNo" maxlength="10">
+          </div>      
+          <div class="col-md-6">
+          <span for="ISONo">ISO Number</span>     
+            <input type="text"  class="form-control " id="ISONo"   name="ISONo" maxlength="10">
+          </div>
+        </div>
+        <div class="col-md-2 ">     
+           <span for="OSHASNo">OHSAS Number</span>
+            <input type="text"  class="form-control " id="OSHASNo"  name="OSHASNo" maxlength="10">
+          
+        </div>
+      </div>
+        <legend>Bank Details</legend>
           <!-- Text input-->
-		  
+      
           <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 isNumberKey(event)" >
+              <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">
@@ -478,38 +487,38 @@ $(function() {
             <div class="col-md-3"><span>Bank Branch Name</span> 
               <input type="text" id="branchname" name="branchname"  maxlength="200" class="form-control">
             </div>
-			<div class="col-md-3"><span>Bank Address</span> 
+      <div class="col-md-3"><span>Bank Address</span> 
               <input type="text" id="bankaddress"  name="bankaddress" maxlength="200" class="form-control">
             </div>
           </div>
-		  
-		   <legend>Payment Details</legend>
+      
+       <legend>Payment Details</legend>
           <!-- Text input-->
-		  
+      
        
             <div class="col-md-12">
             <div class="col-md-3">
-			    <span for="payablefrom">Payable Terms</span>
-				    <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))
-							{
-								foreach ($payment as $pmt)
-								{
-									?>
-									<option value="<?php echo $pmt->PaymentID ?>"><?php echo $pmt->PaymentTerms ?></option>
-									<?php
-								}
-							}
-							?>
-							<input type="hidden" id="paymentid" name="paymentid" value="" >
-							<!--<input type="hidden" id="paymentname" name="paymentname" value=""> -->
-					</select>
-            </div>			
+          <span for="payablefrom">Payable Terms</span>
+            <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))
+              {
+                foreach ($payment as $pmt)
+                {
+                  ?>
+                  <option value="<?php echo $pmt->PaymentID ?>"><?php echo $pmt->PaymentTerms ?></option>
+                  <?php
+                }
+              }
+              ?>
+              <input type="hidden" id="paymentid" name="paymentid" value="" >
+              <!--<input type="hidden" id="paymentname" name="paymentname" value=""> -->
+          </select>
+            </div>      
             </div>
-			 </div> 	   
-			<div class="box-footer" style="text-align:right">
+       </div>      
+      <div class="box-footer" style="text-align:right">
                <input type="reset" id="reset"  class="btn btn-primary" value="Reset" />
                 <input type="submit" onclick="return Validate();" value="Submit" class="btn btn-primary">
               </div>
@@ -558,7 +567,7 @@ $(function() {
 <script>
 function payment_hidden()
 {
-	 var term = document.getElementById("Payment");
+   var term = document.getElementById("Payment");
      var termid = term.options[term.selectedIndex].value;
      var termname = term.options[term.selectedIndex].text;
      $("#paymentid").val(termid);
@@ -568,104 +577,135 @@ function payment_hidden()
 }
 function Validate()
 {
-	if(!validatePAN())
-	{
-		
-		$('#panno').focus();
-                return false;
-	}
+  // if(!validatePAN())
+  // {
+    
+  //  $('#panno').focus();
+ //                return false;
+  // }
+
+if($("#supplierName").val().length < 1)
+   {
+     alert('Please Enter  Supplier Name');
+     $("#supplierName").focus();
+    return false;
+   }
+if(!getContactNumberValidation)
+   {
+     $("#ContactNumber").focus();
+    return false;
+   }
+   if(!validateEmail())
+{
+  $('#emailid').focus();
+   return false;  
+}
+
+if($("#Address").val().length < 1)
+   {
+     alert('Please Enter Address');
+     $("#Address").focus();
+    return false;
+   }
+   
+if($("#TIN").val().length < 1)
+   {
+     alert('Please Enter TIN number');
+     $("#TIN").focus();
+    return false;
+   }
+if(!validateGST())
+{
+  $('#GSTNo').focus();
+  return false;
+}
+}
 if(!validateEmail())
 {
   $('#emailid').focus();
    return false;  
 }
 
-if(!validateGST())
-{
-	$('#GSTNo').focus();
-	return false;
 }
-}
-
 //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();
+    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();
                     return false; 
-	        	}
-				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();
+            }
+        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();
             return false;
-		}
+    }
   
 });
  
  $('#GSTNo').change(function() {
     
  var id = $('#GSTNo').val();
-		if(id != '')
-		{
-		 $.ajax({
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url();?>supplier/checkGST",
-			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) 
-				{                                      
-					$('#GSTNo').val('');
-					$('#GSTNo').focus();
+    if(id != '')
+    {
+     $.ajax({
+      data:{id:id},
+      type:"POST",
+      url:"<?php echo base_url();?>supplier/checkGST",
+      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) 
+        {                                      
+          $('#GSTNo').val('');
+          $('#GSTNo').focus();
                     return false; 
-	            }
-			    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 GST Number');
-			$('#GSTNo').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 GST Number');
+      $('#GSTNo').focus();
             return false;
-		}
+    }
   
 });
 </script>
diff --git a/application/views/editSupplier.php b/application/views/editSupplier.php
index 8e6870a0..c5c467be 100755
--- a/application/views/editSupplier.php
+++ b/application/views/editSupplier.php
@@ -331,7 +331,7 @@ function validateEmail() {
 } 
 
 function validateGST() {
- var reg = /(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}$/;
+ var reg = /(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}$/;
           //alert('gst');
 			var GST = $('#GSTNo').val();
 			
@@ -339,7 +339,7 @@ function validateGST() {
 			{
 				if (reg.test(GST) == false) 
 				{
-					alert('Please Enter Valid GST Number Format should be 22AAAAA1111S1Z1');
+					alert('Please Enter Valid GST Number Format should be 12ABCDE1234A1Z1 or  12ABCDE1234A1ZA');
 					return (false);
 				}
 				else
@@ -463,7 +463,7 @@ function onlyAlphabets(evt) {
             </div>
         </div>
              <div class="col-md-12">
-			 <div class="col-md-6"><span for="CollectrateAddress">Supplier Type :</span><span class="badge">*</span>
+			 <div class="col-md-6"><span for="SupplierType">Supplier Type :</span><!--<span class="badge">*</span>-->
 
 			<input type="checkbox" id="service"  <?php echo $IsService;?>   name="service" value="1"> <b>SERVICE &nbsp;&nbsp;</b> 
 			<input type="checkbox" id="rawmaterial"  <?php echo $IsRawMaterial;?>   name="rawmaterial" value="1"> <b>RAW MATERIALS &nbsp;&nbsp;</b> 
@@ -490,8 +490,8 @@ function onlyAlphabets(evt) {
 		  <div class="col-md-12">
          
 		    <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 pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]}).{1,}" onchange="validatePAN();" class="form-control" value="<?php echo $PAN;?>" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character must be in caps format)" style="text-transform:uppercase;">
+			   <span for="PAN">PAN</span> <!--<span class="badge">*</span>-->
+                <input type="text" id="panno"  maxlength="10"  name="panno" pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]}).{1,}" onchange="validatePAN();" class="form-control" value="<?php echo $PAN;?>" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character must be in caps format)" style="text-transform:uppercase;">
 		    </div>
 			 <div class="col-md-3 pad">
 			<span for="TIN">TIN</span><span class="badge">*</span>
@@ -499,7 +499,7 @@ function onlyAlphabets(evt) {
             </div>
 			<div class="col-md-3 pad">			
 			    <span for="UANumber">UA Number</span>
-                <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">
+                <input type="text"  class="form-control" id="UANumber" name="UANumber" maxlength="15" value="<?php echo $UANumber;?>" title="Please Enter Valid UA Number">
             </div>
 			
             <div class="col-md-3 pad">			
@@ -518,12 +518,12 @@ function onlyAlphabets(evt) {
             </div>
             <div class="col-md-3 pad">
 			<span for="GSTNo">GST Number</span><span class="badge">*</span>
-                <input type="text" id="GSTNo" name="GSTNo" onchange="validateGST();" required  maxlength="15"  class="form-control" value="<?php echo $GSTNO;?>" pattern="(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}"  style="text-transform:uppercase;"  title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 1 Character and 1 Number">
+                <input type="text" id="GSTNo" name="GSTNo" onchange="validateGST();" required  maxlength="15"  class="form-control" value="<?php echo $GSTNO;?>" pattern="(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}"  style="text-transform:uppercase;"  title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' Character and 1 Number (or) Character ">
             </div>
 			
 			<div class="col-md-3 pad">
-			<span for="Range">GST Range</span><span class="badge">*</span>
-                <input type="text"  class="form-control " id="GSTRange" requried value="<?php echo $GSTRange;?>"  name="GSTRange" maxlength="10">
+			<span for="Range">GST Range</span><!--<span class="badge">*</span>-->
+                <input type="text"  class="form-control " id="GSTRange" value="<?php echo $GSTRange;?>"  name="GSTRange" maxlength="10">
             </div>
         </div>
         <div class="col-md-12">
@@ -610,7 +610,8 @@ function onlyAlphabets(evt) {
         </div>
 		<div class="box-footer" style="text-align:right">
                 <input type="submit" onclick="validate();" value="Submit"  class="btn btn-primary">
-				<input type="reset" class="btn btn-primary" value="Cancel" />
+                <a href="<?php echo base_url() ?>supplierListing" class="btn btn-primary" value="Cancel"/>Cancel</a>
+				
               </div>
       </form>
     </div><!-- /.col-lg-12 -->
@@ -667,16 +668,47 @@ function payment_hidden()
 
 function Validate()
 {
-	if(!validatePAN())
-	{
-		return false;
-		$('#panno').focus();
-	}
-	if(!validateGST())
-	{
-	$('#GSTNo').focus();
-	return false;
-	}
+	// if(!validatePAN())
+	// {
+	// 	return false;
+	// 	$('#panno').focus();
+	// }
+	if($("#supplierName").val().length < 1)
+   {
+     alert('Please Enter  Supplier Name');
+     $("#supplierName").focus();
+    return false;
+   }
+if(!getContactNumberValidation)
+   {
+     $("#ContactNumber").focus();
+    return false;
+   }
+   if(!validateEmail())
+{
+  $('#emailid').focus();
+   return false;  
+}
+
+if($("#Address").val().length < 1)
+   {
+     alert('Please Enter Address');
+     $("#Address").focus();
+    return false;
+   }
+   
+if($("#TIN").val().length < 1)
+   {
+     alert('Please Enter TIN number');
+     $("#TIN").focus();
+    return false;
+   }
+if(!validateGST())
+{
+  $('#GSTNo').focus();
+  return false;
+}
+
 }
 
 //Call to ajax existing PAN