Yaltik/golem
1
0
Fork 2
Code Issues Pull Requests 4 Releases Activity

Merge branch 'master' into minor_invoice_payment

Browse Source
This commit is contained in:
Fabien BOURGEOIS 2018-11-01 16:24:50 +01:00
commit 41cd2e863a
9 changed files with 203 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
golem_activity/__manifest__.py
View File

@ -19,7 +19,7 @@
'name': 'GOLEM activities', 'name': 'GOLEM activities',
'summary': 'Extends Odoo products for multi-activity', 'summary': 'Extends Odoo products for multi-activity',
'description': 'Extends Odoo products for multi-activity', 'description': 'Extends Odoo products for multi-activity',
'version': '10.0.2.6.1', 'version': '10.0.2.7.0',
'category': 'GOLEM', 'category': 'GOLEM',
'author': 'Fabien Bourgeois, Michel Dessenne', 'author': 'Fabien Bourgeois, Michel Dessenne',
'license': 'AGPL-3', 'license': 'AGPL-3',

47
golem_activity/i18n/fr.po
View File

@ -6,8 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Odoo Server 10.0\n" "Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-09 13:33+0000\n" "POT-Creation-Date: 2018-11-01 15:16+0000\n"
"PO-Revision-Date: 2018-08-09 15:47+0200\n" "PO-Revision-Date: 2018-11-01 16:17+0100\n"
"Last-Translator: <>\n" "Last-Translator: <>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -173,13 +173,13 @@ msgid "Activity audience"
msgstr "Public" msgstr "Public"
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:160 #: code:addons/golem_activity/models/golem_activity.py:167
#, python-format #, python-format
msgid "Activity end date can not be set after linked season end." msgid "Activity end date can not be set after linked season end."
msgstr "La date de fin ne peut pas être apprêt la date de fin de la saison." msgstr "La date de fin ne peut pas être apprêt la date de fin de la saison."
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:156 #: code:addons/golem_activity/models/golem_activity.py:163
#, python-format #, python-format
msgid "Activity start date can not be set before linked season start." msgid "Activity start date can not be set before linked season start."
msgstr "La date de début ne peut pas être avant la date de début de la saison." msgstr "La date de début ne peut pas être avant la date de début de la saison."
@ -194,6 +194,12 @@ msgstr "Type d'activité"
msgid "Adults" msgid "Adults"
msgstr "Adultes" msgstr "Adultes"
#. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_res_partner_animator_activity_ids
#: model:ir.model.fields,field_description:golem_activity.field_res_users_animator_activity_ids
msgid "Animated activities"
msgstr "Activités animées"
#. module: golem_activity #. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_animator_id #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_animator_id
msgid "Animator" msgid "Animator"
@ -205,7 +211,7 @@ msgid "Arts martiaux"
msgstr "Arts martiaux" msgstr "Arts martiaux"
#. module: golem_activity #. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_audience_id_4516 #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_audience_id_4022
msgid "Audience" msgid "Audience"
msgstr "Public" msgstr "Public"
@ -392,7 +398,7 @@ msgid "Expense Account"
msgstr "Compte de dépenses" msgstr "Compte de dépenses"
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:178 #: code:addons/golem_activity/models/golem_activity.py:185
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Friday" msgid "Friday"
@ -573,7 +579,7 @@ msgid "Membership Start Date"
msgstr "Date de début d'adhésion" msgstr "Date de début d'adhésion"
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:174 #: code:addons/golem_activity/models/golem_activity.py:181
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Monday" msgid "Monday"
@ -590,6 +596,11 @@ msgstr "Nom"
msgid "Others" msgid "Others"
msgstr "Autres" msgstr "Autres"
#. module: golem_activity
#: model:ir.model,name:golem_activity.model_res_partner
msgid "Partner"
msgstr "Partenaire"
#. module: golem_activity #. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_price #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_price
msgid "Price" msgid "Price"
@ -655,12 +666,6 @@ msgstr "Description achat"
msgid "Purchase Unit of Measure" msgid "Purchase Unit of Measure"
msgstr "Unité de mesure d'achat" msgstr "Unité de mesure d'achat"
#. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_resource_ids
#: model:ir.model.fields,field_description:golem_activity.field_product_product_resource_ids
msgid "Resource ids"
msgstr "Resources"
#. module: golem_activity #. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_description_sale #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_description_sale
msgid "Sale Description" msgid "Sale Description"
@ -672,7 +677,7 @@ msgid "Sale Price"
msgstr "Prix de vente" msgstr "Prix de vente"
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:179 #: code:addons/golem_activity/models/golem_activity.py:186
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Saturday" msgid "Saturday"
@ -725,8 +730,8 @@ msgid "Start date"
msgstr "Date de début" msgstr "Date de début"
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:153 #: code:addons/golem_activity/models/golem_activity.py:160
#: code:addons/golem_activity/models/golem_activity.py:205 #: code:addons/golem_activity/models/golem_activity.py:212
#, python-format #, python-format
msgid "Start of the period cannot be after end of the period." msgid "Start of the period cannot be after end of the period."
msgstr "Le début de la période ne peut être antérieure à sa fin" msgstr "Le début de la période ne peut être antérieure à sa fin"
@ -742,7 +747,7 @@ msgid "Stop time"
msgstr "Heure de fin" msgstr "Heure de fin"
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:180 #: code:addons/golem_activity/models/golem_activity.py:187
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Sunday" msgid "Sunday"
@ -793,7 +798,7 @@ msgid "This field holds the image used as image for the activity."
msgstr "This field holds the image used as image for the activity." msgstr "This field holds the image used as image for the activity."
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:177 #: code:addons/golem_activity/models/golem_activity.py:184
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Thursday" msgid "Thursday"
@ -810,14 +815,14 @@ msgid "True"
msgstr "True" msgstr "True"
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:175 #: code:addons/golem_activity/models/golem_activity.py:182
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Tuesday" msgid "Tuesday"
msgstr "Mardi" msgstr "Mardi"
#. module: golem_activity #. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_type_id_3929 #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_type_id_3987
#: model:ir.ui.view,arch_db:golem_activity.golem_activity_report_template #: model:ir.ui.view,arch_db:golem_activity.golem_activity_report_template
msgid "Type" msgid "Type"
msgstr "Type" msgstr "Type"
@ -854,7 +859,7 @@ msgid "Warranty"
msgstr "Garantie" msgstr "Garantie"
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:176 #: code:addons/golem_activity/models/golem_activity.py:183
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Wednesday" msgid "Wednesday"

