From 2dd63fa309ec12d8903f43fc1c2727256bffd6d0 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 15 Feb 2021 15:09:19 +0100 Subject: [PATCH] customs declaration: specify invoice number, not picking number --- models/shipcloud_delivery_carrier.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/models/shipcloud_delivery_carrier.py b/models/shipcloud_delivery_carrier.py index 11aac4a..3fbf14f 100644 --- a/models/shipcloud_delivery_carrier.py +++ b/models/shipcloud_delivery_carrier.py @@ -149,11 +149,20 @@ class SCDeliveryCarrier(models.Model): total = 0.0 for i in items: total += i['value_amount'] + invoice_number = picking.name + invoice_date = picking.date + if picking.sale_id and picking.sale_id.invoice_ids: + invoices = picking.sale_id.invoice_ids.filtered(lambda r: r.type == 'out_invoice' and + r.state not in ['draft', 'cancel']) + if len(invoices): + invoice_number = invoices[0].number + invoice_date = invoices[0].date_invoice customs = { 'contents_type': 'commercial_goods', 'contents_explanation': explanation, 'currency': currency, - 'invoice_number': picking.name, + 'invoice_number': invoice_number, + #'invoice_date': ''.join(c for c in invoice_date if c.isdigit()), 'total_value_amount': total, 'items': items }