From 614b427349b65fd5a2ea9ab6141db946002347a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Wed, 6 May 2020 13:22:35 +0200
Subject: [PATCH] [MOV] b_shift: Configuration in shift instead of attendance
 sheet

---
 beesdoo_shift/__manifest__.py                 |  1 +
 beesdoo_shift/views/cooperative_status.xml    | 17 +----
 beesdoo_shift/views/exempt_reason.xml         |  6 +-
 beesdoo_shift/views/menu.xml                  | 62 +++++++++++++++++++
 beesdoo_shift/views/planning.xml              | 37 ++++++++++-
 beesdoo_shift/views/task.xml                  |  7 ---
 beesdoo_shift/views/task_template.xml         |  7 ---
 .../views/res_config_settings_view.xml        | 50 +--------------
 .../generate_missing_attendance_sheets.xml    |  2 +-
 9 files changed, 103 insertions(+), 86 deletions(-)
 create mode 100644 beesdoo_shift/views/menu.xml

diff --git a/beesdoo_shift/__manifest__.py b/beesdoo_shift/__manifest__.py
index d56e5cf..368e210 100644
--- a/beesdoo_shift/__manifest__.py
+++ b/beesdoo_shift/__manifest__.py
@@ -29,6 +29,7 @@
         "views/planning.xml",
         "views/cooperative_status.xml",
         "views/exempt_reason.xml",
+        "views/menu.xml",
         "wizard/instanciate_planning.xml",
         "wizard/batch_template.xml",
         "wizard/assign_super_coop.xml",
diff --git a/beesdoo_shift/views/cooperative_status.xml b/beesdoo_shift/views/cooperative_status.xml
index 414b62e..282a7bc 100644
--- a/beesdoo_shift/views/cooperative_status.xml
+++ b/beesdoo_shift/views/cooperative_status.xml
@@ -167,18 +167,13 @@
         </field>
     </record>
 
-   <record model="ir.actions.act_window" id="action_coop_status">
+    <!-- Actions -->
+    <record model="ir.actions.act_window" id="action_coop_status">
         <field name="name">Cooperator Status</field>
         <field name="res_model">cooperative.status</field>
         <field name="view_mode">tree,form</field>
     </record>
 
-    <menuitem name="Status" id="menu_status_top" parent="menu_root"
-        groups="beesdoo_shift.group_shift_management" sequence="20" />
-    <menuitem name="Cooperative Status" id="menu_status" parent="menu_status_top"
-        action="action_coop_status" groups="beesdoo_shift.group_cooperative_admin" />
-
-    <!-- Actions -->
     <record model="ir.actions.act_window" id="action_worker">
         <field name="name">Worker</field>
         <field name="res_model">res.partner</field>
@@ -186,17 +181,9 @@
         <field name="domain">[('is_worker', '=', True)]</field>
     </record>
 
-    <menuitem name="Worker" id="menu_worker_top" parent="menu_root"
-        groups="beesdoo_shift.group_shift_attendance" sequence="1" />
-    <menuitem name="Worker" id="menu_worker" parent="menu_worker_top"
-        action="action_worker" />
-
     <record model="ir.actions.act_window" id="action_journal">
         <field name="name">Counter Journal</field>
         <field name="res_model">beesdoo.shift.journal</field>
         <field name="view_mode">tree,form</field>
     </record>
-
-    <menuitem name="Counter Update Journal" id="menu_journal" parent="menu_status_top"
-        action="action_journal" groups="beesdoo_shift.group_cooperative_admin" />
 </odoo>
diff --git a/beesdoo_shift/views/exempt_reason.xml b/beesdoo_shift/views/exempt_reason.xml
index 85c54d6..0335393 100644
--- a/beesdoo_shift/views/exempt_reason.xml
+++ b/beesdoo_shift/views/exempt_reason.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <record model="ir.ui.view" id="exempt_reason_tree_view">
         <field name="name">Exempt Reason Tree view</field>
@@ -13,9 +14,4 @@
         <field name="res_model">cooperative.exempt.reason</field>
         <field name="view_mode">tree</field>
     </record>
-
-    <menuitem name="Exempt Reason" id="menu_exempt_reason" parent="menu_status_top"
-        action="action_exempt_reason" groups="beesdoo_shift.group_cooperative_admin" />
 </odoo>
