diff --git a/lib/classes/module/report/activity.php b/lib/classes/module/report/activity.php index 1ca2b58ec0..0c6cfcf62d 100644 --- a/lib/classes/module/report/activity.php +++ b/lib/classes/module/report/activity.php @@ -294,7 +294,7 @@ class module_report_activity extends module_report AND (log_docs.action = 'download' OR log_docs.action = 'mail') AND (log_docs.final = 'preview' OR log_docs.final = 'document') ) AS tt - INNER JOIN record ON (record.record_id = tt.record_id) + LEFT JOIN record ON (record.record_id = tt.record_id) LEFT JOIN subdef AS s ON (s.record_id = tt.record_id) WHERE s.name = tt.final GROUP BY tt.final, ddate @@ -480,7 +480,7 @@ class module_report_activity extends module_report WHERE (" . $filter['sql'] . ") AND !ISNULL(usrid) AND (log_docs.action = 'download' OR log_docs.action = 'mail') ) AS tt - INNER JOIN record ON (record.record_id = tt.record_id) + LEFT JOIN record ON (record.record_id = tt.record_id) LEFT JOIN subdef FORCE INDEX (unicite) ON (tt.record_id = subdef.record_id) WHERE subdef.name = tt.final GROUP BY " . $on . ", usrid diff --git a/lib/classes/module/report/sqlaction.php b/lib/classes/module/report/sqlaction.php index 530d2b2da2..dadc4daad9 100644 --- a/lib/classes/module/report/sqlaction.php +++ b/lib/classes/module/report/sqlaction.php @@ -50,7 +50,7 @@ class module_report_sqlaction extends module_report_sql implements module_report SELECT DISTINCT(log.id), log.usrid, log.user, d.final, d.comment, d.record_id, d.date, record.mime, record.originalname as file FROM (log_docs AS d) INNER JOIN log FORCE INDEX (date_site) ON (log.id = d.log_id) - INNER JOIN record ON (record.record_id = d.record_id) + LEFT JOIN record ON (record.record_id = d.record_id) WHERE (" . $filter['sql'] . ") AND (d.action = :action) ) AS tt"; @@ -81,7 +81,7 @@ class module_report_sqlaction extends module_report_sql implements module_report SELECT DISTINCT(log.id), TRIM(" . $this->getTransQuery($this->groupby) . ") AS " . $this->groupby . " , log.usrid , d.final, d.record_id, d.date FROM (log_docs as d) INNER JOIN log FORCE INDEX (date_site) ON (log.id = d.log_id) - INNER JOIN record ON (record.record_id = d.record_id) + LEFT JOIN record ON (record.record_id = d.record_id) WHERE (" . $filter['sql'] . ") AND (d.action = :action) ) AS tt LEFT JOIN subdef AS s ON (s.record_id=tt.record_id) @@ -111,7 +111,7 @@ class module_report_sqlaction extends module_report_sql implements module_report SELECT DISTINCT(log.id), " . $this->getTransQuery($field) . " AS val FROM (log_docs as d) INNER JOIN log FORCE INDEX (date_site) ON (log.id = d.log_id) - INNER JOIN record ON (record.record_id = d.record_id) + LEFT JOIN record ON (record.record_id = d.record_id) LEFT JOIN subdef as s ON (s.record_id=d.record_id AND s.name='document') WHERE (" . $filter['sql'] . ") AND (d.action = :action) diff --git a/lib/classes/module/report/sqldownload.php b/lib/classes/module/report/sqldownload.php index bd467ad100..c343099753 100644 --- a/lib/classes/module/report/sqldownload.php +++ b/lib/classes/module/report/sqldownload.php @@ -95,8 +95,8 @@ class module_report_sqldownload extends module_report_sql implements module_repo SELECT DISTINCT(log.id), TRIM(' . $field . ') AS ' . $name . ' FROM log FORCE INDEX (date_site) INNER JOIN log_docs ON (log.id = log_docs.log_id) - INNER JOIN record ON (log_docs.record_id = record.record_id) - INNER JOIN subdef ON ( log_docs.record_id = subdef.record_id)'; + LEFT JOIN record ON (log_docs.record_id = record.record_id) + LEFT JOIN subdef ON ( log_docs.record_id = subdef.record_id)'; // no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND); } else { $this->sql = ' @@ -105,8 +105,8 @@ class module_report_sqldownload extends module_report_sql implements module_repo SELECT DISTINCT(log.id), TRIM( ' . $this->getTransQuery($this->groupby) . ') AS ' . $name . ' FROM log FORCE INDEX (date_site) INNER JOIN log_docs ON (log.id = log_docs.log_id) - INNER JOIN record ON (log_docs.record_id = record.record_id) - INNER JOIN subdef ON (record.record_id = subdef.record_id)'; + LEFT JOIN record ON (log_docs.record_id = record.record_id) + LEFT JOIN subdef ON (record.record_id = subdef.record_id)'; // no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND); } @@ -150,8 +150,8 @@ class module_report_sqldownload extends module_report_sql implements module_repo SELECT DISTINCT(log.id), ' . $this->getTransQuery($field) . ' AS val FROM log FORCE INDEX (date_site) INNER JOIN log_docs ON (log.id = log_docs.log_id) - INNER JOIN record ON (log_docs.record_id = record.record_id) - INNER JOIN subdef ON (log_docs.record_id = subdef.record_id) + LEFT JOIN record ON (log_docs.record_id = record.record_id) + LEFT JOIN subdef ON (log_docs.record_id = subdef.record_id) WHERE (' . $filter['sql'] . ') AND (log_docs.action = "download" OR log_docs.action = "mail")' . ($this->on == 'DOC' ? ' AND subdef.name = "document"' : '') .