Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme
This commit is contained in:
commit
1ae39fe9e2
@ -688,7 +688,7 @@ class Payslip extends BaseController
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
if ($value->esi_applicable == 1) { $esiAmount = $currentDayBasic * $ESI_Rate / 100; } else { $esiAmount = 0; }
|
if ($value->esi_applicable == 1) { $esiAmount = ($currentDayBasic + $currentDayHra) * $ESI_Rate / 100; } else { $esiAmount = 0; }
|
||||||
if ($value->pf_applicable == 1) { $pfAmount = $currentDayBasic * $PF_Rate / 100; } else { $pfAmount = 0; }
|
if ($value->pf_applicable == 1) { $pfAmount = $currentDayBasic * $PF_Rate / 100; } else { $pfAmount = 0; }
|
||||||
|
|
||||||
/** pf amount per day**/
|
/** pf amount per day**/
|
||||||
@ -830,7 +830,7 @@ class Payslip extends BaseController
|
|||||||
//$totalSalary = $currentDayBasic + $currentDayHra + $totSalayOT;
|
//$totalSalary = $currentDayBasic + $currentDayHra + $totSalayOT;
|
||||||
|
|
||||||
|
|
||||||
if ($value->esi_applicable == 1) { $esiAmount = $currentDayBasic * $ESI_Rate / 100; } else { $esiAmount = 0;}
|
if ($value->esi_applicable == 1) { $esiAmount = ($currentDayBasic + $currentDayHra) * $ESI_Rate / 100; } else { $esiAmount = 0;}
|
||||||
if ($value->pf_applicable == 1) { $pfAmount = $currentDayBasic * $PF_Rate / 100; } else { $pfAmount = 0;}
|
if ($value->pf_applicable == 1) { $pfAmount = $currentDayBasic * $PF_Rate / 100; } else { $pfAmount = 0;}
|
||||||
|
|
||||||
/** pf amount per day**/
|
/** pf amount per day**/
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user