From 392c195b424dcb4a0f519ab27ca0c48dfcd3483c Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Fri, 25 May 2018 18:18:49 +0200
Subject: [PATCH] [IMP]GOLEM Resource Report : better menus for reports,
 updated translations

---
 golem_resource_report/__manifest__.py             |  2 +-
 golem_resource_report/i18n/fr.po                  | 15 ++++++++++-----
 .../i18n/golem_resource_report.pot                | 13 +++++++++----
 .../views/golem_resource_report_menu.xml          |  9 ++++++---
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/golem_resource_report/__manifest__.py b/golem_resource_report/__manifest__.py
index 8b40f73..9696ff5 100644
--- a/golem_resource_report/__manifest__.py
+++ b/golem_resource_report/__manifest__.py
@@ -20,7 +20,7 @@
     'name': 'GOLEM resources reports',
     'summary': 'GOLEM resources reports',
     'description': ''' GOLEM resources reports ''',
-    'version': '10.0.0.1.0',
+    'version': '10.0.0.1.1',
     'category': 'GOLEM',
     'author': 'Youssef El Ouahby, Fabien Bourgeois',
     'license': 'AGPL-3',
diff --git a/golem_resource_report/i18n/fr.po b/golem_resource_report/i18n/fr.po
index 11c23b8..1315ce3 100644
--- a/golem_resource_report/i18n/fr.po
+++ b/golem_resource_report/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-25 14:50+0000\n"
-"PO-Revision-Date: 2018-05-25 14:50+0000\n"
+"POT-Creation-Date: 2018-05-25 16:13+0000\n"
+"PO-Revision-Date: 2018-05-25 16:13+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -106,7 +106,7 @@ msgid "Print Report"
 msgstr "Imprimer le rapport"
 
 #. module: golem_resource_report
-#: model:ir.ui.menu,name:golem_resource_report.resource_report_menu
+#: model:ir.ui.menu,name:golem_resource_report.report_menu
 msgid "Report"
 msgstr "Rapport"
 
@@ -115,6 +115,11 @@ msgstr "Rapport"
 msgid "Reservations Report"
 msgstr "Export réservations"
 
+#. module: golem_resource_report
+#: model:ir.ui.menu,name:golem_resource_report.reservation_resource_day_menu
+msgid "Reservations per resource and day"
+msgstr "Réservations par ressource et jour"
+
 #. module: golem_resource_report
 #: model:ir.ui.view,arch_db:golem_resource_report.golem_resource_report_wizard_view_form
 msgid "Resource Report"
@@ -123,10 +128,10 @@ msgstr "Ressource"
 #. module: golem_resource_report
 #: model:ir.model.fields,field_description:golem_resource_report.field_golem_resource_report_wizard_resource_ids
 msgid "Resource ids"
-msgstr "Resources"
+msgstr "Ressources"
 
 #. module: golem_resource_report
-#: model:ir.actions.act_window,name:golem_resource_report.golem_resource_report_action
+#: model:ir.actions.act_window,name:golem_resource_report.reservation_resource_day_action
 msgid "Resources Reports"
 msgstr "Ressources"
 
diff --git a/golem_resource_report/i18n/golem_resource_report.pot b/golem_resource_report/i18n/golem_resource_report.pot
index 2d7477b..91ddc2f 100644
--- a/golem_resource_report/i18n/golem_resource_report.pot
+++ b/golem_resource_report/i18n/golem_resource_report.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-25 14:50+0000\n"
-"PO-Revision-Date: 2018-05-25 14:50+0000\n"
+"POT-Creation-Date: 2018-05-25 16:13+0000\n"
+"PO-Revision-Date: 2018-05-25 16:13+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -105,7 +105,7 @@ msgid "Print Report"
 msgstr ""
 
 #. module: golem_resource_report
-#: model:ir.ui.menu,name:golem_resource_report.resource_report_menu
+#: model:ir.ui.menu,name:golem_resource_report.report_menu
 msgid "Report"
 msgstr ""
 
@@ -114,6 +114,11 @@ msgstr ""
 msgid "Reservations Report"
 msgstr ""
 
+#. module: golem_resource_report
+#: model:ir.ui.menu,name:golem_resource_report.reservation_resource_day_menu
+msgid "Reservations per resource and day"
+msgstr ""
+
 #. module: golem_resource_report
 #: model:ir.ui.view,arch_db:golem_resource_report.golem_resource_report_wizard_view_form
 msgid "Resource Report"
@@ -125,7 +130,7 @@ msgid "Resource ids"
 msgstr ""
 
 #. module: golem_resource_report
-#: model:ir.actions.act_window,name:golem_resource_report.golem_resource_report_action
+#: model:ir.actions.act_window,name:golem_resource_report.reservation_resource_day_action
 msgid "Resources Reports"
 msgstr ""
 
diff --git a/golem_resource_report/views/golem_resource_report_menu.xml b/golem_resource_report/views/golem_resource_report_menu.xml
index a75dc9a..0093461 100644
--- a/golem_resource_report/views/golem_resource_report_menu.xml
+++ b/golem_resource_report/views/golem_resource_report_menu.xml
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   <data>
 
     <!-- Actions -->
-    <record model="ir.actions.act_window" id="golem_resource_report_action">
+    <record model="ir.actions.act_window" id="reservation_resource_day_action">
       <field name="name">Resources Reports</field>
       <field name="res_model">golem.resource.report.wizard</field>
       <field name="view_type">form</field>
@@ -31,8 +31,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     </record>
 
     <!-- Menus -->
-    <menuitem id="resource_report_menu" name="Report" parent="golem_resource.golem_resource_menu"
-      action="golem_resource_report_action" sequence="10" />
+    <menuitem id="report_menu" name="Report"
+      parent="golem_resource.golem_resource_menu" sequence="80" />
+    <menuitem id="reservation_resource_day_menu"
+      name="Reservations per resource and day" parent="report_menu"
+      action="reservation_resource_day_action" sequence="10" />
 
     </data>
   </odoo>