diff --git a/application/views/addemppaydate.php b/application/views/addemppaydate.php
index 57f9ba37..7b2619c5 100755
--- a/application/views/addemppaydate.php
+++ b/application/views/addemppaydate.php
@@ -11,7 +11,7 @@ $("#loan_issued_date").datepicker({
 $("#due_started").datepicker({
                 minDate :'now',
                 //maxDate : 'now',
-                dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+                dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+1'
             });
 });
 
@@ -70,7 +70,7 @@ $("#due_started").datepicker({
                            
                                 <div class="col-md-4">
                                     <div class="form-group">
-                                        <label for="EmpID">Employee ID:</label><font color="Red">*</font>
+                                        <label for="EmpID">Employee ID</label><font color="Red">*</font>
                                         <div class="form-group">
                             
                                           <?php
@@ -95,7 +95,7 @@ $("#due_started").datepicker({
 
                                 <div class="col-md-4">
                                     <div class="form-group">
-                                        <label for="Basic_Pay">Total Salary:</label><font color="Red">*</font>
+                                        <label for="Basic_Pay">Total Salary</label><font color="Red">*</font>
                                         <div class="form-group">
                                                 <?php
                                          
@@ -107,7 +107,7 @@ $("#due_started").datepicker({
                                 </div>
 								<div class="col-md-4">
                                     <div class="form-group">
-                                        <label for="Basic_Pay">Basic Pay:</label><font color="Red">*</font>
+                                        <label for="Basic_Pay">Basic Pay</label><font color="Red">*</font>
                                         <div class="form-group">
                                                 <?php
                                          
@@ -130,7 +130,7 @@ $("#due_started").datepicker({
 								  
 								   <div class="col-md-4">
                                     <div class="form-group">
-                                        <label for="HRA_Rate">HRA Rate(%):</label><font color="Red">*</font>
+                                        <label for="HRA_Rate">HRA Rate(%)</label><font color="Red">*</font>
                                          
                                         <div class="form-group">
                                                 <?php
@@ -143,7 +143,7 @@ $("#due_started").datepicker({
                                 </div>
 								<div class="col-md-4">
                                     <div class="form-group">
-                                        <label for="HRA_Rate">HRA Amount:</label><font color="Red">*</font>
+                                        <label for="HRA_Rate">HRA Amount</label><font color="Red">*</font>
                                          
                                         <div class="form-group">
                                                 <?php
@@ -157,11 +157,11 @@ $("#due_started").datepicker({
 								
                                 <div class="col-md-4">
                                     <div class="form-group">
-                                        <label for="OT_Rate">OT Rate:</label><font color="Red">*</font>
+                                        <label for="OT_Rate">OT Rate</label><font color="Red">*</font>
                                         <div class="form-group">
                                                 <?php
                                           
-                                          $data = array('name' => 'OT_Rate','value' => set_value('OT_Rate'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;','pattern'=>'[0-9]{1,4}' ,'title'=>'Enter the Valid OT Rate, Minimum 1 digit, Maximum 4 digit');
+                                          $data = array('name' => 'OT_Rate','value' => set_value('OT_Rate'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;','pattern="([0-9]{1,2}([.][0-9]{1,2})?' ,'title'=>'Enter the Valid OT Rate, Minimum 1 digit, Maximum 4 digit');
                                         echo form_input($data);
                                         
                                         ?>   
@@ -180,7 +180,7 @@ $("#due_started").datepicker({
 						   
 						   <div class="col-md-4">
                                     <div class="form-group">
-                                        <label for="Allowances">Allowances:</label><font color="Red">*</font>
+                                        <label for="Allowances">Allowances</label><font color="Red">*</font>
                                         <div class="form-group">
                                                 <?php
                                          
@@ -193,7 +193,7 @@ $("#due_started").datepicker({
 								
 						    <div class="col-md-4">
                                     <div class="form-group">
-                                        <label for="PF_Rate">PF Rate(%):</label><font color="Red">*</font>
+                                        <label for="PF_Rate">PF Rate(%)</label><font color="Red">*</font>
                                          
                                         <div class="form-group">
                                                 <?php
@@ -206,7 +206,7 @@ $("#due_started").datepicker({
                                 </div>
                                 <div class="col-md-4">
                                     <div class="form-group">
-                                        <label for="ESI_Rate">ESI Rate(%):</label><font color="Red">*</font>
+                                        <label for="ESI_Rate">ESI Rate(%)</label><font color="Red">*</font>
                                         <div class="form-group">
                                                 <?php
                                          
@@ -219,7 +219,7 @@ $("#due_started").datepicker({
                                 <!--for food allowances-->
                                  <div class="col-md-4">
                                     <div class="form-group">
-                                        <label for="Food_Allowances">Food Allowances:</label><font color="Red">*</font>
+                                        <label for="Food_Allowances">Food Allowances</label><font color="Red">*</font>
                                         <div class="form-group">
                                                 <?php
                                          
@@ -255,7 +255,7 @@ $("#due_started").datepicker({
                                 <div class="col-md-3">
                                     <div class="form-group">
                                         <div class="form-group">
-                                        <span for="EmpID">Loan Issue(d) Date:</span>
+                                        <span for="EmpID">Loan Issue(d) Date</span>
                                         <input type="text" class="form-control" id="loan_issued_date" name="loan_issued_date" value="">
                                     </div>
                                     </div>
@@ -265,7 +265,7 @@ $("#due_started").datepicker({
                                 <div class="col-md-3">
                                     <div class="form-group">
                                         <div class="form-group">
-                                        <span for="Basic_Pay">Monthly Due(s):</span>
+                                        <span for="Basic_Pay">Monthly Due</span>
                                         <input type="text" value="0" class="form-control requried" id="monthly_due" name="monthly_due" value="" pattern="[0-9]{1,6}" title="Minimum 4 digit,Maximum 6 Digit" onchange="duecalculation();">
                                     </div>
                                     </div>
@@ -273,7 +273,7 @@ $("#due_started").datepicker({
 								<div class="col-md-3">
                                     <div class="form-group">
                                         <div class="form-group">
-                                        <span for="Basic_Pay">Due Started:</span>
+                                        <span for="Basic_Pay">Due Started</span>
                                         <input type="text" class="form-control requried" id="due_started" name="due_started" value="">
                                     </div>
                                     </div>
@@ -281,7 +281,7 @@ $("#due_started").datepicker({
 								<div class="col-md-3">
                                     <div class="form-group">
                                         <div class="form-group">
-                                        <span for="Basic_Pay">No Of Due(s):</span>
+                                        <span for="Basic_Pay">No Of Due(s)</span>
                                         <input type="text" value="0" class="form-control requried" id="no_of_due" name="no_of_due" value="" pattern="[0-9]{1,2}" title="Minimum 1 digit,Maximum 2 Digit" readonly>
                                     </div>
                                     </div>
@@ -289,13 +289,13 @@ $("#due_started").datepicker({
 								<div class="col-md-3">
                                     <div class="form-group">
                                         <div class="form-group">
-                                        <span for="Basic_Pay">Paid Amount:</span>
+                                        <span for="Basic_Pay">Paid Amount</span>
                                         <input type="text" value="0" class="form-control requried" id="Paid_Amount" name="Paid_Amount" value="0" pattern="[0-9]{1,2}" title="Minimum 1 digit,Maximum 2 Digit" readonly>
                                     </div>
                                     </div>
                                 </div>
-								<input type="text" id="remaining_due" name="remaining_due" value="0">
-								<input type="text" id="paid_due" name="paid_due" value="0">
+								<input type="hidden" id="remaining_due" name="remaining_due" value="0">
+								<input type="hidden" id="paid_due" name="paid_due" value="0">
                                 </div>
                                <div class="box-footer" style="text-align:right">
                             <input type="submit" class="btn btn-info" value="Submit" onmouseover="empcheck();" />
diff --git a/application/views/advancerequest.php b/application/views/advancerequest.php
index 0c15ffac..ad856a28 100755
--- a/application/views/advancerequest.php
+++ b/application/views/advancerequest.php
@@ -180,7 +180,7 @@ $(function() {
 </div>
 </div>
 						 <div  class="col-md-12" align = "right"><br/>
-						<input type="Submit" class="btn btn-primary" value="Raise Request" style="margin-right:28px" onclick="validate();" />
+						<input type="Submit" class="btn btn-primary" value="Advance Request" style="margin-right:28px" onclick="validate();" />
 						</div>
 						
 </section>
diff --git a/application/views/editOldemppay.php b/application/views/editOldemppay.php
index c178a43c..f767dca3 100755
--- a/application/views/editOldemppay.php
+++ b/application/views/editOldemppay.php
@@ -11,7 +11,7 @@ $("#loan_issued_date").datepicker({
 $("#due_started").datepicker({
                 minDate :'now',
                 //maxDate : 'now',
-                dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+                dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+1'
             });
 });
 
@@ -136,7 +136,7 @@ if(!empty($emppay))
                                 <div class="col-md-4">
                                     <div class="form-group">
                                         <div class="form-group">
-                                        <span for="EmpID">Employee ID:</span>
+                                        <span for="EmpID">Employee ID</span>
                                         <input type="text" class="form-control" readonly  id="EmployeeID" name="EmpID" value="<?php echo $EmpID; ?>">
                                     </div>
                                     </div>
@@ -146,7 +146,7 @@ if(!empty($emppay))
                                 <div class="col-md-4">
                                     <div class="form-group">
                                         <div class="form-group">
-                                        <span for="Basic_Pay">Total Salary:</span><font color="Red">*</font>
+                                        <span for="Basic_Pay">Total Salary</span><font color="Red">*</font>
                                         <input type="text" class="form-control requried" id="total_salary" name="total_salary" value="<?php echo number_format($TotalSalary,0,'',''); ?>" pattern="[0-9]{4,6}" title="Minimum 4 digit,Maximum 6 Digit" onchange="calculateBasic();">
                                     </div>
                                     </div>
@@ -160,7 +160,7 @@ if(!empty($emppay))
 							 <div class="col-md-4">
                                     <div class="form-group">
                                         <div class="form-group">
-                                        <span for="Basic_Pay">Basic Pay:</span><font color="Red">*</font>
+                                        <span for="Basic_Pay">Basic Pay</span><font color="Red">*</font>
                                         <input type="text" class="form-control requried" id="Basic_Pay" name="Basic_Pay" value="<?php echo $Basic_Pay; ?>"  readonly>
                                     </div>
                                     </div>
@@ -169,7 +169,7 @@ if(!empty($emppay))
                                 <div class="col-md-4">
                                     <div class="form-group">
                                         <div class="form-group">
-                                            <span for="HRA_Rate">HRA_Rate(%):</span><font color="Red">*</font>
+                                            <span for="HRA_Rate">HRA_Rate(%)</span><font color="Red">*</font>
                                            <input type="text" class="form-control required" id="HRA_Rate" name="HRA_Rate" value="<?php echo $HRA_Rate; ?>" pattern="([0-9]{1,2}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit" onchange="calculateBasic();">
                                         </div>
                                     </div>
@@ -178,7 +178,7 @@ if(!empty($emppay))
 								<div class="col-md-4">
                                     <div class="form-group">
                                         <div class="form-group">
-                                            <span for="HRA_Rate">HRA_Amount:</span><font color="Red">*</font>
+                                            <span for="HRA_Rate">HRA_Amount</span><font color="Red">*</font>
                                            <input type="text" class="form-control required" id="HRA_Amount" name="HRA_Amount" value="<?php echo number_format($HRA_Amount,0,'',''); ?>"  readonly>
                                         </div>
                                     </div>
@@ -198,8 +198,8 @@ if(!empty($emppay))
 							 <div class="col-md-4">
                                      <div class="form-group">
                                          <div class="form-group">
-                                           <span for="OT_Rate">OT_Rate:</span><font color="Red">*</font>
-                                           <input type="text" class="form-control required" id="OT_Rate" name="OT_Rate" value="<?php echo $OT_Rate; ?>" pattern="[0-9]{1,4}"title="Minimum 1 digit,Maximum 4 Digit">
+                                           <span for="OT_Rate">OT_Rate</span><font color="Red">*</font>
+                                           <input type="text" class="form-control required" id="OT_Rate" name="OT_Rate" value="<?php echo $OT_Rate; ?>" pattern="([0-9]{1,2}([.][0-9]{1,2})?" title="Minimum 1 digit,Maximum 4 Digit">
                                         </div>
                                     </div>
                                 </div>
@@ -207,7 +207,7 @@ if(!empty($emppay))
 							 <div class="col-md-4">
                                     <div class="form-group">
                                         <div class="form-group">
-                                            <span for="Allowances">Allowances:</span><font color="Red">*</font>
+                                            <span for="Allowances">Allowances</span><font color="Red">*</font>
                                            <input type="text" class="form-control required" id="Allowances" name="Allowances" value="<?php echo $Allowances; ?>" pattern="[0-9]{1,4}" title="Minimum 1 digit,Maximum 4 Digit">
                                         </div>
                                     </div>
@@ -215,7 +215,7 @@ if(!empty($emppay))
                                   <div class="col-md-4">
                                     <div class="form-group">
                                          <div class="form-group">
-                                           <span for="PF_Rate">PF_Rate(%):</span><font color="Red">*</font>
+                                           <span for="PF_Rate">PF_Rate(%)</span><font color="Red">*</font>
                                            <input type="text" class="form-control required" id="PF_Rate" name="PF_Rate" value="<?php echo $PF_Rate; ?>" pattern="([0-9]{1,2}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit">
                                         </div>
                                     </div>
@@ -225,7 +225,7 @@ if(!empty($emppay))
                                 <div class="col-md-4">
                                     <div class="form-group">
                                         <div class="form-group">
-                                            <span for="ESI_Rate">ESI_Rate(%):</span><font color="Red">*</font>
+                                            <span for="ESI_Rate">ESI_Rate(%)</span><font color="Red">*</font>
                                            <input type="text" class="form-control required" id="ESI_Rate" name="ESI_Rate" value="<?php echo $ESI_Rate; ?>" pattern="([0-9]{1,2}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit">
                                         </div>
                                     </div>
@@ -234,7 +234,7 @@ if(!empty($emppay))
                                 <div class="col-md-4">
                                 <div class="form-group">
                                     <div class="form-group">
-                                        <span for ="Food_Allowances">Food Allowances:</span><font color="Red">*</font>
+                                        <span for ="Food_Allowances">Food Allowances</span><font color="Red">*</font>
                                          <input type="text" class="form-control" id="Food_Allowances" name="Food_Allowances" value="<?php echo $Food_Allowances; ?>" pattern="[0-9]{1,4}" title="Minimum 1 digit,Maximum 4 Digit">  
                                         </div>
                                     </div>
@@ -252,7 +252,7 @@ if(!empty($emppay))
 
 
                                         <span for="Pay_Data_ID">Loan Amount</span>
-                                        <input type="text" class="form-control"  id="Loan_Amount" name="Loan_Amount" value="<?php echo $Loan_Amount; ?>" pattern="[0-9]{4,6}" title="Minimum 4 digit,Maximum 6 Digit" onchange="duecalculation();">
+                                        <input type="text" class="form-control"  id="Loan_Amount" name="Loan_Amount" value="<?php echo $Loan_Amount; ?>" pattern="[0-9]{1,6}" title="Minimum 4 digit,Maximum 6 Digit" onchange="duecalculation();">
                                     </div>
                                     </div>
                                 </div>
@@ -263,7 +263,7 @@ if(!empty($emppay))
                                 <div class="col-md-3">
                                     <div class="form-group">
                                         <div class="form-group">
-                                        <span for="EmpID">Loan Issue(d) Date:</span>
+                                        <span for="EmpID">Loan Issue(d) Date</span>
                                         <input type="text" class="form-control" id="loan_issued_date" name="loan_issued_date" value="<?php echo $Loan_issued_date;?>">
                                     </div>
                                     </div>
@@ -273,7 +273,7 @@ if(!empty($emppay))
                                 <div class="col-md-3">
                                     <div class="form-group">
                                         <div class="form-group">
-                                        <span for="Basic_Pay">Monthly Due(s):</span>
+                                        <span for="Basic_Pay">Monthly Due</span>
                                         <input type="text" class="form-control requried" id="monthly_due" name="monthly_due" value="<?php echo $Monthly_due; ?>" pattern="[0-9]{4,6}" title="Minimum 4 digit,Maximum 6 Digit" onchange="duecalculation();">
                                     </div>
                                     </div>
@@ -281,7 +281,7 @@ if(!empty($emppay))
 								<div class="col-md-3">
                                     <div class="form-group">
                                         <div class="form-group">
-                                        <span for="Basic_Pay">Due Started:</span>
+                                        <span for="Basic_Pay">Due Started</span>
                                         <input type="text" class="form-control requried" id="due_started" name="due_started" value="<?php echo $Due_start_date; ?>">
                                     </div>
                                     </div>
@@ -289,7 +289,7 @@ if(!empty($emppay))
 								<div class="col-md-3">
                                     <div class="form-group">
                                         <div class="form-group">
-                                        <span for="Basic_Pay">No Of Due(s):</span>
+                                        <span for="Basic_Pay">No Of Due(s)</span>
                                         <input type="text" class="form-control requried" id="no_of_due" name="no_of_due" value="<?php echo $No_of_dues; ?>" pattern="[0-9]{1,2}" title="Minimum 1 digit,Maximum 2 Digit"  readonly>
                                     </div>
                                     </div>
@@ -298,7 +298,7 @@ if(!empty($emppay))
 								<div class="col-md-3">
                                     <div class="form-group">
                                         <div class="form-group">
-                                        <span for="Basic_Pay">Paid Amount:</span>
+                                        <span for="Basic_Pay">Paid Amount</span>
                                         <input type="text" class="form-control requried" id="Paid_Amount" name="Paid_Amount" value="<?php echo $Paid_Amount; ?>" pattern="[0-9]{1,2}" title="Minimum 1 digit,Maximum 2 Digit" readonly>
                                     </div>
                                     </div>
diff --git a/application/views/editOldmonthly.php b/application/views/editOldmonthly.php
index 35e6c809..d9acb46b 100755
--- a/application/views/editOldmonthly.php
+++ b/application/views/editOldmonthly.php
@@ -62,7 +62,7 @@ else{
 function validateOTHRS(){
 var x = $("#OT_Hrs_Worked").val();
     
-	var ck_lopdays = /^[0-9 ]{1,3}$/;
+	var ck_lopdays = /^[0-9]{1,2}([.][0-9]{1,2}$/;//[0-9]{1,2}([.][0-9]{1,2}
 	if(!(ck_lopdays.test(x) && x<=150)){
 	 
 	 $("#OT_Hrs_Worked").css({"border-style":"dotted","border-color":"#ff8080","border-width":"2px","background-color":"#ffe6e6"});
@@ -220,7 +220,7 @@ function validateAll(){
                                     <div class="form-group">
                                         <div class="form-group">
                                             <span for="OT_Hrs_Worked">OverTime Hours Worked:</span>
-                                           <input type="text" class="form-control required" id="OT_Hrs_Worked" name="OT_Hrs_Worked" onfocusout="validateOTHRS();" pattern="[0-9 ]{1,3}" value="<?php echo $OT_Hrs_Worked; ?>">
+                                           <input type="text" class="form-control required" id="OT_Hrs_Worked" name="OT_Hrs_Worked" onfocusout="validateOTHRS();" pattern="([0-9]{1,2}([.][0-9]{1,2})?" value="<?php echo $OT_Hrs_Worked; ?>">
                                         </div>
                                     </div>
                                 </div>
diff --git a/application/views/payslipgenerateprint.php b/application/views/payslipgenerateprint.php
index 61a3466a..b67626f9 100755
--- a/application/views/payslipgenerateprint.php
+++ b/application/views/payslipgenerateprint.php
@@ -9,6 +9,7 @@
 		$Designation = '';
 		$Departmentcode = '';
 		$PANNo = '';
+		$UANNO='';
 		$BankAccountNo = '';
 		$IFSCCode ='';
 		$BankBranchName = '';
@@ -70,6 +71,7 @@ if(!empty($PayDetails))
 		
 		$Designation = $Pay->Designation;
 		$PANNo =$Pay->Pan;
+		$UANNO=$Pay->UANNO;
 		$BankAccountNo = $Pay->BankAccountNumber;
 		$IFSCCode =$Pay->IFSCCode;
 		$BankBranchName = $Pay->BankName;
@@ -232,11 +234,11 @@ if($RecCount > 0)
 <td  width="100px;" style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ;">Bank Account Number :</td>
 <td width="100px;" style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ;"> <?php echo $BankAccountNo  ?></td>
 <td width="50px;" style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ;">UAN Number : </td>
-<td width="100px;" style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ;">101033275864 </td>
+<td width="100px;" style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ;"><?php echo $PANNo;?> </td>
 </tr>
 <tr>
 <td  width="100px;" style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ;">PAN Number  :</td>
-<td width="100px;" style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ;"> QWERS3423E</td>
+<td width="100px;" style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ;"><?php echo $UANNO;?></td>
 </tr>
 </tbody>
 </table>