festival bonus added in edit payslip screen
This commit is contained in:
parent
130a65eb05
commit
7e18560ea3
@ -27,7 +27,8 @@
|
|||||||
$TotalDeduction = '';
|
$TotalDeduction = '';
|
||||||
$SalaryAsPerPF = '';
|
$SalaryAsPerPF = '';
|
||||||
$FoodAllowance='';
|
$FoodAllowance='';
|
||||||
$Incentive = '';
|
$Incentive = '';
|
||||||
|
$FestBonus = '';
|
||||||
$Advance = '';
|
$Advance = '';
|
||||||
$BalanceAdvance = '';
|
$BalanceAdvance = '';
|
||||||
$LessAdvance = '';
|
$LessAdvance = '';
|
||||||
@ -86,7 +87,8 @@ if(!empty($PayInfo))
|
|||||||
$TotalDeduction = $ep->TotalDeduction;
|
$TotalDeduction = $ep->TotalDeduction;
|
||||||
$SalaryAsPerPF = $ep->SalaryAsPerPF;
|
$SalaryAsPerPF = $ep->SalaryAsPerPF;
|
||||||
$FoodAllowance=$ep->FoodAllowance;
|
$FoodAllowance=$ep->FoodAllowance;
|
||||||
$Incentive = $ep->Incentive;
|
$Incentive = $ep->Incentive;
|
||||||
|
$FestBonus = $ep->Festival_Bonus;
|
||||||
$Advance = $ep->Advance;
|
$Advance = $ep->Advance;
|
||||||
$BalanceAdvance = $ep->BalanceAdvance;
|
$BalanceAdvance = $ep->BalanceAdvance;
|
||||||
$LessAdvance = $ep->LessAdvance;
|
$LessAdvance = $ep->LessAdvance;
|
||||||
@ -106,7 +108,7 @@ if(!empty($PayInfo))
|
|||||||
$DOJ = date_format($DOJ,"Y-m-d");
|
$DOJ = date_format($DOJ,"Y-m-d");
|
||||||
$Designation = $ep->Designation;
|
$Designation = $ep->Designation;
|
||||||
$DeptName = $ep->DeptName;
|
$DeptName = $ep->DeptName;
|
||||||
$totalearnings = $WorkedSalary + $HRA + $FoodAllowance + $Other_allowances + $Incentive + $OTSalary;
|
$totalearnings = $WorkedSalary + $HRA + $FoodAllowance + $Other_allowances + $Incentive + $FestBonus + $OTSalary;
|
||||||
$totaldeductions = $PF + $EmployeeESI + $Advance + $OtherDeductions;
|
$totaldeductions = $PF + $EmployeeESI + $Advance + $OtherDeductions;
|
||||||
|
|
||||||
|
|
||||||
@ -551,6 +553,38 @@ if(!empty($PayInfo))
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
|
||||||
|
<div class="col-md-3">
|
||||||
|
<div class="form-group">
|
||||||
|
<div class="form-group">
|
||||||
|
<center><label style="display:block;text-align:right;"><h4>Festival Bonus</h4></label></center>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<div class="col-md-3">
|
||||||
|
<div class="form-group">
|
||||||
|
<div class="form-group">
|
||||||
|
<input type="text" class="form-control num" id="festival" name="festival" value="<?php echo $FestBonus;?>" onchange="calculateSalary();" readonly>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-3">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="col-md-3">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -744,6 +778,7 @@ function calculateSalary()
|
|||||||
var otherallowence = 0.00;
|
var otherallowence = 0.00;
|
||||||
var otherdeductions = 0.00;
|
var otherdeductions = 0.00;
|
||||||
var incentive = 0.00;
|
var incentive = 0.00;
|
||||||
|
var festival =0.00;
|
||||||
var txtbasicda = 0.00;
|
var txtbasicda = 0.00;
|
||||||
var txtpf = 0.00;
|
var txtpf = 0.00;
|
||||||
var txthra = 0.00;
|
var txthra = 0.00;
|
||||||
@ -773,6 +808,7 @@ function calculateSalary()
|
|||||||
otherallowence = parseFloat($('#otherallowence').val());
|
otherallowence = parseFloat($('#otherallowence').val());
|
||||||
otherdeductions = parseFloat($('#otherdeductions').val());
|
otherdeductions = parseFloat($('#otherdeductions').val());
|
||||||
incentive = parseFloat($('#incentive').val());
|
incentive = parseFloat($('#incentive').val());
|
||||||
|
festival = parseFloat($('#festival').val());
|
||||||
txtbasicda = parseFloat($('#txtbasicda').val());
|
txtbasicda = parseFloat($('#txtbasicda').val());
|
||||||
txtpf = parseFloat($('#txtpf').val());
|
txtpf = parseFloat($('#txtpf').val());
|
||||||
txthra = parseFloat($('#txthra').val());
|
txthra = parseFloat($('#txthra').val());
|
||||||
@ -787,7 +823,7 @@ function calculateSalary()
|
|||||||
totaldeductions = parseFloat($('#totaldeductions').val());
|
totaldeductions = parseFloat($('#totaldeductions').val());
|
||||||
netpay = parseFloat($('#netpay').val());
|
netpay = parseFloat($('#netpay').val());
|
||||||
|
|
||||||
totalearnings = parseFloat(txtbasicda + txthra + txtfood + otherallowence + incentive + otsalary,2);
|
totalearnings = parseFloat(txtbasicda + txthra + txtfood + otherallowence + incentive + festival + otsalary,2);
|
||||||
totaldeductions = parseFloat(otherdeductions + txtpf + txtesi + txtloandue,2);
|
totaldeductions = parseFloat(otherdeductions + txtpf + txtesi + txtloandue,2);
|
||||||
netpay = totalearnings - totaldeductions;
|
netpay = totalearnings - totaldeductions;
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user