Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[9.0] MIG hr_skill #299

Merged
merged 5 commits into from
Sep 12, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions hr_skill/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ Contributors
* Savoir-faire Linux
* Daniel Reis
* Ivan Yelizariev
* Nicolás Mac Rouillon
* Yu Weng

Maintainer
----------
Expand Down
4 changes: 4 additions & 0 deletions hr_skill/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
# -*- coding: utf-8 -*-
# © 2015 iDT LABS (http://www.@idtlabs.sl)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

from . import models
25 changes: 4 additions & 21 deletions hr_skill/__openerp__.py
Original file line number Diff line number Diff line change
@@ -1,26 +1,9 @@
# -*- coding: utf-8 -*-
###############################################################################
#
# Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program 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 Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
###############################################################################

# © 2015 iDT LABS (http://www.@idtlabs.sl)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
{
"name": "Skill Management",
"version": "8.0.1.1.0",
"version": "9.0.1.0.0",
"category": "Human Resources",
"license": "AGPL-3",
"author": "Savoir-faire Linux,Odoo Community Association (OCA)",
Expand All @@ -31,5 +14,5 @@
"views/hr_employee.xml",
"security/ir.model.access.csv",
],
'installable': False,
'installable': True,
}
4 changes: 4 additions & 0 deletions hr_skill/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# -*- coding: utf-8 -*-
# © 2015 iDT LABS (http://www.@idtlabs.sl)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

from . import hr_skill
from . import hr_employee
20 changes: 2 additions & 18 deletions hr_skill/models/hr_employee.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,6 @@
# -*- coding: utf-8 -*-
###############################################################################
#
# Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program 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 Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
###############################################################################
# © 2015 iDT LABS (http://www.@idtlabs.sl)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

from openerp import fields, models

Expand Down
21 changes: 2 additions & 19 deletions hr_skill/models/hr_skill.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,6 @@
# -*- coding: utf-8 -*-
###############################################################################
#
# Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program 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 Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
###############################################################################

# © 2015 iDT LABS (http://www.@idtlabs.sl)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from openerp import fields, models, api


Expand Down
2 changes: 1 addition & 1 deletion hr_skill/views/hr_employee.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<field name="arch" type="xml">
<notebook position="inside">
<page string="Skills">
<field name="skill_ids" />
<field name="skill_ids" widget="many2many_tags"/>
</page>
</notebook>
</field>
Expand Down
8 changes: 2 additions & 6 deletions hr_skill/views/hr_skill.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@

<!-- Menu and Actions -->

<menuitem name="Skills Management"
parent="hr.menu_hr_configuration"
id="menu_hr_skill_mgt"/>

<record id="open_view_skill_form" model="ir.actions.act_window">
<field name="name">Skills</field>
<field name="res_model">hr.skill</field>
Expand All @@ -46,7 +42,7 @@
</record>

<menuitem name="Skills"
parent="menu_hr_skill_mgt"
parent="hr.menu_human_resources_configuration"
id="menu_open_view_skill_form"
action="open_view_skill_form"/>

Expand All @@ -59,7 +55,7 @@
</record>

<menuitem name="Skills Structure"
parent="menu_hr_skill_mgt"
parent="menu_open_view_skill_form"
id="menu_open_view_skill_tree"
action="open_view_skill_tree"/>

Expand Down