Fixes : ps
This commit is contained in:
parent
ebb6265626
commit
bdcfe0c01e
@ -801,10 +801,10 @@ class Payslip extends BaseController
|
||||
$loan = $Balance_Amount;
|
||||
}
|
||||
|
||||
$empSalaryAdd = $final_salary_amount+$shed+$diesel;
|
||||
$empSalaryAdd = $final_salary_amount;
|
||||
$empSalarySub = $loan;
|
||||
$salaryInCurrentday = $empSalaryAdd - $empSalarySub;
|
||||
$load_driver_data[$i]->driver_final_payment = $salaryInCurrentday;
|
||||
// $salaryInCurrentday = $empSalaryAdd - $empSalarySub;
|
||||
// $load_driver_data[$i]->driver_final_payment = $salaryInCurrentday;
|
||||
|
||||
$load_driver_data[$i]->payroll_id = $monthly_pay_array[$driver_id]->payroll_id;
|
||||
$load_driver_data[$i]->Festival_Bonus = $monthly_pay_array[$driver_id]->Festival_Bonus;
|
||||
@ -871,8 +871,8 @@ class Payslip extends BaseController
|
||||
|
||||
$empSalaryAdd = $final_salary_amount;
|
||||
$empSalarySub = $loan;
|
||||
$salaryInCurrentday = $empSalaryAdd - $empSalarySub;
|
||||
$load_driver_data[$i]->driver_final_payment = $salaryInCurrentday+$shed+$diesel;
|
||||
// $salaryInCurrentday = $empSalaryAdd - $empSalarySub;
|
||||
// $load_driver_data[$i]->driver_final_payment = $salaryInCurrentday+$shed+$diesel;
|
||||
$load_driver_data[$i]->total_cal_days = $get_last_date_of_the_month;
|
||||
|
||||
}
|
||||
@ -1236,6 +1236,7 @@ class Payslip extends BaseController
|
||||
'total_shed_amount'=>$Shed,
|
||||
'monthly_salary_amount'=>($Basic+$Food),
|
||||
'final_payment'=>$Estimate,
|
||||
'BASIC'=>$Basic,
|
||||
'HRA'=>$HRA,
|
||||
'ESI'=>$ESI,
|
||||
'PF'=>$PF,
|
||||
@ -1421,8 +1422,10 @@ class Payslip extends BaseController
|
||||
$currentDayBasic = isset($Data['PayDetails'][0]->monthly_salary_amount) ? $Data['PayDetails'][0]->monthly_salary_amount : 0;
|
||||
$PF_Rate = $Data['PayDetails'][0]->PF_Rate;
|
||||
$ESI_Rate = $Data['PayDetails'][0]->ESI_Rate;
|
||||
$Data['esi_amount'] = ($Data['PayDetails'][0]->esi_applicable == 1) ? $currentDayBasic * $ESI_Rate / 100 : 0;
|
||||
$Data['pf_amount'] = ($Data['PayDetails'][0]->pf_applicable == 1) ? $currentDayBasic * $PF_Rate / 100 : 0;
|
||||
// $Data['esi_amount'] = ($Data['PayDetails'][0]->esi_applicable == 1) ? $currentDayBasic * $ESI_Rate / 100 : 0;
|
||||
// $Data['pf_amount'] = ($Data['PayDetails'][0]->pf_applicable == 1) ? $currentDayBasic * $PF_Rate / 100 : 0;
|
||||
$Data['esi_amount'] = ($Data['PayDetails'][0]->esi_applicable == 1) ? $Data['PayDetails'][0]->ESI : 0;
|
||||
$Data['pf_amount'] = ($Data['PayDetails'][0]->pf_applicable == 1) ? $Data['PayDetails'][0]->PF : 0;
|
||||
$html = view("driverPayslipGeneratePrint", $Data);
|
||||
}else{
|
||||
//echo "EmpID" . $EmpID;
|
||||
|
||||
@ -3068,7 +3068,6 @@ class Purchaseorder extends BaseController
|
||||
$this->purchaseorder_model->insertlogpo($logpo);
|
||||
}
|
||||
}
|
||||
// print_r($this->request->getPost());die;
|
||||
for ($i = 1; $i <= $RowCount; $i++) {
|
||||
|
||||
$MaterialCode = $this->request->getPost('materialCode' . $i);
|
||||
|
||||
@ -285,7 +285,7 @@ class Driver_model extends Model
|
||||
$builder = $this->db->table('t_driver_payroll Pay')->select('Pay.*')
|
||||
->select('Emp.EmpID,CONCAT_WS(" ", Emp.FirstName, Emp.LastName) as driver_name,Emp.DateofBirth as Dob,Emp.PANNo as Pan,Emp.BankBranchName as BankName,Emp.BankAccountNo as BankAccountNumber,Emp.IFSCCode as IFSCCode,Emp.DateofJoining as DOJ,Emp.AadharNo,Emp.Designation as Designation,Dep.DepartmentName as DeptName,Emp.esi_applicable,Emp.pf_applicable')
|
||||
->select('t_emp_pay_data.PF_Rate,t_emp_pay_data.ESI_Rate')
|
||||
->select('month.Festival_Bonus,month.HRA,month.Loan_Recovered,month.total_diesel_amount,month.total_shed_amount')
|
||||
->select('month.Festival_Bonus,month.BASIC,month.HRA,month.Loan_Recovered,month.total_diesel_amount,month.total_shed_amount')
|
||||
// ->select('month.monthly_salary_amount,month.monthly_food_amount,month.Festival_Bonus,month.final_payment,month.HRA,month.ESI,month.PF,month.Loan_Recovered,month.total_diesel_amount,month.total_shed_amount')
|
||||
->join('t_employee_details Emp', 'Pay.driver_id = Emp.EmpID')
|
||||
->join('t_departmentdetails Dep', 'Emp.Departmentcode = Dep.DEPCode')
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -63,6 +63,20 @@
|
||||
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">Loan Balance </td>
|
||||
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;" ><?php echo ': Rs '.$PayDetails[0]->BalanceAdvance ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"> </td>
|
||||
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"><?php echo ' ' ?></td>
|
||||
<td><?= ' ' ?></td>
|
||||
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">Diesel </td>
|
||||
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;" ><?php echo ': Rs '.$PayDetails[0]->diesel_amount; ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"> </td>
|
||||
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"><?php echo ' '; ?></td>
|
||||
<td><?= ' ' ?></td>
|
||||
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">Shed Duty Amount </td>
|
||||
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;" ><?php echo ': Rs '.$PayDetails[0]->shed_amount; ?></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</td>
|
||||
@ -71,39 +85,27 @@
|
||||
<table style="border-collapse: collapse;border-top:#fff;" cellpadding="0" cellspacing="0" border="1" width="100%" >
|
||||
<tr><th>Earnings</th><th>Amount <span style="font-family: DejaVu Sans; sans-serif;">₹</span></th><th>Deductions</th><th>Amount <span style="font-family: DejaVu Sans; sans-serif;">₹</span></th></tr>
|
||||
<tr>
|
||||
<td width="25%;"> Basic</td>
|
||||
<td width="20%;" style="text-align: right;" ><?php echo $PayDetails[0]->monthly_salary_amount; ?> </td>
|
||||
<td width="25%;"> BASIC</td>
|
||||
<td width="20%;" style="text-align: right;" ><?php echo $PayDetails[0]->BASIC; ?> </td>
|
||||
<td width="25%;"> PF</td>
|
||||
<td width="30%;" style="text-align: right;" ><?php echo $pf_amount; ?> </td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="25%;"> Diesel</td>
|
||||
<td width="20%;" style="text-align: right;" ><?php echo $PayDetails[0]->diesel_amount; ?> </td>
|
||||
<td width="25%;"> HRA</td>
|
||||
<td width="20%;" style="text-align: right;" ><?php echo $PayDetails[0]->HRA; ?> </td>
|
||||
<td> ESI</td>
|
||||
<td style="text-align: right;"> <?php echo $esi_amount ?> </td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="25%;"> Shed Duty Amount</td>
|
||||
<td width="20%;" style="text-align: right;" ><?php echo $PayDetails[0]->shed_amount; ?> </td>
|
||||
<td width="25%;"> Bonus</td>
|
||||
<td width="20%;" style="text-align: right;" ><?php echo $PayDetails[0]->Festival_Bonus; ?> </td>
|
||||
<td> Salary Advance</td>
|
||||
<td style="text-align: right;"> <?php echo $PayDetails[0]->Advance ?> </td>
|
||||
</tr>
|
||||
|
||||
|
||||
<tr>
|
||||
<td width="25%;"> Bonus</td>
|
||||
<td width="20%;" style="text-align: right;" ><?php echo $PayDetails[0]->Festival_Bonus; ?> </td>
|
||||
|
||||
<td width="25%;"> </td>
|
||||
<td width="30%;" style="text-align: right;" > </td>
|
||||
</tr>
|
||||
|
||||
|
||||
|
||||
<tr><th nowrap> Total Earning (Rounded)</th>
|
||||
<td style="text-align: right;">
|
||||
<?php
|
||||
$totEarning = $PayDetails[0]->monthly_salary_amount + $PayDetails[0]->Festival_Bonus + $PayDetails[0]->diesel_amount + $PayDetails[0]->shed_amount;
|
||||
$totEarning = $PayDetails[0]->BASIC + $PayDetails[0]->Festival_Bonus + $PayDetails[0]->HRA ;
|
||||
echo number_format(round($totEarning),2)
|
||||
?>
|
||||
</td>
|
||||
|
||||
@ -4784,12 +4784,12 @@ if (!empty($getlogpodtl)) {
|
||||
// ReceivedQuantity: 0,
|
||||
// PendingQuantity: quantity
|
||||
// }));
|
||||
PONOStatus = <?php echo $PONOStatus; ?>
|
||||
var PONOStatus = "<?php echo $PONOStatus; ?>";
|
||||
var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName;
|
||||
var rowHtml = `
|
||||
<tr id="${temp}">
|
||||
<td align="left">${temp}</td>
|
||||
<td align="left">${Reqnumber}</td>
|
||||
<td align="center">${Reqnumber}</td>
|
||||
<td align="left">${materialCode}</td>
|
||||
<td align="left">${shorten}</td>`;
|
||||
if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -371,17 +371,17 @@
|
||||
|
||||
<td style="max-width:80px;text-align:right;"><?php echo number_format($workedSalary, 2, '.', ''); ?></td>
|
||||
|
||||
<td style="max-width:80px;text-align:right;">
|
||||
<td id="bassalary<?php echo $index ?>" style="max-width:80px;text-align:right;">
|
||||
<?php $basicWorked = $workedSalary * 70 / 100;
|
||||
echo number_format($basicWorked, 2, '.', ''); ?>
|
||||
</td>
|
||||
|
||||
<td style="max-width:80px;text-align:right;">
|
||||
<td id="hrasalary<?php echo $index ?>" style="max-width:80px;text-align:right;">
|
||||
<?php $hraWorked = $workedSalary * 30 / 100;
|
||||
echo number_format($hraWorked, 2, '.', ''); ?>
|
||||
</td>
|
||||
|
||||
<td style="max-width:80px;text-align:right;">
|
||||
<td id="grosalary<?php echo $index ?>" style="max-width:80px;text-align:right;">
|
||||
<?php echo number_format($basicWorked + $hraWorked, 2, '.', ''); ?>
|
||||
</td>
|
||||
|
||||
@ -583,17 +583,17 @@
|
||||
<?php echo number_format($sum_of_amount, 2, '.', ''); ?>
|
||||
</td>
|
||||
|
||||
<td style="max-width:80px;text-align:right;">
|
||||
<td id="bassalary<?php echo $inx ?>" style="max-width:80px;text-align:right;">
|
||||
<?php
|
||||
echo number_format($basic_worked, 2, '.', ''); ?>
|
||||
</td>
|
||||
|
||||
<td style="max-width:80px;text-align:right;">
|
||||
<td id="hrasalary<?php echo $inx ?>" style="max-width:80px;text-align:right;">
|
||||
<?php
|
||||
echo number_format($hra_worked, 2, '.', ''); ?>
|
||||
</td>
|
||||
|
||||
<td style="max-width:80px;text-align:right;">
|
||||
<td id="grosalary<?php echo $inx ?>" style="max-width:80px;text-align:right;">
|
||||
<?php echo number_format($basic_worked + $hra_worked, 2, '.', ''); ?>
|
||||
</td>
|
||||
|
||||
@ -653,11 +653,11 @@
|
||||
<?php if (!empty($record->payroll_id)) { ?> title="Payslip Calculated"
|
||||
style="text-align:right;color:blue;" <?php }else{ ?>style="text-align:right;" <?php } ?>>
|
||||
<?php if (!empty($record->driver_final_payment)) {
|
||||
echo $record->driver_final_payment;
|
||||
$estTotal[] = $record->driver_final_payment;
|
||||
echo ($basic_worked + $hra_worked + $record->Festival_Bonus)-($record->Monthly_Due+$record->esi_amount+$record->pf_amount);
|
||||
$estTotal[] = ($basic_worked + $hra_worked + $record->Festival_Bonus)-($record->Monthly_Due+$record->esi_amount+$record->pf_amount);
|
||||
} else {
|
||||
echo $empSalary[$i];
|
||||
$estTotal[] = $empSalary[$i];
|
||||
echo ($basic_worked + $hra_worked + $record->Festival_Bonus)-($record->Monthly_Due+$record->esi_amount+$record->pf_amount);
|
||||
$estTotal[] = ($basic_worked + $hra_worked + $record->Festival_Bonus)-($record->Monthly_Due+$record->esi_amount+$record->pf_amount);
|
||||
}
|
||||
?>
|
||||
</td>
|
||||
@ -1144,10 +1144,16 @@ $(document).ready(function () {
|
||||
// console.log(sno);return true;
|
||||
|
||||
var driverEarn = parseFloat(document.getElementById('ttlsalary' + sno).textContent);
|
||||
|
||||
var grosssalary = parseFloat(document.getElementById('grosalary' + sno).textContent);
|
||||
var basicsalary = parseFloat(document.getElementById('bassalary' + sno).textContent);
|
||||
var hrasalary = parseFloat(document.getElementById('hrasalary' + sno).textContent);
|
||||
|
||||
var Festivals = parseFloat(document.getElementById('Festival' + sno).textContent);
|
||||
totalfestival[sno] = Festivals;
|
||||
|
||||
var ESI = parseFloat(document.getElementById('esiAmt' + sno).textContent);
|
||||
var PF = parseFloat(document.getElementById('pfAmt' + sno).textContent);
|
||||
|
||||
var element = document.getElementById('loanatm' + sno);
|
||||
|
||||
var loanamt = parseFloat(element.value);
|
||||
@ -1171,6 +1177,7 @@ $(document).ready(function () {
|
||||
|
||||
var current_loan_amt = 0;
|
||||
var autoLoan = parseFloat(monthDue);
|
||||
console.log(autoLoan,"autoLoan");
|
||||
var Balance_Amount = loanamt - paidamt;
|
||||
|
||||
if (autoLoan > Balance_Amount) {
|
||||
@ -1181,21 +1188,21 @@ $(document).ready(function () {
|
||||
current_loan_amt = autoLoan;
|
||||
}
|
||||
|
||||
if (isNaN(driverEarn)) { driverEarn = 0; }
|
||||
|
||||
if (isNaN(basicsalary)) { basicsalary = 0; }
|
||||
if (isNaN(hrasalary)) { hrasalary = 0; }
|
||||
|
||||
|
||||
var driverSalaryAdd = basicsalary + hrasalary + Festivals;
|
||||
console.log('bas + hra + bon ',driverSalaryAdd);
|
||||
|
||||
|
||||
|
||||
|
||||
var driverSalaryAdd = driverEarn + Festivals;
|
||||
|
||||
var driverSalarySub = current_loan_amt;
|
||||
console.log("current loan amt == ",current_loan_amt);
|
||||
var driverSalarySub = current_loan_amt+ESI + PF ;
|
||||
console.log("L + E + P ",current_loan_amt);
|
||||
|
||||
|
||||
var driverMonthSalary = driverSalaryAdd - driverSalarySub
|
||||
var driverSalary = Math.round(driverMonthSalary);
|
||||
console.log("Sal ",driverSalary);
|
||||
|
||||
|
||||
var cals = (driverSalary).toFixed(0);
|
||||
|
||||
|
||||
@ -2385,10 +2385,10 @@ if (!empty($INRSYMBOL)) {
|
||||
var AvlBudAmt = '<?php echo $AvlAmount ?>';
|
||||
var txtTotalOrderValueSummary = $('#txtTotBasicAmount').val();
|
||||
if (serviceValidate()) {
|
||||
// if (document.getElementById('serviceTax').rows.length < 2) {
|
||||
// alert('Please Select Line item to Create PO');
|
||||
// return false;
|
||||
// }
|
||||
if (document.getElementById('ServiceTable').rows.length < 1) {
|
||||
alert('Atleast One Line needed');
|
||||
return false;
|
||||
}
|
||||
// else if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) {
|
||||
// alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
|
||||
// return false;
|
||||
@ -2397,15 +2397,15 @@ if (!empty($INRSYMBOL)) {
|
||||
// alert('Please Enter Other Payable Terms Description');
|
||||
// $('#Otherpayment').focus();
|
||||
// return false;
|
||||
// } else if ($('#descofpo').val().trim() == '') {
|
||||
// alert('Please Enter Description Of Service');
|
||||
// $('#descofpo').focus();
|
||||
// return false;
|
||||
} else if ($('#descofpo').val().trim() == '') {
|
||||
alert('Please Enter Description Of Service');
|
||||
$('#descofpo').focus();
|
||||
return false;
|
||||
// } else if ($('#PoTypeOptions').val() == "0") {
|
||||
// alert('Please Select POType');
|
||||
// $('#PoTypeOptions').focus();
|
||||
// return false;
|
||||
// } else {
|
||||
} else {
|
||||
var formData = new FormData($('.ServicePO')[0]);
|
||||
$('#loader').show();
|
||||
console.log("inside add service purchase order view page");
|
||||
|
||||
@ -145,14 +145,16 @@ function serviceValidate(){
|
||||
alert('Please Select Budget Type');
|
||||
$('#BudgetType').focus();
|
||||
return false;
|
||||
}else if ($('#ServiceTable tbody tr').length < 1) {
|
||||
alert('Atleast One Line needed');
|
||||
return false;
|
||||
} else if ($('#descofpo').val().trim() == '') {
|
||||
alert('Please Enter Description Of Service');
|
||||
$('#descofpo').focus();
|
||||
return false;
|
||||
}else {
|
||||
}
|
||||
// else if ($('#ServiceTable tbody tr').length < 1) {
|
||||
// alert('Atleast One Line needed');
|
||||
// return false;
|
||||
// } else if ($('#descofpo').val().trim() == '') {
|
||||
// alert('Please Enter Description Of Service');
|
||||
// $('#descofpo').focus();
|
||||
// return false;
|
||||
// }
|
||||
else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user