Skip to content

Commit 43e3606

Browse files
author
Pierrick Brun
committed
[FIX] replace categories field by category_ids
1 parent ca32452 commit 43e3606

File tree

3 files changed

+2
-25
lines changed

3 files changed

+2
-25
lines changed

membership_extension/models/res_partner.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,6 @@ class ResPartner(models.Model):
7575
compute="_compute_membership_state",
7676
recursive=True,
7777
)
78-
membership_categories = fields.Char(
79-
string="Membership Categories Labels",
80-
readonly=True,
81-
store=True,
82-
index=True,
83-
compute="_compute_membership_state",
84-
)
8578
membership_state = fields.Selection(
8679
selection=STATE,
8780
store=True,
@@ -198,13 +191,9 @@ def _compute_membership_state(self):
198191
partner.membership_category_ids = [
199192
(6, False, partner.associate_member.membership_category_ids.ids)
200193
]
201-
partner.membership_categories = (
202-
partner.associate_member.membership_categories
203-
)
204194
elif partner.free_member:
205195
partner.membership_state = "free"
206196
partner.membership_category_ids = [(5, False, False)]
207-
partner.membership_categories = False
208197
else:
209198
state = "none"
210199
category_ids = []
@@ -234,10 +223,8 @@ def _compute_membership_state(self):
234223
category_ids = list(set(category_ids))
235224
category_names = list(set(category_names))
236225
partner.membership_category_ids = [(6, False, category_ids)]
237-
partner.membership_categories = ", ".join(category_names)
238226
else:
239227
partner.membership_category_ids = [(5, False, False)]
240-
partner.membership_categories = False
241228

242229
@api.model
243230
def check_membership_expiry(self):

membership_extension/tests/test_membership.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,7 @@ def test_category(self):
199199
}
200200
)
201201
self.assertEqual(self.category_gold, self.partner.membership_category_ids)
202-
self.assertEqual("Gold", self.partner.membership_categories)
203202
self.assertEqual(self.category_gold, self.child.membership_category_ids)
204-
self.assertEqual("Gold", self.child.membership_categories)
205203
line_two = self.env["membership.membership_line"].create(
206204
{
207205
"membership_id": self.silver_product.id,
@@ -217,24 +215,16 @@ def test_category(self):
217215
self.category_gold + self.category_silver,
218216
self.partner.membership_category_ids,
219217
)
220-
self.assertTrue("Silver" in self.partner.membership_categories)
221-
self.assertTrue("Gold" in self.partner.membership_categories)
222218
self.assertEqual(
223219
self.category_gold + self.category_silver,
224220
self.child.membership_category_ids,
225221
)
226-
self.assertTrue("Silver" in self.child.membership_categories)
227-
self.assertTrue("Gold" in self.child.membership_categories)
228222
line_one.write({"state": "canceled"})
229223
self.assertEqual(self.category_silver, self.partner.membership_category_ids)
230-
self.assertEqual("Silver", self.partner.membership_categories)
231224
self.assertEqual(self.category_silver, self.child.membership_category_ids)
232-
self.assertEqual("Silver", self.child.membership_categories)
233225
line_two.write({"state": "waiting"})
234226
self.assertFalse(self.partner.membership_category_ids.ids)
235-
self.assertFalse(self.partner.membership_categories)
236227
self.assertFalse(self.child.membership_category_ids.ids)
237-
self.assertFalse(self.child.membership_categories)
238228

239229
def test_remove_membership_line_with_invoice(self):
240230
invoice_form = common.Form(

membership_extension/views/res_partner_view.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@
111111
/>
112112
<filter
113113
string="Membership Category"
114-
name="membership_categories"
114+
name="membership_category_ids"
115115
domain="[('membership_state', 'in', ['invoiced', 'paid'])]"
116-
context="{'group_by':'membership_categories'}"
116+
context="{'group_by':'membership_category_ids'}"
117117
/>
118118
</xpath>
119119
</field>

0 commit comments

Comments
 (0)