Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

T1732 - Fix incorrect loading of interactions for partners without email addresses #1953

Merged
merged 1 commit into from
Aug 22, 2024
Merged

T1732 - Fix incorrect loading of interactions for partners without email addresses #1953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions interaction_resume/models/abstract_interaction_source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ def fetch_interaction(
@param until:
"""
search_domain = self._get_interaction_partner_domain(partner)
if not search_domain:
return True
records = self.search(
[
*search_domain,
Expand Down
6 changes: 6 additions & 0 deletions interaction_resume/models/crm_request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ def _get_interaction_data(self, partner_id):
return res

def _get_interaction_partner_domain(self, partner):
if not partner.email:
return [
"|",
("partner_id", "=", partner.id),
("partner_id", "in", partner.other_contact_ids.ids),
]
return [
"|",
"|",
Expand Down
1 change: 1 addition & 0 deletions interaction_resume/models/mailing_trace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,5 @@ def _get_interaction_data(self, partner_id):
def _get_interaction_partner_domain(self, partner):
return [
("email", "=", partner.email),
("email", "!=", False),
]
8 changes: 7 additions & 1 deletion interaction_resume/models/res_partner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
# The licence is in the file __manifest__.py
#
##############################################################################
from datetime import datetime as dt

from dateutil.relativedelta import relativedelta

from odoo import _, fields, models
Expand Down Expand Up @@ -63,7 +65,11 @@ def fetch_interactions(
self.ensure_one()
# Each page shows interactions for one year
years_to_fetch = 1
until = fields.Datetime.now() - relativedelta(years=page * years_to_fetch)
years = page * years_to_fetch
# Do not fetch invalid negative years interactions
if years > dt.now().year:
return True
until = fields.Datetime.now() - relativedelta(years=years)
since = until - relativedelta(years=years_to_fetch)
models = [
"partner.communication.job",
Expand Down
Loading