From 934388d7697586c6239bb597b1558fb1dedf98b3 Mon Sep 17 00:00:00 2001 From: Thilina Hasantha Date: Sun, 13 Dec 2015 18:20:55 +0530 Subject: [PATCH] Adding upgrade script --- .../icehrmdb_upgrade_v13.3.OS_v14.0.OS.sql | 145 ++++++++++++ readme.md | 224 +++++++++++------- 2 files changed, 287 insertions(+), 82 deletions(-) create mode 100644 core-ext/db_upgrade/icehrmdb_upgrade_v13.3.OS_v14.0.OS.sql diff --git a/core-ext/db_upgrade/icehrmdb_upgrade_v13.3.OS_v14.0.OS.sql b/core-ext/db_upgrade/icehrmdb_upgrade_v13.3.OS_v14.0.OS.sql new file mode 100644 index 00000000..ac8af28d --- /dev/null +++ b/core-ext/db_upgrade/icehrmdb_upgrade_v13.3.OS_v14.0.OS.sql @@ -0,0 +1,145 @@ +ALTER TABLE EmployeeTravelRecords ADD COLUMN `funding` decimal(10,3) NULL AFTER `details`; +ALTER TABLE EmployeeTravelRecords ADD COLUMN `currency` bigint(20) NULL AFTER `funding`; +ALTER TABLE EmployeeTravelRecords ADD COLUMN `status` enum('Approved','Pending','Rejected','Cancellation Requested','Cancelled') default 'Pending'; + + +REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`) VALUES + ('Travel Request Report', 'This report list employees travel requests for a specified period', + '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}],\r\n[ "status", {"label":"Status","type":"select","source":[["NULL","All Statuses"],["Approved","Approved"],["Pending","Pending"],["Rejected","Rejected"],["Cancellation Requested","Cancellation Requested"],["Cancelled","Cancelled"]]}]\r\n]', + 'TravelRequestReport', + '["employee","date_start","date_end","status"]', 'Class'); + +REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES + ('Travel: Pre-Approve Travel Request', '0', '','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]'); + +REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES +('Attendance: Use Department Time Zone', '0', '','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]'); + +UPDATE `Settings` set value = '1' where name = 'System: Reset Modules and Permissions'; + +ALTER TABLE `CompanyStructures` ADD COLUMN `timezone` varchar(100) not null default 'Europe/London'; + +create table `Timezones` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `name` varchar(100) not null default '', + `details` varchar(255) not null default '', + primary key (`id`) +) engine=innodb default charset=utf8; + + +INSERT INTO `Timezones`(`id`, `name`, `details`) VALUES + (1, 'Pacific/Midway', '(GMT-11:00) Midway Island'), + (2, 'US/Samoa', '(GMT-11:00) Samoa'), + (3, 'US/Hawaii', '(GMT-10:00) Hawaii'), + (4, 'US/Alaska', '(GMT-09:00) Alaska'), + (5, 'US/Pacific', '(GMT-08:00) Pacific Time (US & Canada)'), + (6, 'America/Tijuana', '(GMT-08:00) Tijuana'), + (7, 'US/Arizona', '(GMT-07:00) Arizona'), + (8, 'US/Mountain', '(GMT-07:00) Mountain Time (US & Canada)'), + (9, 'America/Chihuahua', '(GMT-07:00) Chihuahua'), + (10, 'America/Mazatlan', '(GMT-07:00) Mazatlan'), + (11, 'America/Mexico_City', '(GMT-06:00) Mexico City'), + (12, 'America/Monterrey', '(GMT-06:00) Monterrey'), + (13, 'Canada/Saskatchewan', '(GMT-06:00) Saskatchewan'), + (14, 'US/Central', '(GMT-06:00) Central Time (US & Canada)'), + (15, 'US/Eastern', '(GMT-05:00) Eastern Time (US & Canada)'), + (16, 'US/East-Indiana', '(GMT-05:00) Indiana (East)'), + (17, 'America/Bogota', '(GMT-05:00) Bogota'), + (18, 'America/Lima', '(GMT-05:00) Lima'), + (19, 'America/Caracas', '(GMT-04:30) Caracas'), + (20, 'Canada/Atlantic', '(GMT-04:00) Atlantic Time (Canada)'), + (21, 'America/La_Paz', '(GMT-04:00) La Paz'), + (22, 'America/Santiago', '(GMT-04:00) Santiago'), + (23, 'Canada/Newfoundland', '(GMT-03:30) Newfoundland'), + (24, 'America/Buenos_Aires', '(GMT-03:00) Buenos Aires'), + (25, 'Greenland', '(GMT-03:00) Greenland'), + (26, 'Atlantic/Stanley', '(GMT-02:00) Stanley'), + (27, 'Atlantic/Azores', '(GMT-01:00) Azores'), + (28, 'Atlantic/Cape_Verde', '(GMT-01:00) Cape Verde Is.'), + (29, 'Africa/Casablanca', '(GMT) Casablanca'), + (30, 'Europe/Dublin', '(GMT) Dublin'), + (31, 'Europe/Lisbon', '(GMT) Lisbon'), + (32, 'Europe/London', '(GMT) London'), + (33, 'Africa/Monrovia', '(GMT) Monrovia'), + (34, 'Europe/Amsterdam', '(GMT+01:00) Amsterdam'), + (35, 'Europe/Belgrade', '(GMT+01:00) Belgrade'), + (36, 'Europe/Berlin', '(GMT+01:00) Berlin'), + (37, 'Europe/Bratislava', '(GMT+01:00) Bratislava'), + (38, 'Europe/Brussels', '(GMT+01:00) Brussels'), + (39, 'Europe/Budapest', '(GMT+01:00) Budapest'), + (40, 'Europe/Copenhagen', '(GMT+01:00) Copenhagen'), + (41, 'Europe/Ljubljana', '(GMT+01:00) Ljubljana'), + (42, 'Europe/Madrid', '(GMT+01:00) Madrid'), + (43, 'Europe/Paris', '(GMT+01:00) Paris'), + (44, 'Europe/Prague', '(GMT+01:00) Prague'), + (45, 'Europe/Rome', '(GMT+01:00) Rome'), + (46, 'Europe/Sarajevo', '(GMT+01:00) Sarajevo'), + (47, 'Europe/Skopje', '(GMT+01:00) Skopje'), + (48, 'Europe/Stockholm', '(GMT+01:00) Stockholm'), + (49, 'Europe/Vienna', '(GMT+01:00) Vienna'), + (50, 'Europe/Warsaw', '(GMT+01:00) Warsaw'), + (51, 'Europe/Zagreb', '(GMT+01:00) Zagreb'), + (52, 'Europe/Athens', '(GMT+02:00) Athens'), + (53, 'Europe/Bucharest', '(GMT+02:00) Bucharest'), + (54, 'Africa/Cairo', '(GMT+02:00) Cairo'), + (55, 'Africa/Harare', '(GMT+02:00) Harare'), + (56, 'Europe/Helsinki', '(GMT+02:00) Helsinki'), + (57, 'Europe/Istanbul', '(GMT+02:00) Istanbul'), + (58, 'Asia/Jerusalem', '(GMT+02:00) Jerusalem'), + (59, 'Europe/Kiev', '(GMT+02:00) Kyiv'), + (60, 'Europe/Minsk', '(GMT+02:00) Minsk'), + (61, 'Europe/Riga', '(GMT+02:00) Riga'), + (62, 'Europe/Sofia', '(GMT+02:00) Sofia'), + (63, 'Europe/Tallinn', '(GMT+02:00) Tallinn'), + (64, 'Europe/Vilnius', '(GMT+02:00) Vilnius'), + (65, 'Asia/Baghdad', '(GMT+03:00) Baghdad'), + (66, 'Asia/Kuwait', '(GMT+03:00) Kuwait'), + (67, 'Africa/Nairobi', '(GMT+03:00) Nairobi'), + (68, 'Asia/Riyadh', '(GMT+03:00) Riyadh'), + (69, 'Europe/Moscow', '(GMT+03:00) Moscow'), + (70, 'Asia/Tehran', '(GMT+03:30) Tehran'), + (71, 'Asia/Baku', '(GMT+04:00) Baku'), + (72, 'Europe/Volgograd', '(GMT+04:00) Volgograd'), + (73, 'Asia/Muscat', '(GMT+04:00) Muscat'), + (74, 'Asia/Tbilisi', '(GMT+04:00) Tbilisi'), + (75, 'Asia/Yerevan', '(GMT+04:00) Yerevan'), + (76, 'Asia/Kabul', '(GMT+04:30) Kabul'), + (77, 'Asia/Karachi', '(GMT+05:00) Karachi'), + (78, 'Asia/Tashkent', '(GMT+05:00) Tashkent'), + (79, 'Asia/Kolkata', '(GMT+05:30) Kolkata'), + (80, 'Asia/Kathmandu', '(GMT+05:45) Kathmandu'), + (81, 'Asia/Yekaterinburg', '(GMT+06:00) Ekaterinburg'), + (82, 'Asia/Almaty', '(GMT+06:00) Almaty'), + (83, 'Asia/Dhaka', '(GMT+06:00) Dhaka'), + (84, 'Asia/Novosibirsk', '(GMT+07:00) Novosibirsk'), + (85, 'Asia/Bangkok', '(GMT+07:00) Bangkok'), + (86, 'Asia/Jakarta', '(GMT+07:00) Jakarta'), + (87, 'Asia/Krasnoyarsk', '(GMT+08:00) Krasnoyarsk'), + (88, 'Asia/Chongqing', '(GMT+08:00) Chongqing'), + (89, 'Asia/Hong_Kong', '(GMT+08:00) Hong Kong'), + (90, 'Asia/Kuala_Lumpur', '(GMT+08:00) Kuala Lumpur'), + (91, 'Australia/Perth', '(GMT+08:00) Perth'), + (92, 'Asia/Singapore', '(GMT+08:00) Singapore'), + (93, 'Asia/Taipei', '(GMT+08:00) Taipei'), + (94, 'Asia/Ulaanbaatar', '(GMT+08:00) Ulaan Bataar'), + (95, 'Asia/Urumqi', '(GMT+08:00) Urumqi'), + (96, 'Asia/Irkutsk', '(GMT+09:00) Irkutsk'), + (97, 'Asia/Seoul', '(GMT+09:00) Seoul'), + (98, 'Asia/Tokyo', '(GMT+09:00) Tokyo'), + (99, 'Australia/Adelaide', '(GMT+09:30) Adelaide'), + (100, 'Australia/Darwin', '(GMT+09:30) Darwin'), + (101, 'Asia/Yakutsk', '(GMT+10:00) Yakutsk'), + (102, 'Australia/Brisbane', '(GMT+10:00) Brisbane'), + (103, 'Australia/Canberra', '(GMT+10:00) Canberra'), + (104, 'Pacific/Guam', '(GMT+10:00) Guam'), + (105, 'Australia/Hobart', '(GMT+10:00) Hobart'), + (106, 'Australia/Melbourne', '(GMT+10:00) Melbourne'), + (107, 'Pacific/Port_Moresby', '(GMT+10:00) Port Moresby'), + (108, 'Australia/Sydney', '(GMT+10:00) Sydney'), + (109, 'Asia/Vladivostok', '(GMT+11:00) Vladivostok'), + (110, 'Asia/Magadan', '(GMT+12:00) Magadan'), + (111, 'Pacific/Auckland', '(GMT+12:00) Auckland'), + (112, 'Pacific/Fiji', '(GMT+12:00) Fiji'); + + + diff --git a/readme.md b/readme.md index 9d48a869..530c6115 100644 --- a/readme.md +++ b/readme.md @@ -3,19 +3,82 @@ IceHrm Installation ------------ -Download the latest release https://github.com/gamonoid/icehrm/releases/latest + * Download the latest release https://github.com/gamonoid/icehrm/releases/latest -Copy the downloaded file to the path you want to install iCE Hrm in your server and extract. + * Copy the downloaded file to the path you want to install iCE Hrm in your server and extract. -Create a mysql DB for and user. Grant all on iCE Hrm DB to new DB user. + * Create a mysql DB for and user. Grant all on iCE Hrm DB to new DB user. -Visit iCE Hrm installation path in your browser. + * Visit iCE Hrm installation path in your browser. -During the installation form, fill in details appropriately. + * During the installation form, fill in details appropriately. -Once the application is installed use the username = admin and password = admin to login to your system. + * Once the application is installed use the username = admin and password = admin to login to your system. -Note: Please rename or delete the install folder (/app/install) since it could pose a security threat to your iCE Hrm instance. + Note: Please rename or delete the install folder (/app/install) since it could pose a security threat to your iCE Hrm instance. + + +Upgrade from Previous Versions to Latest Version +------------------------------------------------ + + * Backup icehrm installation file and DB + * Remove all folders except icehrm/app from your existing installation + * Copy all folders except icehrm/app into installation folder + * Use sql scripts inside 'db_upgrade/(version)' folder to upgrade the icehrm current version + + + Note: If you are upgrading from older versions of icehrm please note that the icehrm leave module is removed since v13.0 + + + +Release note v14.0 +------------------ + +### Features + * Expense management module + * Improvements to travel management module to change the process of applying for travel requests + * Employee document expiry notifications + * Immigration documents has been removed from travel module and users should use documents module instead + * Allow stopping all email notifications for certain leave types + * Leave filtering with leave period + * New report add for getting travel requests + * Improvements to user interface + * Bunch of UI improvements including changing menu order and font sizes + * Ability to stop all notifications for certain leave types + * Add a setting to use server time for time zone defined on department that a user is attached to create new attendance records + * Improvements to admin/manager and user dashboard + * Managers allowed to view/add/edit employee documents + * New reports added for employee expenses and travel + +### Fixes + * Fix issue: leave type not included in employee leave report + * Fix invoice ordering + * Fix unavailable help links + * Remove manager access from recruitment setup + * Remove Add New button from employees module for managers + * Remove Add New button from archived and terminated employees tabs + * Fix - training module view session info from my training sessions tab not working + + +Release note v13.4 +----------------- + +### Features + +### Fixes + * Fix employee leave report leave type field + +Release note v13.0 +----------------- + +### Features + * Recruitment module + * Allow managers to edit attendance of direct report employees + +### Fixes + * Employee switching issue fixed + * Fix terminated employee labels + * Fix issue with punch-in Release note v12.6 ----------------- @@ -27,31 +90,38 @@ Release note v12.6 ### Fixes * Employee switching issue fixed -Release note v10.2 + +Release note v11.1 ----------------- +### Features + * Add/Edit or remove employee fields + + +Release note v11.0 +----------------- + +### Features + * Employee data archiving + * Leave cancellation requests + * Adding view employee feature + ### Fixes * Improvements to date time pickers - * Fixing fatal error due to non writable log file - * Latest changes from ice-framework v2.0 - + Release note v10.1 ----------------- + ### Features - * Integration with ice-framework (http://github.com/thilinah/ice-framework) - * Travel module - * Meta data module + * Integration with ice-framework (http://githun.com/thilinah/ice-framework) * Option for only allow users to add an entry to a timesheet only if they have marked atteandance for the selected period * Restricting availability of leave types to employees using leave groups - -### Fixes - * Add missing S3FileSystem class - * Fix issue: passing result of a method call directly into empty method is not supported in php v5.3 - + * Admins and add notes to employees Release note v9.1 ----------------- + ### Fixes * Add missing S3FileSystem class * Fix issue: passing result of a method call directly into empty method is not supported in php v5.3 @@ -59,12 +129,14 @@ Release note v9.1 Release note v9.0 ----------------- + ### Features * New user interface * Decimal leave counts supported Update icehrm v8.4 to v9.0 -------------------------- + * Make a backup of your icehrm db * Run db script "icehrmdb_update_v8.4_to_v9.0.sql" which can be found inside script folder of icehrm_v9.0 * remove all folders except app folder in icehrm root folder @@ -73,6 +145,7 @@ Update icehrm v8.4 to v9.0 Release note v8.4 ----------------- + ### Fixes * Fix leave carry forward rounding issues * Fix issue: select2 default value not getting set for select2 @@ -80,102 +153,83 @@ Release note v8.4 Release note v8.3 ----------------- + ### Fixes -* Fix user table issue on windows, this will resolve errors such as: (Note that this fix has no effect on unix based installations) + * Fix user table issue on windows, this will resolve errors such as: (Note that this fix has no effect on unix based installations) * Admin not able to view user uploaded documents * Admin not able to upload documants for users * Admin can not view employee attendance records * Employee projects can not be added -Update icehrm v8.2 to v8.3 --------------------------- - -Copy server.includes.inc.php from v8.3 to your icehrm folder - -Update icehrm v7.x to v8.0 --------------------------- -Delete all folders except /app directory - -Copy contents of icehrm_v8.0.zip to existing icehrm directory except app directory - -Execute 'icehrmdb_os_update_v7.x_to_v8.0.sql' on your icehrm database - -Update icehrm v7.1 to v7.2 --------------------------- -Download update from https://bitbucket.org/thilina/icehrm-opensource/downloads/icehrm_update_from_7.1_to_7.2.zip - -Unzip icehrm_update_from_7.1_to_7.2.zip inside your icehrm installation - -Update icehrm v6.1 to v7.1 --------------------------- -Delete all folders except /app directory - -Copy contents of icehrm_v7.1.zip to existing icehrm directory except app directory - -Execute 'icehrmdb_os_update_v6.1_to_v7.1.sql' on your icehrm database - Release note v8.2 ----------------- + ### Features -*Instance verification added +* Instance verification added Release note v8.1 ----------------- + ### Fixes -*Fixed bug that caused a fatal error in php v5.4 -*aws2.7.11 phar file replaced by a aws2.7.11 extracted files -*old aws sdk removed +* Fixed bug that caused a fatal error in php v5.4 +* aws2.7.11 phar file replaced by a aws2.7.11 extracted files +* old aws sdk removed Release note v8.0 ----------------- + ### Features -*Admin dashbord module -*If the employee joined in current leave period, his leave entitlement is calculated proportional to joined date -*Improvements to reporting module -*Adding new employee time tracking report -*Join date for employees made mandatory -*Sending welcome email when a user is added -*Let users directly reply to admin user from any email sent out from icehrm -*All the users who are not admins must have an employee object attached -*Upgrade aws sdk to v2.7.11 -*Allow employees to change password -*Use only the email address defined under user for sending mails -*Making work_email and private_email fields optional +* Admin dashbord module +* If the employee joined in current leave period, his leave entitlement is calculated proportional to joined date +* Improvements to reporting module +* Adding new employee time tracking report +* Join date for employees made mandatory +* Sending welcome email when a user is added +* Let users directly reply to admin user from any email sent out from icehrm +* All the users who are not admins must have an employee object attached +* Upgrade aws sdk to v2.7.11 +* Allow employees to change password +* Use only the email address defined under user for sending mails +* Making work_email and private_email fields optional ### Fixes -*Upload dialog close button issue fixed +* Upload dialog close button issue fixed Release note v7.2 ----------------- -*Fixes -*Some critical vulnerabilities are fixed as recommend by http://zeroscience.mk/en/ + +### Fixes +* Some critical vulnerabilities are fixed as recommend by http://zeroscience.mk/en/ Release note v7.1 ----------------- -*Features -*Improved company structure graph -*Leave notes implementation � Supervisor can add a note when approving or rejecting leaves -*Filtering support -*Select boxes with long lists are now searchable -*Add/Edit/Delete company structure permissions added for managers -*Add ability to disable employee information editing -*Fixes -*Make loans editable only by admin -*Fix: permissions not getting applied to employee documents -*Fix error adding employee documents when no user assigned to the admin +### Features +* Improved company structure graph +* Leave notes implementation � Supervisor can add a note when approving or rejecting leaves +* Filtering support +* Select boxes with long lists are now searchable +* Add/Edit/Delete company structure permissions added for managers +* Add ability to disable employee information editing -*Code Quality -*Moving all module related code and data into module folders +### Fixes +* Make loans editable only by admin +* Fix: permissions not getting applied to employee documents +* Fix error adding employee documents when no user assigned to the admin + +### Code Quality +* Moving all module related code and data into module folders Release note v6.1 ----------------- + Leave carry forwared related isue fixed Release note v6.0 ----------------- + * Features * Notifications for leaves and timesheets * Leave module accrue and leave carry forward @@ -197,11 +251,13 @@ Release note v6.0 Release note v5.3 ----------------- + * Fixes * Fix missing employee name in employee details report Release note v5.2 ----------------- + * Fixes * Remove unwanted error logs * Fix attendance module employee permission issue @@ -211,12 +267,14 @@ Release note v5.2 Release note v5.1 ----------------- + * Fixes * Fixing for non updating null fields * https://bitbucket.org/thilina/icehrm-opensource/commits/df57308b53484a2e43ef5c72967ed1cd0dc756cc Release note v5.0 ----------------- + * Features * New user permission implementation * Adding new user level - Manager @@ -226,14 +284,16 @@ Release note v5.0 Release note v4.2 ----------------- -* Fixes + +### Fixes * https://bitbucket.org/thilina/icehrm-opensource/issue/23/subordinate-leaves-pagination-not-working * https://bitbucket.org/thilina/icehrm-opensource/issue/20/error-occured-while-time-punch Release note v4.1 ----------------- -* Features + +### Features * Better email format for notifications * Convert upload dialog to a bootstrp model @@ -244,4 +304,4 @@ Release note v4.1 * Fix company structure graph issues * Allow icehrm client to work without an internet connection * Fix installer incorrect base url issue -* Fix empty user creation issue +* Fix empty user creation issue \ No newline at end of file