diff --git a/golem_activity/__manifest__.py b/golem_activity/__manifest__.py
index 7c9992b..2fef29e 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.4.0',
+ 'version': '10.0.2.4.1',
'category': 'GOLEM',
'author': 'Fabien Bourgeois, Michel Dessenne',
'license': 'AGPL-3',
diff --git a/golem_activity/report/golem_activity_report_templates.xml b/golem_activity/report/golem_activity_report_templates.xml
index be6a65e..f548af5 100644
--- a/golem_activity/report/golem_activity_report_templates.xml
+++ b/golem_activity/report/golem_activity_report_templates.xml
@@ -33,7 +33,7 @@ along with this program. If not, see .
-
+
diff --git a/golem_activity_registration/__manifest__.py b/golem_activity_registration/__manifest__.py
index 4abec69..ed21178 100644
--- a/golem_activity_registration/__manifest__.py
+++ b/golem_activity_registration/__manifest__.py
@@ -18,7 +18,7 @@
{
'name': 'GOLEM Activity Member Registrations',
'summary': 'GOLEM Activities Member Registrations management',
- 'version': '10.0.1.3.0',
+ 'version': '10.0.1.3.1',
'category': 'GOLEM',
'author': 'Fabien Bourgeois, Michel Dessenne',
'license': 'AGPL-3',
diff --git a/golem_activity_registration/report/golem_member_card_templates.xml b/golem_activity_registration/report/golem_member_card_templates.xml
index 4fa873b..6751057 100644
--- a/golem_activity_registration/report/golem_member_card_templates.xml
+++ b/golem_activity_registration/report/golem_member_card_templates.xml
@@ -22,7 +22,7 @@ along with this program. If not, see .
-
+
Activities
diff --git a/golem_activity_registration/views/golem_member_views.xml b/golem_activity_registration/views/golem_member_views.xml
index 0efc998..3ee23f1 100644
--- a/golem_activity_registration/views/golem_member_views.xml
+++ b/golem_activity_registration/views/golem_member_views.xml
@@ -25,7 +25,7 @@ along with this program. If not, see .
golem.member
-
+
diff --git a/golem_family/__manifest__.py b/golem_family/__manifest__.py
index 881e84a..f74e80a 100644
--- a/golem_family/__manifest__.py
+++ b/golem_family/__manifest__.py
@@ -19,7 +19,7 @@
'name': 'GOLEM families',
'summary': 'GOLEM Members Families',
'description': 'GOLEM Members Families',
- 'version': '10.0.2.2.1',
+ 'version': '10.0.2.2.2',
'category': 'GOLEM',
'author': 'Fabien Bourgeois',
'license': 'AGPL-3',
diff --git a/golem_family/views/golem_member_views.xml b/golem_family/views/golem_member_views.xml
index 3ea3cf2..2f62c97 100644
--- a/golem_family/views/golem_member_views.xml
+++ b/golem_family/views/golem_member_views.xml
@@ -38,7 +38,7 @@ along with this program. If not, see .
-
+
diff --git a/golem_member/__manifest__.py b/golem_member/__manifest__.py
index e8bc30d..9e9828f 100644
--- a/golem_member/__manifest__.py
+++ b/golem_member/__manifest__.py
@@ -20,14 +20,14 @@
'name': 'GOLEM non-profit members',
'summary': 'Extends Odoo contacts for MJC',
'description': 'Extends Odoo contacts for MJC',
- 'version': '10.0.1.3.0',
+ 'version': '10.0.2.0.0',
'category': 'GOLEM',
'author': 'Fabien Bourgeois, Michel Dessenne',
'license': 'AGPL-3',
'application': True,
'installable': True,
- 'depends': ['golem_base', 'golem_activity', 'golem_season',
- 'odoo_partner_merge'],
+ 'depends': ['golem_base', 'golem_membership', 'golem_activity',
+ 'golem_season', 'odoo_partner_merge'],
'data': ['views/golem_member_views.xml',
'views/res_partner_views.xml',
'views/golem_member_numberconfig_views.xml',
diff --git a/golem_member/models/golem_member.py b/golem_member/models/golem_member.py
index 6c2faeb..5e74653 100644
--- a/golem_member/models/golem_member.py
+++ b/golem_member/models/golem_member.py
@@ -130,7 +130,7 @@ class GolemMember(models.Model):
@api.depends('season_ids')
def _compute_is_default(self):
""" Computes is current according to seasons """
- default_s = self._default_season()
+ default_s = self.default_season()
for member in self:
member.is_default = default_s in member.season_ids
diff --git a/golem_member/report/golem_member_card_templates.xml b/golem_member/report/golem_member_card_templates.xml
index 2d353d9..7230fc1 100644
--- a/golem_member/report/golem_member_card_templates.xml
+++ b/golem_member/report/golem_member_card_templates.xml
@@ -33,7 +33,7 @@ along with this program. If not, see .
-
+
@@ -57,6 +57,45 @@ along with this program. If not, see .
+
+
+
+
Memberships
+
+
+
+
+
+
Registration
+
Registration date
+
Date from
+
Date to
+
State
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/golem_member/tests/test_golem_member.py b/golem_member/tests/test_golem_member.py
index aa4a336..4bb991a 100644
--- a/golem_member/tests/test_golem_member.py
+++ b/golem_member/tests/test_golem_member.py
@@ -49,7 +49,7 @@ class GolemMemberTestCase(TransactionCase):
def test_default_season(self):
""" Test if default season if fixed according to setUp and if users
are correctly seen """
- self.assertEqual(self.member_model._default_season(),
+ self.assertEqual(self.member_model.default_season(),
self.season_current)
self.assertTrue(self.member1.is_default)
self.assertTrue(self.member2.is_default)
diff --git a/golem_member/views/golem_member_views.xml b/golem_member/views/golem_member_views.xml
index 89adbff..79e5df8 100644
--- a/golem_member/views/golem_member_views.xml
+++ b/golem_member/views/golem_member_views.xml
@@ -19,6 +19,24 @@ along with this program. If not, see .
+
+
+
+
+
+ Join Membership
+ golem.membership.invoice
+ golem.member
+ form
+ tree,form
+
+ new
+
+
GOLEM Member Form
@@ -98,6 +116,50 @@ along with this program. If not, see .
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -219,6 +281,11 @@ along with this program. If not, see .
+
+
+
@@ -242,14 +309,6 @@ along with this program. If not, see .
-
-
-
-
diff --git a/golem_membership/__manifest__.py b/golem_membership/__manifest__.py
index a2ecf85..e810f8d 100644
--- a/golem_membership/__manifest__.py
+++ b/golem_membership/__manifest__.py
@@ -18,15 +18,13 @@
{
'name': 'GOLEM non-profit membership handling',
'summary': 'Extends Odoo membership',
- 'version': '10.0.1.1.4',
+ 'version': '10.0.2.0.0',
'category': 'GOLEM',
'author': 'Fabien Bourgeois, Michel Dessenne',
'license': 'AGPL-3',
'application': False,
'installable': True,
- 'depends': ['golem_member', 'account', 'decimal_precision'],
+ 'depends': ['account', 'decimal_precision'],
'data': ['data/account_data.xml',
- 'views/golem_membership_invoice.xml',
- 'views/golem_member_view.xml',
- 'report/golem_member_card_templates.xml']
+ 'views/golem_membership_invoice.xml']
}
diff --git a/golem_membership/migrations/10.0.2.0.0/pre-migrate.py b/golem_membership/migrations/10.0.2.0.0/pre-migrate.py
new file mode 100644
index 0000000..2a229f7
--- /dev/null
+++ b/golem_membership/migrations/10.0.2.0.0/pre-migrate.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2018 Fabien Bourgeois
+#
+# 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 the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+
+""" Migration script """
+
+from openupgradelib import openupgrade
+
+@openupgrade.migrate(use_env=False)
+def migrate(cursor, version):
+ """ Clean up olders views references """
+ cursor.execute('''
+ DELETE FROM ir_ui_view WHERE key IN
+ ('golem_membership.golem_member_card_template_inherit_golem_membership',
+ 'golem_membership.golem_member_form_inherit_golem_membership',
+ 'golem_membership.golem_member_search_inherit_golem_membership')
+ ''')
diff --git a/golem_membership/report/golem_member_card_templates.xml b/golem_membership/report/golem_member_card_templates.xml
deleted file mode 100644
index 7f8cab7..0000000
--- a/golem_membership/report/golem_member_card_templates.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
-
-
-
-
-
-