diff --git a/golem_season/__manifest__.py b/golem_season/__manifest__.py
index cd0726e..47c72f9 100644
--- a/golem_season/__manifest__.py
+++ b/golem_season/__manifest__.py
@@ -22,7 +22,7 @@
- add season with name and period ;
- choose on per default season ;
- link optionnally one or many memberships types''',
- 'version': '10.0.1.1.0',
+ 'version': '10.0.1.1.1',
'category': 'GOLEM',
'author': 'Fabien Bourgeois',
'license': 'AGPL-3',
diff --git a/golem_season/i18n/fr.po b/golem_season/i18n/fr.po
index 9fdc5f9..6cb9ee9 100644
--- a/golem_season/i18n/fr.po
+++ b/golem_season/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-02-28 07:38+0000\n"
-"PO-Revision-Date: 2018-02-28 07:38+0000\n"
+"POT-Creation-Date: 2018-03-06 07:14+0000\n"
+"PO-Revision-Date: 2018-03-06 07:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -94,8 +94,8 @@ msgid "Last Updated on"
msgstr "Dernière mise à jour le"
#. module: golem_season
-#: model:ir.model.fields,field_description:golem_season.field_product_product_season_id
-#: model:ir.model.fields,field_description:golem_season.field_product_template_season_id
+#: model:ir.model.fields,field_description:golem_season.field_product_product_membership_season_id
+#: model:ir.model.fields,field_description:golem_season.field_product_template_membership_season_id
msgid "Linked season"
msgstr "Saison liée"
diff --git a/golem_season/i18n/golem_season.pot b/golem_season/i18n/golem_season.pot
index 4ca194b..114008a 100644
--- a/golem_season/i18n/golem_season.pot
+++ b/golem_season/i18n/golem_season.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-28 07:38+0000\n"
-"PO-Revision-Date: 2018-02-28 07:38+0000\n"
+"POT-Creation-Date: 2018-03-06 07:14+0000\n"
+"PO-Revision-Date: 2018-03-06 07:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -94,8 +94,8 @@ msgid "Last Updated on"
msgstr ""
#. module: golem_season
-#: model:ir.model.fields,field_description:golem_season.field_product_product_season_id
-#: model:ir.model.fields,field_description:golem_season.field_product_template_season_id
+#: model:ir.model.fields,field_description:golem_season.field_product_product_membership_season_id
+#: model:ir.model.fields,field_description:golem_season.field_product_template_membership_season_id
msgid "Linked season"
msgstr ""
diff --git a/golem_season/models/golem_season.py b/golem_season/models/golem_season.py
index 3120d60..d1b0ece 100644
--- a/golem_season/models/golem_season.py
+++ b/golem_season/models/golem_season.py
@@ -28,7 +28,7 @@ class GolemSeason(models.Model):
_('This season name has already been used.'))]
name = fields.Char('Season name', copy=False, required=True)
- membership_ids = fields.One2many('product.template', 'season_id',
+ membership_ids = fields.One2many('product.template', 'membership_season_id',
string='Membership types',
domain=[('membership', '=', True)])
member_counter = fields.Integer('Counter for member number generation',
diff --git a/golem_season/models/product_template.py b/golem_season/models/product_template.py
index 9f949f6..163bc45 100644
--- a/golem_season/models/product_template.py
+++ b/golem_season/models/product_template.py
@@ -23,15 +23,15 @@ class ProductTemplate(models.Model):
""" Product Template adaptations """
_inherit = 'product.template'
- season_id = fields.Many2one('golem.season', 'Linked season', index=True)
+ membership_season_id = fields.Many2one('golem.season', 'Linked season', index=True)
- @api.onchange('season_id')
+ @api.onchange('membership_season_id')
def onchange_season(self):
""" Adapts period to selected season if needed """
for product in self:
- if product.membership and product.season_id \
+ if product.membership and product.membership_season_id \
and not product.membership_date_from:
product.update({
- 'membership_date_from': product.season_id.date_start,
- 'membership_date_to': product.season_id.date_end
+ 'membership_date_from': product.membership_season_id.date_start,
+ 'membership_date_to': product.membership_season_id.date_end
})
diff --git a/golem_season/views/membership_views.xml b/golem_season/views/membership_views.xml
index 551f268..f800c48 100644
--- a/golem_season/views/membership_views.xml
+++ b/golem_season/views/membership_views.xml
@@ -28,7 +28,7 @@ along with this program. If not, see .
-
+
@@ -41,11 +41,11 @@ along with this program. If not, see .
-
+
+ context="{'group_by': 'membership_season_id'}" />