From db1cc94147009a255873e345ce6cd8f04fcda994 Mon Sep 17 00:00:00 2001
From: Pablo <pabloqb@gmail.com>
Date: Fri, 26 Oct 2018 20:35:57 +0200
Subject: [PATCH] [WIP] Rearrange menu items and actions

---
 hotel_node_master/views/hotel_node.xml        | 82 ++-----------------
 hotel_node_master/views/hotel_node_group.xml  | 15 ++++
 .../views/hotel_node_room_type.xml            | 15 ++++
 hotel_node_master/views/hotel_node_user.xml   | 15 ++++
 .../wizards/wizard_hotel_node_reservation.xml | 29 +++++--
 5 files changed, 75 insertions(+), 81 deletions(-)

diff --git a/hotel_node_master/views/hotel_node.xml b/hotel_node_master/views/hotel_node.xml
index f30470568..bbc065ca1 100644
--- a/hotel_node_master/views/hotel_node.xml
+++ b/hotel_node_master/views/hotel_node.xml
@@ -8,7 +8,7 @@
             <form string="Hotel Node">
                 <sheet string="Hotel Node">
                     <div class="oe_button_box" name="button_box" groups="base.group_user">
-                        <button name="%(hotel_node_reservation_action)d" type="action"
+                        <button name="%(hotel_node_reservation_wizard_action)d" type="action"
                                 string="Reserve" help="Make a reservation in this hotel"
                                 class="oe_stat_button" icon="fa-suitcase"
                                 context="{'node_id': id}">
@@ -105,7 +105,7 @@
         </field>
     </record>
 
-    <record id="hotel_node_action_open_dashboard" model="ir.actions.act_window">
+    <record id="hotel_node_action_kanban" model="ir.actions.act_window">
         <field name="name">Hotels</field>
         <field name="res_model">project.project</field>
         <field name="view_type">form</field>
@@ -114,81 +114,13 @@
         <field name="target">main</field>
     </record>
 
-    <!-- Action to open Hotel Nodes List -->
-    <act_window id="hotel_node_action"
-                name="List of Hotels"
-                res_model="project.project"
-                view_mode="tree,form"
-    />
-    <!-- Action to open Hotel Room Types List -->
-    <act_window id="hotel_node_room_type_action"
-                name="List of Room Types in Hotels"
-                res_model="hotel.node.room.type"
-                view_mode="tree,form"
-    />
-    <!-- Action to open Hotel Users List -->
-    <act_window id="hotel_node_user_action"
-                name="List of Users in Hotels"
-                res_model="hotel.node.user"
-                view_mode="tree,form"
-    />
-    <!-- Action to open Hotel Groups List -->
-    <act_window id="hotel_node_group_action"
-                name="List of Access Groups in Hotels"
-                res_model="hotel.node.group"
-                view_mode="tree,form"
-    />
-    <!-- Action to open Hotel Node Reservation List -->
-    <act_window id="hotel_node_reservation_action"
-                name="Hotel Reservation Wizard"
-                res_model="hotel.node.reservation.wizard"
-                view_mode="form"
-                target="new"
+    <menuitem id="hotel_node_menu"
+              name="Hotel Central Dashboard"
+              action="hotel_node_action_kanban"
     />
 
-    <!-- Menu default to open Hotel Nodes Dashboard -->
-    <menuitem id="hotel_node_dashboard_menu"
-              name="Hotel Central Dashboard"
-              action="hotel_node_action_open_dashboard"
-    />
-    <!-- Menu Management Section -->
-    <menuitem id="dashboard_menu"
+    <menuitem id="hotel_node_menu_dashboard"
               name="Management"
-              parent="hotel_node_dashboard_menu"
+              parent="hotel_node_menu"
     />
-    <!-- Menu item to open Hotel Nodes List -->
-    <menuitem id="hotel_node_menu"
-              name="Hotels"
-              action="hotel_node_action"
-              parent="dashboard_menu"
-              sequence="1"
-    />
-    <!-- Menu item to open Hotel Users List -->
-    <menuitem id="hotel_node_user_menu"
-              name="Users"
-              action="hotel_node_user_action"
-              parent="dashboard_menu"
-              sequence="2"
-    />
-    <!-- Menu item to open Hotel Users List -->
-    <menuitem id="hotel_node_group_menu"
-              name="Access Groups"
-              action="hotel_node_group_action"
-              parent="dashboard_menu"
-              sequence="3"
-    />
-    <!-- Menu item to open Hotel Nodes List -->
-    <menuitem id="hotel_node_room_type_menu"
-              name="Room Types"
-              action="hotel_node_room_type_action"
-              parent="dashboard_menu"
-              sequence="1"
-    />
-    <!-- Menu item to open Hotel Node Reservation List -->
-    <!--<menuitem id="hotel_node_reservation_menu"-->
-              <!--name="Reservations Wizard"-->
-              <!--action="hotel_node_reservation_action"-->
-              <!--parent="dashboard_menu"-->
-              <!--sequence="4"-->
-    <!--/>-->
 </odoo>
