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: filter journals for property in GET transactions services

Browse Source
This commit is contained in:
braisab
2022-11-09 14:29:11 +01:00
committed by Darío Lodeiros
parent 98752b3f52
commit 5fc0eadbfe
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pms_api_rest/services/pms_account_journal_service.py
View File

@@ -31,10 +31,10 @@ class PmsAccountJournalService(Component):
if not pms_property:
pass
else:
for method in pms_property._get_payment_methods(automatic_included=True):
payment_method = self.env["account.journal"].search(
[("id", "=", method.id)]
)
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
result_account_journals.append(
PmsAccountJournalInfo(
id=payment_method.id,

24
pms_api_rest/services/pms_transaction_service.py
View File

@@ -35,18 +35,16 @@ class PmsTransactionService(Component):
("state", "=", "posted"),
]
available_journals = ()
if pms_transactions_search_param.pmsPropertyId:
available_journals = self.env["account.journal"].search(
[
(
"pms_property_ids",
"in",
pms_transactions_search_param.pmsPropertyId,
),
]
if pms_transactions_search_param.transactionMethodId:
domain_fields.append(
("journal_id", "=", pms_transactions_search_param.transactionMethodId),
)
domain_fields.append(("journal_id", "in", available_journals.ids))
elif pms_transactions_search_param.pmsPropertyId:
pms_property = self.env['pms.property'].browse(pms_transactions_search_param.pmsPropertyId)
available_journals = pms_property._get_payment_methods(automatic_included=True)
# REVIEW: avoid send to app generic company journals
available_journals = available_journals.filtered(lambda j: j.pms_property_ids)
domain_fields.append(("journal_id", "in", available_journals.ids))
domain_filter = list()
if pms_transactions_search_param.filter:
# TODO: filter by folio and invoice
@@ -70,10 +68,6 @@ class PmsTransactionService(Component):
("date", "<", date_to),
]
)
if pms_transactions_search_param.transactionMethodId:
domain_fields.append(
("journal_id", "=", pms_transactions_search_param.transactionMethodId),
)
if pms_transactions_search_param.transactionType:
domain_fields.append(