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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2022-06-17 14:53:54 +02:00
commit ffbd057ef3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/emailcollector/class/emailcollectoraction.class.php
View File

@ -271,9 +271,9 @@ class EmailCollectorAction extends CommonObject
public function fetch($id, $ref = null) public function fetch($id, $ref = null)
{ {
$result = $this->fetchCommon($id, $ref); $result = $this->fetchCommon($id, $ref);
if ($result > 0 && !empty($this->table_element_line)) { // if ($result > 0 && !empty($this->table_element_line)) {
$this->fetchLines(); // $this->fetchLinesCommon();
} // }
return $result; return $result;
} }

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

@ -85,6 +85,11 @@ class Task extends CommonObjectLine
public $date_end; public $date_end;
public $progress; public $progress;
/**
* @deprecated Use date_end instead
*/
public $datee;
/** /**
* @var int ID * @var int ID
*/ */