47
golem_activity/i18n/golem_activity.pot
View File

@ -6,8 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Odoo Server 10.0\n" "Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-09 13:33+0000\n" "POT-Creation-Date: 2018-11-01 15:16+0000\n"
"PO-Revision-Date: 2018-08-09 13:33+0000\n" "PO-Revision-Date: 2018-11-01 15:16+0000\n"
"Last-Translator: <>\n" "Last-Translator: <>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -170,13 +170,13 @@ msgid "Activity audience"
msgstr "" msgstr ""
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:160 #: code:addons/golem_activity/models/golem_activity.py:167
#, python-format #, python-format
msgid "Activity end date can not be set after linked season end." msgid "Activity end date can not be set after linked season end."
msgstr "" msgstr ""
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:156 #: code:addons/golem_activity/models/golem_activity.py:163
#, python-format #, python-format
msgid "Activity start date can not be set before linked season start." msgid "Activity start date can not be set before linked season start."
msgstr "" msgstr ""
@ -191,6 +191,12 @@ msgstr ""
msgid "Adults" msgid "Adults"
msgstr "" msgstr ""
#. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_res_partner_animator_activity_ids
#: model:ir.model.fields,field_description:golem_activity.field_res_users_animator_activity_ids
msgid "Animated activities"
msgstr ""
#. module: golem_activity #. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_animator_id #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_animator_id
msgid "Animator" msgid "Animator"
@ -202,7 +208,7 @@ msgid "Arts martiaux"
msgstr "" msgstr ""
#. module: golem_activity #. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_audience_id_4516 #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_audience_id_4022
msgid "Audience" msgid "Audience"
msgstr "" msgstr ""
@ -389,7 +395,7 @@ msgid "Expense Account"
msgstr "" msgstr ""
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:178 #: code:addons/golem_activity/models/golem_activity.py:185
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Friday" msgid "Friday"
@ -570,7 +576,7 @@ msgid "Membership Start Date"
msgstr "" msgstr ""
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:174 #: code:addons/golem_activity/models/golem_activity.py:181
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Monday" msgid "Monday"
@ -587,6 +593,11 @@ msgstr ""
msgid "Others" msgid "Others"
msgstr "" msgstr ""
#. module: golem_activity
#: model:ir.model,name:golem_activity.model_res_partner
msgid "Partner"
msgstr ""
#. module: golem_activity #. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_price #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_price
msgid "Price" msgid "Price"
@ -652,12 +663,6 @@ msgstr ""
msgid "Purchase Unit of Measure" msgid "Purchase Unit of Measure"
msgstr "" msgstr ""
#. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_resource_ids
#: model:ir.model.fields,field_description:golem_activity.field_product_product_resource_ids
msgid "Resource ids"
msgstr ""
#. module: golem_activity #. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_description_sale #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_description_sale
msgid "Sale Description" msgid "Sale Description"
@ -669,7 +674,7 @@ msgid "Sale Price"
msgstr "" msgstr ""
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:179 #: code:addons/golem_activity/models/golem_activity.py:186
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Saturday" msgid "Saturday"
@ -722,8 +727,8 @@ msgid "Start date"
msgstr "" msgstr ""
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:153 #: code:addons/golem_activity/models/golem_activity.py:160
#: code:addons/golem_activity/models/golem_activity.py:205 #: code:addons/golem_activity/models/golem_activity.py:212
#, python-format #, python-format
msgid "Start of the period cannot be after end of the period." msgid "Start of the period cannot be after end of the period."
msgstr "" msgstr ""
@ -739,7 +744,7 @@ msgid "Stop time"
msgstr "" msgstr ""
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:180 #: code:addons/golem_activity/models/golem_activity.py:187
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Sunday" msgid "Sunday"
@ -790,7 +795,7 @@ msgid "This field holds the image used as image for the activity."
msgstr "" msgstr ""
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:177 #: code:addons/golem_activity/models/golem_activity.py:184
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Thursday" msgid "Thursday"
@ -807,14 +812,14 @@ msgid "True"
msgstr "" msgstr ""
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:175 #: code:addons/golem_activity/models/golem_activity.py:182
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Tuesday" msgid "Tuesday"
msgstr "" msgstr ""
#. module: golem_activity #. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_type_id_3929 #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_type_id_3987
#: model:ir.ui.view,arch_db:golem_activity.golem_activity_report_template #: model:ir.ui.view,arch_db:golem_activity.golem_activity_report_template
msgid "Type" msgid "Type"
msgstr "" msgstr ""
@ -851,7 +856,7 @@ msgid "Warranty"
msgstr "" msgstr ""
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:176 #: code:addons/golem_activity/models/golem_activity.py:183
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Wednesday" msgid "Wednesday"

