Merged in dashboards2 (pull request #2148)

Correction to usr_reporting calculation

workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql

@@ -41,8 +41,9 @@ SELECT
 FROM
     APP_CACHE_VIEW AS ACV
 WHERE
-    ACV.DEL_INIT_DATE BETWEEN CAST(@INIT_DATE AS DATETIME) AND CAST(@FINISH_DATE AS DATETIME)
-GROUP BY ACV.USR_UID , ACV.TAS_UID , ACV.PRO_UID;
+    (ACV.DEL_INIT_DATE BETWEEN CAST(@INIT_DATE AS DATETIME) AND CAST(@FINISH_DATE AS DATETIME))
+    AND ACV.DEL_INIT_DATE IS NOT NULL
+GROUP BY ACV.USR_UID , ACV.TAS_UID, DATE_FORMAT( ACV.DEL_INIT_DATE,  '%m' ) , DATE_FORMAT( ACV.DEL_INIT_DATE,  '%Y' ) ;
 
 DELETE USR_REPORTING
 FROM USR_REPORTING