diff --git a/hr_employee_transfer/__manifest__.py b/hr_employee_transfer/__manifest__.py index d04770317..93472ca4c 100644 --- a/hr_employee_transfer/__manifest__.py +++ b/hr_employee_transfer/__manifest__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ################################################################################### -# A part of OpenHRMS Project +# A part of Open HRMS Project # # Cybrosys Technologies Pvt. Ltd. # Copyright (C) 2018-TODAY Cybrosys Technologies (). @@ -21,10 +21,10 @@ # ################################################################################### { - 'name': 'OHRMS Branch Transfer', + 'name': 'Open HRMS Branch Transfer', 'version': '10.0.1.0.0', 'summary': 'Employee transfer between branches', - 'category': 'Employees', + 'category': 'Generic Modules/Human Resources', 'author': 'Cybrosys Techno solutions', 'maintainer': 'Cybrosys Techno Solutions', 'company': 'Cybrosys Techno Solutions', diff --git a/hr_employee_transfer/static/description/banner.jpg b/hr_employee_transfer/static/description/banner.jpg index 25867a9c0..1859d8b14 100644 Binary files a/hr_employee_transfer/static/description/banner.jpg and b/hr_employee_transfer/static/description/banner.jpg differ diff --git a/hr_employee_transfer/static/description/cybro-service.png b/hr_employee_transfer/static/description/cybro-service.png index 0a648278c..252929a86 100644 Binary files a/hr_employee_transfer/static/description/cybro-service.png and b/hr_employee_transfer/static/description/cybro-service.png differ diff --git a/hr_employee_transfer/static/description/index.html b/hr_employee_transfer/static/description/index.html index cdfc9fd81..cf3a4edf3 100644 --- a/hr_employee_transfer/static/description/index.html +++ b/hr_employee_transfer/static/description/index.html @@ -1,7 +1,7 @@
-

OpenHRMS

+

Open HRMS

Most advanced open source HR management software

@@ -12,7 +12,6 @@ -
Online Demo
diff --git a/hr_vacation_mngmt/__manifest__.py b/hr_vacation_mngmt/__manifest__.py index 8306ee853..f8f375c16 100644 --- a/hr_vacation_mngmt/__manifest__.py +++ b/hr_vacation_mngmt/__manifest__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ################################################################################### -# A part of OpenHrms Project +# A part of Open Hrms Project # # Cybrosys Technologies Pvt. Ltd. # Copyright (C) 2018-TODAY Cybrosys Technologies (). @@ -21,7 +21,7 @@ # ################################################################################### { - 'name': "OHRMS Vacation Management", + 'name': "Open HRMS Vacation Management", 'version': '10.0.1.0.0', 'summary': """Manage Employee Vacation""", 'description': """HR Vacation management""", @@ -29,7 +29,7 @@ 'company': 'Cybrosys Techno Solutions', 'website': 'https://www.openhrms.com', 'category': 'Generic Modules/Human Resources', - 'depends': ['hr_holidays', 'project', 'hr_payroll', 'account'], + 'depends': ['hr_leave_request_aliasing', 'project', 'hr_payroll', 'account'], 'data': [ 'security/hr_vacation_security.xml', 'security/ir.model.access.csv', diff --git a/hr_vacation_mngmt/models/hr_vacation.py b/hr_vacation_mngmt/models/hr_vacation.py index 47dc51c52..a85f52353 100644 --- a/hr_vacation_mngmt/models/hr_vacation.py +++ b/hr_vacation_mngmt/models/hr_vacation.py @@ -16,7 +16,7 @@ class HrLeaveRequest(models.Model): @api.one def get_overlapping_leaves(self): - if self.type == 'remove': + if self.type == 'remove' and self.date_from and self.date_to: overlap_leaves = [] from_date = datetime.strptime(self.date_from, '%Y-%m-%d %H:%M:%S').date() to_date = datetime.strptime(self.date_to, '%Y-%m-%d %H:%M:%S').date() @@ -126,8 +126,7 @@ class PendingTask(models.Model): class HrVacationConfigSettings(models.TransientModel): - _name = 'hr.vacation.config.settings' - _inherit = 'res.config.settings' + _inherit = 'hr.leave.config.settings' leave_reminder = fields.Boolean(string='Leave Reminder Email', help="Send leave remainder emails to hr managers") reminder_day_before = fields.Integer(string='Reminder Day Before') diff --git a/hr_vacation_mngmt/static/description/index.html b/hr_vacation_mngmt/static/description/index.html index fceb389a0..1f098554d 100644 --- a/hr_vacation_mngmt/static/description/index.html +++ b/hr_vacation_mngmt/static/description/index.html @@ -1,6 +1,6 @@
-

