audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP]pms_api_rest: added filter partners by email and precommit

Browse Source
This commit is contained in:
braisab
2022-11-09 18:28:05 +01:00
committed by Darío Lodeiros
parent efe11fbd9e
commit 2a913967c6
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pms_api_rest/datamodels/pms_partner.py
View File

@@ -8,7 +8,6 @@ class PmsPartnerSearchParam(Datamodel):
_name = "pms.partner.search.param" _name = "pms.partner.search.param"
_inherit = "pms.rest.metadata" _inherit = "pms.rest.metadata"
id = fields.Integer(required=False, allow_none=True) id = fields.Integer(required=False, allow_none=True)
vatNumberOrName = fields.String(required=False, allow_none=True)
documentType = fields.Integer(required=False, allow_none=True) documentType = fields.Integer(required=False, allow_none=True)
documentNumber = fields.String(required=False, allow_none=True) documentNumber = fields.String(required=False, allow_none=True)
name = fields.String(required=False, allow_none=True) name = fields.String(required=False, allow_none=True)

4
pms_api_rest/services/pms_account_journal_service.py
View File

@@ -31,7 +31,9 @@ class PmsAccountJournalService(Component):
if not pms_property: if not pms_property:
pass pass
else: 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 # REVIEW: avoid send to app generic company journals
if not payment_method.pms_property_ids: if not payment_method.pms_property_ids:
continue continue

16
pms_api_rest/services/pms_partner_service.py
View File

@@ -51,22 +51,20 @@ class PmsPartnerService(Component):
domain.append(("is_company", "=", False)) domain.append(("is_company", "=", False))
domain.append(("is_agency", "=", False)) domain.append(("is_agency", "=", False))
if pms_partner_search_params.filter: if pms_partner_search_params.filter:
domain.append(("display_name", "ilike", pms_partner_search_params.filter))
if pms_partner_search_params.vatNumberOrName:
subdomains = [ subdomains = [
[("vat", "ilike", pms_partner_search_params.vatNumberOrName)], [("vat", "like", pms_partner_search_params.filter)],
[ [
( (
"aeat_identification", "aeat_identification",
"ilike", "like",
pms_partner_search_params.vatNumberOrName, 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_partner_search_field = expression.OR(subdomains)
domain = expression.AND([domain, domain_vat_or_name]) domain = expression.AND([domain, domain_partner_search_field])
PmsPartnerResults = self.env.datamodels["pms.partner.results"] PmsPartnerResults = self.env.datamodels["pms.partner.results"]
PmsPartnerInfo = self.env.datamodels["pms.partner.info"] PmsPartnerInfo = self.env.datamodels["pms.partner.info"]
total_partners = self.env["res.partner"].search_count(domain) total_partners = self.env["res.partner"].search_count(domain)