scoured out all_projects

master
dtookey 3 years ago
parent bdd97bcae9
commit 3b0cb09fbb

@ -3,15 +3,15 @@ DROP TABLE IF EXISTS billing_report;
CREATE TABLE billing_report AS
SELECT billing.pkey,
refNumber,
(SELECT all_projects.proj_type from all_projects where all_projects.refnum = refNumber) AS division,
(SELECT projects.proj_type from projects where projects.refnum = refNumber) AS division,
line_created,
accepted_date,
(qty * default_price) AS fee,
invoice_accepted,
clients.name as Client
FROM billing
INNER JOIN all_projects on billing.refNumber = all_projects.refnum
INNER JOIN contacts on all_projects.contact_fkey = contacts.pkey
INNER JOIN projects on billing.refNumber = projects.refnum
INNER JOIN contacts on projects.contact_fkey = contacts.pkey
INNER JOIN clients on contacts.cl_fkey = clients.pkey
where invoice_accepted = 1;

@ -55,7 +55,7 @@ SELECT CONCAT(users.email) AS `Technician`,
ap.description AS `Description`
FROM users
INNER JOIN project_lifecycle ON pkey = modifier
INNER JOIN all_projects ap on project_lifecycle.project_number = ap.refnum
INNER JOIN projects ap on project_lifecycle.project_number = ap.refnum
INNER JOIN contacts on ap.contact_fkey = contacts.pkey
INNER JOIN clients on contacts.cl_fkey = clients.pkey
WHERE project_lifecycle.new_value IN ('+READY_FOR_REVIEW')
@ -96,7 +96,7 @@ SELECT CONCAT(users.email) AS `Technician`,
ap.description AS `Description`
FROM users
INNER JOIN project_lifecycle ON pkey = modifier
INNER JOIN all_projects ap on project_lifecycle.project_number = ap.refnum
INNER JOIN projects ap on project_lifecycle.project_number = ap.refnum
INNER JOIN contacts on ap.contact_fkey = contacts.pkey
INNER JOIN clients on contacts.cl_fkey = clients.pkey
WHERE project_lifecycle.new_value IN ('+DELIVERED', '+READY_TO_INVOICE');

@ -7,6 +7,6 @@ SELECT DATE(timestamp) AS event_date,
if(SUBSTRING(new_value, 1, 1) = '+', 1, -1) AS event_count,
SUBSTRING(`new_value` FROM 2) AS flag
FROM project_lifecycle
INNER JOIN all_projects ON project_lifecycle.project_number = all_projects.refnum
INNER JOIN projects ON project_lifecycle.project_number = projects.refnum
WHERE changed_column = 'status';

Loading…
Cancel
Save