SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

payslip festivalbonus issues fixed

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-01-18 10:24:59 +05:30
parent 3d1f36eeb2
commit 5f98732aad
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/views/editSupplier.php
View File

@ -416,7 +416,7 @@ function onlyAlphabets(evt) {
</section> </section>
<section class="content"> <section class="content" id="content">
<div style="text-align:right;"> <div style="text-align:right;">
<a href="<?php echo base_url() ?>supplierListing" class="btn btn-primary" value="Back"/>Back</a> <a href="<?php echo base_url() ?>supplierListing" class="btn btn-primary" value="Back"/>Back</a>
</div> </div>
@ -636,7 +636,7 @@ function onlyAlphabets(evt) {
{ {
?> ?>
<div class="alert alert-danger alert-dismissable"> <div class="alert alert-danger alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="alert" aria-hidden="true"><EFBFBD></button>
<?php echo $this->session->flashdata('error'); ?> <?php echo $this->session->flashdata('error'); ?>
</div> </div>
<?php } ?> <?php } ?>
@ -646,14 +646,14 @@ function onlyAlphabets(evt) {
{ {
?> ?>
<div class="alert alert-success alert-dismissable"> <div class="alert alert-success alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="alert" aria-hidden="true"><EFBFBD></button>
<?php echo $this->session->flashdata('success'); ?> <?php echo $this->session->flashdata('success'); ?>
</div> </div>
<?php } ?> <?php } ?>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<?php echo validation_errors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>'); ?> <?php echo validation_errors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true"><EFBFBD></button></div>'); ?>
</div> </div>
</div> </div>
</div> </div>

2
application/views/payslipgenerateprint.php
View File

@ -150,7 +150,7 @@ if(!empty($PayDetails))
{ {
$Festival_bonus = $festbonus; $Festival_bonus = $festbonus;
} }
$TotalSalary = $WorkedSalary+$HRA+$Food+$IncenAmt+$OTSal+$Otherallowances; $TotalSalary = $WorkedSalary+$HRA+$Food+$IncenAmt+$OTSal+$Otherallowances+$Festival_bonus;
$Adv = $Pay->Advance; $Adv = $Pay->Advance;
if($Adv == '') if($Adv == '')
{ {