From f7319d99a9f38c0a2c5232e2b3ca54b07c2541af Mon Sep 17 00:00:00 2001 From: miguelpadin Date: Tue, 29 Nov 2022 16:56:02 +0100 Subject: [PATCH] [FIX] pms-api-rest: remove taxes percentage @ product service & reload services when board service chagned --- pms_api_rest/datamodels/pms_product.py | 1 - pms_api_rest/services/pms_product_service.py | 1 - pms_api_rest/services/pms_reservation_service.py | 3 ++- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pms_api_rest/datamodels/pms_product.py b/pms_api_rest/datamodels/pms_product.py index 22a0c85bf..9a11a0bd2 100644 --- a/pms_api_rest/datamodels/pms_product.py +++ b/pms_api_rest/datamodels/pms_product.py @@ -16,4 +16,3 @@ class PmProductInfo(Datamodel): perDay = fields.Boolean(required=False, allow_none=True) perPerson = fields.Boolean(required=False, allow_none=True) consumedOn = fields.String(required=False, allow_none=True) - taxesPercentage = fields.Float(required=False, allow_none=True) diff --git a/pms_api_rest/services/pms_product_service.py b/pms_api_rest/services/pms_product_service.py index eaa70b20a..c550c799c 100644 --- a/pms_api_rest/services/pms_product_service.py +++ b/pms_api_rest/services/pms_product_service.py @@ -53,7 +53,6 @@ class PmsProductService(Component): perDay=product.per_day, perPerson=product.per_person, consumedOn=product.consumed_on, - taxesPercentage=product.taxes_id.amount if product.taxes_id.amount_type == 'percent' else None, ) ) return result_products diff --git a/pms_api_rest/services/pms_reservation_service.py b/pms_api_rest/services/pms_reservation_service.py index d1cad6148..5c2959c81 100644 --- a/pms_api_rest/services/pms_reservation_service.py +++ b/pms_api_rest/services/pms_reservation_service.py @@ -206,7 +206,8 @@ class PmsReservationService(Component): reservation_vals = self._create_vals_from_params( reservation_vals, reservation_data ) - if reservation_data.boardServiceId == 0: + # TODO: this should be @ pms core + if reservation_data.boardServiceId != reservation.board_service_room_id: reservation.service_ids.filtered(lambda x: x.is_board_service).unlink() if reservation_vals: reservation.write(reservation_vals)