Skip to content

Commit 99de351

Browse files
nihelgabsi-acsoneCRogos
authored andcommitted
[MIG] partner_event: Migration to 19.0
1 parent ca5463a commit 99de351

6 files changed

Lines changed: 13 additions & 79 deletions

File tree

partner_event/README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ Link partner to events
2121
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
2222
:alt: License: AGPL-3
2323
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fevent-lightgray.png?logo=github
24-
:target: https://github.com/OCA/event/tree/18.0/partner_event
24+
:target: https://github.com/OCA/event/tree/19.0/partner_event
2525
:alt: OCA/event
2626
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
27-
:target: https://translation.odoo-community.org/projects/event-18-0/event-18-0-partner_event
27+
:target: https://translation.odoo-community.org/projects/event-19-0/event-19-0-partner_event
2828
:alt: Translate me on Weblate
2929
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
30-
:target: https://runboat.odoo-community.org/builds?repo=OCA/event&target_branch=18.0
30+
:target: https://runboat.odoo-community.org/builds?repo=OCA/event&target_branch=19.0
3131
:alt: Try me on Runboat
3232

3333
|badge1| |badge2| |badge3| |badge4| |badge5|
@@ -74,7 +74,7 @@ Bug Tracker
7474
Bugs are tracked on `GitHub Issues <https://github.com/OCA/event/issues>`_.
7575
In case of trouble, please check there if your issue has already been reported.
7676
If you spotted it first, help us to smash it by providing a detailed and welcomed
77-
`feedback <https://github.com/OCA/event/issues/new?body=module:%20partner_event%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
77+
`feedback <https://github.com/OCA/event/issues/new?body=module:%20partner_event%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
7878

7979
Do not contact contributors directly about support or help with technical issues.
8080

@@ -124,6 +124,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
124124
mission is to support the collaborative development of Odoo features and
125125
promote its widespread use.
126126

127-
This module is part of the `OCA/event <https://github.com/OCA/event/tree/18.0/partner_event>`_ project on GitHub.
127+
This module is part of the `OCA/event <https://github.com/OCA/event/tree/19.0/partner_event>`_ project on GitHub.
128128

129129
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

partner_event/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
{
1313
"name": "Link partner to events",
14-
"version": "18.0.1.0.0",
14+
"version": "19.0.1.0.0",
1515
"category": "Marketing",
1616
"author": "Tecnativa,Odoo Community Association (OCA)",
1717
"website": "https://github.com/OCA/event",

partner_event/hooks.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
def post_init_hook(env):
66
"""Preload proper attendee partner for existing registrations using
77
the same rules the module does"""
8-
attendees_emails = env["event.registration"].read_group(
9-
[("email", "!=", False)], ["email"], groupby="email"
8+
attendees_emails = env["event.registration"].formatted_read_group(
9+
domain=[("email", "!=", False)], groupby=["email"]
1010
)
1111
for email in attendees_emails:
1212
# Order was done for avoiding extra queries for sorting the results
1313
attendee_partner = env["res.partner"].search(
1414
[("email", "=ilike", email["email"])], limit=1, order="id"
1515
)
1616
if attendee_partner:
17-
attendees = env["event.registration"].search(email["__domain"])
17+
attendees = env["event.registration"].search(email["__extra_domain"])
1818
attendees.write({"attendee_partner_id": attendee_partner.id})

partner_event/models/event_registration.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def partner_data_update(self, data):
9494
if reg_data:
9595
# Only update registration data if this event is not old
9696
registrations = self.filtered(
97-
lambda x: x.event_end_date >= fields.Datetime.now()
97+
lambda x: x.event_id.date_end >= fields.Datetime.now()
9898
)
9999
registrations.write(reg_data)
100100

@@ -112,13 +112,5 @@ def _onchange_partner_id(self):
112112
vals = registration._synchronize_partner_values(
113113
registration.partner_id
114114
)
115-
# On Odoo 19.0 "mobile" field is removed
116-
# https://github.com/odoo/odoo/pull/189739
117-
# so this should not be ported to 19.0+
118-
if "mobile" not in registration._fields and "mobile" in vals:
119-
mobile = vals.pop("mobile")
120-
phone = vals.get("phone") or mobile
121-
if phone:
122-
vals["phone"] = phone
123115
registration.update(vals)
124116
return {}

partner_event/static/description/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ <h1>Link partner to events</h1>
374374
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
375375
!! source digest: sha256:23c386ee6a1368b2996b3a08ee30b9f0bd78971c8b980dfa889c4635a2db9b86
376376
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
377-
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/event/tree/18.0/partner_event"><img alt="OCA/event" src="https://img.shields.io/badge/github-OCA%2Fevent-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/event-18-0/event-18-0-partner_event"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/event&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
377+
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/event/tree/19.0/partner_event"><img alt="OCA/event" src="https://img.shields.io/badge/github-OCA%2Fevent-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/event-19-0/event-19-0-partner_event"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/event&amp;target_branch=19.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
378378
<p>This module links partners with the events they are registered through a
379379
smart button.</p>
380380
<p>It also includes:</p>
@@ -420,7 +420,7 @@ <h2><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h2>
420420
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/event/issues">GitHub Issues</a>.
421421
In case of trouble, please check there if your issue has already been reported.
422422
If you spotted it first, help us to smash it by providing a detailed and welcomed
423-
<a class="reference external" href="https://github.com/OCA/event/issues/new?body=module:%20partner_event%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
423+
<a class="reference external" href="https://github.com/OCA/event/issues/new?body=module:%20partner_event%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
424424
<p>Do not contact contributors directly about support or help with technical issues.</p>
425425
</div>
426426
<div class="section" id="credits">
@@ -467,7 +467,7 @@ <h3><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h3>
467467
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
468468
mission is to support the collaborative development of Odoo features and
469469
promote its widespread use.</p>
470-
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/event/tree/18.0/partner_event">OCA/event</a> project on GitHub.</p>
470+
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/event/tree/19.0/partner_event">OCA/event</a> project on GitHub.</p>
471471
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
472472
</div>
473473
</div>

partner_event/tests/test_event_registration.py

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from psycopg2 import IntegrityError
1212

1313
from odoo import fields
14-
from odoo.tests import Form
1514
from odoo.tools import mute_logger
1615

1716
from odoo.addons.base.tests.common import BaseCommon
@@ -54,26 +53,6 @@ def setUpClass(cls):
5453
}
5554
)
5655