8
golem_activity/models/golem_activity.py
View File

@ -221,3 +221,11 @@ class ProductCategory(models.Model):
property_account_income_categ_id = fields.Many2one(required=True) property_account_income_categ_id = fields.Many2one(required=True)
property_account_expense_categ_id = fields.Many2one(required=True) property_account_expense_categ_id = fields.Many2one(required=True)
class ResPartner(models.Model):
""" GOLEM Member partner adaptations """
_inherit = 'res.partner'
animator_activity_ids = fields.One2many('golem.activity', 'animator_id',
string='Animated activities',
auto_join=True)

3
golem_member/__manifest__.py
View File

@ -2,6 +2,7 @@
# Copyright 2016-2018 Fabien Bourgeois <fabien@yaltik.com> # Copyright 2016-2018 Fabien Bourgeois <fabien@yaltik.com>
# Copyright 2018 Michel Dessenne <michel@yaltik.com> # Copyright 2018 Michel Dessenne <michel@yaltik.com>
# Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as # it under the terms of the GNU Affero General Public License as
@ -20,7 +21,7 @@
'name': 'GOLEM non-profit members', 'name': 'GOLEM non-profit members',
'summary': 'Extends Odoo contacts for MJC', 'summary': 'Extends Odoo contacts for MJC',
'description': 'Extends Odoo contacts for MJC', 'description': 'Extends Odoo contacts for MJC',
'version': '10.0.2.4.0', 'version': '10.0.2.5.0',
'category': 'GOLEM', 'category': 'GOLEM',
'author': 'Fabien Bourgeois, Michel Dessenne', 'author': 'Fabien Bourgeois, Michel Dessenne',
'license': 'AGPL-3', 'license': 'AGPL-3',

