youssef/GOLEM
2
0
Fork 0
forked from Yaltik/golem
Code Issues Pull Requests Releases Wiki Activity

[FIX]GOLEM Activity : categ_id should not had been inherited

Browse Source
This commit is contained in:
Fabien BOURGEOIS 2018-07-17 10:45:04 +02:00
parent c683931250
commit 3fd0b457c3
5 changed files with 52 additions and 43 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.3.0', 'version': '10.0.2.3.1',
'category': 'GOLEM', 'category': 'GOLEM',
'author': 'Fabien Bourgeois, Michel Dessenne', 'author': 'Fabien Bourgeois, Michel Dessenne',
'license': 'AGPL-3', 'license': 'AGPL-3',

45
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-07-17 07:30+0000\n" "POT-Creation-Date: 2018-07-17 08:44+0000\n"
"PO-Revision-Date: 2018-07-17 09:32+0200\n" "PO-Revision-Date: 2018-07-17 10:44+0200\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:144 #: code:addons/golem_activity/models/golem_activity.py:142
#, 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:140 #: code:addons/golem_activity/models/golem_activity.py:138
#, 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."
@ -260,11 +260,6 @@ msgstr "Peut être loué"
msgid "Can be Sold" msgid "Can be Sold"
msgstr "Peut être vendu" 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 #. module: golem_activity
#: model:ir.ui.menu,name:golem_activity.product_category_menu #: model:ir.ui.menu,name:golem_activity.product_category_menu
msgid "Categories" msgid "Categories"
@ -397,7 +392,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:162 #: code:addons/golem_activity/models/golem_activity.py:160
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Friday" msgid "Friday"
@ -475,6 +470,11 @@ msgstr "Image"
msgid "Income Account" msgid "Income Account"
msgstr "Compte de revenus" 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 #. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_default_code #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_default_code
msgid "Internal Reference" msgid "Internal Reference"
@ -563,7 +563,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:158 #: code:addons/golem_activity/models/golem_activity.py:156
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Monday" msgid "Monday"
@ -657,7 +657,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:163 #: code:addons/golem_activity/models/golem_activity.py:161
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Saturday" msgid "Saturday"
@ -669,9 +669,14 @@ msgid "Season"
msgstr "Saison" msgstr "Saison"
#. module: golem_activity #. 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" 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 #. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_sequence #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_sequence
@ -705,8 +710,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:137 #: code:addons/golem_activity/models/golem_activity.py:135
#: code:addons/golem_activity/models/golem_activity.py:180 #: code:addons/golem_activity/models/golem_activity.py:178
#, 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"
@ -722,7 +727,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:164 #: code:addons/golem_activity/models/golem_activity.py:162
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Sunday" 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." 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:161 #: code:addons/golem_activity/models/golem_activity.py:159
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Thursday" msgid "Thursday"
@ -790,7 +795,7 @@ msgid "True"
msgstr "True" msgstr "True"
#. module: golem_activity #. 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 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Tuesday" msgid "Tuesday"
@ -828,7 +833,7 @@ msgid "Warranty"
msgstr "Garantie" msgstr "Garantie"
#. module: golem_activity #. 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 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Wednesday" msgid "Wednesday"

43
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-07-17 07:30+0000\n" "POT-Creation-Date: 2018-07-17 08:44+0000\n"
"PO-Revision-Date: 2018-07-17 07:30+0000\n" "PO-Revision-Date: 2018-07-17 08:44+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:144 #: code:addons/golem_activity/models/golem_activity.py:142
#, 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:140 #: code:addons/golem_activity/models/golem_activity.py:138
#, 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 ""
@ -257,11 +257,6 @@ msgstr ""
msgid "Can be Sold" msgid "Can be Sold"
msgstr "" msgstr ""
#. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_categ_id
msgid "Categ id"
msgstr ""
#. module: golem_activity #. module: golem_activity
#: model:ir.ui.menu,name:golem_activity.product_category_menu #: model:ir.ui.menu,name:golem_activity.product_category_menu
msgid "Categories" msgid "Categories"
@ -394,7 +389,7 @@ msgid "Expense Account"
msgstr "" msgstr ""
#. module: golem_activity #. 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 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Friday" msgid "Friday"
@ -472,6 +467,11 @@ msgstr ""
msgid "Income Account" msgid "Income Account"
msgstr "" msgstr ""
#. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_categ_id
msgid "Internal Category"
msgstr ""
#. module: golem_activity #. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_default_code #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_default_code
msgid "Internal Reference" msgid "Internal Reference"
@ -560,7 +560,7 @@ msgid "Membership Start Date"
msgstr "" msgstr ""
#. module: golem_activity #. 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 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Monday" msgid "Monday"
@ -654,7 +654,7 @@ msgid "Sale Price"
msgstr "" msgstr ""
#. module: golem_activity #. 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 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Saturday" msgid "Saturday"
@ -666,10 +666,15 @@ msgid "Season"
msgstr "" msgstr ""
#. module: golem_activity #. 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" msgid "Select category for the current activity"
msgstr "" 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 #. module: golem_activity
#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_sequence #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_sequence
msgid "Sequence" msgid "Sequence"
@ -702,8 +707,8 @@ msgid "Start date"
msgstr "" msgstr ""
#. module: golem_activity #. module: golem_activity
#: code:addons/golem_activity/models/golem_activity.py:137 #: code:addons/golem_activity/models/golem_activity.py:135
#: code:addons/golem_activity/models/golem_activity.py:180 #: code:addons/golem_activity/models/golem_activity.py:178
#, 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 ""
@ -719,7 +724,7 @@ msgid "Stop time"
msgstr "" msgstr ""
#. module: golem_activity #. 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 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Sunday" msgid "Sunday"
@ -770,7 +775,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:161 #: code:addons/golem_activity/models/golem_activity.py:159
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Thursday" msgid "Thursday"
@ -787,7 +792,7 @@ msgid "True"
msgstr "" msgstr ""
#. module: golem_activity #. 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 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Tuesday" msgid "Tuesday"
@ -825,7 +830,7 @@ msgid "Warranty"
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:158
#: selection:golem.activity,weekday:0 #: selection:golem.activity,weekday:0
#, python-format #, python-format
msgid "Wednesday" msgid "Wednesday"

2
golem_activity/models/golem_activity.py
View File

@ -112,8 +112,6 @@ class GolemActivity(models.Model):
animator_id = fields.Many2one('res.partner', string='Animator', animator_id = fields.Many2one('res.partner', string='Animator',
domain=[('is_company', '=', False)]) 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, type_id = fields.Many2one('golem.activity.type', required=True, index=True,
string='Type') string='Type')
is_recurrent = fields.Boolean(related='type_id.is_recurrent') is_recurrent = fields.Boolean(related='type_id.is_recurrent')

3
golem_activity/views/golem_activity_views.xml
View File

@ -45,7 +45,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name="audience_id" /> <field name="audience_id" />
</group> </group>
<group> <group>
<field name="categ_id" required="True" /> <field name="categ_id" required="True"
help="Select category for the current activity" />
<field name="default_code" /> <field name="default_code" />
<field name="list_price" /> <field name="list_price" />
</group> </group>