From 5f98732aadaefd1f2d9697ba6192da608b2e6ca3 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 18 Jan 2018 10:24:59 +0530
Subject: [PATCH] payslip festivalbonus issues fixed

---
 application/views/editSupplier.php         | 8 ++++----
 application/views/payslipgenerateprint.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/views/editSupplier.php b/application/views/editSupplier.php
index 4bc15911..917972c3 100755
--- a/application/views/editSupplier.php
+++ b/application/views/editSupplier.php
@@ -416,7 +416,7 @@ function onlyAlphabets(evt) {
         
     </section>
     
-    <section class="content">
+    <section class="content" id="content">
     <div style="text-align:right;">
     <a href="<?php echo base_url() ?>supplierListing" class="btn btn-primary" value="Back"/>Back</a>
   </div>
@@ -636,7 +636,7 @@ function onlyAlphabets(evt) {
                     {
                 ?>
                 <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">�</button>
                     <?php echo $this->session->flashdata('error'); ?>                    
                 </div>
                 <?php } ?>
@@ -646,14 +646,14 @@ function onlyAlphabets(evt) {
                     {
                 ?>
                 <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">�</button>
                     <?php echo $this->session->flashdata('success'); ?>
                 </div>
                 <?php } ?>
                 
                 <div class="row">
                     <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">�</button></div>'); ?>
                     </div>
                 </div>
             </div>
diff --git a/application/views/payslipgenerateprint.php b/application/views/payslipgenerateprint.php
index 9eaa5578..e3540524 100755
--- a/application/views/payslipgenerateprint.php
+++ b/application/views/payslipgenerateprint.php
@@ -150,7 +150,7 @@ if(!empty($PayDetails))
 		{
 			$Festival_bonus = $festbonus;
 		}
-		$TotalSalary = $WorkedSalary+$HRA+$Food+$IncenAmt+$OTSal+$Otherallowances;
+		$TotalSalary = $WorkedSalary+$HRA+$Food+$IncenAmt+$OTSal+$Otherallowances+$Festival_bonus;
 		$Adv = $Pay->Advance;
 		if($Adv == '')
 		{