Merge lp:~savoirfairelinux-openerp/openerp-hr/7.0-skill into lp:openerp-hr

[El Hadji Dem (http://www.savoirfairelinux.com)]

[ADD] adds hr_skill module

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

El Hadji,

l81: Please fix the copyright.

l144, 122: You don't need to instantiate a class in 7.0.

Translation needs to be updated to reflect the new fields and views.

review: Needs Fixing (code review)

[El Hadji Dem (http://www.savoirfairelinux.com) (eh-dem)]

> El Hadji,
>
> l81: Please fix the copyright.
>
> l144, 122: You don't need to instantiate a class in 7.0.
>
> Translation needs to be updated to reflect the new fields and views.

Ok maxime

[lp:~savoirfairelinux-openerp/openerp-hr/7.0-skill]

69. By EL HADJI DEM <email address hidden> on 2013-11-14

[IMP] fix the copyright and update to reflect the new fields and views

70. By EL HADJI DEM <email address hidden> on 2013-11-14

[IMP] don't need to instantiate a class in 7.0

71. By EL HADJI DEM <email address hidden> on 2013-11-14

[IMP] add pot file

[Daniel Reis (dreis-pt)]

Looks good to me.

One remark: the domain for the employee skill_ids is defined on the form; wouldn't be better to have it on the model instead?

review: Approve

[lp:~savoirfairelinux-openerp/openerp-hr/7.0-skill]

72. By EL HADJI DEM <email address hidden> on 2013-11-15

[IMP] the domain for the employee skill ids is defined on the model instead on the form

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

review: Approve (code review)

=== added directory 'hr_skill'
=== added file 'hr_skill/__init__.py'
--- hr_skill/__init__.py	1970-01-01 00:00:00 +0000
+++ hr_skill/__init__.py	2013-11-15 16:53:22 +0000
@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    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/>.
+#
+###############################################################################
+import hr_skill
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'hr_skill/__openerp__.py'
--- hr_skill/__openerp__.py	1970-01-01 00:00:00 +0000
+++ hr_skill/__openerp__.py	2013-11-15 16:53:22 +0000
@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    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/>.
+#
+###############################################################################
+
+{
+    "name": "Skill Management",
+    "version": "0.1",
+    "category": "Human Resources",
+    "license": "AGPL-3",
+    "description": """
+    This module allows you to manage your company and employees skills.
+    """,
+    "author": "Savoir-faire Linux",
+    "website": "http://www.savoirfairelinux.com",
+    "depends": ["hr"],
+    'data': ["security/ir.model.access.csv",
+             "hr_skill_view.xml",
+             ],
+    "demo": [],
+    "test": [],
+    "installable": True,
+    "auto_install": False,
+    "images": [],
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'hr_skill/hr_skill.py'
--- hr_skill/hr_skill.py	1970-01-01 00:00:00 +0000
+++ hr_skill/hr_skill.py	2013-11-15 16:53:22 +0000
@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    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/>.
+#
+###############################################################################
+from openerp.osv import fields, orm
+
+class hr_skill(orm.Model):
+    _name = 'hr.skill'
+    _columns = {
+        'name': fields.char('Name', size=64, required=True, translate=True),
+        'active': fields.boolean('Active'),
+        'parent_id': fields.many2one('hr.skill', 'Parent', ondelete='cascade'),
+        'child_ids': fields.one2many('hr.skill', 'parent_id', 'Children'),
+        'view': fields.selection([('view', 'View'), ('skill', 'Skill')], 'Skill', required=True),
+        'employee_ids': fields.many2many('hr.employee', 'skill_employee_rel', 'skill_id', 'employee_id', 'Employee(s)'),
+    }
+    _defaults = {
+        'view': lambda self, cr, uid, context: 'view',
+        'active': lambda self, cr, uid, context: 1
+    }
+
+class hr_employee(orm.Model):
+    _inherit = 'hr.employee'
+    _columns = {
+        'skill_ids': fields.many2many('hr.skill',
+                                      'skill_employee_rel',
+                                      'employee_id',
+                                      'skill_id',
+                                      'Skills',
+                                      domain="[('view', '=', 'skill')]"),
+    }
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'hr_skill/hr_skill_view.xml'
--- hr_skill/hr_skill_view.xml	1970-01-01 00:00:00 +0000
+++ hr_skill/hr_skill_view.xml	2013-11-15 16:53:22 +0000
@@ -0,0 +1,99 @@
+<openerp>
+  <data>
+
+    <menuitem name="Skills Management"
+              parent="hr.menu_hr_configuration"
+              id="menu_hr_skill_mgt"/>
+
+    <!-- Employee -->
+
+    <record model="ir.ui.view" id="view_employee_skill_form">
+        <field name="name">hr.employee.skill.form</field>
+        <field name="model">hr.employee</field>
+        <field name="inherit_id" ref="hr.view_employee_form"/>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <notebook position="inside">
+                <page string="Skills">
+                    <field name="skill_ids" nolabel="1">
+                        <tree>
+                            <field name="name"/>
+                        </tree>
+                    </field>
+                </page>
+            </notebook>
+        </field>
+    </record>
+
+    <!-- Skill -->
+
+    <record model="ir.ui.view" id="view_skill_form">
+        <field name="name">hr.skill.form</field>
+        <field name="model">hr.skill</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Skill">
+                <field name="name" select="1" colspan="1"/>
+                <field name="active" select="1" />
+                <newline/>
+                <field name="parent_id" select="1"/>
+                <field name="view" select="1"/>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="open_view_skill_form">
+        <field name="res_model">hr.skill</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem name="Skills" 
+              parent="menu_hr_skill_mgt" 
+              id="menu_open_view_skill_form" 
+              action="open_view_skill_form"/>
+
+    <record model="ir.ui.view" id="view_hr_skill_tree">
+        <field name="name">hr.skill.tree</field>
+        <field name="model">hr.skill</field>
+        <field name="type">tree</field>
+        <field name="field_parent">child_ids</field>
+        <field name="arch" type="xml">
+            <tree string="Skills">
+                <field name="name"/>
+                <field name="view"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="open_view_skill_tree">
+        <field name="name">Skills structure</field>
+        <field name="res_model">hr.skill</field>
+        <field name="view_type">tree</field>
+        <field name="view_id" ref="view_hr_skill_tree"/>
+        <field name="domain">[('parent_id','=',False)]</field>
+    </record>
+
+    <record id="hr_employee_normal_action_tree" model="ir.actions.act_window">
+        <field name="name">Employees</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">hr.employee</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('skill_ids','=', active_ids)]</field>
+    </record>
+
+    <record id="hr_employee_skill_open" model="ir.values">
+        <field eval="'tree_but_open'" name="key2"/>
+        <field eval="'hr.skill'" name="model"/>
+        <field name="name">Employees by Skills</field>
+        <field eval="'ir.actions.act_window,%d'%hr_employee_normal_action_tree" name="value"/>
+    </record>
+
+    <menuitem name="Skills Structure"
+              parent="menu_hr_skill_mgt"
+              id="menu_open_view_skill_tree"
+              action="open_view_skill_tree"/>
+
+  </data>
+</openerp>

=== added directory 'hr_skill/i18n'
=== added file 'hr_skill/i18n/hr_skill.pot'
--- hr_skill/i18n/hr_skill.pot	1970-01-01 00:00:00 +0000
+++ hr_skill/i18n/hr_skill.pot	2013-11-15 16:53:22 +0000
@@ -0,0 +1,92 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_skill
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-11-14 22:11+0000\n"
+"PO-Revision-Date: 2013-11-14 22:11+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_skill
+#: field:hr.skill,name:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_skill
+#: field:hr.skill,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: hr_skill
+#: model:ir.model,name:hr_skill.model_hr_skill
+msgid "hr.skill"
+msgstr ""
+
+#. module: hr_skill
+#: view:hr.employee:0
+#: field:hr.employee,skill_ids:0
+#: view:hr.skill:0
+#: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_form
+msgid "Skills"
+msgstr ""
+
+#. module: hr_skill
+#: model:ir.actions.act_window,name:hr_skill.hr_employee_normal_action_tree
+msgid "Employees"
+msgstr ""
+
+#. module: hr_skill
+#: model:ir.ui.menu,name:hr_skill.menu_open_view_skill_tree
+msgid "Skills Structure"
+msgstr ""
+
+#. module: hr_skill
+#: model:ir.model,name:hr_skill.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: hr_skill
+#: model:ir.actions.act_window,name:hr_skill.open_view_skill_tree
+msgid "Skills structure"
+msgstr ""
+
+#. module: hr_skill
+#: field:hr.skill,employee_ids:0
+msgid "Employee(s)"
+msgstr ""
+
+#. module: hr_skill
+#: model:ir.ui.menu,name:hr_skill.menu_hr_skill_mgt
+msgid "Skills Management"
+msgstr ""
+
+#. module: hr_skill
+#: field:hr.skill,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_skill
+#: view:hr.skill:0
+#: field:hr.skill,view:0
+#: selection:hr.skill,view:0
+msgid "Skill"
+msgstr ""
+
+#. module: hr_skill
+#: field:hr.skill,child_ids:0
+msgid "Children"
+msgstr ""
+
+#. module: hr_skill
+#: selection:hr.skill,view:0
+msgid "View"
+msgstr ""
+

=== added directory 'hr_skill/security'
=== added file 'hr_skill/security/ir.model.access.csv'
--- hr_skill/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ hr_skill/security/ir.model.access.csv	2013-11-15 16:53:22 +0000
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_hr_skill","hr.skill","model_hr_skill",base.group_hr_user,1,0,0,0
+"access_hr_skill","hr.skill","model_hr_skill",base.group_hr_manager,1,1,1,1