diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php
index 143fe018..ced6cb41 100755
--- a/application/controllers/supplier.php
+++ b/application/controllers/supplier.php
@@ -77,6 +77,7 @@ class supplier extends BaseController
           print_r($query);          
                   
     }
+
      /* To Check the Pan Number is exists in the database or not for the selected Supplier */
       function checkPanValidateSupplier()     {   
     
@@ -113,6 +114,56 @@ class supplier extends BaseController
               return true;
           }
       }
+
+
+
+        function CheckGST()
+    {
+          //alert('check validation GST');
+          $id = $this->input->post('id');
+          $query = $this->supplier_model->checkGST($id);
+          $query =  $query[0]['GSTNO'];               
+          print_r($query);          
+                  
+    }
+
+
+       /* To Check the GST Number is exists in the database or not for the selected Supplier */
+      function checkGstValidateSupplier()     {   
+          //alert(' gst validation GST');
+          $SupplierID = $this->input->post('SupplierID');   
+          $GstNo = $this->input->post('GSTNo');
+          //echo  'Sup'. $SupplierID ;
+          $query = $this->supplier_model->checkGST($GstNo,$SupplierID);
+          if (count($query)> 0)
+          {
+             $this->form_validation->set_message('checkGstValidateSupplier', 'The Entered GST Number is already exists in the Database.');
+             return false;
+          }
+          else
+          {
+              return true;
+          }
+      }
+    
+
+      /* To Check the GST Number is exists in the database or not */
+      function checkGstValidate()
+      {  
+        
+          $GstNo = $this->input->post('GSTNo');  
+          $query = $this->supplier_model->checkGST($GstNo);
+          if (count($query)> 0)
+          {
+             $this->form_validation->set_message('checkGstValidate', 'The Entered GST Number is  already exists in the Database.');
+             return false;
+          }
+          else
+          {
+              return true;
+          }
+      }
+    
     
     /**
      * This function is used to add new Supplier to the system
@@ -128,7 +179,7 @@ class supplier extends BaseController
             $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('GSTNo','GSTNo','trim|requried|max_length[15]|callback_checkGstValidate');
             
             if($this->form_validation->run() == FALSE)
             {
@@ -144,7 +195,7 @@ class supplier extends BaseController
                 $Exiseregistration = $this->input->post('Exciseregistration');
                 $TIN = $this->input->post('TIN');
                 $PAN = strtoupper($this->input->post('panno'));
-                $GSTNo = $this->input->post('GSTNo');
+                $GSTNo = strtoupper($this->input->post('GSTNo'));
                 $GSTRange = $this->input->post('GSTRange');
                 $CollectrateAddress = $this->input->post('CollectrateAddress');
                 $UANumber = $this->input->post('UANumber');
@@ -183,7 +234,7 @@ class supplier extends BaseController
                 
             
                 $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,'PaymentDays'=>$Payment,'PayableAT'=>$PayableAT,'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);     
-                
+                //print_r($supplier);die();
                 $result = $this->supplier_model->addNewsupplier($supplier);
 
               
@@ -222,8 +273,9 @@ class supplier extends BaseController
             $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('GSTNo','GSTNo','trim|requried|max_length[15]|callback_checkGstValidateSupplier');
+
     
             
             if($this->form_validation->run() == FALSE)
@@ -241,7 +293,7 @@ class supplier extends BaseController
                 $Exiseregistration = $this->input->post('Exciseregistration');
                 $TIN = $this->input->post('TIN');
                 $PAN = strtoupper($this->input->post('panno'));
-                $GSTNo = $this->input->post('GSTNo');
+                $GSTNo = strtoupper($this->input->post('GSTNo'));
                 $GSTRange = $this->input->post('GSTRange');
                 $CollectrateAddress = $this->input->post('CollectrateAddress');
                 $UANumber = $this->input->post('UANumber');
@@ -288,7 +340,7 @@ class supplier extends BaseController
                 $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,'PaymentDays'=>$Payment,'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); 
                 //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();
+                 //print_r($supplier);die();
                  $result = $this->supplier_model->UpdateSupplier($supplier, $supplierID);
                
                                                 
diff --git a/application/models/supplier_model.php b/application/models/supplier_model.php
index f389d323..e7c8f41f 100755
--- a/application/models/supplier_model.php
+++ b/application/models/supplier_model.php
@@ -61,6 +61,24 @@ class supplier_model extends CI_Model
     
            }
 
+    function checkGST($GST,$SID = '')
+    {
+        $this->db->select('GSTNO');
+        $this->db->from('T_SupplierDetailsN');
+        $this->db->where('GSTNO',$GST);
+         if ($SID != '')
+        {
+            $this->db->where('SupplierID  !=',$SID);
+        }
+        $query = $this->db->get();
+        //print_r($this->db->last_query());
+        if ($query->num_rows > 0) {
+          //  echo $query->num_rows;
+            return $query->result_array();
+        }       
+    
+           }
+
     
     
 
diff --git a/application/views/addsupplier.php b/application/views/addsupplier.php
index 21bc2e2a..32ad7d97 100755
--- a/application/views/addsupplier.php
+++ b/application/views/addsupplier.php
@@ -75,6 +75,33 @@ function validatePAN() {
 			}
 			
 }
+
+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}$/;
+          //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);
+			}
+			
+}
+
+
 function validateECCNumber() {
  var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}(?=.*[A-Za-z]).{2,}(?=.*[0-9]).{3,}$/;
           
@@ -190,6 +217,7 @@ $(function() {
  <style>
  legend{
  color:#00c0ef ! important;
+ margin-left:-2%;
  } 
  
    .pad{
@@ -230,49 +258,52 @@ $(function() {
                     
    
     <div class="row">
-    <div class="col-md-10 col-md-offset-1"   style="border:3px solid #3c8dbc;">
+    <div class="col-md-10 col-md-offset-1"><br/>
       <form class="form-horizontal" role="form" id="addsupplier" action="<?php echo base_url() ?>addNewsupplier" method="post" role="form">
         <fieldset>
 		 
           <!-- Form Name -->
           <legend>Supplier Information</legend> 
       		        
-        <div class="col-md-12" style="padding:0px;">
-        <div class="col-md-5" style="padding:0px;">
+        <div class="col-md-12">
+        
 		
-            <div class="col-md-7">
+            <div class="col-md-3">
 			<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-5"><span for="CollectrateAddress">Supplier Type</span><span class="badge">*</span> <br/>
-		
-			<input type="checkbox" id="service"  name="service" value="<?php echo $service = (isset($_POST['service'])) ? 0 : 1;?>"> <b>SERVICE </b><br/>
-			<input type="checkbox" id="rawmaterial" name="rawmaterial" value="<?php echo $rawmaterial = (isset($_POST['rawmaterial'])) ? 0 : 1;?>"> <b>RAW MATERIALS </b><br/> 
-			<input type="checkbox" id="maintanance" name="maintanance" value="<?php echo $maintanance = (isset($_POST['maintanance'])) ? 0 : 1;?>"> <b>MAINTENANCE </b>
-			</div>
-		</div>
-        <div class="col-md-5" style="padding:0px;">
-            <div class="col-md-6">
+			
+       
+            <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">
             </div>
-		 	<div class="col-md-6"> 
+		 	<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">
             </div>
-		</div>
-		<div class="col-md-2" style="padding:0px;">
+		 
+		<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> 
+        <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>    
 
 <!-- Address Section -->
           <!-- Form Name -->
           <legend>Address Details</legend>
           <!-- Text input-->
-          <div class="col-md-12"  style="padding:0px;">
+          <div class="col-md-12"  >
             <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>
@@ -283,10 +314,10 @@ $(function() {
           
           <legend>Tax Related Data</legend>
           <!-- Text input-->
-		      <div class="col-md-12"  style="padding:0px;">     
+		      <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"   onchange="validatePAN();" requried class="form-control" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character should be in caps)">
+                <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>
@@ -302,7 +333,7 @@ $(function() {
                 <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"  style="padding:0px;"> 
+		 <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">
@@ -312,7 +343,7 @@ $(function() {
             </div>		 		  
             <div class="col-md-3 pad">
 			<span for="GSTNo">GST Number</span><span class="badge">*</span>    
-                <input type="text"  class="form-control " id="GSTNo"  name="GSTNo" maxlength="10" required>
+                <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>    
@@ -326,7 +357,7 @@ $(function() {
 		</div>
           <!-- Text input-->
 		   <legend>Certification Details</legend>	
-		   <div class="col-md-12" style="padding:0px;">
+		   <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">
@@ -341,12 +372,12 @@ $(function() {
 						<input type="text"  class="form-control " id="IMSNo"  name="IMSNo" maxlength="10">
 					</div>			
 					<div class="col-md-6">
-					<span for="ISONo">ISO Range</span>     
+					<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">OSHAS Number</span>
+					 <span for="OSHASNo">OHSAS Number</span>
 						<input type="text"  class="form-control " id="OSHASNo"  name="OSHASNo" maxlength="10">
 					
 				</div>
@@ -354,7 +385,7 @@ $(function() {
 			  <legend>Bank Details</legend>
           <!-- Text input-->
 		  
-          <div class="col-md-12"  style="padding:0px;">
+          <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">
             </div>
@@ -399,8 +430,8 @@ $(function() {
           <div class="col-md-12">
             <div class="col-md-3 col-md-offset-9">
               <div class="pull-right">
-               <input type="reset" id="reset"  class="btn btn-info" value="Reset" />
-                <input type="submit" onclick="return Validate();" class="btn btn-primary">
+               <input type="reset" id="reset"  class="btn btn-primary" value="Reset" />
+                <input type="submit" onclick="return Validate();" value="Submit" class="btn btn-primary">
               
               </div>
             </div>
@@ -461,6 +492,12 @@ if(!validateEmail())
   $('#emailid').focus();
    return false;  
 }
+
+if(!validateGST())
+{
+	$('#GSTNo').focus();
+	return false;
+}
 }
 
 //Call to ajax existing PAN
@@ -480,16 +517,55 @@ if(!validateEmail())
 				
 			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').val('');
 					$('#panno').focus();
-                                           return false; 
-	             	          }
-			         else 
+                    return false; 
+	        	}
+				else 
 				{
 					alert('Please edit the supplier details in the Edit screen and change the supplier status to Active');
-				        window.location = 'supplier/supplierListing';	
+				      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();
+                    return false; 
+	            }
+			    else 
+				{
+					alert('Please edit the supplier details in the Edit screen and change the supplier status to Active');
+				    window.location = 'supplier/supplierListing';	
 				}					
 			
 		      }
@@ -499,9 +575,9 @@ if(!validateEmail())
 		}
 		else
 		{
-			alert('Please enter the PAN Number');
-			$('#panno').focus();
-                        return false;
+			alert('Please enter the GST Number');
+			$('#GSTNo').focus();
+            return false;
 		}
   
 });
diff --git a/application/views/editSupplier.php b/application/views/editSupplier.php
index 005ac0de..012898c1 100755
--- a/application/views/editSupplier.php
+++ b/application/views/editSupplier.php
@@ -243,6 +243,31 @@ 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}$/;
+          //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);
+			}
+			
+}
 function onlyAlphabets(evt) {
         var charCode;
         if (window.event)
@@ -281,6 +306,7 @@ function onlyAlphabets(evt) {
  <style>
  legend{
  color:#00c0ef ! important;
+ margin-left:-2%;
  } 
  
    .pad{
@@ -318,7 +344,7 @@ function onlyAlphabets(evt) {
                     
    
     <div class="row">
-    <div class="col-md-10 col-md-offset-1"   style="border:3px solid #3c8dbc;">
+    <div class="col-md-10 col-md-offset-1" ><br/>
       <form class="form-horizontal" role="form" id="UpdateSupplier" action="<?php echo base_url() ?>editsupplier" method="post" role="form">
         <fieldset>
 		 
@@ -374,7 +400,7 @@ function onlyAlphabets(evt) {
          
 		    <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)">
+                <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;">
 		    </div>
 			 <div class="col-md-3 pad">
 			<span for="TIN">TIN</span><span class="badge">*</span>
@@ -394,16 +420,16 @@ function onlyAlphabets(evt) {
                 <input type="text"  class="form-control "  value="<?php echo $CSTNO;?>" id="CSTNo"  name="CSTNo" maxlength="15">
             </div>
 			 <div class="col-md-3 pad"><span>CST Registration Date</span>
-              <input  id="dateofCST" name="dateofCST" value="<?php echo $CSTDate;?>"    onkeypress="return false;" maxlength="10"   class="form-control">
+              <input  id="dateofCST" name="dateofCST" value="<?php echo $CSTDate;?>"  onkeypress="return false;" maxlength="10"   class="form-control">
             </div>
             <div class="col-md-3 pad">
-			<span for="GSTNo">GST Number</span>
-                <input type="text"  class="form-control " value="<?php echo $GSTNO;?>" id="GSTNo"  name="GSTNo" maxlength="10">
+			<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">
             </div>
 			
 			<div class="col-md-3 pad">
-			<span for="Range">GST Range</span>
-                <input type="text"  class="form-control " id="GSTRange"  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" requried value="<?php echo $GSTRange;?>"  name="GSTRange" maxlength="10">
             </div>
 			<!-- Text input-->
         
@@ -433,7 +459,7 @@ function onlyAlphabets(evt) {
 					</div>
 				</div>
 				<div class="col-md-2 ">			
-					 <span for="OSHASNo">OSHAS Number</span>
+					 <span for="OSHASNo">OHSAS Number</span>
 						<input type="text"  class="form-control " id="OSHASNo"  name="OSHASNo"  value="<?php echo $OSHASNo;?>" maxlength="15">
 					
 				</div>
@@ -483,8 +509,8 @@ function onlyAlphabets(evt) {
 		  <div class="form-group">
             <div class="col-md-3 col-md-offset-9">
               <div class="pull-right">
-               <input type="reset" id="reset"  class="btn btn-info" value="Reset" />
-                <input type="submit" onclick="validate();"   class="btn btn-primary">
+               <input type="reset" id="reset"  class="btn btn-primary" value="Reset" />
+                <input type="submit" onclick="validate();" value="Submit"  class="btn btn-primary">
               </div>
             </div>
           </div>
@@ -538,6 +564,11 @@ function Validate()
 		return false;
 		$('#panno').focus();
 	}
+	if(!validateGST())
+	{
+	$('#GSTNo').focus();
+	return false;
+	}
 }
 
 //Call to ajax existing PAN
@@ -580,4 +611,48 @@ function Validate()
 		}
   
 });
+
+ $('#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();
+                    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();
+            return false;
+		}
+  
+});
+
+
+
+
 </script>
\ No newline at end of file