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

This commit is contained in:
Laurent Destailleur 2018-12-27 06:18:03 +01:00
commit fadc9983dc

View File

@ -432,8 +432,8 @@ if ($action == 'update')
foreach ($socpeopleassigned as $cid) $object->socpeopleassigned[$cid] = array('id' => $cid); foreach ($socpeopleassigned as $cid) $object->socpeopleassigned[$cid] = array('id' => $cid);
$object->contactid = GETPOST("contactid",'int'); $object->contactid = GETPOST("contactid",'int');
$object->fk_project = GETPOST("projectid",'int'); $object->fk_project = GETPOST("projectid",'int');
$object->note = GETPOST("note"); $object->note = GETPOST("note","none"); // deprecated
$object->pnote = GETPOST("note"); $object->note_private= GETPOST("note","none");
$object->fk_element = GETPOST("fk_element"); $object->fk_element = GETPOST("fk_element");
$object->elementtype = GETPOST("elementtype"); $object->elementtype = GETPOST("elementtype");