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 @@
-
+
+
@@ -310,19 +311,18 @@ along with this program. If not, see .
-
-
-
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+