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: change domain and filter in get invoices and add ref field in invoice datamodel

Browse Source
This commit is contained in:
Sara Lago
2023-03-06 17:51:34 +01:00
committed by Darío Lodeiros
parent fa55bba9c1
commit a212ce3607
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pms_api_rest/datamodels/pms_invoice.py
View File

@@ -38,6 +38,7 @@ class PmsAccountInvoiceInfo(Datamodel):
# create downpayment invoices from payments
originDownPaymentId = fields.Integer(required=False, allow_none=True)
originAgencyId = fields.Integer(required=False, allow_none=True)
ref = fields.String(required=False, allow_none=True)
class PmsInvoiceResults(Datamodel):
_name = "pms.invoice.results"

18
pms_api_rest/services/pms_invoice_service.py
View File

@@ -34,7 +34,8 @@ class PmsInvoiceService(Component):
domain = []
domain_fields = [
("state", "in", ("draft", "posted")),
("move_type","=","out_invoice")
("move_type", "in", ("out_invoice", "out_refund")),
("folio_ids", "!=", False)
]
domain_filter = list()
@@ -42,7 +43,15 @@ class PmsInvoiceService(Component):
domain_fields.append(
("origin_agency_id","=", pms_invoice_search_param.originAgencyId),
)
if pms_invoice_search_param.paymentState:
if pms_invoice_search_param.paymentState == "paid":
domain_fields.append(
("payment_state", "in", ("paid", "reversed", "invoicing_legacy"))
)
elif pms_invoice_search_param.paymentState == "not_paid":
domain_fields.append(
("payment_state", "in", ("not_paid", "in_payment"))
)
elif pms_invoice_search_param.paymentState == "partial":
domain_fields.append(
("payment_state", "=", pms_invoice_search_param.paymentState)
)
@@ -52,8 +61,8 @@ class PmsInvoiceService(Component):
date_to = fields.Date.from_string(pms_invoice_search_param.dateEnd)
domain_fields.extend(
[
("invoice_date",">=", date_from),
("invoice_date","<=",date_to),
("invoice_date", ">=", date_from),
("invoice_date", "<=", date_to),
]
)
if pms_invoice_search_param.filter:
@@ -171,6 +180,7 @@ class PmsInvoiceService(Component):
originAgencyId=invoice.origin_agency_id.id
if invoice.origin_agency_id
else None,
ref=invoice.ref,
)
)
return PmsInvoiceResults(