Overigen/dbois
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for invoice details in project overview

Browse Source
This commit is contained in:
theo
2026-01-15 10:14:16 +01:00
parent 7772426dca
commit d171eb73dc
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/Eloquent/queries/QEmployeeHours.php
+4 -4
View File
@@ -10,17 +10,17 @@ class QEmployeeHours {
public static function fire( $month, $year )
{
$sql = "
SELECT monthID,
$sql = "
SELECT MAX(monthID) AS monthID,
user_id,
CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname,
MAX(CONCAT(firstname, ' ', middlename, ' ', lastname)) AS fullname,
ROUND(SUM(projecthours), 0) AS projecthours,
ROUND(SUM(profitablehours), 0) AS profitablehours,
ROUND(SUM(nonprofitablehours), 0) AS nonprofitablehours,
ROUND(SUM(revenues), 0) AS revenues,
ROUND(SUM(nonprojecthours), 0) AS nonprojecthours,
ROUND(SUM(projecthours + nonprojecthours), 0) AS totalhours,
targethours
MAX(targethours) AS targethours
FROM (
SELECT employee_id AS user_id,
MONTH(hourdate) monthID,
app/Models/Eloquent/queries/ReservationTotals.php
+2 -2
View File
@@ -32,7 +32,7 @@ class ReservationTotals {
) Q1
RIGHT JOIN
(
SELECT SUM(costs) AS costs, SUM(payed) AS payed, external_id, project_id, from_reservation
SELECT SUM(costs) AS costs, SUM(payed) AS payed, external_id, project_id, MAX(from_reservation) AS from_reservation
FROM projectcosts
GROUP BY external_id, project_id
) Q2
@@ -47,7 +47,7 @@ class ReservationTotals {
) Q3
LEFT JOIN
(
SELECT SUM(costs) AS costs, SUM(payed) AS payed, external_id, project_id, id, from_reservation
SELECT SUM(costs) AS costs, SUM(payed) AS payed, external_id, project_id, MAX(id) AS id, MAX(from_reservation) AS from_reservation
FROM projectcosts
GROUP BY external_id, project_id
) Q4