diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index 01ac48e5..0f9f4fe8 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -2119,7 +2119,7 @@ class StockController extends BaseController if(!empty($previousMonthCustomMachineCodes)){ $existingCustomMaterialCodes = $this->rawmaterialdetails_model - ->getSelectedResinMaterialCode(array_column($previousMonthCustomMachineCodes, 'materialCode')); + ->getSelectedBagMaterialCode(array_column($previousMonthCustomMachineCodes, 'materialCode')); }else{ // inserting all active if no previous month present diff --git a/app/Views/monthlypayinputs.php b/app/Views/monthlypayinputs.php index 5cd1c71b..7399d208 100755 --- a/app/Views/monthlypayinputs.php +++ b/app/Views/monthlypayinputs.php @@ -316,7 +316,7 @@ style="text-align:center;color:blue;" style="text-align:center;" > LOP_Days)) { - echo $record->LOP_Days; + echo round($record->LOP_Days); } else { echo "0.00"; } ?> @@ -330,9 +330,9 @@ style="text-align:center;color:blue;" style="text-align:center;" > Paid_leave)) { - echo number_format($record->Paid_leave, 2, '.', ''); + echo round($record->Paid_leave); } else { - echo number_format(0.00, 2, '.', ''); + echo round(0); } ?> @@ -344,59 +344,59 @@ style="text-align:center;color:blue;" style="text-align:center;" > OT_Hrs_Worked)) { - echo $record->OT_Hrs_Worked; + echo round($record->OT_Hrs_Worked); } else { - echo number_format(0.00, 2, '.', ''); + echo 0; } ?> - TotalSalary; $totalsalary[] = $record->TotalSalary; ?> + TotalSalary); $totalsalary[] = $record->TotalSalary; ?> TotalSalary / $record->NoofDays; - echo number_format($perDaySalary, 2, '.', ''); $totalperdaySalary[] = $perDaySalary; ?> + echo round($perDaySalary); $totalperdaySalary[] = $perDaySalary; ?> Days_worked); - echo number_format($workedSalary, 2, '.', ''); ?> + echo round($workedSalary); ?> + echo round($perHrSalary); $totalperhrSalary[] = $perHrSalary; ?> - + + echo round($basicWorked); $totalbasic[] = $basicWorked; ?> + echo round($hraWorked); $totalhra[] = $hraWorked; ?> - + - + - + - + style="text-align:right;" > Monthly_Due)) { - echo $record->Monthly_Due; + echo round($record->Monthly_Due); $totalmonthloan[] = $record->Monthly_Due; } else { - echo number_format(0.00, 2, '.', ''); + echo 0; } ?> @@ -423,10 +423,10 @@ style="text-align:right;" > Other_Deductions)) { - echo $record->Other_Deductions; + echo round($record->Other_Deductions); $totalotherDet[] = $record->Other_Deductions; } else { - echo number_format(0.00, 2, '.', ''); + echo 0 ; } ?> @@ -441,10 +441,10 @@ style="text-align:right;color:blue;" style="text-align:right;" > Festival_Bonus)) { - echo $record->Festival_Bonus; + echo round($record->Festival_Bonus); $totalfestival[] = $record->Festival_Bonus; } else { - echo number_format(0.00, 2, '.', '');; + echo 0; } ?> @@ -458,15 +458,15 @@ style="text-align:right;color:blue;" style="text-align:right;" > - +