From 6344a5f996aa602444f8f4ad3978e271deaaa988 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Wed, 18 Aug 2021 21:13:26 +0200 Subject: [PATCH 1/2] [13.0][FIX]intrastat_product_declaration - fix amount by removing legacy currency conversion --- 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 a13a5c8..19eb826 100644 --- a/intrastat_product/models/intrastat_product_declaration.py +++ b/intrastat_product/models/intrastat_product_declaration.py @@ -686,7 +686,7 @@ class IntrastatProductDeclaration(models.Model): ) total_inv_weight += weight - amount_company_currency = self._get_amount(inv_line, notedict) + amount_company_currency = -inv_line.balance total_inv_product_cc += amount_company_currency if inv_intrastat_line: From dbf9aecbfacb033922f1092358ec0919fb61d0a6 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Sun, 26 Dec 2021 20:55:48 +0100 Subject: [PATCH 2/2] [14.0][FIX]intrastat_product_declaration - fix amount by removing legacy currency conversion --- .../models/intrastat_product_declaration.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/intrastat_product/models/intrastat_product_declaration.py b/intrastat_product/models/intrastat_product_declaration.py index 19eb826..861ada5 100644 --- a/intrastat_product/models/intrastat_product_declaration.py +++ b/intrastat_product/models/intrastat_product_declaration.py @@ -400,16 +400,6 @@ class IntrastatProductDeclaration(models.Model): return weight, suppl_unit_qty - def _get_amount(self, inv_line, notedict): - invoice = inv_line.move_id - amount = invoice.currency_id._convert( - inv_line.price_subtotal, - self.company_id.currency_id, - self.company_id, - invoice.date, - ) - return amount - def _get_region(self, inv_line, notedict): """ For supplier invoices/refunds: if the invoice line is linked