From e2b5c3ae9e3e6ea222d890de87c25ebdbee453ab Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Sat, 7 Oct 2017 14:02:52 +0200 Subject: [PATCH 1/3] [8.0] skip invoice lines with value 0 --- intrastat_product/models/intrastat_product_declaration.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/intrastat_product/models/intrastat_product_declaration.py b/intrastat_product/models/intrastat_product_declaration.py index 6c5e099..9e537a1 100644 --- a/intrastat_product/models/intrastat_product_declaration.py +++ b/intrastat_product/models/intrastat_product_declaration.py @@ -501,6 +501,9 @@ class IntrastatProductDeclaration(models.Model): total_inv_weight = 0.0 for inv_line in invoice.invoice_line: + if not inv_line.price_unit: + continue + if ( accessory_costs and inv_line.product_id and From b70119d27264117f31591c4c47461f8fdb71d71d Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Sat, 28 Oct 2017 20:55:35 +0200 Subject: [PATCH 2/3] Update intrastat_product_declaration.py @cubells I changed the check on 'price_unit' with value into price_subtotal. By doing so we also cover the case of invoice lines with 100% discount. Let me know if it's ok so that we can merge (and forward port to v10) --- intrastat_product/models/intrastat_product_declaration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intrastat_product/models/intrastat_product_declaration.py b/intrastat_product/models/intrastat_product_declaration.py index 9e537a1..e4394e5 100644 --- a/intrastat_product/models/intrastat_product_declaration.py +++ b/intrastat_product/models/intrastat_product_declaration.py @@ -501,7 +501,7 @@ class IntrastatProductDeclaration(models.Model): total_inv_weight = 0.0 for inv_line in invoice.invoice_line: - if not inv_line.price_unit: + if not inv_line.price_subtotal: continue if ( From 47a531cd371ee7501bb4615997c81938443d7138 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Sun, 25 Nov 2018 17:23:53 +0100 Subject: [PATCH 3/3] fix flake8 --- intrastat_product/models/intrastat_product_declaration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intrastat_product/models/intrastat_product_declaration.py b/intrastat_product/models/intrastat_product_declaration.py index e4394e5..45c3873 100644 --- a/intrastat_product/models/intrastat_product_declaration.py +++ b/intrastat_product/models/intrastat_product_declaration.py @@ -503,7 +503,7 @@ class IntrastatProductDeclaration(models.Model): if not inv_line.price_subtotal: continue - + if ( accessory_costs and inv_line.product_id and