diff --git a/golem_activity_registration/__manifest__.py b/golem_activity_registration/__manifest__.py
index 074d70b8..f0b63405 100644
--- a/golem_activity_registration/__manifest__.py
+++ b/golem_activity_registration/__manifest__.py
@@ -18,9 +18,9 @@
{
'name': 'GOLEM Activity Member Registrations',
'summary': 'GOLEM Activities Member Registrations management',
- 'version': '10.0.1.0.0',
+ 'version': '10.0.1.1.0',
'category': 'GOLEM',
- 'author': 'Fabien Bourgeois',
+ 'author': 'Fabien Bourgeois, Michel Dessenne',
'license': 'AGPL-3',
'application': False,
'installable': True,
diff --git a/golem_activity_registration/i18n/golem_activity_registration.pot b/golem_activity_registration/i18n/golem_activity_registration.pot
index c909d01c..a2570ec6 100644
--- a/golem_activity_registration/i18n/golem_activity_registration.pot
+++ b/golem_activity_registration/i18n/golem_activity_registration.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-14 23:15+0000\n"
-"PO-Revision-Date: 2017-06-14 23:15+0000\n"
+"POT-Creation-Date: 2018-01-09 15:14+0000\n"
+"PO-Revision-Date: 2018-01-09 15:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/golem_activity_registration/models/golem_activity_registration.py b/golem_activity_registration/models/golem_activity_registration.py
index 2819ad1e..4b791df6 100644
--- a/golem_activity_registration/models/golem_activity_registration.py
+++ b/golem_activity_registration/models/golem_activity_registration.py
@@ -74,6 +74,7 @@ class GolemActivityRegistration(models.Model):
""" GOLEM Activity Registration """
_name = 'golem.activity.registration'
_description = 'GOLEM Activity Registration'
+ _rec_name ='activity_id'
member_id = fields.Many2one('golem.member', string='Member', required=True,
ondelete='cascade', index=True)
diff --git a/golem_activity_registration/views/golem_member_views.xml b/golem_activity_registration/views/golem_member_views.xml
index a56b134c..04ce4c17 100644
--- a/golem_activity_registration/views/golem_member_views.xml
+++ b/golem_activity_registration/views/golem_member_views.xml
@@ -52,5 +52,17 @@ along with this program. If not, see .
+
+
+ Add activities registrations to member searches
+ golem.member
+
+
+
+
+
+
+
diff --git a/golem_membership/__manifest__.py b/golem_membership/__manifest__.py
index 4d6bf1d6..b8e1b0e1 100644
--- a/golem_membership/__manifest__.py
+++ b/golem_membership/__manifest__.py
@@ -18,9 +18,9 @@
{
'name': 'GOLEM non-profit membership handling',
'summary': 'Extends Odoo membership',
- 'version': '10.0.1.0.0',
+ 'version': '10.0.1.1.0',
'category': 'GOLEM',
- 'author': 'Fabien Bourgeois',
+ 'author': 'Fabien Bourgeois, Michel Dessenne',
'license': 'AGPL-3',
'application': False,
'installable': True,
diff --git a/golem_membership/i18n/fr.po b/golem_membership/i18n/fr.po
index f80baaa8..dbeb74b8 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: 2017-06-14 07:05+0000\n"
-"PO-Revision-Date: 2017-06-14 07:05+0000\n"
+"POT-Creation-Date: 2018-01-09 15:07+0000\n"
+"PO-Revision-Date: 2018-01-09 15:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -56,6 +56,16 @@ msgstr "ID"
msgid "Invoice Membership"
msgstr "Facture d'adhésion"
+#. module: golem_membership
+#: model:ir.ui.view,arch_db:golem_membership.golem_member_search_inherit_golem_membership
+msgid "Is free"
+msgstr "Adhérent libre"
+
+#. module: golem_membership
+#: model:ir.ui.view,arch_db:golem_membership.golem_member_search_inherit_golem_membership
+msgid "Is paid"
+msgstr "A cotisé"
+
#. module: golem_membership
#: model:ir.actions.act_window,name:golem_membership.golem_membership_invoice_action
msgid "Join Membership"
@@ -106,4 +116,3 @@ msgstr "Contact"
#: model:ir.ui.view,arch_db:golem_membership.golem_membership_invoice_form
msgid "or"
msgstr "ou"
-
diff --git a/golem_membership/i18n/golem_membership.pot b/golem_membership/i18n/golem_membership.pot
index e1b68e32..d95b1f0b 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: 2017-06-14 07:04+0000\n"
-"PO-Revision-Date: 2017-06-14 07:04+0000\n"
+"POT-Creation-Date: 2018-01-09 15:05+0000\n"
+"PO-Revision-Date: 2018-01-09 15:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -55,6 +55,16 @@ msgstr ""
msgid "Invoice Membership"
msgstr ""
+#. module: golem_membership
+#: model:ir.ui.view,arch_db:golem_membership.golem_member_search_inherit_golem_membership
+msgid "Is free"
+msgstr ""
+
+#. module: golem_membership
+#: model:ir.ui.view,arch_db:golem_membership.golem_member_search_inherit_golem_membership
+msgid "Is paid"
+msgstr ""
+
#. module: golem_membership
#: model:ir.actions.act_window,name:golem_membership.golem_membership_invoice_action
msgid "Join Membership"
diff --git a/golem_membership/views/golem_member_view.xml b/golem_membership/views/golem_member_view.xml
index 7a90db01..e665feba 100644
--- a/golem_membership/views/golem_member_view.xml
+++ b/golem_membership/views/golem_member_view.xml
@@ -73,6 +73,21 @@ along with this program. If not, see .
+
+
+ GOLEM Member form adaptations
+ golem.member
+
+
+
+
+
+
+
+
+