From 1d40de2d8b6ce66fd26df9e5ef3d720a3bfc93c4 Mon Sep 17 00:00:00 2001 From: braisab Date: Wed, 9 Nov 2022 18:28:05 +0100 Subject: [PATCH] [IMP]pms_api_rest: added filter partners by email and precommit --- pms_api_rest/datamodels/pms_partner.py | 1 - .../services/pms_account_journal_service.py | 4 +++- pms_api_rest/services/pms_partner_service.py | 16 +++++++--------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pms_api_rest/datamodels/pms_partner.py b/pms_api_rest/datamodels/pms_partner.py index 4b0c9e03d..a2252a7ce 100644 --- a/pms_api_rest/datamodels/pms_partner.py +++ b/pms_api_rest/datamodels/pms_partner.py @@ -8,7 +8,6 @@ class PmsPartnerSearchParam(Datamodel): _name = "pms.partner.search.param" _inherit = "pms.rest.metadata" id = fields.Integer(required=False, allow_none=True) - vatNumberOrName = fields.String(required=False, allow_none=True) documentType = fields.Integer(required=False, allow_none=True) documentNumber = fields.String(required=False, allow_none=True) name = fields.String(required=False, allow_none=True) diff --git a/pms_api_rest/services/pms_account_journal_service.py b/pms_api_rest/services/pms_account_journal_service.py index 1b617a9ac..8e66c2369 100644 --- a/pms_api_rest/services/pms_account_journal_service.py +++ b/pms_api_rest/services/pms_account_journal_service.py @@ -31,7 +31,9 @@ class PmsAccountJournalService(Component): if not pms_property: pass else: - for payment_method in pms_property._get_payment_methods(automatic_included=True): + for payment_method in pms_property._get_payment_methods( + automatic_included=True + ): # REVIEW: avoid send to app generic company journals if not payment_method.pms_property_ids: continue diff --git a/pms_api_rest/services/pms_partner_service.py b/pms_api_rest/services/pms_partner_service.py index a8460f9b6..df74b3adb 100644 --- a/pms_api_rest/services/pms_partner_service.py +++ b/pms_api_rest/services/pms_partner_service.py @@ -51,22 +51,20 @@ class PmsPartnerService(Component): domain.append(("is_company", "=", False)) domain.append(("is_agency", "=", False)) if pms_partner_search_params.filter: - domain.append(("display_name", "ilike", pms_partner_search_params.filter)) - if pms_partner_search_params.vatNumberOrName: subdomains = [ - [("vat", "ilike", pms_partner_search_params.vatNumberOrName)], + [("vat", "like", pms_partner_search_params.filter)], [ ( "aeat_identification", - "ilike", - pms_partner_search_params.vatNumberOrName, + "like", + pms_partner_search_params.filter, ) ], - [("display_name", "ilike", pms_partner_search_params.vatNumberOrName)], + [("display_name", "like", pms_partner_search_params.filter)], + [("email", "like", pms_partner_search_params.filter)], ] - domain_vat_or_name = expression.OR(subdomains) - domain = expression.AND([domain, domain_vat_or_name]) - + domain_partner_search_field = expression.OR(subdomains) + domain = expression.AND([domain, domain_partner_search_field]) PmsPartnerResults = self.env.datamodels["pms.partner.results"] PmsPartnerInfo = self.env.datamodels["pms.partner.info"] total_partners = self.env["res.partner"].search_count(domain)