62
golem_member/i18n/fr.po
View File

@ -6,8 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Odoo Server 10.0\n" "Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-26 15:43+0000\n" "POT-Creation-Date: 2018-11-01 15:15+0000\n"
"PO-Revision-Date: 2018-10-26 17:47+0200\n" "PO-Revision-Date: 2018-11-01 16:21+0100\n"
"Last-Translator: <>\n" "Last-Translator: <>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -55,6 +55,18 @@ msgstr "Adresse"
msgid "Address Type" msgid "Address Type"
msgstr "Type d'adresse" msgstr "Type d'adresse"
#. module: golem_member
#: model:ir.model.fields,field_description:golem_member.field_golem_member_age
#: model:ir.model.fields,field_description:golem_member.field_res_partner_age
#: model:ir.model.fields,field_description:golem_member.field_res_users_age
msgid "Age"
msgstr "Age"
#. module: golem_member
#: model:ir.model.fields,field_description:golem_member.field_golem_member_animator_activity_ids
msgid "Animated activities"
msgstr "Animated activities"
#. module: golem_member #. module: golem_member
#: model:ir.ui.view,arch_db:golem_member.golem_member_numberconfig_form #: model:ir.ui.view,arch_db:golem_member.golem_member_numberconfig_form
msgid "Apply and recompute all member numbers" msgid "Apply and recompute all member numbers"
@ -135,6 +147,11 @@ msgstr "Rebond"
msgid "Buy Membership" msgid "Buy Membership"
msgstr "Payer une adhésion" msgstr "Payer une adhésion"
#. module: golem_member
#: model:ir.ui.view,arch_db:golem_member.l10n_fr_department_filter_inherit_golem_member
msgid "By Area"
msgstr "Par territoire"
#. module: golem_member #. module: golem_member
#: model:ir.ui.view,arch_db:golem_member.golem_member_search #: model:ir.ui.view,arch_db:golem_member.golem_member_search
msgid "By age" msgid "By age"
@ -339,7 +356,7 @@ msgstr "Conditions de Paiement Client"
#. module: golem_member #. module: golem_member
#: model:ir.model.fields,field_description:golem_member.field_golem_member_date #: model:ir.model.fields,field_description:golem_member.field_golem_member_date
msgid "Date" msgid "Date"
msgstr "Date" msgstr "Date "
#. module: golem_member #. module: golem_member
#: model:ir.ui.view,arch_db:golem_member.golem_member_card_template #: model:ir.ui.view,arch_db:golem_member.golem_member_card_template
@ -426,7 +443,7 @@ msgid "Fax"
msgstr "Fax" msgstr "Fax"
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/models/golem_member.py:103 #: code:addons/golem_member/models/golem_member.py:127
#, python-format #, python-format
msgid "Female" msgid "Female"
msgstr "Féminin" msgstr "Féminin"
@ -498,7 +515,7 @@ msgid "GOLEM Members Tags"
msgstr "Catégories d'adhérents" msgstr "Catégories d'adhérents"
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/models/golem_member.py:433 #: code:addons/golem_member/models/golem_member.py:459
#, python-format #, python-format
msgid "GOLEM Members merge has not been implemented yet. Please only merge partners, not members, or delete GOLEM Members manually before merging." 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." 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."
@ -597,6 +614,11 @@ msgstr "Facture"
msgid "Invoices" msgid "Invoices"
msgstr "Factures" msgstr "Factures"
#. module: golem_member
#: model:ir.ui.view,arch_db:golem_member.res_partner_search_inherit_golem_member
msgid "Is Animator"
msgstr "Intervenant"
#. module: golem_member #. module: golem_member
#: model:ir.ui.view,arch_db:golem_member.res_partner_search_inherit_golem_member #: model:ir.ui.view,arch_db:golem_member.res_partner_search_inherit_golem_member
msgid "Is Free Member" msgid "Is Free Member"
@ -732,7 +754,7 @@ msgid "Latest Invoices & Payments Matching Date"
msgstr "Date de dernière correspondance des factures et paiements" msgstr "Date de dernière correspondance des factures et paiements"
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/models/golem_member.py:103 #: code:addons/golem_member/models/golem_member.py:126
#, python-format #, python-format
msgid "Male" msgid "Male"
msgstr "Masculin" msgstr "Masculin"
@ -838,14 +860,20 @@ msgid "Nationality"
msgstr "Nationalité" msgstr "Nationalité"
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/models/golem_member.py:373 #: code:addons/golem_member/models/golem_member.py:399
#: code:addons/golem_member/models/golem_member.py:376 #: code:addons/golem_member/models/golem_member.py:402
#: selection:golem.member.numberconfig,is_automatic:0 #: selection:golem.member.numberconfig,is_automatic:0
#: selection:golem.member.numberconfig,is_per_season:0 #: selection:golem.member.numberconfig,is_per_season:0
#, python-format #, python-format
msgid "No" msgid "No"
msgstr "Non" msgstr "Non"
#. module: golem_member
#: code:addons/golem_member/models/golem_member.py:128
#, python-format
msgid "Not Disclosed"
msgstr "Non communiqué"
#. module: golem_member #. module: golem_member
#: model:ir.model.fields,field_description:golem_member.field_golem_member_comment #: model:ir.model.fields,field_description:golem_member.field_golem_member_comment
msgid "Notes" msgid "Notes"
@ -1202,7 +1230,7 @@ msgid "The name of official registry where this company was declared."
msgstr "Nom de la ville du tribunal de commerce dans laquelle la société est enregistrée." msgstr "Nom de la ville du tribunal de commerce dans laquelle la société est enregistrée."
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/models/golem_member.py:69 #: code:addons/golem_member/models/golem_member.py:71
#, python-format #, python-format
msgid "The parent area is a sub area of the current area, please change it." msgid "The parent area is a sub area of the current area, please change it."
msgstr "Le territoire parent est un sous-territoire du territoire courant, merci de modifier vos saisies." msgstr "Le territoire parent est un sous-territoire du territoire courant, merci de modifier vos saisies."
@ -1243,14 +1271,14 @@ 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." msgstr "Ce champ contient l'image utilisée comme photo d'identité pour ce contact, limitée à 1024x1024px."
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/models/golem_member.py:168 #: code:addons/golem_member/models/golem_member.py:194
#: sql_constraint:golem.member:0 #: sql_constraint:golem.member:0
#, python-format #, python-format
msgid "This member number has already been used." msgid "This member number has already been used."
msgstr "Ce numéro d'adhérent a été déjà utilisé." msgstr "Ce numéro d'adhérent a été déjà utilisé."
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/models/golem_member.py:47 #: code:addons/golem_member/models/golem_member.py:49
#: sql_constraint:golem.partner.area:0 #: sql_constraint:golem.partner.area:0
#, python-format #, python-format
msgid "This patner area has already been used." msgid "This patner area has already been used."
@ -1317,7 +1345,13 @@ msgid "Total amount you have to pay to this vendor."
msgstr "Montant total à payer au fournisseur." msgstr "Montant total à payer au fournisseur."
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/models/golem_member.py:235 #: code:addons/golem_member/models/golem_member.py:103
#, python-format
msgid "Unsupported operator for age search"
msgstr "Opérateur de recherche non supporté pour l'âge"
#. module: golem_member
#: code:addons/golem_member/models/golem_member.py:261
#, python-format #, python-format
msgid "Unsupported operator for defautl season search" msgid "Unsupported operator for defautl season search"
msgstr "Opérateur de recherche non supporté pour le filtre de saison par défaut" msgstr "Opérateur de recherche non supporté pour le filtre de saison par défaut"
@ -1353,8 +1387,8 @@ msgid "Website of Partner or Company"
msgstr "Site Web pour les Partenaires ou les Sociétés" msgstr "Site Web pour les Partenaires ou les Sociétés"
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/models/golem_member.py:373 #: code:addons/golem_member/models/golem_member.py:399
#: code:addons/golem_member/models/golem_member.py:376 #: code:addons/golem_member/models/golem_member.py:402
#: selection:golem.member.numberconfig,is_automatic:0 #: selection:golem.member.numberconfig,is_automatic:0
#: selection:golem.member.numberconfig,is_per_season:0 #: selection:golem.member.numberconfig,is_per_season:0
#, python-format #, python-format

