From c0eec7e7124f21a3e6d18394a64b6b514dfa4c27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dar=C3=ADo=20Lodeiros?= Date: Fri, 30 Dec 2022 17:42:56 +0100 Subject: [PATCH] [IMP]pms_api_rest: draft invoice use invoice_date_due --- pms_api_rest/services/pms_folio_service.py | 11 ++++++++--- pms_api_rest/services/pms_invoice_service.py | 2 ++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pms_api_rest/services/pms_folio_service.py b/pms_api_rest/services/pms_folio_service.py index 1882c791a..ad066c614 100644 --- a/pms_api_rest/services/pms_folio_service.py +++ b/pms_api_rest/services/pms_folio_service.py @@ -796,6 +796,13 @@ class PmsFolioService(Component): self.env["ir.config_parameter"].sudo().get_param("web.base.url") + move_url ) + invoice_date = ( + move.invoice_date.strftime("%d/%m/%Y") + if move.invoice_date + else move.invoice_date_due.strftime("%d/%m/%Y") + if move.invoice_date_due + else None + ) invoices.append( PmsFolioInvoiceInfo( id=move.id if move.id else None, @@ -803,9 +810,7 @@ class PmsFolioService(Component): amount=round(move.amount_total, 2) if move.amount_total else None, - date=move.invoice_date.strftime("%d/%m/%Y") - if move.invoice_date - else None, + date=invoice_date, state=move.state if move.state else None, paymentState=move.payment_state if move.payment_state diff --git a/pms_api_rest/services/pms_invoice_service.py b/pms_api_rest/services/pms_invoice_service.py index 437a3291b..d44658eda 100644 --- a/pms_api_rest/services/pms_invoice_service.py +++ b/pms_api_rest/services/pms_invoice_service.py @@ -146,6 +146,8 @@ class PmsInvoiceService(Component): # so, we need to save and rewrite it. in all line that are not updated or deleted for line in invoice.invoice_line_ids.filtered( lambda l: l.id not in updated_invoice_lines_name + if updated_invoice_lines_name + else [] and l.id not in [ line[1] for line in new_vals["invoice_line_ids"] if line[0] == 2