This commit is contained in:
Laurent Destailleur 2015-03-04 02:28:16 +01:00
parent 6f96d4cd5c
commit 4c1d51bd39
2 changed files with 2 additions and 1 deletions

View File

@ -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;

View File

@ -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
*/