60
golem_member/i18n/golem_member.pot
View File

@ -6,8 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Odoo Server 10.0\n" "Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-26 15:43+0000\n" "POT-Creation-Date: 2018-11-01 15:15+0000\n"
"PO-Revision-Date: 2018-10-26 15:43+0000\n" "PO-Revision-Date: 2018-11-01 15:15+0000\n"
"Last-Translator: <>\n" "Last-Translator: <>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -55,6 +55,18 @@ msgstr ""
msgid "Address Type" msgid "Address Type"
msgstr "" msgstr ""
#. module: golem_member
#: model:ir.model.fields,field_description:golem_member.field_golem_member_age
#: model:ir.model.fields,field_description:golem_member.field_res_partner_age
#: model:ir.model.fields,field_description:golem_member.field_res_users_age
msgid "Age"
msgstr ""
#. module: golem_member
#: model:ir.model.fields,field_description:golem_member.field_golem_member_animator_activity_ids
msgid "Animated activities"
msgstr ""
#. module: golem_member #. module: golem_member
#: model:ir.ui.view,arch_db:golem_member.golem_member_numberconfig_form #: model:ir.ui.view,arch_db:golem_member.golem_member_numberconfig_form
msgid "Apply and recompute all member numbers" msgid "Apply and recompute all member numbers"
@ -135,6 +147,11 @@ msgstr ""
msgid "Buy Membership" msgid "Buy Membership"
msgstr "" msgstr ""
#. module: golem_member
#: model:ir.ui.view,arch_db:golem_member.l10n_fr_department_filter_inherit_golem_member
msgid "By Area"
msgstr ""
#. module: golem_member #. module: golem_member
#: model:ir.ui.view,arch_db:golem_member.golem_member_search #: model:ir.ui.view,arch_db:golem_member.golem_member_search
msgid "By age" msgid "By age"
@ -426,7 +443,7 @@ msgid "Fax"
msgstr "" msgstr ""
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/models/golem_member.py:103 #: code:addons/golem_member/models/golem_member.py:127
#, python-format #, python-format
msgid "Female" msgid "Female"
msgstr "" msgstr ""
@ -498,7 +515,7 @@ msgid "GOLEM Members Tags"
msgstr "" msgstr ""
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/models/golem_member.py:433 #: code:addons/golem_member/models/golem_member.py:459
#, python-format #, python-format
msgid "GOLEM Members merge has not been implemented yet. Please only merge partners, not members, or delete GOLEM Members manually before merging." msgid "GOLEM Members merge has not been implemented yet. Please only merge partners, not members, or delete GOLEM Members manually before merging."
msgstr "" msgstr ""
@ -597,6 +614,11 @@ msgstr ""
msgid "Invoices" msgid "Invoices"
msgstr "" msgstr ""
#. module: golem_member
#: model:ir.ui.view,arch_db:golem_member.res_partner_search_inherit_golem_member
msgid "Is Animator"
msgstr ""
#. module: golem_member #. module: golem_member
#: model:ir.ui.view,arch_db:golem_member.res_partner_search_inherit_golem_member #: model:ir.ui.view,arch_db:golem_member.res_partner_search_inherit_golem_member
msgid "Is Free Member" msgid "Is Free Member"
@ -726,7 +748,7 @@ msgid "Latest Invoices & Payments Matching Date"
msgstr "" msgstr ""
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/models/golem_member.py:103 #: code:addons/golem_member/models/golem_member.py:126
#, python-format #, python-format
msgid "Male" msgid "Male"
msgstr "" msgstr ""
@ -832,14 +854,20 @@ msgid "Nationality"
msgstr "" msgstr ""
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/models/golem_member.py:373 #: code:addons/golem_member/models/golem_member.py:399
#: code:addons/golem_member/models/golem_member.py:376 #: code:addons/golem_member/models/golem_member.py:402
#: selection:golem.member.numberconfig,is_automatic:0 #: selection:golem.member.numberconfig,is_automatic:0
#: selection:golem.member.numberconfig,is_per_season:0 #: selection:golem.member.numberconfig,is_per_season:0
#, python-format #, python-format
msgid "No" msgid "No"
msgstr "" msgstr ""
#. module: golem_member
#: code:addons/golem_member/models/golem_member.py:128
#, python-format
msgid "Not Disclosed"
msgstr ""
#. module: golem_member #. module: golem_member
#: model:ir.model.fields,field_description:golem_member.field_golem_member_comment #: model:ir.model.fields,field_description:golem_member.field_golem_member_comment
msgid "Notes" msgid "Notes"
@ -1194,7 +1222,7 @@ msgid "The name of official registry where this company was declared."
msgstr "" msgstr ""
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/models/golem_member.py:69 #: code:addons/golem_member/models/golem_member.py:71
#, python-format #, python-format
msgid "The parent area is a sub area of the current area, please change it." msgid "The parent area is a sub area of the current area, please change it."
msgstr "" msgstr ""
@ -1235,14 +1263,14 @@ msgid "This field holds the image used as avatar for this contact, limited to 10
msgstr "" msgstr ""
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/models/golem_member.py:168 #: code:addons/golem_member/models/golem_member.py:194
#: sql_constraint:golem.member:0 #: sql_constraint:golem.member:0
#, python-format #, python-format
msgid "This member number has already been used." msgid "This member number has already been used."
msgstr "" msgstr ""
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/models/golem_member.py:47 #: code:addons/golem_member/models/golem_member.py:49
#: sql_constraint:golem.partner.area:0 #: sql_constraint:golem.partner.area:0
#, python-format #, python-format
msgid "This patner area has already been used." msgid "This patner area has already been used."
@ -1309,7 +1337,13 @@ msgid "Total amount you have to pay to this vendor."
msgstr "" msgstr ""
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/models/golem_member.py:235 #: code:addons/golem_member/models/golem_member.py:103
#, python-format
msgid "Unsupported operator for age search"
msgstr ""
#. module: golem_member
#: code:addons/golem_member/models/golem_member.py:261
#, python-format #, python-format
msgid "Unsupported operator for defautl season search" msgid "Unsupported operator for defautl season search"
msgstr "" msgstr ""
@ -1345,8 +1379,8 @@ msgid "Website of Partner or Company"
msgstr "" msgstr ""
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/models/golem_member.py:373 #: code:addons/golem_member/models/golem_member.py:399
#: code:addons/golem_member/models/golem_member.py:376 #: code:addons/golem_member/models/golem_member.py:402
#: selection:golem.member.numberconfig,is_automatic:0 #: selection:golem.member.numberconfig,is_automatic:0
#: selection:golem.member.numberconfig,is_per_season:0 #: selection:golem.member.numberconfig,is_per_season:0
#, python-format #, python-format

