galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix salary module issues

Browse Source
This commit is contained in:
Thilina Hasantha
2016-04-16 17:44:27 +05:30
parent f6d5202ad5
commit 045e85f3ad
3 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core-ext/common.cron.tasks.ext.php
View File

@@ -1 +1,3 @@
<?php <?php
//Nothing here
?>

27
ext/admin/salary/api/SalaryAdminManager.php
View File

@@ -51,33 +51,6 @@ if (!class_exists('SalaryComponent')) {
} }
} }
if (!class_exists('Deduction')) {
class Deduction extends ICEHRM_Record {
var $_table = 'Deductions';
public function getAdminAccess(){
return array("get","element","save","delete");
}
public function getUserAccess(){
return array("get","element");
}
}
}
if (!class_exists('DeductionGroup')) {
class DeductionGroup extends ICEHRM_Record {
var $_table = 'DeductionGroup';
public function getAdminAccess(){
return array("get","element","save","delete");
}
public function getUserAccess(){
return array("get","element");
}
}
}
if (!class_exists('PayrollEmployee')) { if (!class_exists('PayrollEmployee')) {
class PayrollEmployee extends ICEHRM_Record { class PayrollEmployee extends ICEHRM_Record {

3
ext/admin/salary/index.php
View File

@@ -9,9 +9,6 @@ $moduleBuilder = new ModuleBuilder();
$moduleBuilder->addModuleOrGroup(new ModuleTab('SalaryComponentType','SalaryComponentType','Salary Component Types','SalaryComponentTypeAdapter','','',true)); $moduleBuilder->addModuleOrGroup(new ModuleTab('SalaryComponentType','SalaryComponentType','Salary Component Types','SalaryComponentTypeAdapter','','',true));
$moduleBuilder->addModuleOrGroup(new ModuleTab('SalaryComponent','SalaryComponent','Salary Components','SalaryComponentAdapter','','')); $moduleBuilder->addModuleOrGroup(new ModuleTab('SalaryComponent','SalaryComponent','Salary Components','SalaryComponentAdapter','',''));
$moduleBuilder->addModuleOrGroup(new ModuleTab('DeductionGroup','DeductionGroup','Calculation Groups','DeductionGroupAdapter','',''));
$moduleBuilder->addModuleOrGroup(new ModuleTab('Deduction','Deduction','Calculation Methods','DeductionAdapter','',''));
$moduleBuilder->addModuleOrGroup(new ModuleTab('EmployeeSalary','EmployeeSalary','Employee Salary Components','EmployeeSalaryAdapter','','',false,array("setRemoteTable"=>"true"))); $moduleBuilder->addModuleOrGroup(new ModuleTab('EmployeeSalary','EmployeeSalary','Employee Salary Components','EmployeeSalaryAdapter','','',false,array("setRemoteTable"=>"true")));