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

Fix document tab display issue

Browse Source
This commit is contained in:
Thilina Hasantha
2016-08-04 15:10:15 +05:30
parent 271a39b3d4
commit 698c5d3daa
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core-ext/scripts/icehrm_master_data.sql
View File

@@ -883,12 +883,6 @@ INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
('Attendance: Use Department Time Zone', '0', '','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
('Leave: Allow Indirect Admins to Approve', '0', 'Allow indirect admins to approve leave requests','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
('Expense: Allow Indirect Admins to Approve', '0', 'Allow indirect admins to approve expense requests','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
('Travel: Allow Indirect Admins to Approve', '0', 'Allow indirect admins to approve travel requests','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');

2
ext/admin/employees/index.php
View File

@@ -24,7 +24,7 @@ $customFields = BaseService::getInstance()->getCustomFields("Employee");
<li><a id="tabEmployeeLanguage" href="#tabPageEmployeeLanguage"><?=LanguageManager::tran('Languages')?></a></li>
<li><a id="tabEmployeeDependent" href="#tabPageEmployeeDependent"><?=LanguageManager::tran('Dependents')?></a></li>
<li><a id="tabEmergencyContact" href="#tabPageEmergencyContact"><?=LanguageManager::tran('Emergency Contacts')?></a></li>
<?php if (!class_exists('DocumentsAdminManager')) {?>
<?php if (class_exists('DocumentsAdminManager')) {?>
<li><a id="tabEmployeeDocument" href="#tabPageEmployeeDocument"><?=LanguageManager::tran('Documents')?></a></li>
<?php } ?>
<?php }?>

6
readme.md
View File

@@ -530,10 +530,14 @@ Release note v18.0
* PDF Reports
* Ability to specify department heads
* Add advanced custom fields to employees via UI
* Allow indirect admins to allow travel requests
* Adding more languages to Language meta data table
* Improvements to report module
*
### Fixes
* Fix issue: classes should be loaded even the module is disabled
* Fix: suvordinates are not showing beyond first page issue.
Release note v16.1
------------------