diff --git a/app/Controllers/PayrollController.php b/app/Controllers/PayrollController.php index 416ad49..dfe6e92 100644 --- a/app/Controllers/PayrollController.php +++ b/app/Controllers/PayrollController.php @@ -226,12 +226,12 @@ class PayrollController extends BaseController $incomeDeduction = (new IncomeDeductionModel())->find($indedid); $empPayTransInDeds = $empPayTransInDedModel->getEmpPayTransInDedxEmPayTransByPayTransIdInDedId($paytransid, $indedid); - $empPayTransInDed = new EmpPayTransIncomeDeduction(); + $empPayTransIncomeDeduction = new EmpPayTransIncomeDeduction(); $updateCount = 0; foreach($empPayTransInDeds as $empPayTransInDed) { - $empPayTransInDed->fill([ + $empPayTransIncomeDeduction->fill([ 'emppaytransinded_id' => $empPayTransInDed->emppaytransinded_id, 'emppaytrans_id' => $empPayTransInDed->emppaytrans_id, 'inded_id' => $empPayTransInDed->inded_id, @@ -873,25 +873,23 @@ class PayrollController extends BaseController $payCompute = new PayrollComputation(); $amount = $payCompute->computeIncomeDeductionByComputationType($rawData, $empPayTrans); - $empPayTransInDed->fill( - [ - 'emppaytransinded_id' => (isset($rawData['emppaytransinded_id'])) ? $rawData['emppaytransinded_id'] : null, - 'emppaytrans_id' => $rawData['emppaytrans_id'], - 'inded_id' => $rawData['inded_id'], - 'payslip_display' => $incomeDeduction->payslip_display, - 'inded_name' => $incomeDeduction->inded_name, - 'coa_code' => $incomeDeduction->coa_code, - 'is_income' => $incomeDeduction->is_income, - 'is_taxable' => $incomeDeduction->is_taxable, - 'include_in_gross' => $incomeDeduction->include_in_gross, - 'is_fixed_amt' => $rawData['is_fixed_amt'], - 'is_percent_amt' => $rawData['is_percent_amt'], - 'worked_days_based' => $rawData['worked_days_based'], - 'amount' => $amount, - 'base_amount' => $rawData['amount'], - 'is_override' => $rawData['is_override'] - ] - ); + $empPayTransInDed->fill([ + 'emppaytransinded_id' => (isset($rawData['emppaytransinded_id'])) ? $rawData['emppaytransinded_id'] : null, + 'emppaytrans_id' => $rawData['emppaytrans_id'], + 'inded_id' => $rawData['inded_id'], + 'payslip_display' => $incomeDeduction->payslip_display, + 'inded_name' => $incomeDeduction->inded_name, + 'coa_code' => $incomeDeduction->coa_code, + 'is_income' => $incomeDeduction->is_income, + 'is_taxable' => $incomeDeduction->is_taxable, + 'include_in_gross' => $incomeDeduction->include_in_gross, + 'is_fixed_amt' => $rawData['is_fixed_amt'], + 'is_percent_amt' => $rawData['is_percent_amt'], + 'worked_days_based' => $rawData['worked_days_based'], + 'amount' => $amount, + 'base_amount' => $rawData['amount'], + 'is_override' => $rawData['is_override'] + ]); if ($empPayTransInDedModel->save($empPayTransInDed)) { $this->computeEmployeePayroll($rawData['emppaytrans_id'], true, $empPayTransactionModel, $empPayTransInDedModel); diff --git a/app/Views/payroll/compensationbenefitsview copy.php b/app/Views/payroll/compensationbenefitsview copy.php deleted file mode 100644 index e64bf63..0000000 --- a/app/Views/payroll/compensationbenefitsview copy.php +++ /dev/null @@ -1,199 +0,0 @@ - -= $this->extend('templates/adminlte/generalcontent') ?> - - - -= $this->section('title') ?>Compensation and Benefits= $this->endSection() ?> - - - -= $this->section('css') ?> - - - - -= $this->endSection() ?> - - - -= $this->section('bodyclass') ?>sidebar-mini= $this->endSection() ?> - - - -= $this->section('containertitle') ?>Employee Compensation and Benefits= $this->endSection() ?> - - - -= $this->section('activebreadcrumb') ?>Compensation and Benefits= $this->endSection() ?> - - - -= $this->section('main') ?> - - -
Rendering engine | -Browser | -Platform(s) | -Engine version | -CSS grade | -
---|---|---|---|---|
Trident | -Internet - Explorer 4.0 - | -Win 95+ | -4 | -X | -
Here are the list of payroll transaction and the number of affected transactions when we update this Income or Deduction item.
+Here are the list of payroll transaction and the number of affected transactions when we update this Income or Deduction item. These are OPEN transaction and should you re-run computation on each employee after an update.