From 09e16769d623fba9a08c68e89a1cd2e7890f17ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dar=C3=ADo=20Lodeiros?= Date: Thu, 21 Jul 2022 19:26:21 +0200 Subject: [PATCH] [RFC]pms_api_rest: Clean fields in service line datamodel --- pms_api_rest/datamodels/pms_service_line.py | 4 +--- pms_api_rest/services/pms_service_service.py | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pms_api_rest/datamodels/pms_service_line.py b/pms_api_rest/datamodels/pms_service_line.py index a03e868f8..b1d2425e1 100644 --- a/pms_api_rest/datamodels/pms_service_line.py +++ b/pms_api_rest/datamodels/pms_service_line.py @@ -6,9 +6,7 @@ from odoo.addons.datamodel.core import Datamodel class PmsServiceLineInfo(Datamodel): _name = "pms.service.line.info" id = fields.Integer(required=False, allow_none=True) - isBoardService = fields.Boolean(required=False, allow_none=True) - productId = fields.Integer(required=False, allow_none=True) date = fields.String(required=False, allow_none=True) priceUnit = fields.Float(required=False, allow_none=True) - priceTotal = fields.Float(required=False, allow_none=True) discount = fields.Float(required=False, allow_none=True) + quantity = fields.Integer(required=False, allow_none=True) diff --git a/pms_api_rest/services/pms_service_service.py b/pms_api_rest/services/pms_service_service.py index 7ba5c60d8..de6d05582 100644 --- a/pms_api_rest/services/pms_service_service.py +++ b/pms_api_rest/services/pms_service_service.py @@ -42,6 +42,7 @@ class PmsServiceService(Component): priceTaxes=round(service.price_tax, 2), discount=round(service.discount, 2), isBoardService=service.is_board_service, + ) @restapi.method( @@ -66,14 +67,12 @@ class PmsServiceService(Component): result_service_lines.append( PmsServiceLineInfo( id=service_line.id, - isBoardService=service_line.is_board_service, - productId=service_line.product_id.id, date=datetime.combine( service_line.date, datetime.min.time() ).isoformat(), priceUnit=round(service_line.price_unit, 2), - priceTotal=round(service_line.price_day_total, 2), discount=round(service_line.discount, 2), + quantity=service_line.day_qty, ) ) return result_service_lines