Fix master data issue

Fix ready link
Preparing for v16.0.OS release
2016-04-17 12:14:15 +05:30 · 2016-04-17 11:48:57 +05:30 · 2016-04-17 11:34:30 +05:30 · 2016-04-17 08:59:50 +05:30 · 2016-04-17 00:28:01 +05:30 · 2016-04-17 00:20:39 +05:30
31 changed files with 1658 additions and 858 deletions
--- a/core-ext/common.cron.tasks.ext.php
+++ b/core-ext/common.cron.tasks.ext.php
@@ -1 +1,3 @@
-<?php
+<?php
+//Nothing here
+?>
--- a/core-ext/db_upgrade/upgrade_v15.2.OS_to_v16.0.OS.sql
+++ b/core-ext/db_upgrade/upgrade_v15.2.OS_to_v16.0.OS.sql
@@ -1,187 +0,0 @@
-ALTER TABLE `Users` ADD COLUMN `login_hash` varchar(64) default null;
-ALTER TABLE `Users` ADD INDEX login_hash_index (`login_hash`);
-
-INSERT INTO `ImmigrationStatus` VALUES
-  (1,'Citizen'),
-  (2,'Permanent Resident'),
-  (3,'Work Permit Holder'),
-  (4,'Dependant Pass Holder');
-
-INSERT INTO `Ethnicity` VALUES
-  (1,'White American'),
-  (2,'Black or African American'),
-  (3,'Native American'),
-  (4,'Alaska Native'),
-  (5,'Asian American'),
-  (6,'Native Hawaiian'),
-  (7,'Pacific Islander');
-
-REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
-  ('Attendance: Overtime Calculation Class', 'BasicOvertimeCalculator', 'Set the method used to calculate overtime','["value", {"label":"Value","type":"select","source":[["BasicOvertimeCalculator","BasicOvertimeCalculator"],["CaliforniaOvertimeCalculator","CaliforniaOvertimeCalculator"]]}]');
-
-REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
-  ('Attendance: Work Week Start Day', '0', 'Set the starting day of the work week','["value", {"label":"Value","type":"select","source":[["0","Sunday"],["1","Monday"],["2","Tuesday"],["3","Wednesday"],["4","Thursday"],["5","Friday"],["6","Saturday"]]}]');
-
-REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
-  ('System: Reset Module Names', '1', 'Select this to reset module names in Database','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
-
-REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
-('Attendance: Overtime Start Hour', '8', 'Overtime calculation will start after an employee work this number of hours per day, 0 to indicate no overtime', ''),
-('Attendance: Double time Start Hour', '12', 'Double time calculation will start after an employee work this number of hours per day, 0 to indicate no double time', ''),
-('Api: REST Api Enabled', '1',  '','["value", {"label":"Value","type":"select","source":[["0","No"],["1","Yes"]]}]'),
-('Api: REST Api Token', 'Click on edit icon',  '','["value", {"label":"Value","type":"placeholder"}]');
-
-REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
-  ('System: Allowed Countries', '0', 'Only these countries will be allowed in select boxes','["value", {"label":"Value","type":"select2multi","remote-source":["Country","id","name"]}]');
-
-REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
-  ('System: Allowed Currencies', '0', 'Only these currencies will be allowed in select boxes','["value", {"label":"Value","type":"select2multi","remote-source":["CurrencyType","id","code+name"]}]');
-
-INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
-  ('System: Allowed Nationality', '', 'Only these nationalities will be allowed in select boxes','["value", {"label":"Value","type":"select2multi","remote-source":["Nationality","id","name"]}]');
-
-
-REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
-('Overtime Report', 'This report list all employee attendance entries by employee with overtime calculations', '[\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]', 'OvertimeReport', '["employee","date_start","date_end"]', 'Class','Time Management');
-
-REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
-('Overtime Summary Report', 'This report list all employee attendance entries by employee with overtime calculation summary', '[\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]', 'OvertimeSummaryReport', '["employee","date_start","date_end"]', 'Class','Time Management');
-
-create table `EmployeeDataHistory` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `type` varchar(100) not null,
-  `employee` bigint(20) NOT NULL,
-  `field` varchar(100) not null,
-  `old_value` varchar(500) default null,
-  `new_value` varchar(500) default null,
-  `description` varchar(800) default null,
-  `user` bigint(20) NULL,
-  `updated` timestamp default '0000-00-00 00:00:00',
-  `created` timestamp default '0000-00-00 00:00:00',
-  CONSTRAINT `Fk_EmployeeDataHistory_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `Fk_EmployeeDataHistory_Users` FOREIGN KEY (`user`) REFERENCES `Users` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
-  primary key  (`id`)
-) engine=innodb default charset=utf8;
-
-
-
-REPLACE INTO `FieldNameMappings` (`type`, `name`, `textOrig`, `textMapped`, `display`) VALUES
-  ('Employee', 'indirect_supervisors', 'Indirect Supervisors', 'Indirect Supervisors', 'Form');
-
-Update Crons set time = (FLOOR( 1 + RAND( ) *58 )), type = 'Hourly' where name = 'Document Expire Alert';
-
-CREATE TABLE `PayFrequency` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(200) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB default charset=utf8;
-
-INSERT INTO `PayFrequency` VALUES
-  (1,'Bi Weekly'),
-  (2,'Weekly'),
-  (3,'Semi Monthly'),
-  (4,'Monthly'),
-  (5,'Yearly');
-
-
-CREATE TABLE `PayrollColumnTemplates` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `name` varchar(50) DEFAULT NULL,
-  `columns` varchar(500) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB default charset=utf8;
-
-create table `Payroll` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `name` varchar(200) NULL,
-  `pay_period` bigint(20) NOT NULL,
-  `department` bigint(20) NOT NULL,
-  `column_template` bigint(20) NOT NULL,
-  `columns` varchar(500) DEFAULT NULL,
-  `date_start` DATE NULL default '0000-00-00',
-  `date_end` DATE NULL default '0000-00-00',
-  `status` enum('Draft','Completed','Processing') default 'Draft',
-  primary key  (`id`)
-) engine=innodb default charset=utf8;
-
-
-CREATE TABLE `PayrollData` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `payroll` bigint(20) NOT NULL,
-  `employee` bigint(20) NOT NULL,
-  `payroll_item` int(11) NOT NULL,
-  `amount` varchar(25) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `PayrollDataUniqueKey` (`payroll`,`employee`,`payroll_item`),
-  CONSTRAINT `Fk_PayrollData_Payroll` FOREIGN KEY (`payroll`) REFERENCES `Payroll` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB default charset=utf8;
-
-
-CREATE TABLE `PayrollColumns` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(50) DEFAULT NULL,
-  `calculation_hook` varchar(200) DEFAULT NULL,
-  `salary_components` varchar(500) DEFAULT NULL,
-  `deductions` varchar(500) DEFAULT NULL,
-  `add_columns` varchar(500) DEFAULT NULL,
-  `sub_columns` varchar(500) DEFAULT NULL,
-  `colorder` int(11) DEFAULT NULL,
-  `editable` enum('Yes','No') default 'Yes',
-  `enabled` enum('Yes','No') default 'Yes',
-  `default_value` varchar(25) DEFAULT NULL,
-  `calculation_columns` varchar(500) DEFAULT NULL,
-  `calculation_function` varchar(100) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB default charset=utf8;
-
-
-
-
-INSERT INTO `PayrollColumns` (`id`,`name`,`calculation_hook`,`salary_components`,`deductions`,`add_columns`,`sub_columns`,`editable`) VALUES
-  (1,'Total Hours','AttendanceUtil_getTimeWorkedHours','','','','','No'),
-  (2,'Regular Hours','AttendanceUtil_getRegularWorkedHours','','','','','No'),
-  (3,'Overtime Hours','AttendanceUtil_getOverTimeWorkedHours','','','','','No'),
-  (4,'Leave Hours','LeaveUtil_getLeaveHours','','','','','No');
-
-create table `PayrollEmployees` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `employee` bigint(20) NOT NULL,
-  `pay_frequency` int(11) default null,
-  `currency` bigint(20) NULL,
-  `deduction_exemptions` varchar(250) default null,
-  `deduction_allowed` varchar(250) default null,
-  CONSTRAINT `Fk_PayrollEmployee_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  primary key  (`id`),
-  unique key `PayrollEmployees_employee` (`employee`)
-) engine=innodb default charset=utf8;
-
-create table `DeductionGroup` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `name` varchar(100) NOT NULL,
-  `description` varchar(100) NOT NULL,
-  primary key  (`id`)
-) engine=innodb default charset=utf8;
-
-drop table `DeductionRules`;
-drop table `Deductions`;
-
-create table `Deductions` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `name` varchar(100) NOT NULL,
-  `componentType` varchar(250) NULL,
-  `component` varchar(250) NULL,
-  `payrollColumn` int(11) DEFAULT NULL,
-  `rangeAmounts` text default null,
-  `deduction_group` bigint(20) NULL,
-  CONSTRAINT `Fk_Deductions_DeductionGroup` FOREIGN KEY (`deduction_group`) REFERENCES `DeductionGroup` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
-  primary key  (`id`)
-) engine=innodb default charset=utf8;
-
-
-
-
-
-Update Reports set parameters = '[\r\n[ "department", {"label":"Department (Company)","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true}],\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":"Leave Status","type":"select","source":[["NULL","All Statuses"],["Approved","Approved"],["Pending","Pending"],["Rejected","Rejected"],["Cancellation Requested","Cancellation Requested"],["Cancelled","Cancelled"]]}]\r\n]' where name = "Employee Leaves Report";
-
-
-Delete from `Settings` where name = 'System: Default Country';
--- a/core-ext/login.com.inc.php
+++ b/core-ext/login.com.inc.php
@@ -1,2 +1,3 @@
 <?php
-//Nothing here
+//Nothing here
+?>
--- a/core-ext/scripts/icehrm_master_data.sql
+++ b/core-ext/scripts/icehrm_master_data.sql
@@ -793,7 +793,6 @@ INSERT INTO `WorkDays` (`id`, `name`, `status`, `country`) VALUES

 INSERT INTO `Reports` (`id`, `name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
  (1, 'Employee Details Report', 'This report list all employee details and you can filter employees by department, employment status or job title', '[\r\n[ "department", {"label":"Department","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true}],\r\n[ "employment_status", {"label":"Employment Status","type":"select2","remote-source":["EmploymentStatus","id","name"],"allow-null":true}],\r\n[ "job_title", {"label":"Job Title","type":"select2","remote-source":["JobTitle","id","name"],"allow-null":true}]\r\n]', 'Select id, employee_id as ''Employee ID'',\r\nconcat(`first_name`,'' '',`middle_name`,'' '', `last_name`) as ''Name'',\r\n(SELECT name from Nationality where id = nationality) as ''Nationality'',\r\nbirthday as ''Birthday'',\r\ngender as ''Gender'',\r\nmarital_status as ''Marital Status'',\r\nssn_num as ''SSN Number'',\r\nnic_num as ''NIC Number'',\r\nother_id as ''Other IDs'',\r\ndriving_license as ''Driving License Number'',\r\n(SELECT name from EmploymentStatus where id = employment_status) as ''Employment Status'',\r\n(SELECT name from JobTitles where id = job_title) as ''Job Title'',\r\n(SELECT name from PayGrades where id = pay_grade) as ''Pay Grade'',\r\nwork_station_id as ''Work Station ID'',\r\naddress1 as ''Address 1'',\r\naddress2 as ''Address 2'',\r\ncity as ''City'',\r\n(SELECT name from Country where code = country) as ''Country'',\r\n(SELECT name from Province where id = province) as ''Province'',\r\npostal_code as ''Postal Code'',\r\nhome_phone as ''Home Phone'',\r\nmobile_phone as ''Mobile Phone'',\r\nwork_phone as ''Work Phone'',\r\nwork_email as ''Work Email'',\r\nprivate_email as ''Private Email'',\r\njoined_date as ''Joined Date'',\r\nconfirmation_date as ''Confirmation Date'',\r\n(SELECT title from CompanyStructures where id = department) as ''Department'',\r\n(SELECT concat(`first_name`,'' '',`middle_name`,'' '', `last_name`,'' [Employee ID:'',`employee_id`,'']'') from Employees e1 where e1.id = e.supervisor) as ''Supervisor'' \r\nFROM Employees e _where_', '["department","employment_status","job_title"]', 'Query', 'Employee Information'),
-  (2, 'Employee Leaves Report', 'This report list all employee leaves by employee, date range and leave status', '[\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":"Leave Status","type":"select","source":[["NULL","All Statuses"],["Approved","Approved"],["Pending","Pending"],["Rejected","Rejected"],["Cancellation Requested","Cancellation Requested"],["Cancelled","Cancelled"]]}]\r\n]', 'EmployeeLeavesReport', '["employee","date_start","date_end","status"]', 'Class','Leave Management'),
  (3, 'Employee Time Entry Report', 'This report list all employee time entries by employee, date range and project', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "project", {"label":"Project","type":"select","allow-null":true,"remote-source":["Project","id","name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'EmployeeTimesheetReport', '["employee","date_start","date_end","status"]', 'Class','Time Management'),
  (4, 'Employee Attendance Report', 'This report list all employee attendance entries by employee and date range', '[\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]', 'EmployeeAttendanceReport', '["employee","date_start","date_end"]', 'Class','Time Management'),
  (5, 'Employee Time Tracking Report', 'This report list employee working hours and attendance details for each day for a given period ', '[\r\n[ "employee", {"label":"Employee","type":"select2","allow-null":false,"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]', 'EmployeeTimeTrackReport', '["employee","date_start","date_end"]', 'Class','Time Management');
@@ -816,23 +815,12 @@ INSERT INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `
   'TerminatedEmployeeReport',
   '["department","date_start","date_end"]', 'Class','Employee Information');

-INSERT INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
-  ('Employee Leave Entitlement', 'This report list employees leave entitlement for current leave period by department or by employee ',
-   '[[ "department", {"label":"Department","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true,"validation":"none"}],\r\n[ "employee", {"label":"Employee","type":"select2","allow-null":true,"validation":"none","remote-source":["Employee","id","first_name+last_name"]}]]',
-   'EmployeeLeaveEntitlementReport',
-   '["department","employee"]', 'Class','Leave Management');
-
 REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) 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', 'Travel and Expense Management');

-REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
-  ('Expense Report', 'This report list employees expenses 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]',
-   'ExpenseReport',
-   '["employee","date_start","date_end","status"]', 'Class','Travel and Expense Management');

 INSERT INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
  ('Employee Time Sheet Report', 'This report list all employee time sheets by employee and date range', '[\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","allow-null":true,"null-label":"All Status","type":"select","source":[["Approved","Approved"],["Pending","Pending"],["Rejected","Rejected"]]}]\r\n]', 'EmployeeTimeSheetData', '["employee","date_start","date_end","status"]', 'Class','Time Management');
@@ -921,14 +909,6 @@ INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
    ('System: Allowed Nationality', '', 'Only these nationalities will be allowed in select boxes','["value", {"label":"Value","type":"select2multi","remote-source":["Nationality","id","name"]}]');


-INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
-  ('Files: Upload Files to S3', '0', '','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]'),
-  ('Files: Amazon S3 Key for File Upload', '', 'Please provide S3 Key for uploading files',''),
-  ('Files: Amazone S3 Secret for File Upload', '',  'Please provide S3 Secret for uploading files',''),
-  ('Files: S3 Bucket', '',  'Please provide S3 Bucket name for uploading files',''),
-  ('Files: S3 Web Url', '',  'Please provide Url to the s3 bucket','');
-
-
 INSERT INTO `Certifications` (`id`, `name`, `description`) VALUES
  (1, 'Red Hat Certified Architect (RHCA)', 'Red Hat Certified Architect (RHCA)'),
  (2, 'GIAC Secure Software Programmer -Java', 'GIAC Secure Software Programmer -Java'),
