From 9390ad88ceda3ab162f7af8615cd9307317dbab7 Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Thu, 1 Nov 2018 16:18:18 +0100 Subject: [PATCH] [REF]GOLEM Activity : add o2m animated activities --- golem_activity/__manifest__.py | 5 +-- golem_activity/i18n/fr.po | 47 ++++++++++++---------- golem_activity/i18n/golem_activity.pot | 47 ++++++++++++---------- golem_activity/models/golem_activity.py | 11 ++--- golem_activity/views/res_partner_views.xml | 38 ----------------- 5 files changed, 57 insertions(+), 91 deletions(-) delete mode 100644 golem_activity/views/res_partner_views.xml diff --git a/golem_activity/__manifest__.py b/golem_activity/__manifest__.py index 18b54af..5cc07e0 100644 --- a/golem_activity/__manifest__.py +++ b/golem_activity/__manifest__.py @@ -19,7 +19,7 @@ 'name': 'GOLEM activities', 'summary': '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', 'author': 'Fabien Bourgeois, Michel Dessenne', 'license': 'AGPL-3', @@ -29,6 +29,5 @@ 'data': ['security/ir.model.access.csv', 'data/golem_activity_data.xml', 'views/golem_activity_views.xml', - 'report/golem_activity_report_templates.xml', - 'views/res_partner_views.xml'] + 'report/golem_activity_report_templates.xml'] } diff --git a/golem_activity/i18n/fr.po b/golem_activity/i18n/fr.po index 1962476..0d8c5aa 100644 --- a/golem_activity/i18n/fr.po +++ b/golem_activity/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-08-09 13:33+0000\n" -"PO-Revision-Date: 2018-08-09 15:47+0200\n" +"POT-Creation-Date: 2018-11-01 15:16+0000\n" +"PO-Revision-Date: 2018-11-01 16:17+0100\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -173,13 +173,13 @@ msgid "Activity audience" msgstr "Public" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:160 +#: code:addons/golem_activity/models/golem_activity.py:167 #, python-format 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." #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:156 +#: code:addons/golem_activity/models/golem_activity.py:163 #, python-format 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." @@ -194,6 +194,12 @@ msgstr "Type d'activité" msgid "Adults" 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 #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_animator_id msgid "Animator" @@ -205,7 +211,7 @@ msgid "Arts martiaux" msgstr "Arts martiaux" #. 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" msgstr "Public" @@ -392,7 +398,7 @@ msgid "Expense Account" msgstr "Compte de dépenses" #. 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 #, python-format msgid "Friday" @@ -573,7 +579,7 @@ msgid "Membership Start Date" msgstr "Date de début d'adhésion" #. 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 #, python-format msgid "Monday" @@ -590,6 +596,11 @@ msgstr "Nom" msgid "Others" msgstr "Autres" +#. module: golem_activity +#: model:ir.model,name:golem_activity.model_res_partner +msgid "Partner" +msgstr "Partenaire" + #. module: golem_activity #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_price msgid "Price" @@ -655,12 +666,6 @@ msgstr "Description achat" msgid "Purchase Unit of Measure" 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 #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_description_sale msgid "Sale Description" @@ -672,7 +677,7 @@ msgid "Sale Price" msgstr "Prix de vente" #. 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 #, python-format msgid "Saturday" @@ -725,8 +730,8 @@ msgid "Start date" msgstr "Date de début" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:153 -#: code:addons/golem_activity/models/golem_activity.py:205 +#: code:addons/golem_activity/models/golem_activity.py:160 +#: code:addons/golem_activity/models/golem_activity.py:212 #, python-format 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" @@ -742,7 +747,7 @@ msgid "Stop time" msgstr "Heure de fin" #. 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 #, python-format 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." #. 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 #, python-format msgid "Thursday" @@ -810,14 +815,14 @@ msgid "True" msgstr "True" #. 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 #, python-format msgid "Tuesday" msgstr "Mardi" #. 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 msgid "Type" msgstr "Type" @@ -854,7 +859,7 @@ msgid "Warranty" msgstr "Garantie" #. 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 #, python-format msgid "Wednesday" diff --git a/golem_activity/i18n/golem_activity.pot b/golem_activity/i18n/golem_activity.pot index 1e08d29..ef9634c 100644 --- a/golem_activity/i18n/golem_activity.pot +++ b/golem_activity/i18n/golem_activity.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-09 13:33+0000\n" -"PO-Revision-Date: 2018-08-09 13:33+0000\n" +"POT-Creation-Date: 2018-11-01 15:16+0000\n" +"PO-Revision-Date: 2018-11-01 15:16+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -170,13 +170,13 @@ msgid "Activity audience" msgstr "" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:160 +#: code:addons/golem_activity/models/golem_activity.py:167 #, python-format msgid "Activity end date can not be set after linked season end." msgstr "" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:156 +#: code:addons/golem_activity/models/golem_activity.py:163 #, python-format msgid "Activity start date can not be set before linked season start." msgstr "" @@ -191,6 +191,12 @@ msgstr "" msgid "Adults" 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 #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_animator_id msgid "Animator" @@ -202,7 +208,7 @@ msgid "Arts martiaux" msgstr "" #. 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" msgstr "" @@ -389,7 +395,7 @@ msgid "Expense Account" msgstr "" #. 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 #, python-format msgid "Friday" @@ -570,7 +576,7 @@ msgid "Membership Start Date" msgstr "" #. 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 #, python-format msgid "Monday" @@ -587,6 +593,11 @@ msgstr "" msgid "Others" msgstr "" +#. module: golem_activity +#: model:ir.model,name:golem_activity.model_res_partner +msgid "Partner" +msgstr "" + #. module: golem_activity #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_price msgid "Price" @@ -652,12 +663,6 @@ msgstr "" msgid "Purchase Unit of Measure" 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 #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_description_sale msgid "Sale Description" @@ -669,7 +674,7 @@ msgid "Sale Price" msgstr "" #. 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 #, python-format msgid "Saturday" @@ -722,8 +727,8 @@ msgid "Start date" msgstr "" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:153 -#: code:addons/golem_activity/models/golem_activity.py:205 +#: code:addons/golem_activity/models/golem_activity.py:160 +#: code:addons/golem_activity/models/golem_activity.py:212 #, python-format msgid "Start of the period cannot be after end of the period." msgstr "" @@ -739,7 +744,7 @@ msgid "Stop time" msgstr "" #. 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 #, python-format msgid "Sunday" @@ -790,7 +795,7 @@ msgid "This field holds the image used as image for the activity." msgstr "" #. 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 #, python-format msgid "Thursday" @@ -807,14 +812,14 @@ msgid "True" msgstr "" #. 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 #, python-format msgid "Tuesday" msgstr "" #. 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 msgid "Type" msgstr "" @@ -851,7 +856,7 @@ msgid "Warranty" msgstr "" #. 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 #, python-format msgid "Wednesday" diff --git a/golem_activity/models/golem_activity.py b/golem_activity/models/golem_activity.py index e00fcd3..fa5407f 100644 --- a/golem_activity/models/golem_activity.py +++ b/golem_activity/models/golem_activity.py @@ -136,13 +136,6 @@ class GolemActivity(models.Model): date_start = fields.Date('Start date', copy=False) date_stop = fields.Date('End date', copy=False) - @api.constrains('animator_id') - def save_activity_id(self): - """ Saving Activity in animator_id """ - for activity in self: - activity.animator_id.activity_id = activity - - @api.onchange('date_start') def _onchange_date_start(self): """ Sets end date to start date if no start date """ @@ -233,4 +226,6 @@ class ResPartner(models.Model): """ GOLEM Member partner adaptations """ _inherit = 'res.partner' - activity_id = fields.Many2one('golem.activity', ondelete='set null') + animator_activity_ids = fields.One2many('golem.activity', 'animator_id', + string='Animated activities', + auto_join=True) diff --git a/golem_activity/views/res_partner_views.xml b/golem_activity/views/res_partner_views.xml deleted file mode 100644 index 68d3b11..0000000 --- a/golem_activity/views/res_partner_views.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - Partner GOLEM Activity improvement - res.partner - - - - - - - - - -