OpenHRMS

+

Open HRMS

Most advanced open source HR management software

@@ -17,7 +17,7 @@
-

OHRMS Vacation Management

+

Open HRMS Vacation Management

Manage Employee Vacation

Cybrosys Technologies

@@ -47,6 +47,137 @@
+
+
+
+

Remaining & Overlapping Leaves

+

+ +
+
+ +
+
+
+

Pending Tasks Update & Task Re-assign

+ +

+
+

+ Employees can able to update their pending tasks on leave request +

+ +
+ +
+ +
+ +
+

+ On leave request approval it opens a wizard to re-assign tasks to available employees. +

+ +
+ +
+ +
+
+
+ +
+
+
+

Flight Ticket Booking

+

+
+

+ HR managers can able to book the flight ticket for the employee. +

+ +
+ +
+ +
+ + + +
+

+ On confirming the flight ticket generate corresponding supplier invoice. +

+ +
+ +
+ +
+
+
+ +
+
+
+

Leave Salary

+

+ +
+
+ +
+
+
+

Configurations

+

+ + +
+
+

Our Odoo Services

diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_01.png b/hr_vacation_mngmt/static/description/ohrms_vacation_01.png new file mode 100644 index 000000000..e0c3b2065 Binary files /dev/null and b/hr_vacation_mngmt/static/description/ohrms_vacation_01.png differ diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_02.png b/hr_vacation_mngmt/static/description/ohrms_vacation_02.png new file mode 100644 index 000000000..f5fd72e74 Binary files /dev/null and b/hr_vacation_mngmt/static/description/ohrms_vacation_02.png differ diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_03.png b/hr_vacation_mngmt/static/description/ohrms_vacation_03.png new file mode 100644 index 000000000..b70b7530c Binary files /dev/null and b/hr_vacation_mngmt/static/description/ohrms_vacation_03.png differ diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_04.png b/hr_vacation_mngmt/static/description/ohrms_vacation_04.png new file mode 100644 index 000000000..ee4a82ced Binary files /dev/null and b/hr_vacation_mngmt/static/description/ohrms_vacation_04.png differ diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_05.png b/hr_vacation_mngmt/static/description/ohrms_vacation_05.png new file mode 100644 index 000000000..74ece7ff9 Binary files /dev/null and b/hr_vacation_mngmt/static/description/ohrms_vacation_05.png differ diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_06.png b/hr_vacation_mngmt/static/description/ohrms_vacation_06.png new file mode 100644 index 000000000..96660682b Binary files /dev/null and b/hr_vacation_mngmt/static/description/ohrms_vacation_06.png differ diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_07.png b/hr_vacation_mngmt/static/description/ohrms_vacation_07.png new file mode 100644 index 000000000..b43c12347 Binary files /dev/null and b/hr_vacation_mngmt/static/description/ohrms_vacation_07.png differ diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_08.png b/hr_vacation_mngmt/static/description/ohrms_vacation_08.png new file mode 100644 index 000000000..c190c4950 Binary files /dev/null and b/hr_vacation_mngmt/static/description/ohrms_vacation_08.png differ diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_09.png b/hr_vacation_mngmt/static/description/ohrms_vacation_09.png new file mode 100644 index 000000000..84221ab4b Binary files /dev/null and b/hr_vacation_mngmt/static/description/ohrms_vacation_09.png differ diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_10.png b/hr_vacation_mngmt/static/description/ohrms_vacation_10.png new file mode 100644 index 000000000..29079dca1 Binary files /dev/null and b/hr_vacation_mngmt/static/description/ohrms_vacation_10.png differ diff --git a/hr_vacation_mngmt/static/description/ohrms_vacation_11.png b/hr_vacation_mngmt/static/description/ohrms_vacation_11.png new file mode 100644 index 000000000..ad6004e62 Binary files /dev/null and b/hr_vacation_mngmt/static/description/ohrms_vacation_11.png differ diff --git a/hr_vacation_mngmt/views/hr_vacation.xml b/hr_vacation_mngmt/views/hr_vacation.xml index 36c20f485..6aa01cff0 100644 --- a/hr_vacation_mngmt/views/hr_vacation.xml +++ b/hr_vacation_mngmt/views/hr_vacation.xml @@ -74,46 +74,16 @@ - Configure Payroll - hr.vacation.config.settings + Configure Leave + hr.leave.config.settings + -
-
-
- - - - - - - -
+ + + + + - - - Configure Payroll - hr.vacation.config.settings - form - inline - - - - - \ No newline at end of file