--- a/core-ext/db_upgrade/upgrade_v13.3.OS_to_v14.0.OS.sql
+++ b/core-ext/db_upgrade/upgrade_v13.3.OS_to_v14.0.OS.sql
--- a/core-ext/db_upgrade/upgrade_v14.0.OS_to_v15.0.OS.sql
+++ b/core-ext/db_upgrade/upgrade_v14.0.OS_to_v15.0.OS.sql
--- a/core-ext/db_upgrade/upgrade_v15.0.OS_to_v15.2.OS.sql
+++ b/core-ext/db_upgrade/upgrade_v15.0.OS_to_v15.2.OS.sql
--- a/core-ext/scripts/upgrade_v15.2.OS_to_v16.0.OS.sql
+++ b/core-ext/scripts/upgrade_v15.2.OS_to_v16.0.OS.sql
@@ -0,0 +1,839 @@
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
+  ('Employee Details Report', 'This report list all employee details and you can filter employees by department, employment status or job title', '[\r\n[ "department", {"label":"Department","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true}],\r\n[ "employment_status", {"label":"Employment Status","type":"select2","remote-source":["EmploymentStatus","id","name"],"allow-null":true}],\r\n[ "job_title", {"label":"Job Title","type":"select2","remote-source":["JobTitle","id","name"],"allow-null":true}]\r\n]', 'Select id, employee_id as ''Employee ID'',\r\nconcat(`first_name`,'' '',`middle_name`,'' '', `last_name`) as ''Name'',\r\n(SELECT name from Nationality where id = nationality) as ''Nationality'',\r\nbirthday as ''Birthday'',\r\ngender as ''Gender'',\r\nmarital_status as ''Marital Status'',\r\nssn_num as ''SSN Number'',\r\nnic_num as ''NIC Number'',\r\nother_id as ''Other IDs'',\r\ndriving_license as ''Driving License Number'',\r\n(SELECT name from EmploymentStatus where id = employment_status) as ''Employment Status'',\r\n(SELECT name from JobTitles where id = job_title) as ''Job Title'',\r\n(SELECT name from PayGrades where id = pay_grade) as ''Pay Grade'',\r\nwork_station_id as ''Work Station ID'',\r\naddress1 as ''Address 1'',\r\naddress2 as ''Address 2'',\r\ncity as ''City'',\r\n(SELECT name from Country where code = country) as ''Country'',\r\n(SELECT name from Province where id = province) as ''Province'',\r\npostal_code as ''Postal Code'',\r\nhome_phone as ''Home Phone'',\r\nmobile_phone as ''Mobile Phone'',\r\nwork_phone as ''Work Phone'',\r\nwork_email as ''Work Email'',\r\nprivate_email as ''Private Email'',\r\njoined_date as ''Joined Date'',\r\nconfirmation_date as ''Confirmation Date'',\r\n(SELECT title from CompanyStructures where id = department) as ''Department'',\r\n(SELECT concat(`first_name`,'' '',`middle_name`,'' '', `last_name`,'' [Employee ID:'',`employee_id`,'']'') from Employees e1 where e1.id = e.supervisor) as ''Supervisor'' \r\nFROM Employees e _where_', '["department","employment_status","job_title"]', 'Query', 'Employee Information'),
+  ('Employee Time Entry Report', 'This report list all employee time entries by employee, date range and project', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "project", {"label":"Project","type":"select","allow-null":true,"remote-source":["Project","id","name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'EmployeeTimesheetReport', '["employee","date_start","date_end","status"]', 'Class','Time Management'),
+  ('Employee Attendance Report', 'This report list all employee attendance entries by employee and date range', '[\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]', 'EmployeeAttendanceReport', '["employee","date_start","date_end"]', 'Class','Time Management'),
+  ('Employee Time Tracking Report', 'This report list employee working hours and attendance details for each day for a given period ', '[\r\n[ "employee", {"label":"Employee","type":"select2","allow-null":false,"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]', 'EmployeeTimeTrackReport', '["employee","date_start","date_end"]', 'Class','Time Management');
+
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
+  ('Active Employee Report', 'This report list employees who are currently active based on joined date and termination date ',
+   '[\r\n[ "department", {"label":"Department","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true}]\r\n]',
+   'ActiveEmployeeReport',
+   '["department"]', 'Class','Employee Information');
+
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`, `report_group`) VALUES
+  ('New Hires Employee Report', 'This report list employees who are joined between given two dates ',
+   '[[ "department", {"label":"Department","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]',
+   'NewHiresEmployeeReport',
+   '["department","date_start","date_end"]', 'Class','Employee Information');
+
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`, `report_group`) VALUES
+  ('Terminated Employee Report', 'This report list employees who are terminated between given two dates ',
+   '[[ "department", {"label":"Department","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]',
+   'TerminatedEmployeeReport',
+   '["department","date_start","date_end"]', 'Class','Employee Information');
+
+
+
+
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
+  ('Employee Time Sheet Report', 'This report list all employee time sheets by employee and date range', '[\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","allow-null":true,"null-label":"All Status","type":"select","source":[["Approved","Approved"],["Pending","Pending"],["Rejected","Rejected"]]}]\r\n]', 'EmployeeTimeSheetData', '["employee","date_start","date_end","status"]', 'Class','Time Management');
+
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('LDAP: Enabled', '0',  '','["value", {"label":"Value","type":"select","source":[["0","No"],["1","Yes"]]}]'),
+  ('LDAP: Server', '',  'LDAP Server IP or DNS',''),
+  ('LDAP: Port', '389',  'LDAP Server Port',''),
+  ('LDAP: Root DN', '',  'e.g: dc=mycompany,dc=net',''),
+  ('LDAP: Manager DN', '',  'e.g: cn=admin,dc=mycompany,dc=net',''),
+  ('LDAP: Manager Password', '',  'Password of the manager user',''),
+  ('LDAP: Version 3', '1',  'Are you using LDAP v3','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]'),
+  ('LDAP: User Filter', '',  'e.g: uid={}, we will replace {} with actual username provided by the user at the time of login','');
+
+
+
+
+/* v15.0.PRO to v16.0.PRO */
+
+ALTER TABLE `Users` ADD COLUMN `login_hash` varchar(64) default null;
+ALTER TABLE `Users` ADD INDEX login_hash_index (`login_hash`);
+
+INSERT INTO `ImmigrationStatus` VALUES
+  (1,'Citizen'),
+  (2,'Permanent Resident'),
+  (3,'Work Permit Holder'),
+  (4,'Dependant Pass Holder');
+
+INSERT INTO `Ethnicity` VALUES
+  (1,'White American'),
+  (2,'Black or African American'),
+  (3,'Native American'),
+  (4,'Alaska Native'),
+  (5,'Asian American'),
+  (6,'Native Hawaiian'),
+  (7,'Pacific Islander');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('Attendance: Overtime Calculation Class', 'BasicOvertimeCalculator', 'Set the method used to calculate overtime','["value", {"label":"Value","type":"select","source":[["BasicOvertimeCalculator","BasicOvertimeCalculator"],["CaliforniaOvertimeCalculator","CaliforniaOvertimeCalculator"]]}]');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('Attendance: Work Week Start Day', '0', 'Set the starting day of the work week','["value", {"label":"Value","type":"select","source":[["0","Sunday"],["1","Monday"],["2","Tuesday"],["3","Wednesday"],["4","Thursday"],["5","Friday"],["6","Saturday"]]}]');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('System: Reset Module Names', '1', 'Select this to reset module names in Database','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+('Attendance: Overtime Start Hour', '8', 'Overtime calculation will start after an employee work this number of hours per day, 0 to indicate no overtime', ''),
+('Attendance: Double time Start Hour', '12', 'Double time calculation will start after an employee work this number of hours per day, 0 to indicate no double time', ''),
+('Api: REST Api Enabled', '1',  '','["value", {"label":"Value","type":"select","source":[["0","No"],["1","Yes"]]}]'),
+('Api: REST Api Token', 'Click on edit icon',  '','["value", {"label":"Value","type":"placeholder"}]');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('System: Allowed Countries', '0', 'Only these countries will be allowed in select boxes','["value", {"label":"Value","type":"select2multi","remote-source":["Country","id","name"]}]');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('System: Allowed Currencies', '0', 'Only these currencies will be allowed in select boxes','["value", {"label":"Value","type":"select2multi","remote-source":["CurrencyType","id","code+name"]}]');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('System: Allowed Nationality', '', 'Only these nationalities will be allowed in select boxes','["value", {"label":"Value","type":"select2multi","remote-source":["Nationality","id","name"]}]');
+
+
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
+('Overtime Report', 'This report list all employee attendance entries by employee with overtime calculations', '[\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]', 'OvertimeReport', '["employee","date_start","date_end"]', 'Class','Time Management');
+
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`) VALUES
+('Overtime Summary Report', 'This report list all employee attendance entries by employee with overtime calculation summary', '[\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]', 'OvertimeSummaryReport', '["employee","date_start","date_end"]', 'Class','Time Management');
+
+create table `EmployeeDataHistory` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `type` varchar(100) not null,
+  `employee` bigint(20) NOT NULL,
+  `field` varchar(100) not null,
+  `old_value` varchar(500) default null,
+  `new_value` varchar(500) default null,
+  `description` varchar(800) default null,
+  `user` bigint(20) NULL,
+  `updated` timestamp default '0000-00-00 00:00:00',
+  `created` timestamp default '0000-00-00 00:00:00',
+  CONSTRAINT `Fk_EmployeeDataHistory_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Fk_EmployeeDataHistory_Users` FOREIGN KEY (`user`) REFERENCES `Users` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+Alter table `Employees` modify column `joined_date` date default '0000-00-00';
+Alter table `Employees` modify column `confirmation_date` date default '0000-00-00';
+Alter table `Employees` modify column `termination_date` date default '0000-00-00';
+Alter table `Employees` modify column `birthday` date default '0000-00-00';
+
+
+REPLACE INTO `FieldNameMappings` (`type`, `name`, `textOrig`, `textMapped`, `display`) VALUES
+  ('Employee', 'indirect_supervisors', 'Indirect Supervisors', 'Indirect Supervisors', 'Form');
+
+Update Crons set time = (FLOOR( 1 + RAND( ) *58 )), type = 'Hourly' where name = 'Document Expire Alert';
+
+CREATE TABLE `PayFrequency` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(200) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB default charset=utf8;
+
+INSERT INTO `PayFrequency` VALUES
+  (1,'Bi Weekly'),
+  (2,'Weekly'),
+  (3,'Semi Monthly'),
+  (4,'Monthly'),
+  (5,'Yearly');
+
+
+CREATE TABLE `PayrollColumnTemplates` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) DEFAULT NULL,
+  `columns` varchar(500) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB default charset=utf8;
+
+create table `Payroll` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(200) NULL,
+  `pay_period` bigint(20) NOT NULL,
+  `department` bigint(20) NOT NULL,
+  `column_template` bigint(20) NOT NULL,
+  `columns` varchar(500) DEFAULT NULL,
+  `date_start` DATE NULL default '0000-00-00',
+  `date_end` DATE NULL default '0000-00-00',
+  `status` enum('Draft','Completed','Processing') default 'Draft',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+CREATE TABLE `PayrollData` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `payroll` bigint(20) NOT NULL,
+  `employee` bigint(20) NOT NULL,
+  `payroll_item` int(11) NOT NULL,
+  `amount` varchar(25) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `PayrollDataUniqueKey` (`payroll`,`employee`,`payroll_item`),
+  CONSTRAINT `Fk_PayrollData_Payroll` FOREIGN KEY (`payroll`) REFERENCES `Payroll` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB default charset=utf8;
+
+
+CREATE TABLE `PayrollColumns` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) DEFAULT NULL,
+  `calculation_hook` varchar(200) DEFAULT NULL,
+  `salary_components` varchar(500) DEFAULT NULL,
+  `deductions` varchar(500) DEFAULT NULL,
+  `add_columns` varchar(500) DEFAULT NULL,
+  `sub_columns` varchar(500) DEFAULT NULL,
+  `colorder` int(11) DEFAULT NULL,
+  `editable` enum('Yes','No') default 'Yes',
+  `enabled` enum('Yes','No') default 'Yes',
+  `default_value` varchar(25) DEFAULT NULL,
+  `calculation_columns` varchar(500) DEFAULT NULL,
+  `calculation_function` varchar(100) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB default charset=utf8;
+
+
+
+
+INSERT INTO `PayrollColumns` (`id`,`name`,`calculation_hook`,`salary_components`,`deductions`,`add_columns`,`sub_columns`,`editable`) VALUES
+  (1,'Total Hours','AttendanceUtil_getTimeWorkedHours','','','','','No'),
+  (2,'Regular Hours','AttendanceUtil_getRegularWorkedHours','','','','','No'),
+  (3,'Overtime Hours','AttendanceUtil_getOverTimeWorkedHours','','','','','No'),
+  (4,'Leave Hours','LeaveUtil_getLeaveHours','','','','','No');
+
+create table `PayrollEmployees` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `employee` bigint(20) NOT NULL,
+  `pay_frequency` int(11) default null,
+  `currency` bigint(20) NULL,
+  `deduction_exemptions` varchar(250) default null,
+  `deduction_allowed` varchar(250) default null,
+  CONSTRAINT `Fk_PayrollEmployee_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  primary key  (`id`),
+  unique key `PayrollEmployees_employee` (`employee`)
+) engine=innodb default charset=utf8;
+
+create table `DeductionGroup` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `description` varchar(100) NOT NULL,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+drop table `DeductionRules`;
+drop table `Deductions`;
+
+create table `Deductions` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `componentType` varchar(250) NULL,
+  `component` varchar(250) NULL,
+  `payrollColumn` int(11) DEFAULT NULL,
+  `rangeAmounts` text default null,
+  `deduction_group` bigint(20) NULL,
+  CONSTRAINT `Fk_Deductions_DeductionGroup` FOREIGN KEY (`deduction_group`) REFERENCES `DeductionGroup` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+
+
+
+Update Reports set parameters = '[\r\n[ "department", {"label":"Department (Company)","type":"select2","remote-source":["CompanyStructure","id","title"],"allow-null":true}],\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":"Leave Status","type":"select","source":[["NULL","All Statuses"],["Approved","Approved"],["Pending","Pending"],["Rejected","Rejected"],["Cancellation Requested","Cancellation Requested"],["Cancelled","Cancelled"]]}]\r\n]' where name = "Employee Leaves Report";
+
+
+Delete from `Settings` where name = 'System: Default Country';
+
+
+
+
+
+
+
+create table `LeaveTypes` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `supervisor_leave_assign` enum('Yes','No') default 'Yes',
+  `employee_can_apply` enum('Yes','No') default 'Yes',
+  `apply_beyond_current` enum('Yes','No') default 'Yes',
+  `leave_accrue` enum('No','Yes') default 'No',
+  `carried_forward` enum('No','Yes') default 'No',
+  `default_per_year` decimal(10,3) NOT NULL,
+  `carried_forward_percentage` int(11) NULL default 0,
+  `carried_forward_leave_availability` int(11) NULL default 365,
+  `propotionate_on_joined_date` enum('No','Yes') default 'No',
+  `send_notification_emails` enum('Yes','No') default 'Yes',
+  `leave_group` bigint(20) NULL,
+  `leave_color` varchar(10) NULL,
+  `max_carried_forward_amount` int(11) NULL default 0,
+  primary key  (`id`),
+  unique key (`name`)
+) engine=innodb default charset=utf8;
+
+create table `LeaveRules` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `leave_type` bigint(20) NOT NULL,
+  `job_title` bigint(20) NULL,
+  `employment_status` bigint(20) NULL,
+  `employee` bigint(20) NULL,
+  `supervisor_leave_assign` enum('Yes','No') default 'Yes',
+  `employee_can_apply` enum('Yes','No') default 'Yes',
+  `apply_beyond_current` enum('Yes','No') default 'Yes',
+  `leave_accrue` enum('No','Yes') default 'No',
+  `carried_forward` enum('No','Yes') default 'No',
+  `default_per_year` decimal(10,3) NOT NULL,
+  `carried_forward_percentage` int(11) NULL default 0,
+  `carried_forward_leave_availability` int(11) NULL default 365,
+  `propotionate_on_joined_date` enum('No','Yes') default 'No',
+  `leave_group` bigint(20) NULL,
+  `max_carried_forward_amount` int(11) NULL default 0,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+create table `LeaveGroups` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `details` text default null,
+  `created` timestamp NULL default '0000-00-00 00:00:00',
+  `updated` timestamp NULL default '0000-00-00 00:00:00',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `LeaveGroupEmployees` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `employee` bigint(20) NOT NULL,
+  `leave_group` bigint(20) NOT NULL,
+  `created` timestamp NULL default '0000-00-00 00:00:00',
+  `updated` timestamp NULL default '0000-00-00 00:00:00',
+  CONSTRAINT `Fk_LeaveGroupEmployees_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Fk_LeaveGroupEmployees_LeaveGroups` FOREIGN KEY (`leave_group`) REFERENCES `LeaveGroups` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  primary key  (`id`),
+  unique key `LeaveGroupEmployees_employee` (`employee`)
+) engine=innodb default charset=utf8;
+
+create table `LeavePeriods` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `date_start` date default '0000-00-00',
+  `date_end` date default '0000-00-00',
+  `status` enum('Active','Inactive') default 'Inactive',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `WorkDays` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `status` enum('Full Day','Half Day','Non-working Day') default 'Full Day',
+  `country` bigint(20) DEFAULT NULL,
+  primary key  (`id`),
+  unique key `workdays_name_country` (`name`,`country`)
+) engine=innodb default charset=utf8;
+
+create table `HoliDays` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `dateh` date default '0000-00-00',
+  `status` enum('Full Day','Half Day') default 'Full Day',
+  `country` bigint(20) DEFAULT NULL,
+  primary key  (`id`),
+  unique key `holidays_dateh_country` (`dateh`,`country`)
+) engine=innodb default charset=utf8;
+
+create table `EmployeeLeaves` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `employee` bigint(20) NOT NULL,
+  `leave_type` bigint(20) NOT NULL,
+  `leave_period` bigint(20) NOT NULL,
+  `date_start` date default '0000-00-00',
+  `date_end` date default '0000-00-00',
+  `details` text default null,
+  `status` enum('Approved','Pending','Rejected','Cancellation Requested','Cancelled') default 'Pending',
+  `attachment` varchar(100) NULL,
+  CONSTRAINT `Fk_EmployeeLeaves_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Fk_EmployeeLeaves_LeaveTypes` FOREIGN KEY (`leave_type`) REFERENCES `LeaveTypes` (`id`),
+  CONSTRAINT `Fk_EmployeeLeaves_LeavePeriods` FOREIGN KEY (`leave_period`) REFERENCES `LeavePeriods` (`id`),
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `EmployeeLeaveLog` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `employee_leave` bigint(20) NOT NULL,
+  `user_id` bigint(20) NULL,
+  `data` varchar(500) NOT NULL,
+  `status_from` enum('Approved','Pending','Rejected','Cancellation Requested','Cancelled') default 'Pending',
+  `status_to` enum('Approved','Pending','Rejected','Cancellation Requested','Cancelled') default 'Pending',
+  `created` timestamp default '0000-00-00 00:00:00',
+  CONSTRAINT `Fk_EmployeeLeaveLog_EmployeeLeaves` FOREIGN KEY (`employee_leave`) REFERENCES `EmployeeLeaves` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Fk_EmployeeLeaveLog_Users` FOREIGN KEY (`user_id`) REFERENCES `Users` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `EmployeeLeaveDays` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `employee_leave` bigint(20) NOT NULL,
+  `leave_date` date default '0000-00-00',
+  `leave_type` enum('Full Day','Half Day - Morning','Half Day - Afternoon','1 Hour - Morning','2 Hours - Morning','3 Hours - Morning','1 Hour - Afternoon','2 Hours - Afternoon','3 Hours - Afternoon') NOT NULL,
+  CONSTRAINT `Fk_EmployeeLeaveDays_EmployeeLeaves` FOREIGN KEY (`employee_leave`) REFERENCES `EmployeeLeaves` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+create table `Documents` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `details` text default null,
+  `expire_notification` enum('Yes','No') default 'Yes',
+  `expire_notification_month` enum('Yes','No') default 'Yes',
+  `expire_notification_week` enum('Yes','No') default 'Yes',
+  `expire_notification_day` enum('Yes','No') default 'Yes',
+  `sign` enum('Yes','No') default 'Yes',
+  `sign_label` VARCHAR(500) default null,
+  `created` DATETIME default '0000-00-00 00:00:00',
+  `updated` DATETIME default '0000-00-00 00:00:00',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+create table `EmployeeDocuments` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `employee` bigint(20) NOT NULL,
+  `document` bigint(20) NULL,
+  `date_added` date NOT NULL,
+  `valid_until` date NOT NULL,
+  `status` enum('Active','Inactive','Draft') default 'Active',
+  `details` text default null,
+  `attachment` varchar(100) NULL,
+  `signature` text default null,
+  `expire_notification_last` int(4) NULL,
+  CONSTRAINT `Fk_EmployeeDocuments_Documents` FOREIGN KEY (`document`) REFERENCES `Documents` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT `Fk_EmployeeDocuments_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  primary key  (`id`),
+  KEY `KEY_EmployeeDocuments_valid_until` (`valid_until`),
+  KEY `KEY_EmployeeDocuments_valid_until_status` (`valid_until`,`status`,`expire_notification_last`)
+) engine=innodb default charset=utf8;
+
+
+create table `CompanyDocuments` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `details` text default null,
+  `valid_until` date NOT NULL,
+  `status` enum('Active','Inactive','Draft') default 'Active',
+  `notify_employees` enum('Yes','No') default 'Yes',
+  `attachment` varchar(100) NULL,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+create table `Courses` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `code` varchar(300) NOT NULL,
+  `name` varchar(300) NOT NULL,
+  `description` text default null,
+  `coordinator` bigint(20) NULL,
+  `trainer` varchar(300) NULL,
+  `trainer_info` text default null,
+  `paymentType` enum('Company Sponsored','Paid by Employee') default 'Company Sponsored',
+  `currency` varchar(3) null,
+  `cost` decimal(12,2) DEFAULT 0.00,
+  `status` enum('Active','Inactive') default 'Active',
+  `created` datetime default '0000-00-00 00:00:00',
+  `updated` datetime default '0000-00-00 00:00:00',
+  CONSTRAINT `Fk_Courses_Employees` FOREIGN KEY (`coordinator`) REFERENCES `Employees` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `TrainingSessions` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(300) NOT NULL,
+  `course` bigint(20) NOT NULL,
+  `description` text default null,
+  `scheduled` datetime default '0000-00-00 00:00:00',
+  `dueDate` datetime default '0000-00-00 00:00:00',
+  `deliveryMethod` enum('Classroom','Self Study','Online') default 'Classroom',
+  `deliveryLocation` varchar(500) NULL,
+  `status` enum('Pending','Approved','Completed','Cancelled') default 'Pending',
+  `attendanceType` enum('Sign Up','Assign') default 'Sign Up',
+  `attachment` varchar(300) NULL,
+  `created` datetime default '0000-00-00 00:00:00',
+  `updated` datetime default '0000-00-00 00:00:00',
+  `requireProof` enum('Yes','No') default 'Yes',
+  CONSTRAINT `Fk_TrainingSessions_Courses` FOREIGN KEY (`course`) REFERENCES `Courses` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+create table `EmployeeTrainingSessions` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `employee` bigint(20) NOT NULL,
+  `trainingSession` bigint(20) NULL,
+  `feedBack` varchar(1500) NULL,
+  `status` enum('Scheduled','Attended','Not-Attended','Completed') default 'Scheduled',
+  `proof` varchar(300) NULL,
+  CONSTRAINT `Fk_EmployeeTrainingSessions_TrainingSessions` FOREIGN KEY (`trainingSession`) REFERENCES `TrainingSessions` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Fk_EmployeeTrainingSessions_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+
+create table `LeaveStartingBalance` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `leave_type` bigint(20) NOT NULL,
+  `employee` bigint(20) NULL,
+  `leave_period` bigint(20) NOT NULL,
+  `amount` decimal(10,3) NOT NULL,
+  `note` text DEFAULT NULL,
+  `created` datetime default '0000-00-00 00:00:00',
+  `updated` datetime default '0000-00-00 00:00:00',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+
+/* Sync with Default Schema */
+
+create table `EmployementType` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(250) not null default '',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `Industry` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(250) not null default '',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `ExperienceLevel` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(250) not null default '',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `JobFunction` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(250) not null default '',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `EducationLevel` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(250) not null default '',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `Benifits` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(250) not null default '',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `Tags` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(250) not null default '',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `Job` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `title` varchar(200) NOT NULL,
+  `shortDescription` text DEFAULT NULL,
+  `description` text DEFAULT NULL,
+  `requirements` text DEFAULT NULL,
+  `benefits` text DEFAULT NULL,
+  `country` bigint(20) DEFAULT NULL,
+  `company` bigint(20) DEFAULT NULL,
+  `department` VARCHAR(100) NULL,
+  `code` VARCHAR(20) NULL,
+  `employementType` bigint(20) DEFAULT NULL,
+  `industry` bigint(20) DEFAULT NULL,
+  `experienceLevel` bigint(20) DEFAULT NULL,
+  `jobFunction` bigint(20) DEFAULT NULL,
+  `educationLevel` bigint(20) DEFAULT NULL,
+  `currency` bigint(20) DEFAULT NULL,
+  `showSalary` enum('Yes','No') default NULL,
+  `salaryMin` bigint(20) DEFAULT NULL,
+  `salaryMax` bigint(20) DEFAULT NULL,
+  `keywords` text DEFAULT NULL,
+  `status` enum('Active','On hold','Closed') default NULL,
+  `closingDate` DATETIME default '0000-00-00 00:00:00',
+  `attachment` varchar(100) NULL,
+  `display` varchar(200) NOT NULL,
+  `postedBy` bigint(20) DEFAULT NULL,
+  INDEX `Job_status` (`status`),
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+create table `Candidates` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `first_name` varchar(100) default '' not null,
+  `last_name` varchar(100) default '' not null,
+  `nationality` bigint(20) default null,
+  `birthday` DATETIME default '0000-00-00 00:00:00',
+  `gender` enum('Male','Female') default NULL,
+  `marital_status` enum('Married','Single','Divorced','Widowed','Other') default NULL,
+  `address1` varchar(100) default '',
+  `address2` varchar(100) default '',
+  `city` varchar(150) default '',
+  `country` char(2) default null,
+  `province` bigint(20) default null,
+  `postal_code` varchar(20) default null,
+  `email` varchar(200) default null,
+  `home_phone` varchar(50) default null,
+  `mobile_phone` varchar(50) default null,
+  `cv_title` varchar(200) default '' not null,
+  `cv` varchar(150) NULL,
+  `cvtext` text NULL,
+  `industry` text DEFAULT NULL,
+  `profileImage` varchar(150) NULL,
+  `head_line` text DEFAULT NULL,
+  `objective` text DEFAULT NULL,
+  `work_history` text DEFAULT NULL,
+  `education` text DEFAULT NULL,
+  `skills` text DEFAULT NULL,
+  `referees` text DEFAULT NULL,
+  `linkedInUrl` varchar(500) DEFAULT NULL,
+  `linkedInData` text DEFAULT NULL,
+  `totalYearsOfExperience` int(11) default null,
+  `totalMonthsOfExperience` int(11) default null,
+  `htmlCVData` longtext DEFAULT NULL,
+  `generatedCVFile` varchar(150) DEFAULT NULL,
+  `created` DATETIME default '0000-00-00 00:00:00',
+  `updated` DATETIME default '0000-00-00 00:00:00',
+  `expectedSalary` int(11) default null,
+  `preferedPositions` text default null,
+  `preferedJobtype` varchar(60) default null,
+  `preferedCountries` text default null,
+  `tags` text default null,
+  `notes` text default null,
+  `calls` text default null,
+  `age` int(11) default null,
+  `hash` varchar(100) DEFAULT NULL,
+  `linkedInProfileLink` varchar(250) DEFAULT NULL,
+  `linkedInProfileId` varchar(50) DEFAULT NULL,
+  `facebookProfileLink` varchar(250) DEFAULT NULL,
+  `facebookProfileId` varchar(50) DEFAULT NULL,
+  `twitterProfileLink` varchar(250) DEFAULT NULL,
+  `twitterProfileId` varchar(50) DEFAULT NULL,
+  `googleProfileLink` varchar(250) DEFAULT NULL,
+  `googleProfileId` varchar(50) DEFAULT NULL,
+  primary key  (`id`)
+
+) engine=innodb default charset=utf8;
+
+
+create table `Applications` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `job` bigint(20) NOT NULL,
+  `candidate` bigint(20) DEFAULT NULL,
+  `created` DATETIME default '0000-00-00 00:00:00',
+  `referredByEmail` varchar(200) DEFAULT NULL,
+  `notes` text DEFAULT NULL,
+  primary key  (`id`),
+  unique key  (`job`,`candidate`),
+  CONSTRAINT `Fk_Applications_Job` FOREIGN KEY (`job`) REFERENCES `Job` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Fk_Applications_Candidates` FOREIGN KEY (`candidate`) REFERENCES `Candidates` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) engine=innodb default charset=utf8;
+
+create table `Interviews` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `job` bigint(20) NOT NULL,
+  `candidate` bigint(20) DEFAULT NULL,
+  `level` varchar(100) DEFAULT NULL,
+  `created` DATETIME default '0000-00-00 00:00:00',
+  `updated` DATETIME default '0000-00-00 00:00:00',
+  `scheduled` DATETIME default '0000-00-00 00:00:00',
+  `location` varchar(500) DEFAULT NULL,
+  `mapId` bigint(20) NULL,
+  `status` varchar(100) default null,
+  `notes` text DEFAULT NULL,
+  primary key  (`id`),
+  CONSTRAINT `Fk_Interviews_Job` FOREIGN KEY (`job`) REFERENCES `Job` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Fk_Interviews_Candidates` FOREIGN KEY (`candidate`) REFERENCES `Candidates` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) engine=innodb default charset=utf8;
+
+
+create table `Calls` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `job` bigint(20) NOT NULL,
+  `candidate` bigint(20) DEFAULT NULL,
+  `phone` varchar(20) default null,
+  `created` DATETIME default '0000-00-00 00:00:00',
+  `updated` DATETIME default '0000-00-00 00:00:00',
+  `status` varchar(100) default null,
+  `notes` text DEFAULT NULL,
+  primary key  (`id`),
+  CONSTRAINT `Fk_Calls_Job` FOREIGN KEY (`job`) REFERENCES `Job` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Fk_Calls_Candidates` FOREIGN KEY (`candidate`) REFERENCES `Candidates` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) engine=innodb default charset=utf8;
+
+
+
+
+
+
+/* Add Missing Master Data */
+
+INSERT INTO `WorkDays` (`id`, `name`, `status`, `country`) VALUES
+  (1, 'Monday', 'Full Day',NULL),
+  (2, 'Tuesday', 'Full Day',NULL),
+  (3, 'Wednesday', 'Full Day',NULL),
+  (4, 'Thursday', 'Full Day',NULL),
+  (5, 'Friday', 'Full Day',NULL),
+  (6, 'Saturday', 'Non-working Day',NULL),
+  (7, 'Sunday', 'Non-working Day',NULL);
+
+
+
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+('System: Reset Module Names', '1', 'Select this to reset module names in Database','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]'),
+('Leave: Share Calendar to Whole Company', '1', '','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]'),
+('Leave: CC Emails', '',  'Every email sent though leave module will be CC to these comma seperated list of emails addresses',''),
+('Leave: BCC Emails', '',  'Every email sent though leave module will be BCC to these comma seperated list of emails addresses',''),
+('Api: REST Api Enabled', '1',  '','["value", {"label":"Value","type":"select","source":[["0","No"],["1","Yes"]]}]'),
+('Api: REST Api Token', 'Click on edit icon',  '','["value", {"label":"Value","type":"placeholder"}]');
+
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+  ('LDAP: Enabled', '0',  '','["value", {"label":"Value","type":"select","source":[["0","No"],["1","Yes"]]}]'),
+  ('LDAP: Server', '',  'LDAP Server IP or DNS',''),
+  ('LDAP: Port', '389',  'LDAP Server Port',''),
+  ('LDAP: Root DN', '',  'e.g: dc=mycompany,dc=net',''),
+  ('LDAP: Manager DN', '',  'e.g: cn=admin,dc=mycompany,dc=net',''),
+  ('LDAP: Manager Password', '',  'Password of the manager user',''),
+  ('LDAP: Version 3', '1',  'Are you using LDAP v3','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]'),
+  ('LDAP: User Filter', '',  'e.g: uid={}, we will replace {} with actual username provided by the user at the time of login','');
+
+REPLACE 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"]]}]');
+
+
+REPLACE INTO `Documents` (`id`, `name`, `details`, `expire_notification`, `expire_notification_month`, `expire_notification_week`, `expire_notification_day`,`sign`,`created`, `updated`) VALUES
+  (1, 'ID Copy', 'Your ID copy','Yes','Yes','Yes','Yes','No',NOW(), NOW()),
+  (2, 'Degree Certificate', 'Degree Certificate','Yes','Yes','Yes','Yes','Yes',NOW(), NOW()),
+  (3, 'Driving License', 'Driving License','Yes','Yes','Yes','Yes','Yes',NOW(), NOW());
+
+REPLACE INTO `HoliDays` (`id`, `name`, `dateh`, `status`) VALUES
+  (1, 'New Year''s Day', '2015-01-01', 'Full Day'),
+  (2, 'Christmas Day', '2015-12-25', 'Full Day');
+
+REPLACE INTO `LeavePeriods` (`id`, `name`, `date_start`, `date_end`, `status`) VALUES
+  (3, 'Year 2015', '2015-01-01', '2015-12-31', 'Active'),
+  (4, 'Year 2016', '2016-01-01', '2016-12-31', 'Active'),
+  (5, 'Year 2017', '2017-01-01', '2017-12-31', 'Active');
+
+REPLACE INTO `LeaveTypes` (`id`, `name`, `supervisor_leave_assign`, `employee_can_apply`, `apply_beyond_current`, `leave_accrue`, `carried_forward`, `default_per_year`) VALUES
+  (1, 'Annual leave', 'No', 'Yes', 'No', 'No', 'No', 14),
+  (2, 'Casual leave', 'Yes', 'Yes', 'No', 'No', 'No', 7),
+  (3, 'Medical leave', 'Yes', 'Yes', 'Yes', 'No', 'No', 7);
+
+REPLACE INTO `Courses` (`id`,`code`, `name`, `description`, `coordinator`, `trainer`, `trainer_info`, `paymentType`, `currency`, `cost`, `status`, `created`, `updated`) VALUES
+  (1,'C0001', 'Info Marketing', 'Learn how to Create and Outsource Info Marketing Products', 1, 'Tim Jhon', 'Tim Jhon has a background in business management and has been working with small business to establish their online presence','Company Sponsored','USD','55','Active',now(), now()),
+  (2,'C0002', 'People Management', 'Learn how to Manage People', 1, 'Tim Jhon', 'Tim Jhon has a background in business management and has been working with small business to establish their online presence','Company Sponsored','USD','59','Active',now(), now());
+
+REPLACE INTO `EmployementType` (`name`) VALUES
+  ('Full-time'),
+  ('Part-time'),
+  ('Contract'),
+  ('Temporary'),
+  ('Other');
+
+REPLACE INTO `Benifits` (`name`) VALUES
+  ('Retirement plan'),
+  ('Health plan'),
+  ('Life insurance'),
+  ('Paid vacations');
+
+
+
+REPLACE INTO `ExperienceLevel` (`name`) VALUES
+  ('Not Applicable'),
+  ('Internship'),
+  ('Entry level'),
+  ('Associate'),
+  ('Mid-Senior level'),
+  ('Director'),
+  ('Executive');
+
+REPLACE INTO `JobFunction` (`name`) VALUES
+  ('Accounting/Auditing'),
+  ('Administrative'),
+  ('Advertising'),
+  ('Business Analyst'),
+  ('Financial Analyst'),
+  ('Data Analyst'),
+  ('Art/Creative'),
+  ('Business Development'),
+  ('Consulting'),
+  ('Customer Service'),
+  ('Distribution'),
+  ('Design'),
+  ('Education'),
+  ('Engineering'),
+  ('Finance'),
+  ('General Business'),
+  ('Health Care Provider'),
+  ('Human Resources'),
+  ('Information Technology'),
+  ('Legal'),
+  ('Management'),
+  ('Manufacturing'),
+  ('Marketing'),
+  ('Other'),
+  ('Public Relations'),
+  ('Purchasing'),
+  ('Product Management'),
+  ('Project Management'),
+  ('Production'),
+  ('Quality Assurance'),
+  ('Research'),
+  ('Sales'),
+  ('Science'),
+  ('Strategy/Planning'),
+  ('Supply Chain'),
+  ('Training'),
+  ('Writing/Editing');
+
+
+REPLACE INTO `EducationLevel` (`name`) VALUES
+  ('Unspecified'),
+  ('High School or equivalent'),
+  ('Certification'),
+  ('Vocational'),
+  ('Associate Degree'),
+  ('Bachelor\'s Degree'),
+  ('Master\'s Degree'),
+  ('Doctorate'),
+  ('Professional'),
+  ('Some College Coursework Completed'),
+  ('Vocational - HS Diploma'),
+  ('Vocational - Degree'),
+  ('Some High School Coursework');
+
+
+REPLACE INTO `Crons` (`name`,`class`, `lastrun`, `frequency`, `time`, `type`, `status`) VALUES
+  ('Email Sender Task', 'EmailSenderTask', NULL, 1, 1, 'Minutely', 'Enabled'),
+  ('Document Expire Alert', 'DocumentExpiryNotificationTask', NULL, 1, (FLOOR( 1 + RAND( ) *58 )), 'Hourly', 'Enabled');
+
+
+REPLACE INTO `ExpensesPaymentMethods` (`name`) VALUES
+  ('Cash'),
+  ('Check'),
+  ('Credit Card'),
+  ('Debit Card');
+
+
+REPLACE INTO `ExpensesCategories` (`name`) VALUES
+  ('Auto - Gas'),
+  ('Auto - Insurance'),
+  ('Auto - Maintenance'),
+  ('Auto - Payment'),
+  ('Transportation'),
+  ('Bank Fees'),
+  ('Dining Out'),
+  ('Entertainment'),
+  ('Hotel / Motel'),
+  ('Insurance'),
+  ('Interest Charges'),
+  ('Loan Payment'),
+  ('Medical'),
+  ('Mileage'),
+  ('Rent'),
+  ('Rental Car'),
+  ('Utility');
--- a/ext/admin/charts/LICENSE.txt
+++ b/ext/admin/charts/LICENSE.txt
@@ -1,44 +0,0 @@
-ICEHRM END USER LICENSE AGREEMENT
-NOTICE TO ALL USERS: BY PURCHASING THE MODULE, YOU (EITHER AN INDIVIDUAL OR A SINGLE ENTITY) CONSENT TO BE BOUND BY AND BECOME A PARTY TO THIS AGREEMENT.
-
-All references to "Software" herein shall be deemed to include the software license with which you will be provided by Gamonoid Media Pvt Ltd, as part of the Software.
-
-1. LICENSE GRANT. Subject to the payment of the applicable licence fees, and subject to the terms and conditions of this Agreement, ICEHRM hereby grants to you a non-exclusive, non-transferable right to use one copy of the specified version of the Software and the accompanying documentation (the "Documentation") for the term of this Agreement solely for your own internal business purposes. You may install one copy of the Software for production use.
-.
-2. USE. The Software is licensed as a single product; it may not be used on more than one ICEHRM Server at a time. The Software is "in use" on a Server when its installed on a Server. You shall not, nor permit any third party to copy (other than as expressly permitted herein). You shall not rent, lease or lend the Software to any other person, nor transfer or sub-licence your licence rights to any other person.
-
-3. TERM. This Agreement is effective until terminated as set forth herein. This Agreement will terminate automatically if you fail to comply with any of the conditions, limitations or other requirements described herein. Upon any termination of this Agreement, you must immediately destroy all copies of the Software and the Documentation. You may terminate this Agreement at any point by destroying all copies of the Software and the Documentation.
-
-4. SUPPORT. Gamonoid Media Pvt Ltd will provide you support according to the support agreement subscribed by the company.
-
-5. OWNERSHIP RIGHTS. The Software is protected by copyright laws. ICEHRM and Gamonoid Media Pvt Ltd own and retain all right, title and interest in and to the Software, including all copyrights, patents, trademarks and other intellectual property rights therein. Your possession, installation, or use of the Software does not transfer to you any title to the intellectual property in the Software, and you will not acquire any rights to the Software except as expressly set forth in this Agreement.
-
-6. LIMITED WARRANTY. You may not rent, lease, loan or resell the Software. You may not permit third parties to benefit from the use or functionality of the Software via a timesharing, service bureau or other arrangement, except to the extent such use is specified in the applicable list price or product packaging for the Software. You may not transfer any of the rights granted to you under this Agreement. You may not modify, or create derivative works based upon, the Software in whole or in part. You may not copy the Software or Documentation except as expressly permitted in Section 1 above. You may not remove any proprietary notices or labels on the Software. All rights not expressly set forth hereunder are reserved by ICEHRM. ICEHRM reserves the right to periodically conduct audits upon advance written notice to verify compliance with the terms of this Agreement.
-
-7. WARRANTY and DISCLAIMER. 
-
-(i) Gamonoid Media Pvt Ltd. warrants that for 30 days from first download or installation the Software will perform substantially in accordance with the functionality described in the Documentation (http://blog.icehrm.com) when operated properly and in the manner specified in the Documentation. 
-
-(ii) You accept all responsibility for the selection of this Software to meet your requirements. 
-
-(iii) Gamonoid Media Pvt Ltd. does not warrant that the Software and/or the Documentation will be suitable for such requirements nor that any use will be uninterrupted and error free.
-
-(iv) The warranty in (i) shall not apply if you (a) make or cause to be made any modifications to this Software, (b) use the Software in a manner for which it was not intended or (c) use the Software other than as permitted under this Agreement. 
-
-(vii) The warranties and conditions stated in this Agreement are in lieu of all other conditions, warranties or other terms concerning the supply or purported supply of, failure to supply or delay in supplying the Software or the Documentation which might but for this paragraph (vii) have effect between the ICEHRM and you or would otherwise be implied into or incorporated into this Agreement or any collateral contract, whether by statute, common law or otherwise, all of which are hereby excluded (including, without limitation, the implied conditions, warranties or other terms as to satisfactory quality, fitness for purpose or as to the use of reasonable skill and care).
-
-8. LIMITATION of LIABILITY. Gamonoid Media Pvt Ltd. shall have no liability (whether in contract, tort, restitution or otherwise) for any of the following losses or damage (whether such losses or damage were foreseen, foreseeable, known or otherwise): 
- Loss of revenue; 
- Loss of actual or anticipated profits (including for loss of profits on contracts); 
- Loss of the use of money; 
- Loss of anticipated savings; 
- Loss of business; 
- Loss of opportunity; 
- Loss of goodwill; 
- Loss of reputation; 
- Loss of, damage to or corruption of data; 
-or 
-Any indirect or consequential loss or damage howsoever caused (including, for the avoidance of doubt, where such loss or damage is of the type specified in paragraph (ii), (a) to (ii), (i). 
-The ICEHRM liability (whether in contract, tort, restitution or otherwise) arising out of or in connection with the supply of the Software shall in no circumstances exceed a sum equal to the amount equally paid by you for the Software.
-The construction and interpretation of this Agreement shall be governed in accordance with the laws of Sri Lanka. The parties hereby submit to the jurisdiction of the courts of Sri Lanka save that ICEHRM as claimant shall be entitled to initiate proceedings in any court of competent jurisdiction.
-This Agreement contains the entire understanding of the parties with respect to the subject matter hereof and supersedes all and any prior understandings, undertakings and promises between you and ICEHRM, whether oral or in writing, which have been given or may be implied from anything written or said in negotiations between us or our representatives prior to this Agreement and all prior agreements between the parties relating to the matters aforesaid shall cease to have effect as from the Effective Date.
--- a/ext/admin/charts/README.txt
+++ b/ext/admin/charts/README.txt
@@ -1,7 +0,0 @@
-This module is licensed under IceHrm Commercial License, which can be found in LICENSE.txt.
-You are allowed to make any modification required to these module, but only allowed to use
-the module in one production server (even with modifications).
-
-Installation
------------
-Copy this module into <icehrm path>/admin/ directory
--- a/ext/admin/charts/api/ChartsActionManager.php
+++ b/ext/admin/charts/api/ChartsActionManager.php
@@ -1,156 +0,0 @@
-<?php
-if (!class_exists('ChartsActionManager')) {
-	class ChartsActionManager extends SubActionManager{
-
-		public function getTimeUtilization($req){
-			
-			if(empty($req->start)){
-				$req->start = date("Y-m-01");
-			}
-			
-			if(empty($req->end)){
-				$req->end = date("Y-m-t",strtotime($req->start));
-			}
-			
-			//Find Time Entries
-			
-			$employeeTimeEntry = new EmployeeTimeEntry();
-			if(empty($req->employee)){
-				$timeEntryList = $employeeTimeEntry->Find("date(date_start) >= ? and  date(date_end) <= ?",array($req->start, $req->end));	
-			}else{
-				$timeEntryList = $employeeTimeEntry->Find("employee = ? and date(date_start) >= ? and  date(date_end) <= ?",array($req->employee, $req->start, $req->end));
-			}
-			
-			$seconds = 0;
-			$graphTimeArray = array();
-			foreach($timeEntryList as $entry){
-				$seconds = (strtotime($entry->date_end) - strtotime($entry->date_start));
-				$key = date("Y-m-d",strtotime($entry->date_end));
-				if(isset($graphTimeArray[$key])){
-					$graphTimeArray[$key] += $seconds;
-				}else{
-					$graphTimeArray[$key] = $seconds;
-				}
-			}
-			
-			//$minutes = (int)($seconds/60);
-			
-			
-			//Find Attendance Entries
-			
-			$attendance = new Attendance();
-			if(empty($req->employee)){
-				$atteandanceList = 	$attendance->Find("date(in_time) >= ? and  date(out_time) <= ? and in_time < out_time",array($req->start, $req->end));	
-			}else{
-				$atteandanceList = 	$attendance->Find("employee = ? and date(in_time) >= ? and  date(out_time) <= ? and in_time < out_time",array($req->employee, $req->start, $req->end));
-			}
-			
-			$seconds = 0;
-			$graphAttendanceArray = array();
-			foreach($atteandanceList as $entry){
-				$seconds = (strtotime($entry->out_time) - strtotime($entry->in_time));
-				$key = date("Y-m-d",strtotime($entry->in_time));
-				if(isset($graphAttendanceArray[$key])){
-					$graphAttendanceArray[$key] += $seconds;
-				}else{
-					$graphAttendanceArray[$key] = $seconds;
-				}
-			}
-			
-			
-			$data = array();
-			$data[] = array("key"=>"Hours in Attendance", "values"=>array());
-			$data[] = array("key"=>"Hours Worked", "values"=>array());
-			
-			
-			//Iterate date range
-			
-			$interval = DateInterval::createFromDateString('1 day');
-			$period = new DatePeriod(new DateTime($req->start), $interval, new DateTime($req->end));
-			
-			foreach ( $period as $dt ){
-				$key = $dt->format("Y-m-d");
-				if(isset($graphAttendanceArray[$key])){
-					$data[0]['values'][] = array("x"=>$key, "y"=>round(($graphAttendanceArray[$key]/3600),2));
-				}else{
-					$data[0]['values'][] = array("x"=>$key, "y"=>0);
-				}
-				
-				if(isset($graphTimeArray[$key])){
-					$data[1]['values'][] = array("x"=>$key, "y"=>round(($graphTimeArray[$key]/3600),2));
-				}else{
-					$data[1]['values'][] = array("x"=>$key, "y"=>0);
-				}
-			}
-			
-			
-			
-			/*
-			//Test data
-			
-			for($i = 1; $i<31; $i++){
-				$data[0]['values'][] = array("x"=>$i, "y"=>rand(2,9));	
-				$data[1]['values'][] = array("x"=>$i, "y"=>rand(2,8));	
-			}
-			*/ 
-			
-			
-			return new IceResponse(IceResponse::SUCCESS,$data);
-		}
-		
-		public function getAttendance($req){
-				
-			if(empty($req->start)){
-				$req->start = date("Y-m-01");
-			}
-				
-			if(empty($req->end)){
-				$req->end = date("Y-m-t",strtotime($req->start));
-			}
-				
-				
-			//Find Attendance Entries
-				
-			$attendance = new Attendance();
-			if(empty($req->employee)){
-				$atteandanceList = 	$attendance->Find("date(in_time) >= ? and  date(out_time) <= ? and in_time < out_time",array($req->start, $req->end));
-			}else{
-				$atteandanceList = 	$attendance->Find("employee = ? and date(in_time) >= ? and  date(out_time) <= ? and in_time < out_time",array($req->employee, $req->start, $req->end));
-			}
-				
-			$seconds = 0;
-			$graphAttendanceArray = array();
-			foreach($atteandanceList as $entry){
-				$seconds = (strtotime($entry->out_time) - strtotime($entry->in_time));
-				$key = date("Y-m-d",strtotime($entry->in_time));
-				if(isset($graphAttendanceArray[$key])){
-					$graphAttendanceArray[$key] += $seconds;
-				}else{
-					$graphAttendanceArray[$key] = $seconds;
-				}
-			}
-				
-				
-			$data[0] = array();
-			$data[0] = array("key"=>"Attendance", "values"=>array());
-				
-				
-			//Iterate date range
-				
-			$interval = DateInterval::createFromDateString('1 day');
-			$period = new DatePeriod(new DateTime($req->start), $interval, new DateTime($req->end));
-				
-			foreach ( $period as $dt ){
-				$key = $dt->format("Y-m-d");
-				if(isset($graphAttendanceArray[$key])){
-					$data[0]['values'][] = array("x"=>$key, "y"=>round(($graphAttendanceArray[$key]/3600),2));
-				}else{
-					$data[0]['values'][] = array("x"=>$key, "y"=>0);
-				}
-			}
-				
-				
-			return new IceResponse(IceResponse::SUCCESS,$data);
-		}
-	}
-}
--- a/ext/admin/charts/index.php
+++ b/ext/admin/charts/index.php
@@ -1,56 +0,0 @@
-<?php 
-
-$moduleName = 'company_structure';
-define('MODULE_PATH',dirname(__FILE__));
-include APP_BASE_PATH.'header.php';
-include APP_BASE_PATH.'modulejslibs.inc.php';
-?>
-
-<link href="<?=BASE_URL.'js/nvd3/src/nv.d3.css?v='.$jsVersion?>" rel="stylesheet" type="text/css">
-
-<script src="<?=BASE_URL.'js/nvd3/lib/d3.v3.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/nv.d3.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/tooltip.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/utils.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/models/legend.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/models/axis.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/models/multiBar.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/models/discreteBar.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/models/discreteBarChart.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/stream_layers.js?v='.$jsVersion?>"></script>
-
-<style type="text/css">
-svg .tooltip { opacity: 1; }
-</style>
-
-<div class="span9">
-	
-  		  
-	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
-		<li class="active"><a id="tabAttendanceGraph" href="#tabPageAttendanceGraph">Attendance Graph</a></li>
-		<li><a id="tabTimeUtilizationGraph" href="#tabPageTimeUtilizationGraph">Hours in Office vs Hours Worked Graph</a></li>
-	</ul>
-	 
-	<div class="tab-content">
-		<div class="tab-pane active reviewBlock with-3d-shadow with-transitions" id="tabPageAttendanceGraph" style="height: 500px;position: relative;">
-			<svg></svg>
-		</div>
-		<div class="tab-pane reviewBlock with-3d-shadow with-transitions" id="tabPageTimeUtilizationGraph" style="height: 500px;position: relative;">
-			<svg></svg>
-		</div>
-	</div>
-
-</div>
-<script>
-var modJsList = new Array();
-modJsList['tabAttendanceGraph'] = new AttendanceGraphAdapter('AttendanceGraph');
-modJsList['tabAttendanceGraph'].setShowAddNew(false);
-
-modJsList['tabTimeUtilizationGraph'] = new TimeUtilizationGraphAdapter('TimeUtilizationGraph');
-modJsList['tabTimeUtilizationGraph'].setShowAddNew(false);
-
-var modJs = modJsList['tabAttendanceGraph'];
-
-</script>
-
-<?php include APP_BASE_PATH.'footer.php';?>      
--- a/ext/admin/charts/lib.js
+++ b/ext/admin/charts/lib.js
@@ -1,284 +0,0 @@
-/**
- * Author: Thilina Hasantha
- */
-function BaseGraphAdapter(endPoint) {
-	this.initAdapter(endPoint);
-}
-
-BaseGraphAdapter.inherits(AdapterBase);
-
-BaseGraphAdapter.method('getDataMapping', function() {
-	return [];
-});
-
-BaseGraphAdapter.method('getHeaders', function() {
-	return [];
-});
-
-BaseGraphAdapter.method('getFormFields', function() {
-	return [];
-});
-
-BaseGraphAdapter.method('createTable', function(elementId) {
-	
-});
-
-/*
- * TimeUtilizationGraphAdapter
- */
-
-
-function AttendanceGraphAdapter(endPoint) {
-	this.initAdapter(endPoint);
-}
-
-AttendanceGraphAdapter.inherits(BaseGraphAdapter);
-
-AttendanceGraphAdapter.method('getFormFields', function() {
-	return [];
-});
-
-AttendanceGraphAdapter.method('getFilters', function() {
-	return [
-	        [ "employee", {"label":"Employee","type":"select2","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],
-	        [ "start", {"label":"Start Date","type":"date","validation":""}],
-	        [ "end", {"label":"End Date","type":"date","validation":""}]
-	        
-	];
-});
-
-AttendanceGraphAdapter.method('get', function() {
-	this.initFieldMasterData();
-	this.getTimeUtilization();
-});
-
-AttendanceGraphAdapter.method('doCustomFilterValidation', function(params) {
-	$("#"+this.table+"_filter_error").html("");
-	$("#"+this.table+"_filter_error").hide();
-	if(Date.parse(params.start).getTime() > Date.parse(params.end).getTime()){
-		$("#"+this.table+"_filter_error").html("End date should be a later date than start date");
-		$("#"+this.table+"_filter_error").show();
-		return false;
-	}
-	
-	var dateDiff = (Date.parse(params.end).getTime() - Date.parse(params.start).getTime())/(1000*60*60*24);
-	
-	if(dateDiff > 45 && (params['employee'] == undefined || params['employee'] == null || params['employee'] == "NULL")){
-		$("#"+this.table+"_filter_error").html("Differance between start and end dates should not be more than 45 days, when creating chart for all employees");
-		$("#"+this.table+"_filter_error").show();
-		return false;
-		
-	}else if(dateDiff > 90){
-		$("#"+this.table+"_filter_error").html("Differance between start and end dates should not be more than 90 days");
-		$("#"+this.table+"_filter_error").show();
-		return false;
-	}
-	
-	return true;
-});
-
-AttendanceGraphAdapter.method('getTimeUtilization', function(object,callBackData) {
-	var that = this;
-	object = {};
-	
-	
-	if(this.filter != null && this.filter != undefined){
-		if(this.filter.employee != "NULL"){
-			object['employee'] = this.filter.employee;
-		}
-		
-		object['start'] = this.filter.start;
-		object['end'] = this.filter.end;
-	}
-	
-	var reqJson = JSON.stringify(object);
-	
-	var callBackData = [];
-	callBackData['callBackData'] = [];
-	callBackData['callBackSuccess'] = 'getAttendanceSuccessCallBack';
-	callBackData['callBackFail'] = 'getAttendanceFailCallBack';
-	
-	this.customAction('getAttendance','admin=charts',reqJson,callBackData);
-});
-
-
-AttendanceGraphAdapter.method('getAttendanceFailCallBack', function(callBackData) {
-	this.showMessage("Error Occured while getting data for chart", callBackData);
-});
-
-
-AttendanceGraphAdapter.method('getAttendanceSuccessCallBack', function(callBackData) {
-
-	var that = this;
-	var chart;
-	
-	var filterHtml = that.getTableTopButtonHtml();
-	$("#tabPageAttendanceGraph svg").remove();
-	$("#tabPageAttendanceGraph div").remove();
-    $("#tabPageAttendanceGraph").html("");
-    $("#tabPageAttendanceGraph").html(filterHtml+"<svg></svg>");
-    
- 
-	nv.addGraph(function() {
-		
-		var chart = nv.models.multiBarChart()
-		  .margin({bottom: 200})
-	      .transitionDuration(0)
-	      .reduceXTicks(true)   //If 'false', every single x-axis tick label will be rendered.
-	      .rotateLabels(45)      //Angle to rotate x-axis labels.
-	      .showControls(false)   //Allow user to switch between 'Grouped' and 'Stacked' mode.
-	      .groupSpacing(0.1)    //Distance between each group of bars.
-	    ;
-
-	    chart.yAxis
-	        .tickFormat(d3.format(',.1f'));
-		
-	    chart.dispatch.on('stateChange', function(e) { nv.log('New State:', JSON.stringify(e)); });
-
-	    chart.tooltip(function (key, x, y, e, graph) {
-	        return '<p><strong>' + key + '</strong></p>' +
-	        '<p>' + y + ' on ' + x + '</p>';
-	    });
-	    
-
-	    d3.select('#tabPageAttendanceGraph svg')
-	        .datum(callBackData)
-	       .call(chart);
-	    
-	    return chart;
-	});
-
-	
-});
-
-/*
- * TimeUtilizationGraphAdapter
- */
-
-
-function TimeUtilizationGraphAdapter(endPoint) {
-	this.initAdapter(endPoint);
-}
-
-TimeUtilizationGraphAdapter.inherits(BaseGraphAdapter);
-
-TimeUtilizationGraphAdapter.method('getFormFields', function() {
-	return [];
-});
-
-TimeUtilizationGraphAdapter.method('getFilters', function() {
-	return [
-	        [ "employee", {"label":"Employee","type":"select2","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],
-	        [ "start", {"label":"Start Date","type":"date","validation":""}],
-	        [ "end", {"label":"End Date","type":"date","validation":""}]
-	        
-	];
-});
-
-TimeUtilizationGraphAdapter.method('get', function() {
-	this.initFieldMasterData();
-	this.getTimeUtilization();
-});
-
-TimeUtilizationGraphAdapter.method('doCustomFilterValidation', function(params) {
-	$("#"+this.table+"_filter_error").html("");
-	$("#"+this.table+"_filter_error").hide();
-	if(Date.parse(params.start).getTime() > Date.parse(params.end).getTime()){
-		$("#"+this.table+"_filter_error").html("End date should be a later date than start date");
-		$("#"+this.table+"_filter_error").show();
-		return false;
-	}
-	
-	var dateDiff = (Date.parse(params.end).getTime() - Date.parse(params.start).getTime())/(1000*60*60*24);
-	
-	if(dateDiff > 45 && (params['employee'] == undefined || params['employee'] == null || params['employee'] == "NULL")){
-		$("#"+this.table+"_filter_error").html("Differance between start and end dates should not be more than 45 days, when creating chart for all employees");
-		$("#"+this.table+"_filter_error").show();
-		return false;
-		
-	}else if(dateDiff > 90){
-		$("#"+this.table+"_filter_error").html("Differance between start and end dates should not be more than 90 days");
-		$("#"+this.table+"_filter_error").show();
-		return false;
-	}
-	
-	return true;
-});
-
-TimeUtilizationGraphAdapter.method('getTimeUtilization', function(object,callBackData) {
-	var that = this;
-	object = {};
-	
-	
-	if(this.filter != null && this.filter != undefined){
-		if(this.filter.employee != "NULL"){
-			object['employee'] = this.filter.employee;
-		}
-		
-		object['start'] = this.filter.start;
-		object['end'] = this.filter.end;
-	}
-	
-	var reqJson = JSON.stringify(object);
-	
-	var callBackData = [];
-	callBackData['callBackData'] = [];
-	callBackData['callBackSuccess'] = 'getTimeUtilizationSuccessCallBack';
-	callBackData['callBackFail'] = 'getTimeUtilizationFailCallBack';
-	
-	this.customAction('getTimeUtilization','admin=charts',reqJson,callBackData);
-});
-
-
-TimeUtilizationGraphAdapter.method('getTimeUtilizationFailCallBack', function(callBackData) {
-	this.showMessage("Error Occured while getting data for chart", callBackData);
-});
-
-
-TimeUtilizationGraphAdapter.method('getTimeUtilizationSuccessCallBack', function(callBackData) {
-
-	var that = this;
-	var chart;
-	
-	var filterHtml = that.getTableTopButtonHtml();
-	$("#tabPageTimeUtilizationGraph svg").remove();
-	$("#tabPageTimeUtilizationGraph div").remove();
-    $("#tabPageTimeUtilizationGraph").html("");
-    $("#tabPageTimeUtilizationGraph").html(filterHtml+"<svg></svg>");
-    
-	nv.addGraph(function() {
-		
-		var chart = nv.models.multiBarChart()
-		  .margin({bottom: 200})
-	      .transitionDuration(0)
-	      .reduceXTicks(true)   //If 'false', every single x-axis tick label will be rendered.
-	      .rotateLabels(45)      //Angle to rotate x-axis labels.
-	      .showControls(true)   //Allow user to switch between 'Grouped' and 'Stacked' mode.
-	      .groupSpacing(0.1)    //Distance between each group of bars.
-	    ;
-
-	    chart.yAxis
-	        .tickFormat(d3.format(',.1f'));
-		
-	    
-
-	    d3.select('#tabPageTimeUtilizationGraph svg')
-	        .datum(callBackData)
-	       .call(chart);
-
-	    chart.dispatch.on('stateChange', function(e) { nv.log('New State:', JSON.stringify(e)); });
-
-	    chart.tooltip(function (key, x, y, e, graph) {
-	        return '<p><strong>' + key + '</strong></p>' +
-	        '<p>' + y + ' on ' + x + '</p>';
-	    });
-	    
-	    return chart;
-	});
-
-	
-});
-
-
-
-
--- a/ext/admin/charts/meta.json
+++ b/ext/admin/charts/meta.json
@@ -1,11 +0,0 @@
-{
-"label":"Performance Charts",
-"menu":"Employees",
-"order":"93",
-"icon":"fa-bar-chart-o",
-"user_levels":["Admin","Manager"],
-
-"permissions":
-	{
-	}	
-}
--- a/ext/admin/dashboard/index.php
+++ b/ext/admin/dashboard/index.php
@@ -93,6 +93,6 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
        } catch (e) {
        }

-    }
+    });
 </script>
 <?php include APP_BASE_PATH.'footer.php';?>
--- a/ext/admin/salary/api/SalaryAdminManager.php
+++ b/ext/admin/salary/api/SalaryAdminManager.php
@@ -1,26 +1,26 @@
 <?php
 if (!class_exists('SalaryAdminManager')) {
-	class SalaryAdminManager extends AbstractModuleManager{
-		
-		public function initializeUserClasses(){
-			
-		}
-		
-		public function initializeFieldMappings(){
-			
-		}
-		
-		public function initializeDatabaseErrorMappings(){
+    class SalaryAdminManager extends AbstractModuleManager{

-		}
-		
-		public function setupModuleClassDefinitions(){
+        public function initializeUserClasses(){
+
+        }
+
+        public function initializeFieldMappings(){
+
+        }
+
+        public function initializeDatabaseErrorMappings(){
+
+        }
+
+        public function setupModuleClassDefinitions(){
            $this->addModelClass('SalaryComponentType');
            $this->addModelClass('SalaryComponent');
-            $this->addModelClass('Deduction');
-		}
-		
-	}
+            $this->addModelClass('PayrollEmployee');
+        }
+
+    }
 }

 if (!class_exists('SalaryComponentType')) {
@@ -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')) {
    class PayrollEmployee extends ICEHRM_Record {
--- a/ext/admin/salary/index.php
+++ b/ext/admin/salary/index.php
@@ -9,9 +9,6 @@ $moduleBuilder = new ModuleBuilder();

 $moduleBuilder->addModuleOrGroup(new ModuleTab('SalaryComponentType','SalaryComponentType','Salary Component Types','SalaryComponentTypeAdapter','','',true));
 $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")));


--- a/ext/admin/settings/index.php
+++ b/ext/admin/settings/index.php
@@ -34,7 +34,7 @@ $options1['setShowAddNew'] = 'false';
 $moduleBuilder->addModuleOrGroup(new ModuleTab('CompanySetting','Setting','Company','SettingAdapter','{"name":["Company:"]}','name',true,$options1));
 $moduleBuilder->addModuleOrGroup(new ModuleTab('SystemSetting','Setting','System','SettingAdapter','{"name":["System:"]}','name',false,$options1));
 $moduleBuilder->addModuleOrGroup(new ModuleTab('EmailSetting','Setting','Email','SettingAdapter','{"name":["Email:"]}','name',false,$options1));
-$moduleBuilder->addModuleOrGroup(new ModuleTab('LeaveSetting','Setting','Leave / PTO','SettingAdapter','{"name":["Leave:"]}','name',false,$options1));
+//$moduleBuilder->addModuleOrGroup(new ModuleTab('LeaveSetting','Setting','Leave / PTO','SettingAdapter','{"name":["Leave:"]}','name',false,$options1));
 $moduleBuilder->addModuleOrGroup(new ModuleTab('LDAPSetting','Setting','LDAP','SettingAdapter','{"name":["LDAP:"]}','name',false,$options1));
 $moduleBuilder->addModuleOrGroup(new ModuleTab('OtherSetting','Setting','Other','SettingAdapter','{"name":["Projects:","Attendance:","Recruitment:","Notifications:","Expense:","Travel:","Api:"]}','name',false,$options1));
 echo UIManager::getInstance()->renderModule($moduleBuilder);
--- a/ext/admin/travel/api/TravelActionManager.php
+++ b/ext/admin/travel/api/TravelActionManager.php
@@ -0,0 +1,19 @@
+<?php
+class TravelActionManager extends ApproveAdminActionManager{
+
+    public function getModelClass(){
+        return "EmployeeTravelRecord";
+    }
+
+    public function getItemName(){
+        return "TravelRequest";
+    }
+
+    public function getModuleName(){
+        return "Travel Management";
+    }
+
+    public function getModuleTabUrl(){
+        return "g=modules&n=travel&m=module_Travel_Management";
+    }
+}
--- a/ext/admin/travel/api/TravelAdminManager.php
+++ b/ext/admin/travel/api/TravelAdminManager.php
@@ -0,0 +1,128 @@
+<?php
+if (!class_exists('TravelAdminManager')) {
+	
+	class TravelAdminManager extends AbstractModuleManager{
+
+		public function initializeUserClasses(){
+			if(defined('MODULE_TYPE') && MODULE_TYPE != 'admin'){
+				$this->addUserClass("EmployeeImmigration");
+				$this->addUserClass("EmployeeTravelRecord");
+			}
+		}
+
+		public function initializeFieldMappings(){
+			$this->addFileFieldMapping('EmployeeImmigration', 'attachment1', 'name');
+			$this->addFileFieldMapping('EmployeeImmigration', 'attachment2', 'name');
+			$this->addFileFieldMapping('EmployeeImmigration', 'attachment3', 'name');
+			
+			$this->addFileFieldMapping('EmployeeTravelRecord', 'attachment1', 'name');
+			$this->addFileFieldMapping('EmployeeTravelRecord', 'attachment2', 'name');
+			$this->addFileFieldMapping('EmployeeTravelRecord', 'attachment3', 'name');
+		}
+
+		public function initializeDatabaseErrorMappings(){
+
+		}
+
+		public function setupModuleClassDefinitions(){
+			
+			$this->addModelClass('ImmigrationDocument');
+			$this->addModelClass('EmployeeImmigration');
+			$this->addModelClass('EmployeeTravelRecord');
+			
+		}
+
+	}
+}
+
+
+if (!class_exists('ImmigrationDocument')) {
+	class ImmigrationDocument extends ICEHRM_Record {
+		var $_table = 'ImmigrationDocuments';
+
+		public function getAdminAccess(){
+			return array("get","element","save","delete");
+		}
+
+		public function getManagerAccess(){
+			return array("get","element","save","delete");
+		}
+
+		public function getUserAccess(){
+			return array("get");
+		}
+
+		public function getUserOnlyMeAccess(){
+			return array("get","element");
+		}
+	}
+}
+
+if (!class_exists('EmployeeImmigration')) {
+	class EmployeeImmigration extends ICEHRM_Record {
+		var $_table = 'EmployeeImmigrations';
+
+		public function getAdminAccess(){
+			return array("get","element","save","delete");
+		}
+
+		public function getManagerAccess(){
+			return array("get","element","save","delete");
+		}
+
+		public function getUserAccess(){
+			return array("get");
+		}
+
+		public function getUserOnlyMeAccess(){
+			return array("element","save","delete");
+		}
+	}
+}
+
+
+if (!class_exists('EmployeeTravelRecord')) {
+	class EmployeeTravelRecord extends ApproveModel
+    {
+        var $_table = 'EmployeeTravelRecords';
+
+        var $notificationModuleName = "Travel Management";
+        var $notificationUnitName = "TravelRequest";
+        var $notificationUnitPrefix = "A";
+        var $notificationUnitAdminUrl = "g=admin&n=travel&m=admin_Employees";
+        var $preApproveSettingName = "Travel: Pre-Approve Travel Request";
+
+        public function getAdminAccess()
+        {
+            return array("get", "element", "save", "delete");
+        }
+
+        public function getManagerAccess()
+        {
+            return array("get", "element", "save", "delete");
+        }
+
+        public function getUserAccess()
+        {
+            return array("get");
+        }
+
+        public function getUserOnlyMeAccess()
+        {
+            return array("element", "save", "delete");
+        }
+
+        public function fieldsNeedToBeApproved()
+        {
+            return array(
+                "travel_from",
+                "travel_to",
+                "travel_date",
+                "return_date",
+                "funding",
+                "currency"
+            );
+        }
+
+    }
+}
--- a/ext/admin/travel/dashboard.html
+++ b/ext/admin/travel/dashboard.html
@@ -0,0 +1,19 @@
+<div class="col-lg-3 col-xs-12">
+
+    <div class="small-box bg-red">
+        <div class="inner">
+            <h3>
+                Travel
+            </h3>
+            <p id="numberOfTravel">
+                Requests
+            </p>
+        </div>
+        <div class="icon">
+            <i class="ion ion-plane"></i>
+        </div>
+        <a href="#_moduleLink_#" class="small-box-footer" id="travelLink">
+            Manage Travel <i class="fa fa-arrow-circle-right"></i>
+        </a>
+    </div>
+</div>
--- a/ext/admin/travel/index.php
+++ b/ext/admin/travel/index.php
@@ -0,0 +1,78 @@
+<?php 
+/*
+This file is part of iCE Hrm.
+
+iCE Hrm is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+iCE Hrm is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with iCE Hrm. If not, see <http://www.gnu.org/licenses/>.
+
+------------------------------------------------------------------
+
+Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]  
+Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilinah)
+ */
+
+$moduleName = 'travel';
+define('MODULE_PATH',dirname(__FILE__));
+include APP_BASE_PATH.'header.php';
+include APP_BASE_PATH.'modulejslibs.inc.php';
+
+$options = array();
+$options['setRemoteTable'] = 'true';
+
+$moduleBuilder = new ModuleBuilder();
+$moduleBuilder->addModuleOrGroup(new ModuleTab('EmployeeTravelRecord','EmployeeTravelRecord','Travel Requests','EmployeeTravelRecordAdapter','','',true,$options));
+echo UIManager::getInstance()->renderModule($moduleBuilder);
+
+
+$itemName = 'TravelRequest';
+$moduleName = 'Travel Management';
+$itemNameLower = strtolower($itemName);
+
+$statuses = array("Approved","Pending","Rejected","Cancelled");
+
+?><div class="modal" id="<?=$itemNameLower?>StatusModel" tabindex="-1" role="dialog" aria-labelledby="messageModelLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
+                <h3 style="font-size: 17px;">Change <?=$itemName?> Status</h3>
+            </div>
+            <div class="modal-body">
+                <form id="expenseStatusForm">
+                    <div class="control-group">
+                        <label class="control-label" for="expense_status"><?=$itemName?> Status</label>
+                        <div class="controls">
+                            <select type="text" id="<?=$itemNameLower?>_status" class="form-control" name="<?=$itemNameLower?>_status" value="">
+                                <?php foreach($statuses as $status){?>
+                                    <option value="<?=$status?>"><?=$status?></option>
+                                <?php }?>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="control-group">
+                        <label class="control-label" for="expense_status">Status Change Note</label>
+                        <div class="controls">
+                            <textarea id="<?=$itemNameLower?>_reason" class="form-control" name="<?=$itemNameLower?>_reason" maxlength="500"></textarea>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-primary" onclick="modJs.changeStatus();">Change <?=$itemName?> Status</button>
+                <button class="btn" onclick="modJs.closeDialog();">Not Now</button>
+            </div>
+        </div>
+    </div>
+    </div>
+<?php
+include APP_BASE_PATH.'footer.php';
--- a/ext/admin/travel/lib.js
+++ b/ext/admin/travel/lib.js
@@ -0,0 +1,182 @@
+/**
+ * Author: Thilina Hasantha
+ */
+
+
+/**
+ * ImmigrationDocumentAdapter
+ */
+
+function ImmigrationDocumentAdapter(endPoint) {
+	this.initAdapter(endPoint);
+}
+
+ImmigrationDocumentAdapter.inherits(AdapterBase);
+
+
+
+ImmigrationDocumentAdapter.method('getDataMapping', function() {
+	return [
+	        "id",
+	        "name",
+	        "details",
+	        "required",
+	        "alert_on_missing",
+	        "alert_before_expiry"
+	];
+});
+
+ImmigrationDocumentAdapter.method('getHeaders', function() {
+	return [
+			{ "sTitle": "ID" ,"bVisible":false},
+			{ "sTitle": "Name" },
+			{ "sTitle": "Details"},
+			{ "sTitle": "Compulsory"},
+			{ "sTitle": "Alert If Not Found"},
+			{ "sTitle": "Alert Before Expiry"}
+	];
+});
+
+ImmigrationDocumentAdapter.method('getFormFields', function() {
+	return [
+	        [ "id", {"label":"ID","type":"hidden"}],
+	        [ "name", {"label":"Name","type":"text","validation":""}],
+	        [ "details", {"label":"Details","type":"textarea","validation":"none"}],
+	        [ "required", {"label":"Compulsory","type":"select","source":[["No","No"],["Yes","Yes"]]}],
+	        [ "alert_on_missing", {"label":"Alert If Not Found","type":"select","source":[["No","No"],["Yes","Yes"]]}],
+	        [ "alert_before_expiry", {"label":"Alert Before Expiry","type":"select","source":[["No","No"],["Yes","Yes"]]}],
+	        [ "alert_before_day_number", {"label":"Days for Expiry Alert","type":"text","validation":""}]
+	];
+});
+
+
+/**
+ * EmployeeImmigrationAdapter
+ */
+
+
+function EmployeeImmigrationAdapter(endPoint) {
+	this.initAdapter(endPoint);
+}
+
+EmployeeImmigrationAdapter.inherits(AdapterBase);
+
+
+
+EmployeeImmigrationAdapter.method('getDataMapping', function() {
+	return [
+	        "id",
+	        "employee",
+	        "document",
+	        "documentname",
+	        "valid_until",
+	        "status"
+	];
+});
+
+EmployeeImmigrationAdapter.method('getHeaders', function() {
+	return [
+			{ "sTitle": "ID" ,"bVisible":false},
+			{ "sTitle": "Employee" },
+			{ "sTitle": "Document" },
+			{ "sTitle": "Document Id" },
+			{ "sTitle": "Valid Until"},
+			{ "sTitle": "Status"}
+	];
+});
+
+EmployeeImmigrationAdapter.method('getFormFields', function() {
+	return [
+	        [ "id", {"label":"ID","type":"hidden"}],
+	        [ "employee", {"label":"Employee","type":"select2","remote-source":["Employee","id","first_name+last_name"]}],
+	        [ "document", {"label":"Document","type":"select2","remote-source":["ImmigrationDocument","id","name"]}],
+	        [ "documentname", {"label":"Document Id","type":"text","validation":""}],
+	        [ "valid_until", {"label":"Valid Until","type":"date","validation":"none"}],
+	        [ "status", {"label":"Status","type":"select","source":[["Active","Active"],["Inactive","Inactive"],["Draft","Draft"]]}],
+	        [ "details", {"label":"Details","type":"textarea","validation":"none"}],
+	        [ "attachment1", {"label":"Attachment 1","type":"fileupload","validation":"none"}],
+	        [ "attachment2", {"label":"Attachment 2","type":"fileupload","validation":"none"}],
+	        [ "attachment3", {"label":"Attachment 3","type":"fileupload","validation":"none"}]
+	];
+});
+
+
+EmployeeImmigrationAdapter.method('getFilters', function() {
+	return [
+	        [ "employee", {"label":"Employee","type":"select2","remote-source":["Employee","id","first_name+last_name"]}]
+	        
+	];
+});
+
+
+/**
+ * EmployeeTravelRecordAdapter
+ */
+
+
+function EmployeeTravelRecordAdapter(endPoint,tab,filter,orderBy) {
+    this.initAdapter(endPoint,tab,filter,orderBy);
+    this.itemName = 'TravelRequest';
+    this.itemNameLower = 'travelrequest';
+    this.modulePathName = 'travel';
+}
+
+EmployeeTravelRecordAdapter.inherits(ApproveAdminAdapter);
+
+
+
+EmployeeTravelRecordAdapter.method('getDataMapping', function() {
+	return [
+	        "id",
+	        "employee",
+	        "type",
+	        "purpose",
+	        "travel_from",
+	        "travel_to",
+	        "travel_date",
+            "status"
+	];
+});
+
+EmployeeTravelRecordAdapter.method('getHeaders', function() {
+	return [
+			{ "sTitle": "ID" ,"bVisible":false},
+			{ "sTitle": "Employee" },
+			{ "sTitle": "Travel Type" },
+			{ "sTitle": "Purpose" },
+			{ "sTitle": "From"},
+			{ "sTitle": "To"},
+			{ "sTitle": "Travel Date"},
+			{ "sTitle": "Status"}
+	];
+});
+
+EmployeeTravelRecordAdapter.method('getFormFields', function() {
+    return [
+        ["id", {"label": "ID", "type": "hidden"}],
+        ["employee", {
+            "label": "Employee",
+            "type": "select2",
+            "sort": "none",
+            "allow-null": false,
+            "remote-source": ["Employee", "id", "first_name+last_name", "getActiveSubordinateEmployees"]
+        }],
+        ["type", {
+            "label": "Travel Type",
+            "type": "select",
+            "source": [["Local", "Local"], ["International", "International"]]
+        }],
+        ["purpose", {"label": "Purpose of Travel", "type": "textarea", "validation": ""}],
+        ["travel_from", {"label": "Travel From", "type": "text", "validation": ""}],
+        ["travel_to", {"label": "Travel To", "type": "text", "validation": ""}],
+        ["travel_date", {"label": "Travel Date", "type": "datetime", "validation": ""}],
+        ["return_date", {"label": "Return Date", "type": "datetime", "validation": ""}],
+        ["details", {"label": "Notes", "type": "textarea", "validation": "none"}],
+        ["currency", {"label": "Currency", "type": "select2", "allow-null":false, "remote-source": ["CurrencyType", "id", "code"]}],
+        ["funding", {"label": "Total Funding Proposed", "type": "text", "validation": "float"}],
+        ["attachment1", {"label": "Itinerary / Cab Receipt", "type": "fileupload", "validation": "none"}],
+        ["attachment2", {"label": "Other Attachment 1", "type": "fileupload", "validation": "none"}],
+        ["attachment3", {"label": "Other Attachment 2", "type": "fileupload", "validation": "none"}]
+    ];
+});
+
--- a/ext/admin/travel/meta.json
+++ b/ext/admin/travel/meta.json
@@ -0,0 +1,12 @@
+{
+  "label":"Travel Administration",
+  "menu":"Employees",
+  "order":"6",
+  "icon":"fa-plane",
+  "user_levels":["Admin","Manager"],
+  "dashboardPosition":12,
+
+  "permissions":
+      {
+      }
+}
--- a/ext/modules/travel/api/TravelActionManager.php
+++ b/ext/modules/travel/api/TravelActionManager.php
@@ -0,0 +1,59 @@
+<?php
+class TravelActionManager extends ApproveModuleActionManager{
+
+    public function getModelClass(){
+        return "EmployeeTravelRecord";
+    }
+
+    public function getItemName(){
+        return "TravelRequest";
+    }
+
+    public function getModuleName(){
+        return "Travel Management";
+    }
+
+    public function getModuleTabUrl(){
+        return "g=admin&n=travel&m=admin_Employees#tabEmployeeTravelRecord";
+    }
+}
+
+
+/*
+class TravelActionManager extends SubActionManager{
+    public function cancelTravel($req){
+
+        $employee = $this->baseService->getElement('Employee',$this->getCurrentProfileId(),null,true);
+
+        $employeeTravel = new EmployeeTravelRecord();
+        $employeeTravel->Load("id = ?",array($req->id));
+        if($employeeTravel->id != $req->id){
+            return new IceResponse(IceResponse::ERROR,"Travel record not found");
+        }
+
+
+        if($this->user->user_level != 'Admin' && $this->getCurrentProfileId() != $employeeTravel->employee){
+            return new IceResponse(IceResponse::ERROR,"Only an admin or owner of the travel request can do this");
+        }
+
+        if($employeeTravel->status != 'Approved'){
+            return new IceResponse(IceResponse::ERROR,"Only an approved travel request can be cancelled");
+        }
+
+        $employeeTravel->status = 'Cancellation Requested';
+        $ok = $employeeTravel->Save();
+        if(!$ok){
+            LogManager::getInstance()->error("Error occured while cancelling the travel:".$employeeTravel->ErrorMsg());
+            return new IceResponse(IceResponse::ERROR,"Error occurred while cancelling the travel request. Please contact admin.");
+        }
+
+
+        $this->baseService->audit(IceConstants::AUDIT_ACTION, "Travel cancellation \ start:".$employeeTravel->date_start."\ end:".$employeeTravel->date_end);
+        $notificationMsg = $employee->first_name." ".$employee->last_name." cancelled a travel. Visit travel management module to approve";
+
+        $this->baseService->notificationManager->addNotification($employee->supervisor,$notificationMsg,'{"type":"url","url":"g=admin&n=travel&m=admin_Employees#tabEmployeeTravelRecord"}',
+            "Travel Module", null, false, true);
+        return new IceResponse(IceResponse::SUCCESS,$employeeTravel);
+    }
+}
+*/
--- a/ext/modules/travel/api/TravelModulesManager.php
+++ b/ext/modules/travel/api/TravelModulesManager.php
@@ -1,22 +1,24 @@
 <?php
-if (!class_exists('ChartsAdminManager')) {
-	class ChartsAdminManager extends AbstractModuleManager{
-		
+if (!class_exists('TravelModulesManager')) {
+	
+	class TravelModulesManager extends AbstractModuleManager{
+
 		public function initializeUserClasses(){
 			
 		}
-		
+
 		public function initializeFieldMappings(){
-	
+				
 		}
-		
+
 		public function initializeDatabaseErrorMappings(){
-			
-		}
-		
-		public function setupModuleClassDefinitions(){

 		}
-		
+
+		public function setupModuleClassDefinitions(){
+			
+			
+		}
+
 	}
 }
--- a/ext/modules/travel/dashboard.html
+++ b/ext/modules/travel/dashboard.html
@@ -0,0 +1,17 @@
+<div class="col-lg-3 col-xs-12">
+    <!-- small box -->
+    <div class="small-box bg-aqua">
+        <div class="inner">
+            <h3>My Travel</h3>
+            <p>
+                Management
+            </p>
+        </div>
+        <div class="icon">
+            <i class="ion ion-plane"></i>
+        </div>
+        <a href="#_moduleLink_#" class="small-box-footer" id="mytravelLink">
+            Travel Management <i class="fa fa-arrow-circle-right"></i>
+        </a>
+    </div>
+</div>
--- a/ext/modules/travel/index.php
+++ b/ext/modules/travel/index.php
@@ -0,0 +1,66 @@
+<?php
+/*
+This file is part of iCE Hrm.
+
+iCE Hrm is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+iCE Hrm is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with iCE Hrm. If not, see <http://www.gnu.org/licenses/>.
+
+------------------------------------------------------------------
+
+Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]  
+Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilinah)
+ */
+
+$moduleName = 'travel';
+$moduleMainName = "EmployeeTravelRecord";
+$moduleItemName = "Travel Request";
+define('MODULE_PATH',dirname(__FILE__));
+include APP_BASE_PATH.'header.php';
+include APP_BASE_PATH.'modulejslibs.inc.php';
+?><div class="span9">
+
+    <ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
+        <li class="active"><a id="tab<?=$moduleMainName?>" href="#tabPage<?=$moduleMainName?>">Travel Requests</a></li>
+    </ul>
+
+    <div class="tab-content">
+        <div class="tab-pane active" id="tabPage<?=$moduleMainName?>">
+            <div id="<?=$moduleMainName?>" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+            </div>
+            <div id="<?=$moduleMainName?>Form" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+            </div>
+        </div>
+    </div>
+
+</div>
+<script>
+    var modJsList = new Array();
+
+    modJsList['tab<?=$moduleMainName?>'] = new <?=$moduleMainName?>Adapter('<?=$moduleMainName?>','<?=$moduleMainName?>');
+
+    <?php if(isset($modulePermissions['perm']['Add '.$moduleItemName]) && $modulePermissions['perm']['Add '.$moduleItemName] == "No"){?>
+    modJsList['tab<?=$moduleMainName?>'].setShowAddNew(false);
+    <?php }?>
+    <?php if(isset($modulePermissions['perm']['Delete '.$moduleItemName]) && $modulePermissions['perm']['Delete '.$moduleItemName] == "No"){?>
+    modJsList['tab<?=$moduleMainName?>'].setShowDelete(false);
+    <?php }?>
+    <?php if(isset($modulePermissions['perm']['Edit '.$moduleItemName]) && $modulePermissions['perm']['Edit '.$moduleItemName] == "No"){?>
+    modJsList['tab<?=$moduleMainName?>'].setShowEdit(false);
+    <?php }?>
+
+    var modJs = modJsList['tab<?=$moduleMainName?>'];
+
+</script>
+<?php include APP_BASE_PATH.'footer.php';?>      
--- a/ext/modules/travel/lib.js
+++ b/ext/modules/travel/lib.js
@@ -0,0 +1,158 @@
+/*
+This file is part of iCE Hrm.
+
+Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]  
+Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilinah)
+ */
+
+function EmployeeImmigrationAdapter(endPoint) {
+	this.initAdapter(endPoint);
+}
+
+EmployeeImmigrationAdapter.inherits(AdapterBase);
+
+
+
+EmployeeImmigrationAdapter.method('getDataMapping', function() {
+	return [
+	        "id",
+	        "document",
+	        "documentname",
+	        "valid_until",
+	        "status"
+	];
+});
+
+EmployeeImmigrationAdapter.method('getHeaders', function() {
+	return [
+			{ "sTitle": "ID" ,"bVisible":false},
+			{ "sTitle": "Document" },
+			{ "sTitle": "Document Id" },
+			{ "sTitle": "Valid Until"},
+			{ "sTitle": "Status"}
+	];
+});
+
+EmployeeImmigrationAdapter.method('getFormFields', function() {
+	return [
+	        [ "id", {"label":"ID","type":"hidden"}],
+	        [ "document", {"label":"Document","type":"select2","remote-source":["ImmigrationDocument","id","name"]}],
+	        [ "documentname", {"label":"Document Id","type":"text","validation":""}],
+	        [ "valid_until", {"label":"Valid Until","type":"date","validation":"none"}],
+	        [ "status", {"label":"Status","type":"select","source":[["Active","Active"],["Inactive","Inactive"],["Draft","Draft"]]}],
+	        [ "details", {"label":"Details","type":"textarea","validation":"none"}],
+	        [ "attachment1", {"label":"Attachment 1","type":"fileupload","validation":"none"}],
+	        [ "attachment2", {"label":"Attachment 2","type":"fileupload","validation":"none"}],
+	        [ "attachment3", {"label":"Attachment 3","type":"fileupload","validation":"none"}]
+	];
+});
+
+
+
+
+
+function EmployeeTravelRecordAdapter(endPoint) {
+	this.initAdapter(endPoint);
+}
+
+EmployeeTravelRecordAdapter.inherits(AdapterBase);
+
+
+
+EmployeeTravelRecordAdapter.method('getDataMapping', function() {
+	return [
+	        "id",
+	        "type",
+	        "purpose",
+	        "travel_from",
+	        "travel_to",
+	        "travel_date",
+	        "return_date",
+            "status"
+	];
+});
+
+EmployeeTravelRecordAdapter.method('getHeaders', function() {
+	return [
+			{ "sTitle": "ID" ,"bVisible":false},
+			{ "sTitle": "Travel Type" },
+			{ "sTitle": "Purpose" },
+			{ "sTitle": "From"},
+			{ "sTitle": "To"},
+			{ "sTitle": "Travel Date"},
+			{ "sTitle": "Return Date"},
+			{ "sTitle": "Status"}
+	];
+});
+
+EmployeeTravelRecordAdapter.method('getFormFields', function() {
+	return [
+        [ "id", {"label":"ID","type":"hidden"}],
+        [ "type", {"label":"Travel Type","type":"select","source":[["Local","Local"],["International","International"]]}],
+        [ "purpose", {"label":"Purpose of Travel","type":"textarea","validation":""}],
+        [ "travel_from", {"label":"Travel From","type":"text","validation":""}],
+        [ "travel_to", {"label":"Travel To","type":"text","validation":""}],
+        [ "travel_date", {"label":"Travel Date","type":"datetime","validation":""}],
+        [ "return_date", {"label":"Return Date","type":"datetime","validation":""}],
+        [ "details", {"label":"Notes","type":"textarea","validation":"none"}],
+        [ "currency", {"label":"Currency","type":"select2","allow-null":false,"remote-source":["CurrencyType","id","code"]}],
+        [ "funding", {"label":"Total Funding Proposed","type":"text","validation":"float"}],
+        [ "attachment1", {"label":"Itinerary / Cab Receipt","type":"fileupload","validation":"none"}],
+        [ "attachment2", {"label":"Other Attachment 1","type":"fileupload","validation":"none"}],
+        [ "attachment3", {"label":"Other Attachment 2","type":"fileupload","validation":"none"}]
+	];
+});
+
+EmployeeTravelRecordAdapter.method('getActionButtonsHtml', function(id,data) {
+    var editButton = '<img class="tableActionButton" src="_BASE_images/edit.png" style="cursor:pointer;" rel="tooltip" title="Edit" onclick="modJs.edit(_id_);return false;"></img>';
+    var deleteButton = '<img class="tableActionButton" src="_BASE_images/delete.png" style="margin-left:15px;cursor:pointer;" rel="tooltip" title="Delete" onclick="modJs.deleteRow(_id_);return false;"></img>';
+    var requestCancellationButton = '<img class="tableActionButton" src="_BASE_images/delete.png" style="margin-left:15px;cursor:pointer;" rel="tooltip" title="Cancel Travel Request" onclick="modJs.cancelTravel(_id_);return false;"></img>';
+
+    var html = '<div style="width:80px;">_edit__delete_</div>';
+
+    if(this.showDelete){
+        if(data[7] == "Approved"){
+            html = html.replace('_delete_',requestCancellationButton);
+        }else{
+            html = html.replace('_delete_',deleteButton);
+        }
+
+    }else{
+        html = html.replace('_delete_','');
+    }
+
+    if(this.showEdit){
+        html = html.replace('_edit_',editButton);
+    }else{
+        html = html.replace('_edit_','');
+    }
+
+    html = html.replace(/_id_/g,id);
+    html = html.replace(/_BASE_/g,this.baseUrl);
+    return html;
+});
+
+EmployeeTravelRecordAdapter.method('cancelTravel', function(id) {
+    var that = this;
+    var object = {};
+    object['id'] = id;
+
+    var reqJson = JSON.stringify(object);
+
+    var callBackData = [];
+    callBackData['callBackData'] = [];
+    callBackData['callBackSuccess'] = 'cancelSuccessCallBack';
+    callBackData['callBackFail'] = 'cancelFailCallBack';
+
+    this.customAction('cancelTravel','modules=travel',reqJson,callBackData);
+});
+
+EmployeeTravelRecordAdapter.method('cancelSuccessCallBack', function(callBackData) {
+    this.showMessage("Successful", "Travel request cancellation request sent");
+    this.get([]);
+});
+
+EmployeeTravelRecordAdapter.method('cancelFailCallBack', function(callBackData) {
+    this.showMessage("Error Occurred while cancelling Travel request", callBackData);
+});
+
--- a/ext/modules/travel/meta.json
+++ b/ext/modules/travel/meta.json
@@ -0,0 +1,23 @@
+{
+"label":"Travel",
+"menu":"Travel Management",
+"order":"1",
+"icon":"fa-plane",
+"user_levels":["Admin","Manager","Employee"],
+  "dashboardPosition":107,
+"permissions":
+	{
+		"Manager":{
+			"Add Travel Request":"Yes",
+			"Edit Travel Request":"Yes",
+			"Delete Travel Request":"Yes"
+		},
+		
+		"Employee":{
+			"Add Travel Request":"Yes",
+			"Edit Travel Request":"Yes",
+			"Delete Travel Request":"Yes"
+		}
+	}
+	
+}
--- a/readme.md
+++ b/readme.md
@@ -26,45 +26,37 @@ Installation
 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
- 
+Refer: [http://blog.icehrm.com/docs/upgrade/](http://blog.icehrm.com/docs/upgrade/)

-
-Following is a list of features supported in each version of icehrm
+Following is a list of features supported in each edition of icehrm
 -------------------------------------------------------------------

-### IceHrm Open Source Version 
+### IceHrm Open Source Edition 
 * IceHrm Core Modules - Both Enterprise and Open source versions developed on same core concept. But the core modules in professional and enterprise versions are more feature rich and updated with latest security improvements.
 * [Company Information Management](http://icehrm.com/compare.php) - Store and manage details about how companies, departments and branches of the organisation are connected
 * Basic [Employee Management](http://icehrm.com) - Store, manage and retrieve employee information when required
 * Time sheets - IceHrm is a [timesheet app](http://icehrm.com) / [Open source timesheet management](http://icehrm.com) application to track time spent by employees on various projects
 * [Attendance Management](http://icehrm.com) - IceHrm can be used as a [attendance management system](http://icehrm.com) effectively for any size a company.
- * [Performance Charts](http://icehrm.com) - Charts for monitoring attendance hours and comparing attendance with time sheets
+ * [LDAP Login](http://icehrm.com) - Users can share login with company LDAP server
 * [Travel Management](http://icehrm.com) - Module for managing travel requests
 
+ #### Advanced Employee Module (from v16.0.OS)
 
-### IceHrm Pro Version | [Buy now for 349.49 USD](http://icehrm.com)
+ ![Advanced Employee Module](https://icehrm.s3.amazonaws.com/images/blog-images/advanced-employee-module.png)
+ 
+ - Update all employee information without having to switch employees.
+ - Search employee skills, qualifications and other information<br/>easily across whole company.
+ - Terminate employees while keeping data in system.
+ - Re-enable temporarily terminated employees with one click.
+ - Employee archive feature to archive data of terminated employees.
+ 
+### IceHrm Pro Edition | [Buy now for 349.49 USD](http://icehrm.com)

 IceHrm Profession version (in short IceHrmPro) is the feature rich commercial alternative for icehrm
 open source version.  IceHrm Pro supports following features

 Following features are supported in IceHrm Pro version in addition to the features supported in open source version.

-#### Advanced Employee Module
-
-![Advanced Employee Module](https://icehrm.s3.amazonaws.com/images/blog-images/advanced-employee-module.png)
-
- Update all employee information without having to switch employees.
- Search employee skills, qualifications and other information<br/>easily across whole company.
- Terminate employees while keeping data in system.
- Re-enable temporarily terminated employees with one click.
- Employee archive feature to archive data of terminated employees.
    
 #### Leave Management

@@ -89,10 +81,14 @@ You can learn more about [IceHrm Pro here](http://blog.icehrm.com/docs/icehrm-pr

 To purchase IceHrmPro please visit [http://icehrm.com/modules.php](http://icehrm.com/modules.php)

+#### Training Management

-### IceHrm Enterprise Version [Starts from 1498 USD](http://icehrm.com)
+Icehrm [training management system](http://icehrm.com) is for Module for managing courses, training sessions and employee attendance to training sessions.
+ 

-In addition to pro version features icehrm enterprise version includes following features
+### IceHrm Hosted Edition [Starts from 1498 USD](http://icehrm.com)
+
+In addition to pro version features icehrm enterprise hosted edition includes following features

 #### Candidate / Recruitment Management

@@ -111,12 +107,6 @@ following features

 More about [recruitment module](http://blog.icehrm.com/docs/recruitment/)

-#### LDAP Support
-
-#### Training Management
-
-Icehrm [training management system](http://icehrm.com) is for Module for managing courses, training sessions and employee attendance to training sessions.
- 

 Your Company Structure (Departments / Branches and other Organization Units)
 -------------------------------------------
Author	SHA1	Message	Date
Thilina Hasantha	143961cf3f	Fix master data issue	2016-04-17 12:14:15 +05:30
Thilina Hasantha	aae74a8cc9	Fix ready link	2016-04-17 11:48:57 +05:30
Thilina Hasantha	3c89cb277c	Preparing for v16.0.OS release	2016-04-17 11:34:30 +05:30
Thilina Hasantha	48619a086c	Fix issues with DB script	2016-04-17 08:59:50 +05:30
Thilina Hasantha	ace8020028	Fix	2016-04-17 00:28:01 +05:30
Thilina Hasantha	acf281371b	Adding travel module	2016-04-17 00:20:39 +05:30
Thilina Hasantha	39820b84e0	Fix js error	2016-04-16 23:53:03 +05:30
Thilina Hasantha	5656910eab	Changes to db scripts	2016-04-16 22:00:33 +05:30
Thilina Hasantha	0594d84ed1	Remove leave settings from open source	2016-04-16 21:48:38 +05:30
Thilina Hasantha	fbd77cedf7	Fix 500	2016-04-16 21:44:03 +05:30
Thilina Hasantha	045e85f3ad	Fix salary module issues	2016-04-16 17:44:27 +05:30
Thilina Hasantha	f6d5202ad5	Fix login page styles	2016-04-16 07:55:03 +05:30