master #2455

Merged
juan merged 8 commits from master into test 2024-05-15 06:56:49 +00:00
1 changed files with 3 additions and 1 deletions
Showing only changes of commit adaba6ecfb - Show all commits

View File

@ -56,7 +56,9 @@ BEGIN
typeFk, typeFk,
clientFk, clientFk,
companyFk, companyFk,
IF (marginComponents IS NULL, 0, CAST(marginComponents + amount + surcharge - total AS DECIMAL(10, 3))) IF (marginComponents IS NULL,
0,
CAST(marginComponents + amount + surcharge - total AS DECIMAL(10, 3)))
FROM calculatedSales; FROM calculatedSales;
END$$ END$$
DELIMITER ; DELIMITER ;