diff --git a/hr_employee_updation/README.md b/hr_employee_updation/README.md index 3f124a582..93877f956 100644 --- a/hr_employee_updation/README.md +++ b/hr_employee_updation/README.md @@ -1,6 +1,6 @@ -OHRMS Employee Info -------------------- -Supporting Addon for Open HRMS, Added Advance Fields On Employee Master +Open HRMS Employee Info +----------------------- +Supporting Addon for Open HRMS, Added Advanced Fields On Employee Master. Connect with experts -------------------- diff --git a/hr_employee_updation/__manifest__.py b/hr_employee_updation/__manifest__.py index 5dae48fba..0db3bebcb 100644 --- a/hr_employee_updation/__manifest__.py +++ b/hr_employee_updation/__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,9 +21,9 @@ # ################################################################################### { - 'name': 'OHRMS Employee Info', - 'version': '10.0.1.0.0', - 'summary': """Adding Advance Fields In Employee Master""", + 'name': 'Open HRMS Employee Info', + 'version': '10.0.1.1.0', + 'summary': """Adding Advanced Fields In Employee Master""", 'description': 'This module helps you to add more information in employee records.', 'category': 'Generic Modules/Human Resources', 'author': 'Cybrosys Techno Solutions', diff --git a/hr_employee_updation/doc/RELEASE_NOTES.md b/hr_employee_updation/doc/RELEASE_NOTES.md new file mode 100644 index 000000000..3fceaa8fc --- /dev/null +++ b/hr_employee_updation/doc/RELEASE_NOTES.md @@ -0,0 +1,11 @@ +## Module + +#### 07.04.2018 +#### Version 10.0.1.1.0 +##### CHG +- Index updated. + +#### 30.03.2018 +#### Version 10.0.1.0.0 +##### ADD +- Initial commit for Open HRMS Project diff --git a/hr_employee_updation/models/hr_employee.py b/hr_employee_updation/models/hr_employee.py index 0ed69a441..a834e6937 100644 --- a/hr_employee_updation/models/hr_employee.py +++ b/hr_employee_updation/models/hr_employee.py @@ -29,28 +29,26 @@ GENDER_SELECTION = [('male', 'Male'), class HrEmployeeContractName(models.Model): + """This class is to add emergency contact table""" _name = 'hr.emergency.contact' _description = 'HR Emergency Contact' - number = fields.Char(string='Number') - relation = fields.Char(string='Contact') + number = fields.Char(string='Number', help='Contact Number') + relation = fields.Char(string='Contact', help='Relation with employee') employee_obj = fields.Many2one('hr.employee', invisible=1) -class HrEmployeeDocumentName(models.Model): - _name = 'hr.document.document' - _description = 'HR Employee Documents' - - name = fields.Char(string='Name') - - class HrEmployeeFamily(models.Model): + """Table for keep employee family information""" _name = 'hr.employee.family' _description = 'HR Employee Family' member_name = fields.Char(string='Name', related='employee_ref.name', store=True) - employee_id = fields.Many2one(string="Employee", comodel_name='hr.employee', invisible=1) - employee_ref = fields.Many2one(string="Is Employee", comodel_name='hr.employee') + employee_id = fields.Many2one(string="Employee", help='Select corresponding Employee', comodel_name='hr.employee', + invisible=1) + employee_ref = fields.Many2one(string="Is Employee", help='If family member currently is an employee of ' + 'same company, then please tick this field', + comodel_name='hr.employee') member_id = fields.Char(string='Identification No', related='employee_ref.identification_id', store=True) member_passport = fields.Char(string='Passport No', related='employee_ref.passport_id', store=True) member_passport_expiry_date = fields.Date(string='Expiry Date', related='employee_ref.passport_expiry_date', @@ -59,7 +57,7 @@ class HrEmployeeFamily(models.Model): ('mother', 'Mother'), ('daughter', 'Daughter'), ('son', 'Son'), - ('wife', 'Wife')], string='Relationship') + ('wife', 'Wife')], string='Relationship', help='Relation with employee') member_contact = fields.Char(string='Contact No', related='employee_ref.personal_mobile', store=True) date_of_birth = fields.Date(string="Date of Birth", related='employee_ref.birthday', store=True) gender = fields.Selection(string='Gender', selection=GENDER_SELECTION, related='employee_ref.gender', store=True) @@ -102,14 +100,14 @@ class HrEmployee(models.Model): personal_mobile = fields.Char(string='Mobile', related='address_home_id.mobile', store=True) emergency_contact = fields.One2many('hr.emergency.contact', 'employee_obj', string='Emergency Contact') joining_date = fields.Date(string='Joining Date') - id_expiry_date = fields.Date(string='Expiry Date') - passport_expiry_date = fields.Date(string='Expiry Date') + id_expiry_date = fields.Date(string='Expiry Date', help='Expiry date of Identification ID') + passport_expiry_date = fields.Date(string='Expiry Date', help='Expiry date of Passport ID') id_attachment_id = fields.Many2many('ir.attachment', 'id_attachment_rel', 'id_ref', 'attach_ref', string="Attachment", help='You can attach the copy of your Id') passport_attachment_id = fields.Many2many('ir.attachment', 'passport_attachment_rel', 'passport_ref', 'attach_ref1', string="Attachment", help='You can attach the copy of Passport') - fam_ids = fields.One2many('hr.employee.family', 'employee_id', string='Family') + fam_ids = fields.One2many('hr.employee.family', 'employee_id', string='Family', help='Family Information') class HrEmployeeAttachment(models.Model): diff --git a/hr_employee_updation/static/description/banner.jpg b/hr_employee_updation/static/description/banner.jpg index 5c5c11882..663c0a0a9 100644 Binary files a/hr_employee_updation/static/description/banner.jpg and b/hr_employee_updation/static/description/banner.jpg differ diff --git a/hr_employee_updation/static/description/cybro-service.png b/hr_employee_updation/static/description/cybro-service.png index 0a648278c..252929a86 100644 Binary files a/hr_employee_updation/static/description/cybro-service.png and b/hr_employee_updation/static/description/cybro-service.png differ diff --git a/hr_employee_updation/static/description/emergency_contact.png b/hr_employee_updation/static/description/emergency_contact.png new file mode 100644 index 000000000..2fd7ba18e Binary files /dev/null and b/hr_employee_updation/static/description/emergency_contact.png differ diff --git a/hr_employee_updation/static/description/family_info.png b/hr_employee_updation/static/description/family_info.png new file mode 100644 index 000000000..b3d3fbb65 Binary files /dev/null and b/hr_employee_updation/static/description/family_info.png differ diff --git a/hr_employee_updation/static/description/index.html b/hr_employee_updation/static/description/index.html index c2187bf97..293c0a13e 100644 --- a/hr_employee_updation/static/description/index.html +++ b/hr_employee_updation/static/description/index.html @@ -1,12 +1,11 @@ - -
-
-

