diff --git a/application/views/payslipgenerate.php b/application/views/payslipgenerate.php
index 824ba084..547e4909 100644
--- a/application/views/payslipgenerate.php
+++ b/application/views/payslipgenerate.php
@@ -22,9 +22,10 @@ $(function() {
});
-});
+
-
+/
+ });
@@ -38,37 +39,7 @@ $(function() {
-
-
+
Select Month
+
+
+
+ Employee
+
+
+
Select All
+
+
+
diff --git a/application/views/payslipgenerateprint.php b/application/views/payslipgenerateprint.php
index d5aec25b..a24e267e 100644
--- a/application/views/payslipgenerateprint.php
+++ b/application/views/payslipgenerateprint.php
@@ -1,4 +1,3 @@
-
EmpID;
$FirstName = $Pay->FName;
$LastName = $Pay->Lname;
- $DateofBirth = $Pay->Dob;
- $DateofJoining = $Pay->DOJ;
+
+ $DoB = $Pay->Dob;
+ $DoJ = $Pay->DOJ;
+
+ $from = new DateTime($DoB);
+ $dt = new DateTime($DoJ);
+ $DateofBirth = $from ->format('d-m-y');
+ $DateofJoining = $dt ->format('d-m-y');
+
$Designation = $Pay->Designation;
$PANNo =$Pay->Pan;
$BankAccountNo = $Pay->BankAccountNumber;
@@ -97,7 +110,7 @@ if(!empty($PayDetails))
}
else
{
- $FoodAllowance = $Food;
+ $FoodAllowance = $Food;
}
$IncenAmt = $Pay->Incentive;
if($IncenAmt == '')
@@ -141,8 +154,15 @@ if(!empty($PayDetails))
}
}
-
+if($RecCount > 0)
+{
?>
+
+
+
+