-
-
diff --git a/beesdoo_shift/views/menu.xml b/beesdoo_shift/views/menu.xml
new file mode 100644
index 0000000..90ed86d
--- /dev/null
+++ b/beesdoo_shift/views/menu.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Root menu -->
+    <menuitem name="Shift Management" id="menu_root"
+        groups="beesdoo_shift.group_shift_attendance" />
+
+
+    <!-- Planning -->
+    <menuitem name="Planning" id="menu_task_top" parent="menu_root"
+        sequence="1" groups="beesdoo_shift.group_shift_attendance" />
+
+    <menuitem name="Shifts" id="menu_task" parent="menu_task_top"
+        action="action_task" groups="beesdoo_shift.group_shift_attendance" />
+
+
+    <!-- Worker -->
+    <menuitem name="Worker" id="menu_worker_top" parent="menu_root"
+        groups="beesdoo_shift.group_shift_attendance" sequence="1" />
+
+    <menuitem name="Worker" id="menu_worker" parent="menu_worker_top"
+        action="action_worker" />
+
+
+    <!-- Templates -->
+    <menuitem name="Templates" id="menu_template_top" parent="menu_root"
+        groups="beesdoo_shift.group_shift_management"
+        sequence="20" />
+
+    <menuitem name="Planning Week" id="menu_planning" parent="menu_template_top"
+        sequence="20" action="action_planning" />
+
+
+    <!-- Status -->
+    <menuitem name="Status" id="menu_status_top" parent="menu_root"
+        groups="beesdoo_shift.group_shift_management" sequence="20" />
+
+    <menuitem name="Cooperative Status" id="menu_status" parent="menu_status_top"
+        action="action_coop_status" groups="beesdoo_shift.group_cooperative_admin" />
+
+    <menuitem name="Exempt Reason" id="menu_exempt_reason" parent="menu_status_top"
+        action="action_exempt_reason" groups="beesdoo_shift.group_cooperative_admin" />
+
+    <menuitem name="Counter Update Journal" id="menu_journal" parent="menu_status_top"
+        action="action_journal" groups="beesdoo_shift.group_cooperative_admin" />
+
+
+    <!-- Configuration / Settings -->
+    <menuitem name="Configuration"
+              id="menu_configuration_top"
+              parent="beesdoo_shift.menu_root"
+              groups="beesdoo_shift.group_planning_management"
+              sequence="21"
+    />
+
+    <menuitem name="Shift Day" id="menu_configuration_day"
+        parent="menu_configuration_top" action="action_day_number" />
+
+    <menuitem name="Shift Type" id="menu_configuration_type"
+        parent="menu_configuration_top" action="action_type" />
+
+</odoo>
diff --git a/beesdoo_shift/views/planning.xml b/beesdoo_shift/views/planning.xml
index e09ee96..d6f6c6d 100644
--- a/beesdoo_shift/views/planning.xml
+++ b/beesdoo_shift/views/planning.xml
@@ -59,6 +59,30 @@
         </field>
     </record>
 
+    <record model="ir.ui.view" id="daynumber_view_tree">
+        <field name="name">Day Number List</field>
+        <field name="model">beesdoo.shift.daynumber</field>
+        <field name="arch" type="xml">
+            <tree editable="top">
+                <field name="name" />
+                <field name="number" />
+                <field name="active" />
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="type_view_tree">
+        <field name="name">Shift Type List</field>
+        <field name="model">beesdoo.shift.type</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name" />
+                <field name="description" />
+                <field name="active" />
+            </tree>
+        </field>
+    </record>
+
     <!-- Actions -->
     <record model="ir.actions.act_window" id="action_planning">
         <field name="name">Planning Action</field>
@@ -66,7 +90,16 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-    <menuitem name="Planning Week" id="menu_planning" parent="menu_template_top"
-        sequence="20" action="action_planning" />
+    <record model="ir.actions.act_window" id="action_day_number">
+        <field name="name">Day Number</field>
+        <field name="res_model">beesdoo.shift.daynumber</field>
+        <field name="view_mode">tree</field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_type">
+        <field name="name">Shift Type</field>
+        <field name="res_model">beesdoo.shift.type</field>
+        <field name="view_mode">tree,form</field>
+    </record>
 
 </odoo>
diff --git a/beesdoo_shift/views/task.xml b/beesdoo_shift/views/task.xml
index b509357..b2bb63a 100644
--- a/beesdoo_shift/views/task.xml
+++ b/beesdoo_shift/views/task.xml
@@ -208,11 +208,4 @@
             'search_default_gb_type':1}</field>
     </record>
 
-    <!-- Top menu item -->
-    <menuitem name="Planning" id="menu_task_top" parent="menu_root"
-        sequence="1" groups="beesdoo_shift.group_shift_attendance" />
-    <!-- actions -->
-    <menuitem name="Shifts" id="menu_task" parent="menu_task_top"
-        action="action_task" groups="beesdoo_shift.group_shift_attendance" />
-
 </odoo>
