From 5746a30a623af8357a006405b7abea364935f5b1 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Fri, 20 Jul 2018 16:23:56 +0200
Subject: [PATCH] [IMP]GOLEM Member(ship) : whole menu reorganization

---
 golem_member/__manifest__.py                  |  2 +-
 golem_member/i18n/fr.po                       | 28 ++++++++----
 golem_member/i18n/golem_member.pot            | 26 +++++++----
 .../views/golem_member_numberconfig_views.xml |  4 +-
 golem_member/views/golem_member_views.xml     | 24 +++++-----
 golem_membership/__manifest__.py              |  3 +-
 golem_membership/i18n/fr.po                   | 19 +++++++-
 golem_membership/i18n/golem_membership.pot    | 19 +++++++-
 golem_membership/views/membership_views.xml   | 44 +++++++++++++++++++
 9 files changed, 132 insertions(+), 37 deletions(-)
 create mode 100644 golem_membership/views/membership_views.xml

diff --git a/golem_member/__manifest__.py b/golem_member/__manifest__.py
index 0deb99e..d4daa65 100644
--- a/golem_member/__manifest__.py
+++ b/golem_member/__manifest__.py
@@ -20,7 +20,7 @@
     'name': 'GOLEM non-profit members',
     'summary': 'Extends Odoo contacts for MJC',
     'description': 'Extends Odoo contacts for MJC',
-    'version': '10.0.2.1.0',
+    'version': '10.0.2.2.0',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois, Michel Dessenne',
     'license': 'AGPL-3',
diff --git a/golem_member/i18n/fr.po b/golem_member/i18n/fr.po
index c9d43ad..d25c8b6 100644
--- a/golem_member/i18n/fr.po
+++ b/golem_member/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-07-20 10:07+0000\n"
-"PO-Revision-Date: 2018-07-20 12:09+0200\n"
+"POT-Creation-Date: 2018-07-20 14:15+0000\n"
+"PO-Revision-Date: 2018-07-20 16:16+0200\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -446,7 +446,6 @@ msgid "GOLEM MemberShip invoicing"
 msgstr "GOLEM : facturation de l'adhésion"
 
 #. module: golem_member
-#: model:ir.actions.act_window,name:golem_member.golem_member_action
 #: model:ir.ui.view,arch_db:golem_member.golem_member_graph
 #: model:ir.ui.view,arch_db:golem_member.golem_member_tree
 msgid "GOLEM Members"
@@ -711,11 +710,6 @@ msgstr "Fiche adhérent"
 msgid "Member number"
 msgstr "Numéro d'adhérent"
 
-#. module: golem_member
-#: model:ir.ui.menu,name:golem_member.golem_members_menu
-msgid "Members"
-msgstr "Membres"
-
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_member_lines
 #: model:ir.ui.view,arch_db:golem_member.golem_member_form
@@ -949,10 +943,20 @@ msgstr "Sélectionner l'option 'Avertissement' notifiera l'utilisateur avec le M
 msgid "Self"
 msgstr "Self"
 
+#. module: golem_member
+#: model:ir.actions.act_window,name:golem_member.golem_member_user_action
+msgid "Service Users"
+msgstr "Usagers"
+
+#. module: golem_member
+#: model:ir.ui.menu,name:golem_member.golem_member_user_menu
+msgid "Service users"
+msgstr "Usagers"
+
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_partner_share
 msgid "Share Partner"
-msgstr "Share Partner"
+msgstr "Partager un contact"
 
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_signup_type
@@ -1011,6 +1015,12 @@ msgstr "Rue..."
 msgid "Street2"
 msgstr "Rue 2"
 
+#. module: golem_member
+#: model:ir.actions.act_window,name:golem_member.golem_member_action
+#: model:ir.ui.menu,name:golem_member.golem_members_menu
+msgid "Subscribers"
+msgstr "Adhérents"
+
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_vat
 msgid "TIN"
diff --git a/golem_member/i18n/golem_member.pot b/golem_member/i18n/golem_member.pot
index 528c2f2..1571d14 100644
--- a/golem_member/i18n/golem_member.pot
+++ b/golem_member/i18n/golem_member.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-20 10:07+0000\n"
-"PO-Revision-Date: 2018-07-20 10:07+0000\n"
+"POT-Creation-Date: 2018-07-20 14:15+0000\n"
+"PO-Revision-Date: 2018-07-20 14:15+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -446,7 +446,6 @@ msgid "GOLEM MemberShip invoicing"
 msgstr ""
 
 #. module: golem_member
-#: model:ir.actions.act_window,name:golem_member.golem_member_action
 #: model:ir.ui.view,arch_db:golem_member.golem_member_graph
 #: model:ir.ui.view,arch_db:golem_member.golem_member_tree
 msgid "GOLEM Members"
