diff --git a/application/views/addsupplier.php b/application/views/addsupplier.php
index 9c73edfb..35f8e810 100755
--- a/application/views/addsupplier.php
+++ b/application/views/addsupplier.php
@@ -416,7 +416,8 @@ $(function() {
       
             <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]){3}([0-9]){3}" title="Please enter PAN Number and EM/ED option and 3 digit Numbers format" style="text-transform:uppercase;">
+                <!-- <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]){3}([0-9]){3}" title="Please enter PAN Number and EM/ED option and 3 digit Numbers format" style="text-transform:uppercase;"> -->
+                  <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"  > 
diff --git a/application/views/companyview.php b/application/views/companyview.php
index e66ec26b..d96a75af 100755
--- a/application/views/companyview.php
+++ b/application/views/companyview.php
@@ -479,7 +479,8 @@ function ValidateUA() {
             </div>
                
             <div class="col-md-6 pad"><span>Excise Registration</span><span class="badge">*</span>
-               <input type="text" name="Exiseregistration1" id="ExiseRegistration1"   maxlength="15" class="form-control" value="<?php echo $Exiseregistration ;?>" pattern="(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[A-Za-z]).{2}(?=.*[0-9]).{3}" required onchange="ValidateExno();" style="text-transform: uppercase">
+               <!-- <input type="text" name="Exiseregistration1" id="ExiseRegistration1"   maxlength="15" class="form-control" value="<?php echo $Exiseregistration ;?>" pattern="(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[A-Za-z]).{2}(?=.*[0-9]).{3}" required onchange="ValidateExno();" style="text-transform: uppercase"> -->
+               <input type="text" name="Exiseregistration1" id="ExiseRegistration1"   maxlength="15" class="form-control" value="<?php echo $Exiseregistration ;?>" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([A-Za-z]){2}([0-9]){3}" required onchange="ValidateExno();" style="text-transform: uppercase">
             </div>
           </div>
          
@@ -580,10 +581,13 @@ function ValidateUA() {
                     <input type="text" id="TIN" name="TIN" maxlength="11"   class="form-control" value="<?php echo $TIN;?>" pattern="(.){11,11}" onkeypress="return isNumberKey(event)"  title="Please Enter 11 digit Number">
                 </div>
                 <div class="col-md-3"><span>PAN Number</span><span class="badge">*</span> 
-                     <input type="text" id="PAN"  maxlength="10"  name="PAN"  onchange="validatePAN();" class="form-control" style="text-transform: uppercase" value="<?php echo $PAN;?>"  pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}" required>
+                     <!-- <input type="text" id="PAN"  maxlength="10"  name="PAN"  onchange="validatePAN();" class="form-control" style="text-transform: uppercase" value="<?php echo $PAN;?>"  pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}" required> -->
+                     <input type="text" id="PAN"  maxlength="10"  name="PAN"  onchange="validatePAN();" class="form-control" style="text-transform: uppercase" value="<?php echo $PAN;?>"  pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" required>
+
                 </div>
                 <div class="col-md-3"><span>GST Number</span><span class="badge">*</span>
-                      <input type="text" id="GSTNO"  maxlength="15" onchange="validateGST();" name="GSTNO" class="form-control" style="text-transform: uppercase" value="<?php echo $GSTNO;?>" pattern="(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}" required title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and should be 'Z' only and 1 Number">
+                      <!-- <input type="text" id="GSTNO"  maxlength="15" onchange="validateGST();" name="GSTNO" class="form-control" style="text-transform: uppercase" value="<?php echo $GSTNO;?>" pattern="(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}" required title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and should be 'Z' only and 1 Number"> -->
+                      <input type="text" id="GSTNO"  maxlength="15" onchange="validateGST();" name="GSTNO" class="form-control" style="text-transform: uppercase" value="<?php echo $GSTNO;?>" pattern="([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}" required title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and should be 'Z' only and 1 Number">
                 </div>
             </div>
      
diff --git a/application/views/editSupplier.php b/application/views/editSupplier.php
index 1c4ee61a..1ec44280 100755
--- a/application/views/editSupplier.php
+++ b/application/views/editSupplier.php
@@ -164,8 +164,7 @@ function alpha(e) {
      
 //PAN Validate 
 function validatePAN() {
- var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}$/;
-          
+var reg = /^([a-zA-Z]){5}([0-9]){4}([a-zA-Z]){1}?$/;//(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}$/;          
       var PAN = $('#panno').val();
       
       if(PAN != '')
@@ -188,7 +187,7 @@ function validatePAN() {
       
 }
 function validateECCNumber() {
- var reg = /(?=.*[A-Z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Z]).{1,}(?=.*[A-Z]).{2,}(?=.*[0-9]).{3,}$/;
+ var reg = /^([a-zA-Z]){5}([0-9]){4}([a-zA-Z]){3}([0-9]){3}?$/;     //(?=.*[A-Z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Z]).{1,}(?=.*[A-Z]).{2,}(?=.*[0-9]).{3,}$/;
           
       var ECC = $('#Exciseregistration').val();
       
@@ -314,7 +313,7 @@ function validateEmail() {
 } 
 
 function validateGST() {
- var reg = /(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}$/;
+ var reg =/^([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}$/; //([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();
       
@@ -495,7 +494,8 @@ 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" 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)" onkeypress="return alpha(event)" style="text-transform:uppercase;">
+                <!-- <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)" onkeypress="return alpha(event)" style="text-transform:uppercase;"> -->
+                <input type="text" id="panno"  maxlength="10"  name="panno"  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)" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" onkeypress="return alpha(event)" style="text-transform:uppercase;">
         </div>
        <div class="col-md-3 pad">
       <span for="TIN">TIN</span><span class="badge">*</span>
@@ -508,7 +508,8 @@ function onlyAlphabets(evt) {
       
             <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;?>" style="text-transform:uppercase;" title="Please enter PAN Number and EM/ED option and 3 digit Numbers format" pattern="(?=.*[A-Z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Z]).{1,}(?=.*[A-Z]).{2,}(?=.*[0-9]).{3,}">
+                <!-- <input type="text"  class="form-control required"  onchange="validateECCNumber();" id="Exciseregistration" name="Exciseregistration" minlength="15" maxlength="15" value="<?php echo $Exiseregistration;?>" style="text-transform:uppercase;" title="Please enter PAN Number and EM/ED option and 3 digit Numbers format" pattern="(?=.*[A-Z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Z]).{1,}(?=.*[A-Z]).{2,}(?=.*[0-9]).{3,}"> -->
+                <input type="text"  class="form-control required"  onchange="validateECCNumber();" id="Exciseregistration" name="Exciseregistration" minlength="15" maxlength="15" value="<?php echo $Exiseregistration;?>" style="text-transform:uppercase;" title="Please enter PAN Number and EM/ED option and 3 digit Numbers format" pattern="([a-zA-Z]){5}([0-9]){4}([a-zA-Z]){1}([a-zA-Z]){2}([0-9]){3}">
             </div>
         </div>
             <div class="col-md-12">
@@ -522,7 +523,8 @@ 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}(?=.*[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 " onkeypress="return alpha(event)">
+                <!-- <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 " onkeypress="return alpha(event)"> -->
+                 <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 " onkeypress="return alpha(event)">
             </div>
       
       <div class="col-md-3 pad">