From 72f4ef70ed3393ed031b2a34055ecb65da802559 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Thu, 17 Feb 2022 10:18:47 +0100
Subject: [PATCH] recalculate neto in sql

---
 print/templates/reports/invoice/sql/intrastat.sql | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/print/templates/reports/invoice/sql/intrastat.sql b/print/templates/reports/invoice/sql/intrastat.sql
index e391056ec5..6bf72c158a 100644
--- a/print/templates/reports/invoice/sql/intrastat.sql
+++ b/print/templates/reports/invoice/sql/intrastat.sql
@@ -2,9 +2,13 @@ SELECT
         ir.id AS code,
         ir.description AS description, 
         CAST(SUM(IFNULL(i.stems,1) * s.quantity) AS DECIMAL(10,2)) as stems,
-        CAST(SUM( weight) AS DECIMAL(10,2)) as netKg,
+        CAST(SUM(IF(sv.physicalWeight, sv.physicalWeight, i.density * sub.cm3delivery/1000000)) AS DECIMAL(10,2)) netKg,
         CAST(SUM((s.quantity * s.price * (100 - s.discount) / 100 )) AS DECIMAL(10,2)) AS subtotal 
-    FROM vn.sale s   
+    FROM vn.sale s 
+        LEFT JOIN (SELECT ic.itemFk, ic.cm3, ic.cm3delivery
+                        FROM vn.itemCost ic
+                        WHERE ic.cm3
+                        GROUP BY ic.itemFk) sub ON s.itemFk = sub.itemFk  
         LEFT JOIN vn.saleVolume sv ON sv.saleFk = s.id
         LEFT JOIN vn.ticket t ON t.id = s.ticketFk
         LEFT JOIN vn.invoiceOut io ON io.ref = t.refFk