diff --git a/application/controllers/user.php b/application/controllers/user.php
index 5ef90b61..bae3f096 100755
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -202,8 +202,9 @@ class user extends BaseController
                 $Basic_Pay = $totalEmployeePersent[0]->Basic_Pay;
                 $totalsalary = $totalEmployeePersent[0]->TotalSalary;
                 $dayFoodAmt = $totalEmployeePersent[0]->Food_Allowances;
+                $allowances =$totalEmployeePersent[0]->Allowances;
 
-
+                $Allowances = $allowances * $values;
                 $Food_Allowances = $dayFoodAmt * $values;
 
                 $daySalary = $Basic_Pay / $CUR_month;
@@ -213,6 +214,7 @@ class user extends BaseController
                 $dayHra = $HRA_Amount / $CUR_month;
                 /** per day hra amount **/
                 //echo $dayHra.'<br/>';
+                
                 $onehoursSalary = ($daySalary + $dayHra) / 8;
                 /**one hour salay ot calculation**/
                 if ($totalothour != 0) /** if ot not equal zero **/ {
@@ -227,7 +229,7 @@ class user extends BaseController
                 $currentDayHra = $dayHra * $values;
                 /** total working days hra calculations**/
                 // echo   $currentDayHra.'<br/>';
-                $currentDatePF = $currentDaySalary + $currentDayHra;
+                $currentDatePF = $currentDaySalary + $currentDayHra + $totSalayOT;
                 /** current date pf calculation**/
                 if ($totalsalary <= 20000) {
 
@@ -240,8 +242,8 @@ class user extends BaseController
                 /** pf amount per day**/
 
                 //echo $totalothour;die;
-                $salaryInCurrentday = $currentDaySalary + $totSalayOT + $currentDayHra + $Food_Allowances;
-
+                $salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $Food_Allowances+ $Allowances;
+                $salaryInCurrentday =  $salaryInCurrentdays - ($esiAmount + $pfAmount);
                 $employeeSalary += round($salaryInCurrentday);
 
             }
@@ -316,7 +318,10 @@ class user extends BaseController
                     $Basic_Pay = $totalEmployeePersent[0]->Basic_Pay;
                     $totalsalary = $totalEmployeePersent[0]->TotalSalary;
                     $dayFoodAmt = $totalEmployeePersent[0]->Food_Allowances;
+                    $allowances =$totalEmployeePersent[0]->Allowances;
 
+                    $Allowances = $allowances * $values;
+               
 
                     $Food_Allowances = $dayFoodAmt * $values;
 
@@ -341,7 +346,7 @@ class user extends BaseController
                     $currentDayHra = $dayHra * $values;
                     /** total working days hra calculations**/
                     // echo   $currentDayHra.'<br/>';
-                    $currentDatePF = $currentDaySalary + $currentDayHra;
+                    $currentDatePF = $currentDaySalary + $currentDayHra + $totSalayOT;
                     /** current date pf calculation**/
                     if ($totalsalary <= 20000) {
 
@@ -354,9 +359,9 @@ class user extends BaseController
                     /** pf amount per day**/
 
                     //echo $totalothour;die;
-                    $salaryInCurrentday = $currentDaySalary + $totSalayOT + $currentDayHra + $Food_Allowances;
-
+                    $salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $Food_Allowances + $Allowances;
 
+                      $salaryInCurrentday = $salaryInCurrentdays -($esiAmount+$pfAmount);
                     $totalSalarys = $totalSalary + $salaryInCurrentday;
 
                     $totalSalary = round($totalSalarys);