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

[WIP] pms_api_rest: refact payment info datamodel

Browse Source
This commit is contained in:
Sara Lago
2022-11-04 11:11:49 +01:00
committed by Darío Lodeiros
parent 9faa3155d6
commit fffed128dd
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pms_api_rest/datamodels/pms_account_payment.py
View File

@@ -42,11 +42,18 @@ class PmsPaymentResults(Datamodel):
totalPayments = fields.Integer(required=False, allow_none=True) totalPayments = fields.Integer(required=False, allow_none=True)
class PmsAccountPaymentInfo(Datamodel): class PmsTransactionInfo(Datamodel):
_name = "pms.account.payment.short.info" _name = "pms.transaction.info"
id = fields.Integer(required=False, allow_none=True) id = fields.Integer(required=False, allow_none=True)
date = fields.String(required=False, allow_none=True) date = fields.String(required=False, allow_none=True)
journalId = fields.Integer(required=False, allow_none=True) journalId = fields.Integer(required=False, allow_none=True)
amount = fields.Float(required=False, allow_none=True) amount = fields.Float(required=False, allow_none=True)
partnerId = fields.Integer(required=False, allow_none=True) partnerId = fields.Integer(required=False, allow_none=True)
reservationIds = fields.List(fields.Integer(), required=False) reservationIds = fields.List(fields.Integer(), required=False)
folioId = fields.Integer(required=False, allow_none=True)
transactionType = fields.String(required=False, allow_none=True)
destinationJournalId = fields.Integer(required=False, allow_none=True)
reference = fields.String(required=False, allow_none=True)
pmsPropertyId = fields.Integer(required=False, allow_none=True)
createUid = fields.Integer(required=False, allow_none=True)

1
pms_api_rest/datamodels/pms_payment_report_input.py
View File

@@ -1,7 +1,6 @@
from marshmallow import fields from marshmallow import fields
from odoo.addons.datamodel.core import Datamodel from odoo.addons.datamodel.core import Datamodel
from odoo.addons.datamodel.fields import NestedModel
class PmsPaymentReportSearchParam(Datamodel): class PmsPaymentReportSearchParam(Datamodel):

4
pms_api_rest/services/pms_account_payment_service.py
View File

@@ -153,7 +153,9 @@ class PmsAccountPaymentService(Component):
balance=statement.balance_start if isOpen else statement.balance_end_real, balance=statement.balance_start if isOpen else statement.balance_end_real,
dateTime=statement.create_date.strftime("%d/%m/%Y") dateTime=statement.create_date.strftime("%d/%m/%Y")
if isOpen if isOpen
else statement.date_done.strftime("%d/%m/%Y"), else statement.date_done.strftime("%d/%m/%Y")
if statement.date_done
else None,
) )
@restapi.method( @restapi.method(