diff --git a/golem_member/__manifest__.py b/golem_member/__manifest__.py
index c170894..6bc3578 100644
--- a/golem_member/__manifest__.py
+++ b/golem_member/__manifest__.py
@@ -19,7 +19,8 @@
{
'name': 'GOLEM non-profit members',
'summary': 'Extends Odoo contacts for MJC',
- 'version': '10.0.1.1.6',
+ 'description': 'Extends Odoo contacts for MJC',
+ 'version': '10.0.1.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 04258d9..38286bc 100644
--- a/golem_member/i18n/fr.po
+++ b/golem_member/i18n/fr.po
@@ -6,15 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-27 13:58+0000\n"
-"PO-Revision-Date: 2018-03-27 13:58+0000\n"
+"POT-Creation-Date: 2018-07-17 06:55+0000\n"
+"PO-Revision-Date: 2018-07-17 09:01+0200\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
-"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: \n"
#. module: golem_member
#: model:ir.ui.view,arch_db:golem_member.golem_member_card_template
@@ -339,7 +338,12 @@ msgstr "Nom affiché"
#. module: golem_member
#: model:ir.model.fields,help:golem_member.field_golem_member_partner_share
msgid "Either customer (no user), either shared user. Indicated the current partner is a customer without access or with a limited access created for sharing data."
-msgstr "Either customer (no user), either shared user. Indicated the current partner is a customer without access or with a limited access created for sharing data."
+msgstr "Soit un contact (pas un utilisateur), soit un utilisateur partagé. Indique que le contact actuel est un client sans permission ou avec des accès limités créés pour partager des données."
+
+#. module: golem_member
+#: model:ir.model.fields,field_description:golem_member.field_golem_member_electronic_processing_agreement
+msgid "Electronic Processing Agreement?"
+msgstr "Autorise le traitement informatique automatisé?"
#. module: golem_member
#: model:ir.model.fields,field_description:golem_member.field_golem_member_email
@@ -434,7 +438,7 @@ msgid "GOLEM Members Tags"
msgstr "Catégories d'adhérents"
#. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:319
+#: code:addons/golem_member/models/golem_member.py:318
#, python-format
msgid "GOLEM Members merge has not been implemented yet. Please only merge partners, not members, or delete GOLEM Members manually before merging."
msgstr "La fusion d'adhérents n'a pas encore été implémentée. Merci de ne fusionner que des contacts non adhérents, ou bien de supprimer les adhérents manuellement en premier lieu."
@@ -501,11 +505,6 @@ msgstr "Si cette boîte est cochée, cela indique que l'usager refuse de recevoi
msgid "Image"
msgstr "Image"
-#. module: golem_member
-#: model:ir.model.fields,field_description:golem_member.field_golem_member_image_permission
-msgid "Image permission?"
-msgstr "Autorise les photos?"
-
#. module: golem_member
#: model:ir.model.fields,field_description:golem_member.field_golem_member_ref
msgid "Internal Reference"
@@ -714,7 +713,7 @@ msgstr "NIC"
#. module: golem_member
#: model:ir.model.fields,field_description:golem_member.field_golem_member_name
-#: model:ir.model.fields,field_description:golem_member.field_golem_member_number_name_4186
+#: model:ir.model.fields,field_description:golem_member.field_golem_member_number_name_4260
msgid "Name"
msgstr "Nom"
@@ -726,8 +725,8 @@ msgid "Nationality"
msgstr "Nationalité"
#. module: golem_member
+#: code:addons/golem_member/models/golem_member.py:261
#: code:addons/golem_member/models/golem_member.py:264
-#: code:addons/golem_member/models/golem_member.py:267
#: selection:golem.member.numberconfig,is_automatic:0
#: selection:golem.member.numberconfig,is_per_season:0
#, python-format
@@ -937,7 +936,7 @@ msgstr "Image de petite taille de ce contact. Elle est automatiquement redimensi
#: model:ir.model.fields,field_description:golem_member.field_golem_member_state_id
#: model:ir.ui.view,arch_db:golem_member.golem_member_form
msgid "State"
-msgstr "Région"
+msgstr "État"
#. module: golem_member
#: model:ir.model.fields,field_description:golem_member.field_golem_member_street
@@ -952,7 +951,7 @@ msgstr "Rue..."
#. module: golem_member
#: model:ir.model.fields,field_description:golem_member.field_golem_member_street2
msgid "Street2"
-msgstr "Complément de rue"
+msgstr "Rue 2"
#. module: golem_member
#: model:ir.model.fields,field_description:golem_member.field_golem_member_vat
@@ -962,7 +961,7 @@ msgstr "Numéro fiscal"
#. module: golem_member
#: model:ir.model.fields,field_description:golem_member.field_golem_member_category_id
msgid "Tags"
-msgstr "Catégories"
+msgstr "Étiquettes"
#. module: golem_member
#: model:ir.ui.view,arch_db:golem_member.golem_member_form
@@ -1040,7 +1039,7 @@ msgid "This field holds the image used as avatar for this contact, limited to 10
msgstr "Ce champ contient l'image utilisée comme photo d'identité pour ce contact, limitée à 1024x1024px."
#. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:78
+#: code:addons/golem_member/models/golem_member.py:77
#: sql_constraint:golem.member:0
#, python-format
msgid "This member number has already been used."
@@ -1137,8 +1136,8 @@ msgid "Website of Partner or Company"
msgstr "Site Web pour les Partenaires ou les Sociétés"
#. module: golem_member
+#: code:addons/golem_member/models/golem_member.py:261
#: code:addons/golem_member/models/golem_member.py:264
-#: code:addons/golem_member/models/golem_member.py:267
#: selection:golem.member.numberconfig,is_automatic:0
#: selection:golem.member.numberconfig,is_per_season:0
#, python-format
@@ -1169,3 +1168,4 @@ msgstr "e.g. www.yaltik.com"
#: model:ir.ui.view,arch_db:golem_member.golem_member_form
msgid "name@example.org"
msgstr "name@example.org"
+
diff --git a/golem_member/i18n/golem_member.pot b/golem_member/i18n/golem_member.pot
index b35ee5a..559aeb1 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-03-27 13:57+0000\n"
-"PO-Revision-Date: 2018-03-27 13:57+0000\n"
+"POT-Creation-Date: 2018-07-17 06:55+0000\n"
+"PO-Revision-Date: 2018-07-17 06:55+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -340,6 +340,11 @@ msgstr ""
msgid "Either customer (no user), either shared user. Indicated the current partner is a customer without access or with a limited access created for sharing data."
msgstr ""
+#. module: golem_member
+#: model:ir.model.fields,field_description:golem_member.field_golem_member_electronic_processing_agreement
+msgid "Electronic Processing Agreement?"
+msgstr ""
+
#. module: golem_member
#: model:ir.model.fields,field_description:golem_member.field_golem_member_email
msgid "Email"
@@ -433,7 +438,7 @@ msgid "GOLEM Members Tags"
msgstr ""
#. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:319
+#: code:addons/golem_member/models/golem_member.py:318
#, python-format
msgid "GOLEM Members merge has not been implemented yet. Please only merge partners, not members, or delete GOLEM Members manually before merging."
msgstr ""
@@ -500,11 +505,6 @@ msgstr ""
msgid "Image"
msgstr ""
-#. module: golem_member
-#: model:ir.model.fields,field_description:golem_member.field_golem_member_image_permission
-msgid "Image permission?"
-msgstr ""
-
#. module: golem_member
#: model:ir.model.fields,field_description:golem_member.field_golem_member_ref
msgid "Internal Reference"
@@ -707,7 +707,7 @@ msgstr ""
#. module: golem_member
#: model:ir.model.fields,field_description:golem_member.field_golem_member_name
-#: model:ir.model.fields,field_description:golem_member.field_golem_member_number_name_4186
+#: model:ir.model.fields,field_description:golem_member.field_golem_member_number_name_4260
msgid "Name"
msgstr ""
@@ -719,8 +719,8 @@ msgid "Nationality"
msgstr ""
#. module: golem_member
+#: code:addons/golem_member/models/golem_member.py:261
#: code:addons/golem_member/models/golem_member.py:264
-#: code:addons/golem_member/models/golem_member.py:267
#: selection:golem.member.numberconfig,is_automatic:0
#: selection:golem.member.numberconfig,is_per_season:0
#, python-format
@@ -1031,7 +1031,7 @@ msgid "This field holds the image used as avatar for this contact, limited to 10
msgstr ""
#. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:78
+#: code:addons/golem_member/models/golem_member.py:77
#: sql_constraint:golem.member:0
#, python-format
msgid "This member number has already been used."
@@ -1128,8 +1128,8 @@ msgid "Website of Partner or Company"
msgstr ""
#. module: golem_member
+#: code:addons/golem_member/models/golem_member.py:261
#: code:addons/golem_member/models/golem_member.py:264
-#: code:addons/golem_member/models/golem_member.py:267
#: selection:golem.member.numberconfig,is_automatic:0
#: selection:golem.member.numberconfig,is_per_season:0
#, python-format
diff --git a/golem_member/models/golem_member.py b/golem_member/models/golem_member.py
index a78d61f..f0e0052 100644
--- a/golem_member/models/golem_member.py
+++ b/golem_member/models/golem_member.py
@@ -90,7 +90,9 @@ class GolemMember(models.Model):
number_manual = fields.Char('Manual number', size=50, index=True,
help='Manual number overwriting automatic '
'numbering')
- pictures_agreement = fields.Boolean('Pictures agreement?')
+ pictures_agreement = fields.Boolean('Pictures agreement?', default=True)
+ electronic_processing_agreement = fields.Boolean('Electronic Processing Agreement?',
+ default=True)
opt_out_sms = fields.Boolean('Out of SMS campaigns?',
help='If this field has been checked, it '
'tells that the user refuses to receive SMS')
@@ -101,7 +103,6 @@ class GolemMember(models.Model):
store=True, compute='_compute_is_current')
is_number_manual = fields.Boolean('Is number manual?', store=False,
compute='_compute_is_number_manual')
- image_permission = fields.Boolean('Image permission?', default=True)
@api.onchange('country_id')
def onchange_country_domain_state(self):
diff --git a/golem_member/views/golem_member_views.xml b/golem_member/views/golem_member_views.xml
index cce9e1a..b1feb07 100644
--- a/golem_member/views/golem_member_views.xml
+++ b/golem_member/views/golem_member_views.xml
@@ -83,7 +83,6 @@ along with this program. If not, see .
widget="phonefr" />
-
@@ -91,9 +90,10 @@ along with this program. If not, see .
+
+
-