lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'NEW/element_time_code_integration' of github.com:atm-gauthier/dolibarr into NEW/element_time_code_integration

Browse Source
This commit is contained in:
Gauthier PC portable 024 2023-03-08 11:59:55 +01:00
commit 87f9052f87
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/projet/class/task.class.php
View File

@ -1310,7 +1310,7 @@ class Task extends CommonObjectLine
} }
// Update hourly rate of this time spent entry // Update hourly rate of this time spent entry
$resql_thm_user = $this->db->query("SELECT thm FROM " . MAIN_DB_PREFIX . "user WHERE rowid = " . ((int)$timespent->fk_user)); $resql_thm_user = $this->db->query("SELECT thm FROM " . MAIN_DB_PREFIX . "user WHERE rowid = " . ((int) $timespent->fk_user));
if (!empty($resql_thm_user)) { if (!empty($resql_thm_user)) {
$obj_thm_user = $this->db->fetch_object($resql_thm_user); $obj_thm_user = $this->db->fetch_object($resql_thm_user);
$timespent->thm = $obj_thm_user->thm; $timespent->thm = $obj_thm_user->thm;
@ -1573,7 +1573,6 @@ class Task extends CommonObjectLine
} }
return 0; return 0;
} }
/** /**
@ -1760,8 +1759,8 @@ class Task extends CommonObjectLine
// Update hourly rate of this time spent entry, but only if it was not set initialy // Update hourly rate of this time spent entry, but only if it was not set initialy
$res_update = 1; $res_update = 1;
if(empty($timespent->thm) || !empty($conf->global->TIMESPENT_ALWAYS_UPDATE_THM)) { if (empty($timespent->thm) || !empty($conf->global->TIMESPENT_ALWAYS_UPDATE_THM)) {
$resql_thm_user = $this->db->query("SELECT thm FROM " . MAIN_DB_PREFIX . "user WHERE rowid = " . ((int)$timespent->fk_user)); $resql_thm_user = $this->db->query("SELECT thm FROM " . MAIN_DB_PREFIX . "user WHERE rowid = " . ((int) $timespent->fk_user));
if (!empty($resql_thm_user)) { if (!empty($resql_thm_user)) {
$obj_thm_user = $this->db->fetch_object($resql_thm_user); $obj_thm_user = $this->db->fetch_object($resql_thm_user);
$timespent->thm = $obj_thm_user->thm; $timespent->thm = $obj_thm_user->thm;