Merge remote-tracking branch 'upstream/develop' into camelCaps

This commit is contained in:
Frédéric FRANCE
2018-08-25 09:07:04 +02:00
33 changed files with 180 additions and 80 deletions

View File

@@ -194,7 +194,7 @@ class Task extends CommonObject
*/
function fetch($id, $ref='', $loadparentdata=0)
{
global $langs;
global $langs, $conf;
$sql = "SELECT";
$sql.= " t.rowid,";
@@ -267,7 +267,6 @@ class Task extends CommonObject
}
// Retreive all extrafield
// fetch optionals attributes and labels
$this->fetch_optionals();
}