diff --git a/beesdoo_shift/views/task_template.xml b/beesdoo_shift/views/task_template.xml
index bfd3b20..fe9935b 100644
--- a/beesdoo_shift/views/task_template.xml
+++ b/beesdoo_shift/views/task_template.xml
@@ -159,13 +159,6 @@
         </field>
     </record>
 
-    <menuitem name="Shift Management" id="menu_root"
-        groups="beesdoo_shift.group_shift_attendance" />
-    <menuitem name="Templates" id="menu_template_top" parent="menu_root"
-        groups="beesdoo_shift.group_shift_management"
-        sequence="20" />
-
-
     <record model="ir.actions.act_window" id="action_generate_shift_template_wizard">
         <field name="name">Generate Shift Template</field>
         <field name="res_model">beesddoo.shift.generate_shift_template</field>
diff --git a/beesdoo_shift_attendance/views/res_config_settings_view.xml b/beesdoo_shift_attendance/views/res_config_settings_view.xml
index 96c7faf..7eb2253 100644
--- a/beesdoo_shift_attendance/views/res_config_settings_view.xml
+++ b/beesdoo_shift_attendance/views/res_config_settings_view.xml
@@ -5,29 +5,6 @@
 -->
 <odoo>
   <data>
-      <record model="ir.ui.view" id="daynumber_view_tree">
-          <field name="name">Day Number List</field>
-          <field name="model">beesdoo.shift.daynumber</field>
-          <field name="arch" type="xml">
-              <tree editable="top">
-                  <field name="name" />
-                  <field name="number" />
-                  <field name="active" />
-              </tree>
-          </field>
-      </record>
-
-      <record model="ir.ui.view" id="type_view_tree">
-          <field name="name">Shift Type List</field>
-          <field name="model">beesdoo.shift.type</field>
-          <field name="arch" type="xml">
-              <tree>
-                  <field name="name" />
-                  <field name="description" />
-                  <field name="active" />
-              </tree>
-          </field>
-      </record>
 
       <record id="res_config_settings_view_form" model="ir.ui.view">
           <field name="name">res.config.settings.view.form.inherit.beesdoo.shift</field>
@@ -89,13 +66,6 @@
             </field>
       </record>
 
-      <menuitem name="Configuration"
-                id="menu_configuration_top"
-                parent="beesdoo_shift.menu_root"
-                groups="beesdoo_shift.group_planning_management"
-                sequence="21"
-      />
-
 
       <record model="ir.actions.act_window" id="action_missing_attendance_sheets">
           <field name="name">Generate missing past attendance sheets</field>
@@ -103,24 +73,6 @@
           <field name="view_mode">form</field>
       </record>
 
-      <record model="ir.actions.act_window" id="action_day_number">
-          <field name="name">Day Number</field>
-          <field name="res_model">beesdoo.shift.daynumber</field>
-          <field name="view_mode">tree</field>
-      </record>
-
-      <menuitem name="Shift Day" id="menu_configuration_day"
-          parent="menu_configuration_top" action="action_day_number" />
-
-      <record model="ir.actions.act_window" id="action_type">
-          <field name="name">Shift Type</field>
-          <field name="res_model">beesdoo.shift.type</field>
-          <field name="view_mode">tree,form</field>
-      </record>
-
-      <menuitem name="Shift Type" id="menu_configuration_type"
-          parent="menu_configuration_top" action="action_type" />
-
       <record model="ir.actions.act_window" id="action_shift_settings">
           <field name="name">Settings</field>
           <field name="type">ir.actions.act_window</field>
@@ -132,7 +84,7 @@
 
       <menuitem name="Shift Settings"
                 id="menu_shift_settings"
-                parent="menu_configuration_top"
+                parent="beesdoo_shift.menu_configuration_top"
                 action="action_shift_settings"
                 groups="beesdoo_shift.group_cooperative_admin"
       />
diff --git a/beesdoo_shift_attendance/wizard/generate_missing_attendance_sheets.xml b/beesdoo_shift_attendance/wizard/generate_missing_attendance_sheets.xml
index a37fdae..aca35ca 100644
--- a/beesdoo_shift_attendance/wizard/generate_missing_attendance_sheets.xml
+++ b/beesdoo_shift_attendance/wizard/generate_missing_attendance_sheets.xml
@@ -28,7 +28,7 @@
 
     <menuitem id="menu_missing_attendance_sheets"
               name="Generate missing past attendance sheets"
-              parent="menu_configuration_top"
+              parent="beesdoo_shift.menu_configuration_top"
               action="action_missing_attendance_sheets"
               sequence="2"
     />