57-
# On Odoo 19.0 "mobile" field is removed
58-
# https://github.com/odoo/odoo/pull/189739
59-
# so these example and related tests
60-
# should not be ported to 19.0+
61-
cls.partner_with_mobile = partner_model.create(
62-
{
63-
"name": "Test Partner with mobile",
64-
"email": "email_with_mobile@test.com",
65-
"mobile": "+1254728912",
66-
}
67-
)
68-
cls.partner_with_phone_and_mobile = partner_model.create(
69-
{
70-
"name": "Test Partner with mobile and phone",
71-
"email": "email_with_mobile_and_phone@test.com",
72-
"phone": "254728913",
73-
"mobile": "+1254728913",
74-
}
75-
)
76-
7756
def test_create(self):
7857
self.assertEqual(self.partner_01.name, self.registration_01.name)
7958
self.assertEqual(self.partner_01.email, self.registration_01.email)
@@ -132,40 +111,3 @@ def test_delete_registered_partner(self):
132111
partner3 = self.env["res.partner"].create({"name": "unregistered partner"})
133112
partner3.unlink()
134113
self.assertFalse(partner3.exists())
135-
136-
def test_partner_only_mobile(self):
137-
reg_form = Form(self.env["event.registration"])
138-
reg_form.event_id = self.event_0
139-
reg_form.attendee_partner_id = self.partner_with_mobile
140-
reg = reg_form.save()
141-
self.assertEqual(reg.partner_id, self.partner_with_mobile)
142-
self.assertEqual(reg.phone, self.partner_with_mobile.mobile)
143-
144-
def test_partner_mobile_and_phone(self):
145-
reg_form = Form(self.env["event.registration"])
146-
reg_form.event_id = self.event_0
147-
reg_form.attendee_partner_id = self.partner_with_phone_and_mobile
148-
reg = reg_form.save()
149-
self.assertEqual(reg.phone, self.partner_with_phone_and_mobile.phone)
150-
self.assertNotEqual(
151-
reg.phone,
152-
self.partner_with_phone_and_mobile.mobile,
153-
"Incorrect test. Partners phone and mobile must differ",
154-
)
155-
156-
@mute_logger("odoo.models.unlink")
157-
def test_action_merge(self):
158-
partner_1 = self.partner_with_mobile
159-
partner_2 = self.partner_with_phone_and_mobile
160-
self.registration_01.partner_id = partner_1
161-
self.registration_02.partner_id = partner_2
162-
partners = partner_1 + partner_2
163-
wizard = (
164-
self.env["base.partner.merge.automatic.wizard"]
165-
.with_context(active_ids=partners.ids, active_model=partners._name)
166-
.create({})
167-
)
168-
self.assertEqual(wizard.dst_partner_id, partner_2)
169-
wizard.action_merge()
170-
self.assertEqual(self.registration_01.partner_id, partner_2)
171-
self.assertEqual(self.registration_02.partner_id, partner_2)

0 commit comments

Comments
 (0)