@@ -705,11 +704,6 @@ msgstr ""
 msgid "Member number"
 msgstr ""
 
-#. module: golem_member
-#: model:ir.ui.menu,name:golem_member.golem_members_menu
-msgid "Members"
-msgstr ""
-
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_member_lines
 #: model:ir.ui.view,arch_db:golem_member.golem_member_form
@@ -941,6 +935,16 @@ msgstr ""
 msgid "Self"
 msgstr ""
 
+#. module: golem_member
+#: model:ir.actions.act_window,name:golem_member.golem_member_user_action
+msgid "Service Users"
+msgstr ""
+
+#. module: golem_member
+#: model:ir.ui.menu,name:golem_member.golem_member_user_menu
+msgid "Service users"
+msgstr ""
+
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_partner_share
 msgid "Share Partner"
@@ -1003,6 +1007,12 @@ msgstr ""
 msgid "Street2"
 msgstr ""
 
+#. module: golem_member
+#: model:ir.actions.act_window,name:golem_member.golem_member_action
+#: model:ir.ui.menu,name:golem_member.golem_members_menu
+msgid "Subscribers"
+msgstr ""
+
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_vat
 msgid "TIN"
diff --git a/golem_member/views/golem_member_numberconfig_views.xml b/golem_member/views/golem_member_numberconfig_views.xml
index dc6e250..22e0088 100644
--- a/golem_member/views/golem_member_numberconfig_views.xml
+++ b/golem_member/views/golem_member_numberconfig_views.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-Copyright 2017 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -59,7 +59,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <menuitem
       id="golem_member_numberconfig_menu"
       action="golem_member_numberconfig_action"
-      parent="membership.menu_marketing_config_association" sequence="1"
+      parent="golem_membership.menu_config_association" sequence="1"
       groups="golem_base.group_golem_manager" />
   </data>
 </odoo>
diff --git a/golem_member/views/golem_member_views.xml b/golem_member/views/golem_member_views.xml
index b42024a..0f1c33b 100644
--- a/golem_member/views/golem_member_views.xml
+++ b/golem_member/views/golem_member_views.xml
@@ -21,10 +21,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   <data>
 
     <!-- Actions -->
-    <act_window id="golem_member_action"
-      name="GOLEM Members"
-      res_model="golem.member"
-      view_mode="kanban,tree,form,graph" />
+    <act_window id="golem_member_action" name="Subscribers"
+      res_model="res.partner" view_mode="kanban,tree,form,graph"
+      domain="[('membership_state', '!=', 'none')]" />
+    <act_window id="golem_member_user_action" name="Service Users"
+      res_model="golem.member" view_mode="kanban,tree,form,graph" />
     <act_window id="res_partner_category_action" name="GOLEM Members Tags"
       res_model="res.partner.category" view_mode="tree,form" />
     <record id="golem_membership_invoice_action" model="ir.actions.act_window">
@@ -310,19 +311,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     </record>
 
     <!-- Menu items -->
-    <!-- Deactivate classic membership list -->
-    <record id="membership.menu_membership" model="ir.ui.menu">
-      <field name="active">0</field>
-    </record>
     <!-- Add new menu items -->
-    <menuitem id="golem_members_menu" name="Members"
-      parent="membership.menu_association" sequence="5"
+    <menuitem id="golem_member_user_menu" name="Service users"
+      parent="golem_membership.menu_association" sequence="5"
+      action="golem_member_user_action" groups="golem_base.group_golem_user" />
+    <menuitem id="golem_members_menu" name="Subscribers"
+      parent="golem_membership.menu_association" sequence="10"
       action="golem_member_action" groups="golem_base.group_golem_user" />
     <menuitem id="golem_member_tool_menu" name="Tools"
-      parent="membership.menu_association" sequence="80"
+      parent="golem_membership.menu_association" sequence="80"
       groups="golem_base.group_golem_user" />
     <menuitem id="res_partner_category_menu" name="Member Tags"
-      parent="membership.menu_marketing_config_association" sequence="10"
+      parent="golem_membership.menu_config_association" sequence="15"
       action="res_partner_category_action"
       groups="golem_base.group_golem_manager" />
   </data>
diff --git a/golem_membership/__manifest__.py b/golem_membership/__manifest__.py
index e810f8d..9a9d71c 100644
--- a/golem_membership/__manifest__.py
+++ b/golem_membership/__manifest__.py
@@ -18,7 +18,7 @@
 {
     'name': 'GOLEM non-profit membership handling',
     'summary': 'Extends Odoo membership',
-    'version': '10.0.2.0.0',
+    'version': '10.0.2.1.0',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois, Michel Dessenne',
     'license': 'AGPL-3',
@@ -26,5 +26,6 @@
     'installable': True,
     'depends': ['account', 'decimal_precision'],
     'data': ['data/account_data.xml',
+             'views/membership_views.xml',
              'views/golem_membership_invoice.xml']
 }
