From a40545264bf322898eda746aac26fdea96e07bf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Tue, 30 Apr 2024 15:46:24 +0200
Subject: [PATCH] fix: descuentos en bs.ventas refs #6974

---
 db/routines/bs/procedures/sale_add.sql | 50 +++++++++++++-------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/db/routines/bs/procedures/sale_add.sql b/db/routines/bs/procedures/sale_add.sql
index e9f91740f..64beb4776 100644
--- a/db/routines/bs/procedures/sale_add.sql
+++ b/db/routines/bs/procedures/sale_add.sql
@@ -34,37 +34,37 @@ BEGIN
 			clientFk,
 			companyFk,
 			margin
-		)WITH calculated AS(
-				SELECT s.id saleFk,
-						SUM(IF(ct.isBase, s.quantity * sc.value, 0)) amount,
-						SUM(IF(ct.isBase, 0, s.quantity * sc.value)) surcharge,
-						s.total pvp,
-						DATE(t.shipped) dated,
-						i.typeFk,
-						t.clientFk,
-						t.companyFk,
-						SUM(IF(ct.isMargin, s.quantity * sc.value, 0 )) marginComponents
-					FROM vn.ticket t
-						STRAIGHT_JOIN vn.sale s ON s.ticketFk = t.id
-						JOIN vn.item i ON i.id = s.itemFk
-						JOIN vn.itemType it ON it.id = i.typeFk
-						JOIN vn.itemCategory ic ON ic.id = it.categoryFk
-						JOIN vn.saleComponent sc ON sc.saleFk = s.id 
-						JOIN vn.component c ON c.id = sc.componentFk
-						JOIN vn.componentType ct ON ct.id = c.typeFk
-					WHERE t.shipped BETWEEN vLoopDate AND vLoopDateTime
-						AND s.quantity <> 0
-						AND ic.merchandise 
-					GROUP BY s.id
-		)SELECT  saleFk, 
+		)WITH calculatedSales AS(
+		SELECT s.id saleFk,
+				SUM(IF(ct.isBase, s.quantity * sc.value, 0)) amount,
+				SUM(IF(ct.isBase, 0, s.quantity * sc.value)) surcharge,
+				s.total pvp,
+				DATE(t.shipped) dated,
+				i.typeFk,
+				t.clientFk,
+				t.companyFk,
+				SUM(IF(ct.isMargin, s.quantity * sc.value, 0 )) marginComponents
+			FROM vn.ticket t
+				STRAIGHT_JOIN vn.sale s ON s.ticketFk = t.id
+				JOIN vn.item i ON i.id = s.itemFk
+				JOIN vn.itemType it ON it.id = i.typeFk
+				JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+				JOIN vn.saleComponent sc ON sc.saleFk = s.id 
+				JOIN vn.component c ON c.id = sc.componentFk
+				JOIN vn.componentType ct ON ct.id = c.typeFk
+			WHERE t.shipped BETWEEN vLoopDate AND vLoopDateTime
+				AND s.quantity <> 0
+				AND ic.merchandise 
+			GROUP BY s.id
+		)SELECT saleFk, 
 				amount, 
 				surcharge, 
 				dated, 
 				typeFk, 
 				clientFk, 
 				companyFk, 
-				marginComponents + amount + surcharge - pvp    
-			FROM calculated;
+				marginComponents + amount + surcharge - pvp
+			FROM calculatedSales;
 
 		SET vLoopDate = vLoopDate + INTERVAL 1 DAY;
 	END WHILE;