From fffed128dd7097bc7b1c361845a9a1b7f976871d Mon Sep 17 00:00:00 2001 From: Sara Lago Date: Fri, 4 Nov 2022 11:11:49 +0100 Subject: [PATCH] [WIP] pms_api_rest: refact payment info datamodel --- pms_api_rest/datamodels/pms_account_payment.py | 11 +++++++++-- pms_api_rest/datamodels/pms_payment_report_input.py | 1 - pms_api_rest/services/pms_account_payment_service.py | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pms_api_rest/datamodels/pms_account_payment.py b/pms_api_rest/datamodels/pms_account_payment.py index 0b27e9c4a..190ac8369 100644 --- a/pms_api_rest/datamodels/pms_account_payment.py +++ b/pms_api_rest/datamodels/pms_account_payment.py @@ -42,11 +42,18 @@ class PmsPaymentResults(Datamodel): totalPayments = fields.Integer(required=False, allow_none=True) -class PmsAccountPaymentInfo(Datamodel): - _name = "pms.account.payment.short.info" +class PmsTransactionInfo(Datamodel): + _name = "pms.transaction.info" id = fields.Integer(required=False, allow_none=True) date = fields.String(required=False, allow_none=True) journalId = fields.Integer(required=False, allow_none=True) amount = fields.Float(required=False, allow_none=True) partnerId = fields.Integer(required=False, allow_none=True) 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) diff --git a/pms_api_rest/datamodels/pms_payment_report_input.py b/pms_api_rest/datamodels/pms_payment_report_input.py index b100556f1..ccc5c0928 100644 --- a/pms_api_rest/datamodels/pms_payment_report_input.py +++ b/pms_api_rest/datamodels/pms_payment_report_input.py @@ -1,7 +1,6 @@ from marshmallow import fields from odoo.addons.datamodel.core import Datamodel -from odoo.addons.datamodel.fields import NestedModel class PmsPaymentReportSearchParam(Datamodel): diff --git a/pms_api_rest/services/pms_account_payment_service.py b/pms_api_rest/services/pms_account_payment_service.py index 35b51c956..43f7051d3 100644 --- a/pms_api_rest/services/pms_account_payment_service.py +++ b/pms_api_rest/services/pms_account_payment_service.py @@ -153,7 +153,9 @@ class PmsAccountPaymentService(Component): balance=statement.balance_start if isOpen else statement.balance_end_real, dateTime=statement.create_date.strftime("%d/%m/%Y") 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(