[12.0.1.0.0] hr_job_family_modelling

open-synergy · May 10, 2019 · a8db993 · a8db993
1 parent 0dadba5
commit a8db993
Show file tree

Hide file tree

Showing 19 changed files with 50 additions and 76 deletions.
diff --git a/hr_job_family_modelling/README.rst b/hr_job_family_modelling/README.rst
@@ -13,7 +13,7 @@ Installation
 
 To install this module, you need to:
 
-1.  Clone the branch 8.0 of the repository https://github.com/open-synergy/opnsynid-hr
+1.  Clone the branch 12.0 of the repository https://github.com/open-synergy/opnsynid-hr
 2.  Add the path to this repository in your configuration (addons-path)
 3.  Update the module list
 4.  Go to menu *Setting -> Modules -> Local Modules*
@@ -38,6 +38,7 @@ Contributors
 ------------
 
 * Andhitia Rama <andhitia.r@gmail.com>
+* Michael Viriyananda <viriyananda.michael@gmail.com>
 
 Maintainer
 ----------

diff --git a/hr_job_family_modelling/__init__.py b/hr_job_family_modelling/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# © 2016 OpenSynergy Indonesia
+# Copyright 2016-2019 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from . import models
diff --git a/hr_job_family_modelling/__openerp__.py → hr_job_family_modelling/__manifest__.py b/hr_job_family_modelling/__openerp__.py → hr_job_family_modelling/__manifest__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
-# Copyright 2016 OpenSynergy Indonesia
+# Copyright 2016-2019 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 # pylint: disable=locally-disabled, manifest-required-author
 {
     "name": "Job Family Modelling",
     "summary": "Grading system that divides jobs into coherent groups "
                "based on shared characteristics",
-    "version": "8.0.1.2.0",
+    "version": "12.0.1.0.0",
     "category": "Human Resources",
     "website": "https://opensynergy-indonesia.com/",
     "author": "OpenSynergy Indonesia",

diff --git a/hr_job_family_modelling/menu.xml b/hr_job_family_modelling/menu.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- © <YEAR(S)> <AUTHOR(S)>
+<!-- Copyright 2016-2019 OpenSynergy Indonesia
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
 
-<openerp>
-<data>
+<odoo>
 <menuitem id="job_family_modelling_configuration_menu"
-    parent="hr.menu_hr_configuration"
+    parent="hr.menu_human_resources_configuration"
     name="Job Family Modelling"
     sequence="5"/>
-</data>
-</openerp>
-
-
+</odoo>
diff --git a/hr_job_family_modelling/models/__init__.py b/hr_job_family_modelling/models/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2018 OpenSynergy Indonesia
+# Copyright 2018-2019 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from . import (

diff --git a/hr_job_family_modelling/models/hr_employee.py b/hr_job_family_modelling/models/hr_employee.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-# Copyright 2018 OpenSynergy Indonesia
+# Copyright 2018-2019 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields, api
+from odoo import models, fields, api
 
 
 class HrEmployee(models.Model):
@@ -30,8 +30,3 @@ def _compute_job_grade(self):
         compute="_compute_job_grade",
         store=False,
     )
-    # job_family_grade_id = fields.Many2one(
-    #     string="Job Family Grade",
-    #     comodel_name="hr.job_family_grade",
-    #     required=False,
-    # )
diff --git a/hr_job_family_modelling/models/hr_job.py b/hr_job_family_modelling/models/hr_job.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-# Copyright 2018 OpenSynergy Indonesia
+# Copyright 2018-2019 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields, api
+from odoo import models, fields, api
 
 
 class HrJob(models.Model):

diff --git a/hr_job_family_modelling/models/hr_job_family.py b/hr_job_family_modelling/models/hr_job_family.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-# © 2016 OpenSynergy Indonesia
+# Copyright 2016-2019 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields, api, _
-from openerp.exceptions import Warning as UserError
+from odoo import models, fields, api, _
+from odoo.exceptions import Warning as UserError
 
 
 class HrJobFamily(models.Model):

diff --git a/hr_job_family_modelling/models/hr_job_family_grade.py b/hr_job_family_modelling/models/hr_job_family_grade.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-# Copyright 2018 OpenSynergy Indonesia
+# Copyright 2018-2019 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields
+from odoo import models, fields
 
 
 class HrJobFamilyGrade(models.Model):

diff --git a/hr_job_family_modelling/models/hr_job_family_level.py b/hr_job_family_modelling/models/hr_job_family_level.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-# © 2016 OpenSynergy Indonesia
+# Copyright 2016-2019 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields, api, _
-from openerp.exceptions import Warning as UserError
+from odoo import models, fields, api, _
+from odoo.exceptions import Warning as UserError
 
 
 class HrJobFamilyLevel(models.Model):

diff --git a/hr_job_family_modelling/models/hr_job_grade.py b/hr_job_family_modelling/models/hr_job_grade.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-# © 2016 OpenSynergy Indonesia
+# Copyright 2016-2019 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields
+from odoo import models, fields
 
 
 class HrJobGrade(models.Model):

