From 2b8421f9f6c3a4623cb9c64ec6ff1588aae52c07 Mon Sep 17 00:00:00 2001 From: braisab Date: Wed, 31 Aug 2022 18:35:01 +0200 Subject: [PATCH] [IMP]pms_api_rest: changes in account_payment and folio service --- pms_api_rest/datamodels/pms_account_payment.py | 1 + pms_api_rest/datamodels/pms_partner.py | 1 + pms_api_rest/services/pms_folio_service.py | 13 ++++--------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pms_api_rest/datamodels/pms_account_payment.py b/pms_api_rest/datamodels/pms_account_payment.py index a42f79aff..5723e3d8c 100644 --- a/pms_api_rest/datamodels/pms_account_payment.py +++ b/pms_api_rest/datamodels/pms_account_payment.py @@ -19,4 +19,5 @@ class PmsAccountPaymentInfo(Datamodel): journalId = fields.Integer(required=False, allow_none=True) amount = fields.Float(required=False, allow_none=True) partnerId = fields.Integer(required=False, allow_none=True) + reference = fields.String(required=False, allow_none=True) reservationIds = fields.List(fields.Integer(), required=False) diff --git a/pms_api_rest/datamodels/pms_partner.py b/pms_api_rest/datamodels/pms_partner.py index e220d5529..cad2afabb 100644 --- a/pms_api_rest/datamodels/pms_partner.py +++ b/pms_api_rest/datamodels/pms_partner.py @@ -2,6 +2,7 @@ from marshmallow import fields from odoo.addons.datamodel.core import Datamodel + class PmsPartnerSearchParam(Datamodel): _name = "pms.partner.search.param" id = fields.Integer(required=False, allow_none=True) diff --git a/pms_api_rest/services/pms_folio_service.py b/pms_api_rest/services/pms_folio_service.py index fae0b3fd4..d50b00869 100644 --- a/pms_api_rest/services/pms_folio_service.py +++ b/pms_api_rest/services/pms_folio_service.py @@ -47,7 +47,7 @@ class PmsFolioService(Component): amountTotal=round(folio.amount_total, 2), reservationType=folio.reservation_type, pendingAmount=folio.pending_amount, - lastCheckout=str(folio.last_checkout) + lastCheckout=str(folio.last_checkout), ) else: raise MissingError(_("Folio not found")) @@ -219,10 +219,7 @@ class PmsFolioService(Component): ) def create_folio_charge(self, folio_id, pms_account_payment_info): folio = self.env["pms.folio"].browse(folio_id) - if pms_account_payment_info.partnerId: - partner_id = self.env["res.partner"].browse(int(pms_account_payment_info.partnerId)) - else: - partner_id = folio.partner_id + partner_id = self.env["res.partner"].browse(pms_account_payment_info.partnerId) journal_id = self.env["account.journal"].browse( pms_account_payment_info.journalId ) @@ -252,10 +249,7 @@ class PmsFolioService(Component): ) def create_folio_refund(self, folio_id, pms_account_payment_info): folio = self.env["pms.folio"].browse(folio_id) - if pms_account_payment_info.partnerId: - partner_id = self.env["res.partner"].browse(pms_account_payment_info.partnerId) - else: - partner_id = folio.partner_id + partner_id = self.env["res.partner"].browse(pms_account_payment_info.partnerId) journal_id = self.env["account.journal"].browse( pms_account_payment_info.journalId ) @@ -269,6 +263,7 @@ class PmsFolioService(Component): services=False, partner=partner_id, date=datetime.strptime(pms_account_payment_info.date, "%m/%d/%Y"), + ref=pms_account_payment_info.reference, ) @restapi.method(