7383-testToMaster #2445

Merged
alexm merged 233 commits from 7383-testToMaster into master 2024-05-14 05:44:13 +00:00
1 changed files with 25 additions and 25 deletions
Showing only changes of commit a40545264b - Show all commits

View File

@ -34,7 +34,7 @@ BEGIN
clientFk,
companyFk,
margin
)WITH calculated AS(
)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,
@ -64,7 +64,7 @@ BEGIN
clientFk,
companyFk,
marginComponents + amount + surcharge - pvp
FROM calculated;
FROM calculatedSales;
SET vLoopDate = vLoopDate + INTERVAL 1 DAY;
END WHILE;