diff --git a/hr_job_family_modelling/models/hr_job_grade_category.py b/hr_job_family_modelling/models/hr_job_grade_category.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-# Copyright 2018 OpenSynergy Indonesia
+# Copyright 2018-2019 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields
+from odoo import models, fields
 
 
 class HrJobGradeCategory(models.Model):

diff --git a/hr_job_family_modelling/views/hr_employee_views.xml b/hr_job_family_modelling/views/hr_employee_views.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- © <YEAR(S)> <AUTHOR(S)>
+<!-- Copyright 2016-2019 OpenSynergy Indonesia
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
 
-<openerp>
-<data>
-
+<odoo>
 
 <record id="hr_employee_view_form" model="ir.ui.view">
     <field name="name">form hr.employee</field>
@@ -20,5 +18,4 @@
     </field>
 </record>
 
-</data>
-</openerp>
+</odoo>
diff --git a/hr_job_family_modelling/views/hr_job_family_grade_views.xml b/hr_job_family_modelling/views/hr_job_family_grade_views.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- © <YEAR(S)> <AUTHOR(S)>
+<!-- Copyright 2016-2019 OpenSynergy Indonesia
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
 
-<openerp>
-<data>
+<odoo>
 
 <!-- Job Family Grade -->
 <record id="hr_job_family_grade_view_tree" model="ir.ui.view">
@@ -46,7 +45,6 @@
 <menuitem action="hr_job_family_grade_action"
     id="hr_job_family_grade_menu"
     parent="job_family_modelling_configuration_menu"
-    groups="base.group_hr_user"
     sequence="3"/>
-</data>
-</openerp>
+
+</odoo>
diff --git a/hr_job_family_modelling/views/hr_job_family_level_views.xml b/hr_job_family_modelling/views/hr_job_family_level_views.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- © <YEAR(S)> <AUTHOR(S)>
+<!-- Copyright 2016-2019 OpenSynergy Indonesia
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
 
-<openerp>
-<data>
+<odoo>
 
 <!-- Job Family -->
 <record id="hr_job_family_level_view_tree" model="ir.ui.view">
@@ -62,8 +61,6 @@
 <menuitem action="hr_job_family_level_action"
     id="hr_job_family_level_menu"
     parent="job_family_modelling_configuration_menu"
-    groups="base.group_hr_user"
     sequence="5"/>
 
-</data>
-</openerp>
+</odoo>
diff --git a/hr_job_family_modelling/views/hr_job_family_views.xml b/hr_job_family_modelling/views/hr_job_family_views.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- © <YEAR(S)> <AUTHOR(S)>
+<!-- Copyright 2016-2019 OpenSynergy Indonesia
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
 
-<openerp>
-<data>
+<odoo>
 
 <!-- Job Family -->
 <record id="hr_job_family_view_tree" model="ir.ui.view">
@@ -59,8 +58,6 @@
 <menuitem action="hr_job_family_action"
     id="hr_job_family_menu"
     parent="job_family_modelling_configuration_menu"
-    groups="base.group_hr_user"
     sequence="4"/>
 
-</data>
-</openerp>
+</odoo>
diff --git a/hr_job_family_modelling/views/hr_job_grade_category_views.xml b/hr_job_family_modelling/views/hr_job_grade_category_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- © <YEAR(S)> <AUTHOR(S)>
+<!-- Copyright 2016-2019 OpenSynergy Indonesia
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
 
-<openerp>
-<data>
+<odoo>
+
 <!-- Job Grade Category -->
 <record id="hr_job_grade_category_view_tree" model="ir.ui.view">
     <field name="name">tree hr.job.grade.category</field>
@@ -45,7 +45,6 @@
 <menuitem action="hr_job_grade_category_action"
     id="hr_job_grade_category_menu"
     parent="job_family_modelling_configuration_menu"
-    groups="base.group_hr_user"
     sequence="1"/>
-</data>
-</openerp>
+
+</odoo>
diff --git a/hr_job_family_modelling/views/hr_job_grade_views.xml b/hr_job_family_modelling/views/hr_job_grade_views.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- © <YEAR(S)> <AUTHOR(S)>
+<!-- Copyright 2016-2019 OpenSynergy Indonesia
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
 
-<openerp>
-<data>
-
+<odoo>
 <!-- Job Grade -->
 <record id="hr_job_grade_view_tree" model="ir.ui.view">
     <field name="name">tree hr.job_grade</field>
@@ -50,8 +48,6 @@
 <menuitem action="hr_job_grade_action"
     id="hr_job_grade_menu"
     parent="job_family_modelling_configuration_menu"
-    groups="base.group_hr_user"
     sequence="2"/>
 
-</data>
-</openerp>
+</odoo>
diff --git a/hr_job_family_modelling/views/hr_job_views.xml b/hr_job_family_modelling/views/hr_job_views.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- © <YEAR(S)> <AUTHOR(S)>
+<!-- Copyright 2016-2019 OpenSynergy Indonesia
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
 
-<openerp>
-<data>
+<odoo>
 
 <!-- Job Grade -->
 <record id="hr_job_view_tree" model="ir.ui.view">
@@ -40,5 +39,4 @@
     parent="job_family_modelling_configuration_menu"
     sequence="6"/>
 
-</data>
-</openerp>
+</odoo>