diff --git a/golem_activity/__manifest__.py b/golem_activity/__manifest__.py index 0d2559f..0d6bcf2 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.3.0', + 'version': '10.0.2.3.1', 'category': 'GOLEM', 'author': 'Fabien Bourgeois, Michel Dessenne', 'license': 'AGPL-3', diff --git a/golem_activity/i18n/fr.po b/golem_activity/i18n/fr.po index 952fccf..c4878c1 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-07-17 07:30+0000\n" -"PO-Revision-Date: 2018-07-17 09:32+0200\n" +"POT-Creation-Date: 2018-07-17 08:44+0000\n" +"PO-Revision-Date: 2018-07-17 10:44+0200\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:144 +#: code:addons/golem_activity/models/golem_activity.py:142 #, 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:140 +#: code:addons/golem_activity/models/golem_activity.py:138 #, 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." @@ -260,11 +260,6 @@ msgstr "Peut être loué" msgid "Can be Sold" msgstr "Peut être vendu" -#. module: golem_activity -#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_categ_id -msgid "Categ id" -msgstr "Catégorie" - #. module: golem_activity #: model:ir.ui.menu,name:golem_activity.product_category_menu msgid "Categories" @@ -397,7 +392,7 @@ msgid "Expense Account" msgstr "Compte de dépenses" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:162 +#: code:addons/golem_activity/models/golem_activity.py:160 #: selection:golem.activity,weekday:0 #, python-format msgid "Friday" @@ -475,6 +470,11 @@ msgstr "Image" msgid "Income Account" msgstr "Compte de revenus" +#. module: golem_activity +#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_categ_id +msgid "Internal Category" +msgstr "Catégorie interne" + #. module: golem_activity #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_default_code msgid "Internal Reference" @@ -563,7 +563,7 @@ msgid "Membership Start Date" msgstr "Date de début d'adhésion" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:158 +#: code:addons/golem_activity/models/golem_activity.py:156 #: selection:golem.activity,weekday:0 #, python-format msgid "Monday" @@ -657,7 +657,7 @@ msgid "Sale Price" msgstr "Prix de vente" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:163 +#: code:addons/golem_activity/models/golem_activity.py:161 #: selection:golem.activity,weekday:0 #, python-format msgid "Saturday" @@ -669,9 +669,14 @@ msgid "Season" msgstr "Saison" #. module: golem_activity -#: model:ir.model.fields,help:golem_activity.field_golem_activity_categ_id +#: model:ir.ui.view,arch_db:golem_activity.golem_activity_form msgid "Select category for the current activity" -msgstr "Sélectionnez la catégorie pour l'activité" +msgstr "Select category for the current activity" + +#. module: golem_activity +#: model:ir.model.fields,help:golem_activity.field_golem_activity_categ_id +msgid "Select category for the current product" +msgstr "Sélectionnez la catégorie de l'article actuel" #. module: golem_activity #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_sequence @@ -705,8 +710,8 @@ msgid "Start date" msgstr "Date de début" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:137 -#: code:addons/golem_activity/models/golem_activity.py:180 +#: code:addons/golem_activity/models/golem_activity.py:135 +#: code:addons/golem_activity/models/golem_activity.py:178 #, 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" @@ -722,7 +727,7 @@ msgid "Stop time" msgstr "Heure de fin" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:164 +#: code:addons/golem_activity/models/golem_activity.py:162 #: selection:golem.activity,weekday:0 #, python-format msgid "Sunday" @@ -773,7 +778,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:161 +#: code:addons/golem_activity/models/golem_activity.py:159 #: selection:golem.activity,weekday:0 #, python-format msgid "Thursday" @@ -790,7 +795,7 @@ msgid "True" msgstr "True" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:159 +#: code:addons/golem_activity/models/golem_activity.py:157 #: selection:golem.activity,weekday:0 #, python-format msgid "Tuesday" @@ -828,7 +833,7 @@ msgid "Warranty" msgstr "Garantie" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:160 +#: code:addons/golem_activity/models/golem_activity.py:158 #: 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 3cd0f47..f28604b 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-07-17 07:30+0000\n" -"PO-Revision-Date: 2018-07-17 07:30+0000\n" +"POT-Creation-Date: 2018-07-17 08:44+0000\n" +"PO-Revision-Date: 2018-07-17 08:44+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:144 +#: code:addons/golem_activity/models/golem_activity.py:142 #, 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:140 +#: code:addons/golem_activity/models/golem_activity.py:138 #, python-format msgid "Activity start date can not be set before linked season start." msgstr "" @@ -257,11 +257,6 @@ msgstr "" msgid "Can be Sold" msgstr "" -#. module: golem_activity -#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_categ_id -msgid "Categ id" -msgstr "" - #. module: golem_activity #: model:ir.ui.menu,name:golem_activity.product_category_menu msgid "Categories" @@ -394,7 +389,7 @@ msgid "Expense Account" msgstr "" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:162 +#: code:addons/golem_activity/models/golem_activity.py:160 #: selection:golem.activity,weekday:0 #, python-format msgid "Friday" @@ -472,6 +467,11 @@ msgstr "" msgid "Income Account" msgstr "" +#. module: golem_activity +#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_categ_id +msgid "Internal Category" +msgstr "" + #. module: golem_activity #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_default_code msgid "Internal Reference" @@ -560,7 +560,7 @@ msgid "Membership Start Date" msgstr "" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:158 +#: code:addons/golem_activity/models/golem_activity.py:156 #: selection:golem.activity,weekday:0 #, python-format msgid "Monday" @@ -654,7 +654,7 @@ msgid "Sale Price" msgstr "" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:163 +#: code:addons/golem_activity/models/golem_activity.py:161 #: selection:golem.activity,weekday:0 #, python-format msgid "Saturday" @@ -666,10 +666,15 @@ msgid "Season" msgstr "" #. module: golem_activity -#: model:ir.model.fields,help:golem_activity.field_golem_activity_categ_id +#: model:ir.ui.view,arch_db:golem_activity.golem_activity_form msgid "Select category for the current activity" msgstr "" +#. module: golem_activity +#: model:ir.model.fields,help:golem_activity.field_golem_activity_categ_id +msgid "Select category for the current product" +msgstr "" + #. module: golem_activity #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_sequence msgid "Sequence" @@ -702,8 +707,8 @@ msgid "Start date" msgstr "" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:137 -#: code:addons/golem_activity/models/golem_activity.py:180 +#: code:addons/golem_activity/models/golem_activity.py:135 +#: code:addons/golem_activity/models/golem_activity.py:178 #, python-format msgid "Start of the period cannot be after end of the period." msgstr "" @@ -719,7 +724,7 @@ msgid "Stop time" msgstr "" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:164 +#: code:addons/golem_activity/models/golem_activity.py:162 #: selection:golem.activity,weekday:0 #, python-format msgid "Sunday" @@ -770,7 +775,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:161 +#: code:addons/golem_activity/models/golem_activity.py:159 #: selection:golem.activity,weekday:0 #, python-format msgid "Thursday" @@ -787,7 +792,7 @@ msgid "True" msgstr "" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:159 +#: code:addons/golem_activity/models/golem_activity.py:157 #: selection:golem.activity,weekday:0 #, python-format msgid "Tuesday" @@ -825,7 +830,7 @@ msgid "Warranty" msgstr "" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:160 +#: code:addons/golem_activity/models/golem_activity.py:158 #: 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 75a6b27..8749fb0 100644 --- a/golem_activity/models/golem_activity.py +++ b/golem_activity/models/golem_activity.py @@ -112,8 +112,6 @@ class GolemActivity(models.Model): animator_id = fields.Many2one('res.partner', string='Animator', domain=[('is_company', '=', False)]) - categ_id = fields.Many2one('product.category', - help='Select category for the current activity') type_id = fields.Many2one('golem.activity.type', required=True, index=True, string='Type') is_recurrent = fields.Boolean(related='type_id.is_recurrent') diff --git a/golem_activity/views/golem_activity_views.xml b/golem_activity/views/golem_activity_views.xml index 70b544a..70e3cfb 100644 --- a/golem_activity/views/golem_activity_views.xml +++ b/golem_activity/views/golem_activity_views.xml @@ -45,7 +45,8 @@ along with this program. If not, see . - +