diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php
index 7101eda3..52e15ff9 100755
--- a/application/controllers/employeedetails.php
+++ b/application/controllers/employeedetails.php
@@ -630,9 +630,9 @@ echo "<script>alert('Record Not Saved!');</script>";redirect('employeeListing','
           else
           {
             //echo  'Exists But Replace';
-            $Picture = $ModifyPictureName;
+            //$Picture = $ModifyPictureName;
             //$Picture = $this->editimage($ModifyPictureName);  
-            //$Picture = $this->add($ModifyPictureName);
+            $Picture = $this->add($ModifyPictureName);
           } 
         }
         else
diff --git a/application/views/addemployee.php b/application/views/addemployee.php
index 5037a973..df6bca39 100755
--- a/application/views/addemployee.php
+++ b/application/views/addemployee.php
@@ -236,7 +236,7 @@ function validatecomEmail() {
 function validateDriverLicense() {
       
   
-  var reg = /^[A-Z]{2}[0-9]{2}\s[0-9]{11}$/;
+  var reg = /^[a-zA-Z]{2}[0-9]{2}\s[0-9]{11}$/;
          // alert();
       var VehicleNo = $('#Driverlicense').val();
       if(VehicleNo != "")
@@ -761,7 +761,7 @@ function validateESI() {
           <!-- Text input-->
       
           <div class="col-md-12 pad">
-            <div class="col-md-12"><span>Nominee</span> 
+            <div class="col-md-12"><span>Nominee reference</span> 
               <input type="text" id="nomineename" name="nomineename" maxlength="255" class="form-control">
               <!-- <textarea id="nomineename" name="nomineename" maxlength="255" class="form-control" rows="3" cols="50"></textarea> -->
             </div>
diff --git a/application/views/addsupplier.php b/application/views/addsupplier.php
index 291ee57a..9c73edfb 100755
--- a/application/views/addsupplier.php
+++ b/application/views/addsupplier.php
@@ -53,7 +53,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}?$/;     
           
       var PAN = $('#panno').val();
       
@@ -77,8 +77,30 @@ function validatePAN() {
       
 }
 
+function validateUA() {
+
+        var reguano = /^([a-zA-Z]){5}([0-9]){10}?$/;     
+            var UA = $('#UANumber').val();
+            
+            if(UA != '')
+            {
+              if (reguano.test(UA) == false) 
+              {
+                alert('Please Enter Valid UA Number');
+                return (false);
+              }
+              else
+              {
+                return true;
+              }
+            }
+            
+      }
+
+
 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}$/;
+ 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();
       
@@ -104,7 +126,8 @@ function validateGST() {
 
 
 function validateECCNumber() {
- var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}(?=.*[A-Za-z]).{2,}(?=.*[0-9]).{3,}$/;
+ // var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}(?=.*[A-Za-z]).{2,}(?=.*[0-9]).{3,}$/;
+ var reg = /^([a-zA-Z]){5}([0-9]){4}([a-zA-Z]){3}([0-9]){3}?$/;     
           
       var ECC = $('#Exciseregistration').val();
       
@@ -380,20 +403,20 @@ $(function() {
           <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)" onkeypress="return alpha(event)" style="text-transform: uppercase">
-        </div>
+                <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)" onkeypress="return alpha(event)" style="text-transform: uppercase">        </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" id="UANumber" name="UANumber" maxlength="15" title="Please Enter Valid UA Number" onkeypress="return alpha(event)" >
+                <!-- <input type="text"  class="form-control" id="UANumber" name="UANumber" maxlength="15" title="Please Enter Valid UA Number" onkeypress="return alpha(event)" > -->
+                <input type="text"  class="form-control" id="UANumber" name="UANumber" onchange="validateUA();" maxlength="15" pattern="([a-zA-Z]){5}([0-9]){10}" title="Please Enter Valid UA Number" onkeypress="return alpha(event)" style="text-transform: uppercase">
             </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" 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;">
+                <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;">
             </div>
       </div>
      <div class="col-md-12"  > 
@@ -406,7 +429,7 @@ $(function() {
             </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}(?=.*[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" onkeypress="return alpha(event)">
+                <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" onkeypress="return alpha(event)">
             </div>      
       <div class="col-md-3 pad">
       <span for="Range">GST Range</span><!--<span class="badge">*</span>-->
diff --git a/application/views/companyview.php b/application/views/companyview.php
index ad9bb75a..e66ec26b 100755
--- a/application/views/companyview.php
+++ b/application/views/companyview.php
@@ -342,6 +342,26 @@ function ValidateAlternateContact(){
       }
 
 
+
+function ValidateUA() {
+
+        var reguano = /^([a-zA-Z]){5}([0-9]){10}?$/;     
+            var UA = $('#UANumber').val();
+            
+            if(UA != '')
+            {
+              if (reguano.test(UA) == false) 
+              {
+                alert('Please Enter Valid UA Number');
+                return (false);
+              }
+              else
+              {
+                return true;
+              }
+            }
+            
+      }
   
 </script> 
 <script>
@@ -553,8 +573,8 @@ function ValidateAlternateContact(){
           <div class="form-group">
             <div class="col-md-12 pad">
 
-                <div class="col-md-3"><span>UANumber</span>
-                   <input type="text" id="UANumber" name="UANumber" maxlength="10" class="form-control" value="<?php echo $UANumber;?>" style="text-transform: uppercase">
+                <div class="col-md-3"><span>UA Number</span>
+                    <input type="text" id="UANumber" name="UANumber" onchange="ValidateUA();" maxlength="15" class="form-control" value="<?php echo $UANumber;?>" pattern="([a-zA-Z]){5}([0-9]){10}" style="text-transform: uppercase">
                  </div>
                 <div class="col-md-3"><span>TIN Number</span> 
                     <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">
diff --git a/application/views/editEmployee.php b/application/views/editEmployee.php
index 403b18ff..9b4e59fa 100755
--- a/application/views/editEmployee.php
+++ b/application/views/editEmployee.php
@@ -256,7 +256,7 @@ function ValidateAadhar(){
 function validateDriverLicense() {
 			
 	
-	var reg = /^[A-Z]{2}[0-9]{2}\s[0-9]{11}$/;
+	var reg = /^[a-zA-Z]{2}[0-9]{2}\s[0-9]{11}$/;
          // alert();
 			var VehicleNo = $('#Driverlicense').val();
 			if(VehicleNo != "")
@@ -998,7 +998,7 @@ function onlyAlphabets(evt) {
           <!-- Text input-->
       
           <div class="col-md-12 pad">
-            <div class="col-md-12"><span>Nominee</span> 
+            <div class="col-md-12"><span>Nominee reference</span> 
               <input type="text" id="nomineename" name="nomineename" maxlength="250" class="form-control" placeholder="Nominee Name" value="<?php echo $nominee ;?>"> 
            <!-- rows="3" cols="50" -->
             </div>
diff --git a/application/views/editOldcost.php b/application/views/editOldcost.php
index 0a9282b1..cad7f116 100755
--- a/application/views/editOldcost.php
+++ b/application/views/editOldcost.php
@@ -91,6 +91,26 @@ $(function() {
 
 
 //});
+
+$( document ).ready(function() {
+    //console.log( "ready!" );
+    var id = $('#drpBudget').val();
+    var code = $('#CostCode').val();
+    $.ajax({
+			data:{id:id},
+			dataType: 'json',
+			type:"POST",
+			url:"<?php echo base_url();?>CostCenter/GetBudgetForYear?BudYear="+id+"&CostCode="+code,
+			success:function(json) {
+
+				$("#Addbudget").empty();
+				$("#Addbudget").append(json.BudYear);
+				
+		      }
+			  
+			});	
+				
+});
 	 
 	 $('#drpBudget').change(function() {
 
diff --git a/application/views/editSupplier.php b/application/views/editSupplier.php
index 418d8f0d..1c4ee61a 100755
--- a/application/views/editSupplier.php
+++ b/application/views/editSupplier.php
@@ -337,6 +337,27 @@ function validateGST() {
       }
       
 }
+function validateUA() {
+
+        var reguano = /^([a-zA-Z]){5}([0-9]){10}?$/;     
+            var UA = $('#UANumber').val();
+            
+            if(UA != '')
+            {
+              if (reguano.test(UA) == false) 
+              {
+                alert('Please Enter Valid UA Number');
+                return (false);
+              }
+              else
+              {
+                return true;
+              }
+            }
+            
+      }
+
+
 function onlyAlphabets(evt) {
         var charCode;
         if (window.event)
@@ -482,7 +503,7 @@ function onlyAlphabets(evt) {
             </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" value="<?php echo $UANumber;?>" title="Please Enter Valid UA Number">
+                <input type="text"  class="form-control" id="UANumber" name="UANumber" maxlength="15" value="<?php echo $UANumber;?>" onchange="validateUA()" pattern="([a-zA-Z]){5}([0-9]){10}" title="Please Enter Valid UA Number" onkeypress="return alpha(event)" style="text-transform: uppercase">
             </div>
       
             <div class="col-md-3 pad">      
diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index 1f6c0aa6..8ff8bad3 100755
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -208,7 +208,7 @@ $(function() {
 						?>
 						<li class="treeview">
 						  <a href="<?php echo base_url(); ?>companyview" >
-							<i class="fa fa-user-circle"></i>
+							<i class="fa fa-industry"></i>
 							<span class="nav-label">Company Master</span>
 						  </a>
 						</li>
@@ -220,13 +220,13 @@ $(function() {
 						</li>
 						<li class="treeview">
 						  <a href="<?php echo base_url(); ?>configlisting" >
-							<i class="fa fa-user-circle"></i>
+							<i class="fa fa-file-text"></i>
 							<span class="nav-label">Config Master</span>
 						  </a>
 						</li>
 						<li class="treeview">
 						  <a href="<?php echo base_url(); ?>departmentListing" >
-							<i class="fa fa-user-circle"></i>
+							<i class="fa fa-building"></i>
 							<span class="nav-label">Department Master</span>
 						  </a>
 						</li>