diff --git a/golem_membership/i18n/fr.po b/golem_membership/i18n/fr.po
index c645d3f..3e78977 100644
--- a/golem_membership/i18n/fr.po
+++ b/golem_membership/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-07-20 10:08+0000\n"
-"PO-Revision-Date: 2018-07-20 12:09+0200\n"
+"POT-Creation-Date: 2018-07-20 14:15+0000\n"
+"PO-Revision-Date: 2018-07-20 16:16+0200\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,6 +26,11 @@ msgstr "Annuler"
 msgid "Check"
 msgstr "Chèque"
 
+#. module: golem_membership
+#: model:ir.ui.menu,name:golem_membership.menu_config_association
+msgid "Configuration"
+msgstr "Configuration"
+
 #. module: golem_membership
 #: model:ir.model.fields,field_description:golem_membership.field_golem_membership_invoice_create_uid
 msgid "Created by"
@@ -90,6 +95,11 @@ msgstr "Dernière mise à jour le"
 msgid "Member Price"
 msgstr "Tarif d'adhésion"
 
+#. module: golem_membership
+#: model:ir.ui.menu,name:golem_membership.menu_association
+msgid "Members and users"
+msgstr "Adhérents et usagers"
+
 #. module: golem_membership
 #: model:ir.model.fields,field_description:golem_membership.field_golem_membership_invoice_product_id
 msgid "Membership"
@@ -105,6 +115,11 @@ msgstr "Facture de l'adhésion"
 msgid "Partner"
 msgstr "Contact"
 
+#. module: golem_membership
+#: model:ir.ui.menu,name:golem_membership.subscription_product_menu
+msgid "Subscriptions"
+msgstr "Adhésions"
+
 #. module: golem_membership
 #: model:ir.ui.view,arch_db:golem_membership.golem_membership_invoice_form
 msgid "or"
diff --git a/golem_membership/i18n/golem_membership.pot b/golem_membership/i18n/golem_membership.pot
index 35e10d6..1324246 100644
--- a/golem_membership/i18n/golem_membership.pot
+++ b/golem_membership/i18n/golem_membership.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-20 10:08+0000\n"
-"PO-Revision-Date: 2018-07-20 10:08+0000\n"
+"POT-Creation-Date: 2018-07-20 14:15+0000\n"
+"PO-Revision-Date: 2018-07-20 14:15+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,6 +26,11 @@ msgstr ""
 msgid "Check"
 msgstr ""
 
+#. module: golem_membership
+#: model:ir.ui.menu,name:golem_membership.menu_config_association
+msgid "Configuration"
+msgstr ""
+
 #. module: golem_membership
 #: model:ir.model.fields,field_description:golem_membership.field_golem_membership_invoice_create_uid
 msgid "Created by"
@@ -90,6 +95,11 @@ msgstr ""
 msgid "Member Price"
 msgstr ""
 
+#. module: golem_membership
+#: model:ir.ui.menu,name:golem_membership.menu_association
+msgid "Members and users"
+msgstr ""
+
 #. module: golem_membership
 #: model:ir.model.fields,field_description:golem_membership.field_golem_membership_invoice_product_id
 msgid "Membership"
@@ -105,6 +115,11 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: golem_membership
+#: model:ir.ui.menu,name:golem_membership.subscription_product_menu
+msgid "Subscriptions"
+msgstr ""
+
 #. module: golem_membership
 #: model:ir.ui.view,arch_db:golem_membership.golem_membership_invoice_form
 msgid "or"
diff --git a/golem_membership/views/membership_views.xml b/golem_membership/views/membership_views.xml
new file mode 100644
index 0000000..8e9ce49
--- /dev/null
+++ b/golem_membership/views/membership_views.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<odoo>
+  <data>
+
+    <!-- Menus reorganization -->
+    <!-- Deactivate classic membership list -->
+    <record id="membership.menu_membership" model="ir.ui.menu">
+      <field name="active">0</field>
+    </record>
+    <record id="membership.menu_marketing_config_association" model="ir.ui.menu">
+      <field name="active">0</field>
+    </record>
+    <record id="membership.menu_association" model="ir.ui.menu">
+      <field name="active">0</field>
+    </record>
+    <!-- New menus -->
+    <menuitem name="Members and users" id="menu_association"
+      sequence="15" web_icon="membership,static/description/icon.png" />
+    <menuitem name="Configuration" id="menu_config_association"
+      parent="menu_association" sequence="100" />
+    <menuitem name="Subscriptions" id="subscription_product_menu"
+      parent="menu_config_association" sequence="5"
+      action="membership.action_membership_products"/>
+
+  </data>
+</odoo>