diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 1134d3f0945..c4b2902113a 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2575,7 +2575,7 @@ abstract class CommonObject { global $conf, $hookmanager, $inputalsopricewithtax, $usemargins, $langs, $user; - # Define usemargins + // Define usemargins $usemargins=0; if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element,array('facture','propal','commande'))) $usemargins=1; diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 12750e00c6f..1d5daf2110a 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -1437,6 +1437,7 @@ class Project extends CommonObject * load time spent into this->weekWorkLoad for all day of a week and task id * * @param int $datestart First day of week (use dol_get_first_day to find this date) + * @param int $taskid Task id * @param int $userid Time consumed per a particular user * @return int <0 if OK, >0 if KO */