changeset 0ed259ef06f2 in modules/company:default
details: https://hg.tryton.org/modules/company?cmd=changeset;node=0ed259ef06f2
description:
        Add supervisor and subordinates of employee

        issue8820
        review266331002
diffstat:

 CHANGELOG              |   1 +
 company.py             |  14 ++++++++++++++
 company.xml            |  24 ++++++++++++++++++++++++
 view/employee_form.xml |   2 ++
 view/employee_tree.xml |   1 +
 5 files changed, 42 insertions(+), 0 deletions(-)

diffs (87 lines):

diff -r 9b308b0be7c2 -r 0ed259ef06f2 CHANGELOG
--- a/CHANGELOG Wed Dec 18 09:16:46 2019 +0100
+++ b/CHANGELOG Sat Dec 28 18:02:39 2019 +0100
@@ -1,3 +1,4 @@
+* Add supervisor and subordinates of employee
 * Add employee to rule context
 * Add company and employee administrator group
 * Add top level menu entry
diff -r 9b308b0be7c2 -r 0ed259ef06f2 company.py
--- a/company.py        Wed Dec 18 09:16:46 2019 +0100
+++ b/company.py        Sat Dec 28 18:02:39 2019 +0100
@@ -74,6 +74,20 @@
             ],
         depends=['start_date'],
         help="When the employee leaves the company.")
+    supervisor = fields.Many2One(
+        'company.employee', "Supervisor",
+        domain=[
+            ('company', '=', Eval('company', -1)),
+            ],
+        depends=['company'],
+        help="The employee who oversees this employee.")
+    subordinates = fields.One2Many(
+        'company.employee', 'supervisor', "Subordinates",
+        domain=[
+            ('company', '=', Eval('company', -1)),
+            ],
+        depends=['company'],
+        help="The employees to be overseen by this employee.")
 
     @staticmethod
     def default_company():
diff -r 9b308b0be7c2 -r 0ed259ef06f2 company.xml
--- a/company.xml       Wed Dec 18 09:16:46 2019 +0100
+++ b/company.xml       Sat Dec 28 18:02:39 2019 +0100
@@ -164,6 +164,30 @@
         </record>
         <menuitem parent="menu_company" action="act_employee_form" 
id="menu_employee_form"/>
 
+        <record model="ir.action.act_window" id="act_employee_subordinates">
+            <field name="name">Supervised by</field>
+            <field name="res_model">company.employee</field>
+            <field
+                name="domain"
+                pyson="1"
+                eval="[If(Eval('active_ids', []) == [Eval('active_id')], 
('supervisor', '=', Eval('active_id')), ('supervisor', 'in', 
Eval('active_ids')))]"/>
+        </record>
+        <record model="ir.action.act_window.view" 
id="act_employee_subordinates_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="employee_view_tree"/>
+            <field name="act_window" ref="act_employee_subordinates"/>
+        </record>
+        <record model="ir.action.act_window.view" 
id="act_employee_subordinates_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="employee_view_form"/>
+            <field name="act_window" ref="act_employee_subordinates"/>
+        </record>
+        <record model="ir.action.keyword" 
id="act_employee_subordinates_keyword1">
+            <field name="keyword">form_relate</field>
+            <field name="model">company.employee,-1</field>
+            <field name="action" ref="act_employee_subordinates"/>
+        </record>
+
         <record model="ir.model.access" id="access_employee">
             <field name="model" search="[('model', '=', 'company.employee')]"/>
             <field name="perm_read" eval="True"/>
diff -r 9b308b0be7c2 -r 0ed259ef06f2 view/employee_form.xml
--- a/view/employee_form.xml    Wed Dec 18 09:16:46 2019 +0100
+++ b/view/employee_form.xml    Sat Dec 28 18:02:39 2019 +0100
@@ -10,4 +10,6 @@
     <field name="start_date"/>
     <label name="end_date"/>
     <field name="end_date"/>
+    <label name="supervisor"/>
+    <field name="supervisor"/>
 </form>
diff -r 9b308b0be7c2 -r 0ed259ef06f2 view/employee_tree.xml
--- a/view/employee_tree.xml    Wed Dec 18 09:16:46 2019 +0100
+++ b/view/employee_tree.xml    Sat Dec 28 18:02:39 2019 +0100
@@ -4,6 +4,7 @@
 <tree>
     <field name="party" expand="1"/>
     <field name="company" expand="1"/>
+    <field name="supervisor" expand="1"/>
     <field name="start_date"/>
     <field name="end_date"/>
 </tree>

Reply via email to