From 89319bd7e52af7807ae74ac132661594e214ad32 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Sun, 18 Feb 2018 07:59:24 +0100
Subject: [PATCH] [IMP]GOLEM Resources : add icon, menu reorganization

---
 golem_ressources/__manifest__.py                |  11 +++++------
 golem_ressources/static/description/icon.png    | Bin 0 -> 3054 bytes
 .../views/golem_reservation_views.xml           |   4 ++--
 .../views/golem_resources_views.xml             |  16 +++++++++++-----
 4 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 golem_ressources/static/description/icon.png

diff --git a/golem_ressources/__manifest__.py b/golem_ressources/__manifest__.py
index e610aff..00b2f04 100644
--- a/golem_ressources/__manifest__.py
+++ b/golem_ressources/__manifest__.py
@@ -18,17 +18,16 @@
 
 {
     'name': 'GOLEM non-profit resources',
-    'summary': 'Extends Odoo resources for MJC',
-    'version': '10.0.1.0.1',
+    'summary': 'GOLEM resources management',
+    'description': ''' GOLEM resources management ''',
+    'version': '10.0.1.0.2',
     'category': 'GOLEM',
     'author': 'Youssef El Ouahby, Fabien Bourgeois',
     'license': 'AGPL-3',
     'application': True,
     'installable': True,
-    'depends': ['product',
-                ],
+    'depends': ['product'],
     'data': ['views/golem_resources_views.xml',
              'views/golem_reservation_views.xml',
-             'security/ir.model.access.csv',
-            ]
+             'security/ir.model.access.csv']
 }
diff --git a/golem_ressources/static/description/icon.png b/golem_ressources/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..211b00f9ad59ee3cf81b816168b1370a365c2085
GIT binary patch
literal 3054
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

literal 0
HcmV?d00001

diff --git a/golem_ressources/views/golem_reservation_views.xml b/golem_ressources/views/golem_reservation_views.xml
index 1154616..1a968d5 100644
--- a/golem_ressources/views/golem_reservation_views.xml
+++ b/golem_ressources/views/golem_reservation_views.xml
@@ -109,8 +109,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="res_model">golem.reservation</field>
       <field name="view_mode">tree,search,form,calendar</field>
     </record>
-    <menuitem id="reservation_sub_menu" name="Reservation" parent="resources_menu"
-                    action="action_reservation"/>
+    <menuitem id="resource_reservation_menu" name="Reservations"
+      parent="resources_menu" action="action_resources" sequence="20" />
 
     <!--formulaire relatif au wizard du motif de refus-->
     <record model="ir.ui.view" id="wizard_form_view">
diff --git a/golem_ressources/views/golem_resources_views.xml b/golem_ressources/views/golem_resources_views.xml
index 165fcec..bc71e73 100644
--- a/golem_ressources/views/golem_resources_views.xml
+++ b/golem_ressources/views/golem_resources_views.xml
@@ -151,10 +151,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="view_mode">tree</field>
     </record>
     <!--menu principale et sous menu-->
-    <menuitem id="resources_menu" name="Resources" />
-    <menuitem id="resources_sub_menu" name="Resources" parent="resources_menu"
-              action="action_resources"/>
-    <menuitem id="configuration_sub_menu" name="Configuration" parent="resources_menu"
-              action="action_configuration"/>
+    <menuitem id="resources_menu" name="Resources"
+      sequence="55" groups="golem_base.group_golem_user"
+      web_icon="golem_ressources,static/description/icon.png" />
+    <menuitem id="resources_list_menu" name="Resources" parent="resources_menu"
+      action="action_resources" sequence="10" />
+    <menuitem id="resource_configuration_menu" name="Configuration"
+      parent="resources_menu" groups="golem_base.group_golem_manager"
+      action="action_configuration" sequence="90" />
+    <menuitem id="resource_cofiguration_type_menu" name="Resource Types"
+      parent="resource_configuration_menu"
+      action="action_configuration" sequence="10" />
   </data>
 </odoo>