mirror of
https://github.com/OCA/pms.git
synced 2025-01-29 00:17:45 +02:00
[IMP] pms_api_rest: add filters in invoices list
This commit is contained in:
committed by
Darío Lodeiros
parent
6fbb93c14f
commit
14a19a7f01
@@ -7,7 +7,11 @@ class PmsInvoiceSearchParam(Datamodel):
|
|||||||
_name = "pms.invoice.search.param"
|
_name = "pms.invoice.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)
|
||||||
name = fields.String(required=False, allow_none=True)
|
filter = fields.String(required=False, allow_none=True)
|
||||||
|
originAgencyId = fields.Integer(required=False, allow_none=True)
|
||||||
|
paymentState = fields.String(required=False, allow_none=True)
|
||||||
|
dateStart = fields.String(required=False, allow_none=True)
|
||||||
|
dateEnd = fields.String(required=False, allow_none=True)
|
||||||
|
|
||||||
class PmsAccountInvoiceInfo(Datamodel):
|
class PmsAccountInvoiceInfo(Datamodel):
|
||||||
_name = "pms.invoice.info"
|
_name = "pms.invoice.info"
|
||||||
@@ -33,6 +37,7 @@ class PmsAccountInvoiceInfo(Datamodel):
|
|||||||
# REVIEW: originDownPaymentId Only input field to service to
|
# REVIEW: originDownPaymentId Only input field to service to
|
||||||
# create downpayment invoices from payments
|
# create downpayment invoices from payments
|
||||||
originDownPaymentId = fields.Integer(required=False, allow_none=True)
|
originDownPaymentId = fields.Integer(required=False, allow_none=True)
|
||||||
|
originAgencyId = fields.Integer(required=False, allow_none=True)
|
||||||
|
|
||||||
class PmsInvoiceResults(Datamodel):
|
class PmsInvoiceResults(Datamodel):
|
||||||
_name = "pms.invoice.results"
|
_name = "pms.invoice.results"
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ from odoo.exceptions import UserError
|
|||||||
from odoo.addons.base_rest import restapi
|
from odoo.addons.base_rest import restapi
|
||||||
from odoo.addons.base_rest_datamodel.restapi import Datamodel
|
from odoo.addons.base_rest_datamodel.restapi import Datamodel
|
||||||
from odoo.addons.component.core import Component
|
from odoo.addons.component.core import Component
|
||||||
|
from odoo.odoo.osv import expression
|
||||||
|
|
||||||
|
|
||||||
class PmsInvoiceService(Component):
|
class PmsInvoiceService(Component):
|
||||||
@@ -31,14 +32,55 @@ class PmsInvoiceService(Component):
|
|||||||
result_invoices = []
|
result_invoices = []
|
||||||
|
|
||||||
domain = []
|
domain = []
|
||||||
if pms_invoice_search_param.name:
|
domain_fields = [
|
||||||
domain.append(("name", "ilike", pms_invoice_search_param.name))
|
("state", "in", ("draft", "posted"))
|
||||||
|
]
|
||||||
|
domain_filter = list()
|
||||||
|
|
||||||
|
if pms_invoice_search_param.originAgencyId:
|
||||||
|
domain_fields.append(
|
||||||
|
("origin_agency_id","=", pms_invoice_search_param.originAgencyId),
|
||||||
|
)
|
||||||
|
if pms_invoice_search_param.paymentState:
|
||||||
|
domain_fields.append(
|
||||||
|
("payment_state", "=", pms_invoice_search_param.paymentState)
|
||||||
|
)
|
||||||
|
if (
|
||||||
|
pms_invoice_search_param.dateStart and pms_invoice_search_param.dateEnd):
|
||||||
|
date_from = fields.Date.from_string(pms_invoice_search_param.dateStart)
|
||||||
|
date_to = fields.Date.from_string(pms_invoice_search_param.dateEnd)
|
||||||
|
domain_fields.extend(
|
||||||
|
[
|
||||||
|
("invoice_date",">=", date_from),
|
||||||
|
("invoice_date","<=",date_to),
|
||||||
|
]
|
||||||
|
)
|
||||||
|
if pms_invoice_search_param.filter:
|
||||||
|
for search in pms_invoice_search_param.filter.split(" "):
|
||||||
|
subdomains = [
|
||||||
|
[("name", "ilike", search)],
|
||||||
|
[("partner_id.display_name", "ilike", search)],
|
||||||
|
[("partner_id.vat", "ilike", search)],
|
||||||
|
[
|
||||||
|
(
|
||||||
|
"partner_id.aeat_identification",
|
||||||
|
"ilike",
|
||||||
|
search,
|
||||||
|
)
|
||||||
|
],
|
||||||
|
[("folio_ids.name", "ilike", search)],
|
||||||
|
]
|
||||||
|
domain_filter.append(expression.OR(subdomains))
|
||||||
|
|
||||||
|
if domain_filter:
|
||||||
|
domain = expression.AND([domain_fields, domain_filter[0]])
|
||||||
|
else:
|
||||||
|
domain = domain_fields
|
||||||
|
|
||||||
PmsInvoiceResults = self.env.datamodels["pms.invoice.results"]
|
PmsInvoiceResults = self.env.datamodels["pms.invoice.results"]
|
||||||
PmsInvoiceInfo = self.env.datamodels["pms.invoice.info"]
|
PmsInvoiceInfo = self.env.datamodels["pms.invoice.info"]
|
||||||
PmsInvoiceLineInfo = self.env.datamodels["pms.invoice.line.info"]
|
PmsInvoiceLineInfo = self.env.datamodels["pms.invoice.line.info"]
|
||||||
total_invoices = self.env["account.move"].search_count([])
|
total_invoices = self.env["account.move"].search_count(domain)
|
||||||
amount_total = 100
|
amount_total = 100
|
||||||
for invoice in self.env["account.move"].search(
|
for invoice in self.env["account.move"].search(
|
||||||
domain,
|
domain,
|
||||||
@@ -120,6 +162,9 @@ class PmsInvoiceService(Component):
|
|||||||
isReversed=invoice.payment_state == "reversed",
|
isReversed=invoice.payment_state == "reversed",
|
||||||
isDownPaymentInvoice=invoice._is_downpayment(),
|
isDownPaymentInvoice=invoice._is_downpayment(),
|
||||||
isSimplifiedInvoice=invoice.journal_id.is_simplified_invoice,
|
isSimplifiedInvoice=invoice.journal_id.is_simplified_invoice,
|
||||||
|
originAgencyId=invoice.origin_agency_id.id
|
||||||
|
if invoice.origin_agency_id
|
||||||
|
else None,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
return PmsInvoiceResults(
|
return PmsInvoiceResults(
|
||||||
|
|||||||
Reference in New Issue
Block a user