Merge pull request #121 from delcroip/develop

rev 4.3.1
delcroip · Aug 1, 2020 · c2a1b56 · c2a1b56
2 parents 8d04b82 + 0a4644e
commit c2a1b56
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/htdocs/timesheet/ChangeLog.md b/htdocs/timesheet/ChangeLog.md
@@ -1,4 +1,9 @@
 # dolibarr_project_timesheet changelog
+4.3.1
+- fix: show only active user in unserreport (admin)
+- fix: missing SQL quotes
+- fix: wrong task in reports
+
 4.3.0
 - new: possibility to ungroup reports
 - fix: remove closed project (without end date) task

diff --git a/htdocs/timesheet/TimesheetReportUser.php b/htdocs/timesheet/TimesheetReportUser.php
@@ -82,7 +82,7 @@
 $sql .= 'JOIN '.MAIN_DB_PREFIX.'element_contact as ec '
      .' ON ec.fk_socpeople = usr.rowid '
      .' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_contact as ctc ON ctc.rowid = ec.fk_c_type_contact'
-     .' WHERE ctc.element in (\'project_task\', \'project\') AND ctc.active = \'1\' ';
+     .' WHERE ctc.element in (\'project_task\', \'project\') AND ctc.active = \'1\' AND usr.statut = \'1\' ';
 if(!$user->admin) {
     $list = getSubordinates($db, $userid, 3);
     $list[] = $userid;

diff --git a/htdocs/timesheet/class/AttendanceEvent.class.php b/htdocs/timesheet/class/AttendanceEvent.class.php
@@ -789,9 +789,9 @@ public function fetchTasks($userid = '', $date = '')
     $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as prj ON prj.rowid = tsk.fk_projet ';
     $sql .= " WHERE ec.fk_socpeople = '".$userid."' AND ctc.element = 'project_task' ";
     if($conf->global->TIMESHEET_HIDE_DRAFT == '1') {
-        $sql .= ' AND prj.fk_statut =  1)';
+        $sql .= ' AND prj.fk_statut =  \'1\')';
     }else{
-        $sql .= ' AND prj.fk_statut in (0, 1)';
+        $sql .= ' AND prj.fk_statut in (\'0\', \'1\')';
     }
     $sql .= ' AND (prj.datee >= \''.$this->db->idate($datestart).'\' OR prj.datee IS NULL)';
     $sql .= ' AND (prj.dateo <= \''.$this->db->idate($datestop).'\' OR prj.dateo IS NULL)';

diff --git a/htdocs/timesheet/class/TimesheetReport.class.php b/htdocs/timesheet/class/TimesheetReport.class.php
@@ -246,7 +246,7 @@ public function  getReportArray($forceGroup = false)
         $resArray = array();
         $first = true;
 
-        $sql = 'SELECT tsk.fk_projet as projectid, ptt.fk_user  as userid, tsk.fk_projet as taskid, ptt.rowid as id,';
+        $sql = 'SELECT tsk.fk_projet as projectid, ptt.fk_user  as userid, tsk.rowid as taskid, ptt.rowid as id,';
         if(version_compare(DOL_VERSION, "4.9.9") >= 0) {
             $sql .= ' (ptt.invoice_id > 0 or ptt.invoice_line_id>0)  AS invoiced,';
         }else{

diff --git a/htdocs/timesheet/class/TimesheetUserTasks.class.php b/htdocs/timesheet/class/TimesheetUserTasks.class.php
@@ -527,9 +527,9 @@ public function fetchTaskTimesheet($userid = '')
     //end approval
     $sql .= " WHERE ec.fk_socpeople = '".$userid."' AND ctc.element = 'project_task' ";
     if($conf->global->TIMESHEET_HIDE_DRAFT == '1') {
-        $sql .= ' AND prj.fk_statut =  1)';
+        $sql .= ' AND prj.fk_statut =  \'1\')';
     }else{
-        $sql .= ' AND prj.fk_statut in (0, 1)';
+        $sql .= ' AND prj.fk_statut in (\'0\',\'1\')';
     }
     $sql .= ' AND (prj.datee >= \''.$this->db->idate($datestart).'\' OR prj.datee IS NULL)';
     $sql .= ' AND (prj.dateo <= \''.$this->db->idate($datestop).'\' OR prj.dateo IS NULL)';

diff --git a/htdocs/timesheet/core/modules/modtimesheet.class.php b/htdocs/timesheet/core/modules/modtimesheet.class.php
@@ -52,7 +52,7 @@ public function __construct($db)
                 // Module description, used if translation string 'ModuleXXXDesc' not found(where XXX is value of numeric property 'numero' of module)
                 $this->description = "TimesheetView";
                 // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-                $this->version = '4.3.0';
+                $this->version = '4.3.1';
                 // Key used in llx_cons table to save module status enabled/disabled(where timesheet is value of property name of module in uppercase)
                 $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
                 // Where to store the module in setup page(0=common, 1=interface, 2=others, 3=very specific)