30
golem_member/models/golem_member.py
View File

@ -19,6 +19,8 @@
""" GOLEM Members """ """ GOLEM Members """
import logging import logging
from datetime import date, timedelta
from dateutil.relativedelta import relativedelta
from odoo import models, fields, api, _ from odoo import models, fields, api, _
from odoo.exceptions import UserError, ValidationError from odoo.exceptions import UserError, ValidationError
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -85,6 +87,27 @@ class ResPartner(models.Model):
""" GOLEM Member partner adaptations """ """ GOLEM Member partner adaptations """
_inherit = 'res.partner' _inherit = 'res.partner'
age = fields.Integer(compute='_compute_age', search='_search_age')
@api.depends('birthdate_date')
def _compute_age(self):
for contact in self:
if contact.birthdate_date:
age = relativedelta(date.today(),
fields.Date.from_string(contact.birthdate_date))
contact.age = age.years
def _search_age(self, operator, value):
""" Age search function """
if operator != '=':
err = _('Unsupported operator for age search')
raise NotImplementedError(err)
today = date.today()
min_birthdate_date = today - timedelta(days=365.25 * value)
max_birthdate_date = today - timedelta(days=365.25 * (value + 1))
return ['&', ('birthdate_date', '>', max_birthdate_date),
('birthdate_date', '<=', min_birthdate_date)]
@api.model @api.model
def _get_default_nationality_id(self): def _get_default_nationality_id(self):
return self.env.ref('base.main_company').country_id return self.env.ref('base.main_company').country_id
@ -99,8 +122,11 @@ class ResPartner(models.Model):
area_from_street = fields.Boolean(store=False, default=False) area_from_street = fields.Boolean(store=False, default=False)
country_id = fields.Many2one(default=_get_default_nationality_id) country_id = fields.Many2one(default=_get_default_nationality_id)
# Gender overwriting : no need for 'other' choice # Gender overwriting
gender = fields.Selection([('male', _('Male')), ('female', _('Female'))]) gender = fields.Selection([('male', _('Male')),
('female', _('Female')),
('not_disclosed', _('Not Disclosed'))],
default='not_disclosed')
member_id = fields.One2many('golem.member', 'partner_id', 'Service user', member_id = fields.One2many('golem.member', 'partner_id', 'Service user',
readonly=True) readonly=True)

