From 960b5b15238ab125f9fa7f49e87b990ac5d9a469 Mon Sep 17 00:00:00 2001 From: braisab Date: Thu, 10 Nov 2022 19:56:18 +0100 Subject: [PATCH] [FIX]pms_api_rest: added discount in folio sale line and invoice GET service --- pms_api_rest/datamodels/pms_folio_sale_line.py | 1 + pms_api_rest/datamodels/pms_invoice_line.py | 1 + pms_api_rest/services/pms_folio_service.py | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/pms_api_rest/datamodels/pms_folio_sale_line.py b/pms_api_rest/datamodels/pms_folio_sale_line.py index 89c5837e6..7c5f0bb49 100644 --- a/pms_api_rest/datamodels/pms_folio_sale_line.py +++ b/pms_api_rest/datamodels/pms_folio_sale_line.py @@ -11,6 +11,7 @@ class PmsFolioSaleInfo(Datamodel): qtyToInvoice = fields.Float(required=False, allow_none=True) qtyInvoiced = fields.Float(required=False, allow_none=True) priceTotal = fields.Float(required=False, allow_none=True) + discount = fields.Float(required=False, allow_none=True) productQty = fields.Float(required=False, allow_none=True) reservationId = fields.Integer(required=False, allow_none=True) serviceId = fields.Integer(required=False, allow_none=True) diff --git a/pms_api_rest/datamodels/pms_invoice_line.py b/pms_api_rest/datamodels/pms_invoice_line.py index 29aa784ec..96532a9db 100644 --- a/pms_api_rest/datamodels/pms_invoice_line.py +++ b/pms_api_rest/datamodels/pms_invoice_line.py @@ -10,5 +10,6 @@ class PmsInvoiceLineInfo(Datamodel): quantity = fields.Float(required=False, allow_none=True) priceUnit = fields.Float(required=False, allow_none=True) total = fields.Float(required=False, allow_none=True) + discount = fields.Float(required=False, allow_none=True) displayType = fields.String(required=False, allow_none=True) saleLineId = 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 aee451540..f7bd79ec5 100644 --- a/pms_api_rest/services/pms_folio_service.py +++ b/pms_api_rest/services/pms_folio_service.py @@ -488,6 +488,7 @@ class PmsFolioService(Component): priceTotal=sale_line.price_total if sale_line.price_total else None, + discount=sale_line.discount if sale_line.discount else None, productQty=sale_line.product_uom_qty if sale_line.product_uom_qty else None, @@ -542,6 +543,9 @@ class PmsFolioService(Component): total=move_line.price_total if move_line.price_total else None, + discount=move_line.discount + if move_line.discount + else None, displayType=move_line.display_type if move_line.display_type else None,