diff --git a/hotel_node_master/views/hotel_node_group.xml b/hotel_node_master/views/hotel_node_group.xml
index 03362e259..23f52d869 100644
--- a/hotel_node_master/views/hotel_node_group.xml
+++ b/hotel_node_master/views/hotel_node_group.xml
@@ -11,4 +11,19 @@
             </tree>
         </field>
     </record>
+
+    <record id="hotel_node_group_action" model="ir.actions.act_window">
+        <field name="name">List of Access Groups in Hotels</field>
+        <field name="res_model">hotel.node.group</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="target">main</field>
+    </record>
+
+    <menuitem id="hotel_node_group_menu"
+              name="Access Groups"
+              action="hotel_node_group_action"
+              parent="hotel_node_menu_dashboard"
+              sequence="3"
+    />
 </odoo>
diff --git a/hotel_node_master/views/hotel_node_room_type.xml b/hotel_node_master/views/hotel_node_room_type.xml
index eb4e376c4..32680aac1 100644
--- a/hotel_node_master/views/hotel_node_room_type.xml
+++ b/hotel_node_master/views/hotel_node_room_type.xml
@@ -54,4 +54,19 @@
             </tree>
         </field>
     </record>
+
+    <record id="hotel_node_room_type_action" model="ir.actions.act_window">
+        <field name="name">List of Room Types in Hotels</field>
+        <field name="res_model">hotel.node.room.type</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="target">main</field>
+    </record>
+
+    <menuitem id="hotel_node_room_type_menu"
+              name="Room Types"
+              action="hotel_node_room_type_action"
+              parent="hotel_node_menu_dashboard"
+              sequence="1"
+    />
 </odoo>
diff --git a/hotel_node_master/views/hotel_node_user.xml b/hotel_node_master/views/hotel_node_user.xml
index 7824a1f33..7a16d78bd 100644
--- a/hotel_node_master/views/hotel_node_user.xml
+++ b/hotel_node_master/views/hotel_node_user.xml
@@ -51,4 +51,19 @@
             </tree>
         </field>
     </record>
+
+    <record id="hotel_node_user_action" model="ir.actions.act_window">
+        <field name="name">List of Users in Hotels</field>
+        <field name="res_model">hotel.node.user</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="target">main</field>
+    </record>
+
+    <menuitem id="hotel_node_user_menu"
+              name="Users"
+              action="hotel_node_user_action"
+              parent="hotel_node_menu_dashboard"
+              sequence="2"
+    />
 </odoo>
diff --git a/hotel_node_master/wizards/wizard_hotel_node_reservation.xml b/hotel_node_master/wizards/wizard_hotel_node_reservation.xml
index 82f73ae83..6b9adf052 100644
--- a/hotel_node_master/wizards/wizard_hotel_node_reservation.xml
+++ b/hotel_node_master/wizards/wizard_hotel_node_reservation.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-
     <record id="hotel_node_reservation_wizard_view_form" model="ir.ui.view">
 		<field name="name">hotel.node.reservation.wizard</field>
 		<field name="model">hotel.node.reservation.wizard</field>
@@ -21,7 +20,7 @@
                         <group>
                             <field name="partner_id"/>
                         </group>
-                        <group colspan="2">
+                        <group name="room_type_wizard_ids" colspan="2">
                             <field name="room_type_wizard_ids" nolabel="1">
                                 <tree editable="bottom" create="false" delete="false"
                                       decoration-muted="room_type_availability == 0">
@@ -43,10 +42,6 @@
                             <field name="price_total" widget="monetary" readonly="1" force_save="1"/>
                         </group>
                     </group>
-                    <!--<field name="confirm" invisible="1"/>-->
-                    <!--<group colspan="2" class="oe_subtotal_footer">-->
-                        <!--<field name="total"/>-->
-                    <!--</group>-->
                     <footer attrs="{'invisible':[('node_id','=',False)]}">
                         <button name="create_node_reservation" string="Create Reservations" type="object"
 							class="oe_highlight" />
@@ -57,4 +52,26 @@
 			</form>
 		</field>
 	</record>
+
+    <record id="hotel_node_reservation_wizard_view_search_form" model="ir.ui.view">
+        <field name="name">hotel.node.reservation.wizard.search</field>
+        <field name="model">hotel.node.reservation.wizard</field>
+        <field name="inherit_id" ref="hotel_node_reservation_wizard_view_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='room_type_wizard_ids']" position="replace">
+                <group name="rooms_wizard_ids" colspan="2">
+                    <field name="node_id"/>
+                </group>
+	        </xpath>
+        </field>
+    </record>
+
+    <record id="hotel_node_reservation_wizard_action" model="ir.actions.act_window">
+		<field name="name">Hotel Reservation Wizard</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="res_model">hotel.node.reservation.wizard</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">form</field>
+		<field name="target">new</field>
+	</record>
 </odoo>