OpenHRMS

+
+
+

Open HRMS

Most advanced open source HR management software

-
+
@@ -21,7 +20,7 @@
-

OH Employee Info

+

Open HRMS Employee Info

Added Advance Fields On Employee Master

Cybrosys Technologies

@@ -49,6 +48,50 @@
+
+
+

Identification ID & Passport ID

+
+
+ +
+
+
+
+ +
+
+

Emergency Contact Number

+
+
+ +
+
+
+
+ +
+
+

Family Information

+
+
+ +
+
+
+
+ +
+
+

Joining Date

+
+
+ +
+
+
+
+

Our Odoo Services

diff --git a/hr_employee_updation/static/description/joining_date.png b/hr_employee_updation/static/description/joining_date.png new file mode 100644 index 000000000..e1575e52f Binary files /dev/null and b/hr_employee_updation/static/description/joining_date.png differ diff --git a/hr_employee_updation/static/description/personal_info.png b/hr_employee_updation/static/description/personal_info.png new file mode 100644 index 000000000..3c9901c4b Binary files /dev/null and b/hr_employee_updation/static/description/personal_info.png differ diff --git a/hr_employee_updation/views/hr_employee_view.xml b/hr_employee_updation/views/hr_employee_view.xml index deb5d24ea..356f69dbc 100644 --- a/hr_employee_updation/views/hr_employee_view.xml +++ b/hr_employee_updation/views/hr_employee_view.xml @@ -5,7 +5,7 @@ groups="hr.group_hr_manager,hr.group_hr_user"/> - + hr.employee.form.view hr.employee @@ -26,14 +26,21 @@ - - - - - - - - + + + + + + + + + + + + + + +