17
golem_member/views/res_partner_views.xml
View File

@ -2,6 +2,7 @@
<!-- <!--
Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com> Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU Affero General Public License as published by
@ -90,6 +91,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="name" position="after"> <field name="name" position="after">
<field name="member_number" /> <field name="member_number" />
<field name="age" />
<field name="area_id" />
</field> </field>
<filter name="filter_my_partners" position="before"> <filter name="filter_my_partners" position="before">
<filter name="is_subscriber" string="Is Subscriber" <filter name="is_subscriber" string="Is Subscriber"
@ -103,10 +106,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<separator /> <separator />
<filter name="is_service_user" string="Is Service User" <filter name="is_service_user" string="Is Service User"
domain="[('member_id', '!=', False)]" /> domain="[('member_id', '!=', False)]" />
<filter name="is_animator" string="Is Animator"
domain="[('animator_activity_ids', '!=', False)]" />
<separator /> <separator />
</filter> </filter>
</field> </field>
</record> </record>
<record model="ir.ui.view" id="l10n_fr_department_filter_inherit_golem_member">
<field name="name">Partner search adaptations</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="l10n_fr_department.view_res_partner_filter" />
<field name="arch" type="xml">
<filter name="department_groupby" position="before">
<filter name="group_area" string="By Area"
context="{'group_by': 'area_id'}" />
</filter>
</field>
</record>
</data> </data>
</odoo> </odoo>