diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index e92068ee364..024ab5c30a9 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -1,8 +1,8 @@ - * Copyright (C) 2012 Laurent Destailleur - * Copyright (C) 2012 Regis Houssin - * Copyright (C) 2013 Florian Henry +/* Copyright (C) 2011 Dimitri Mouillard + * Copyright (C) 2012-2014 Laurent Destailleur + * Copyright (C) 2012 Regis Houssin + * Copyright (C) 2013 Florian Henry * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -923,13 +923,13 @@ class Holiday extends CommonObject dol_syslog(get_class($this).'::updateSoldeCP sql='.$sql2); $result= $this->db->query($sql2); - + if ($result) return 1; else return -1; } - + return 0; - } + } else { // Mise à jour pour un utilisateur @@ -942,7 +942,7 @@ class Holiday extends CommonObject dol_syslog(get_class($this).'::updateSoldeCP sql='.$sql); $result = $this->db->query($sql); - + if ($result) return 1; else return -1; } @@ -1061,7 +1061,7 @@ class Holiday extends CommonObject $sql = "SELECT u.rowid"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; - $sql.= " WHERE statut > '0'"; + $sql.= " WHERE statut > 0"; dol_syslog(get_class($this)."::fetchUsers sql=".$sql, LOG_DEBUG); $resql=$this->db->query($sql); @@ -1143,7 +1143,7 @@ class Holiday extends CommonObject $sql = "SELECT u.rowid, u.lastname, u.firstname"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; - $sql.= " WHERE statut > '0'"; + $sql.= " WHERE statut > 0"; dol_syslog(get_class($this)."::fetchUsers sql=".$sql, LOG_DEBUG); $resql=$this->db->query($sql); @@ -1229,7 +1229,7 @@ class Holiday extends CommonObject $sql = "SELECT count(u.rowid) as compteur"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; - $sql.= " WHERE u.statut > '0'"; + $sql.= " WHERE u.statut > 0"; $result = $this->db->query($sql); $objet = $this->db->fetch_object($result); @@ -1256,8 +1256,8 @@ class Holiday extends CommonObject /** * Compare le nombre d'utilisateur actif de Dolibarr à celui des utilisateurs des congés payés * - * @param int $userDolibarr nombre d'utilisateur actifs dans Dolibarr - * @param int $userCP nombre d'utilisateur actifs dans le module congés payés + * @param int $userDolibarrWithoutCP Number of active users in Dolibarr without holidays + * @param int $userCP Number of active users into table of holidays * @return void */ function verifNbUsers($userDolibarrWithoutCP,$userCP) { @@ -1670,7 +1670,7 @@ class Holiday extends CommonObject $sql.= " cpl.new_solde"; $sql.= " FROM ".MAIN_DB_PREFIX."holiday_logs as cpl"; - $sql.= " WHERE cpl.rowid > '0'"; // Hack pour la recherche sur le tableau + $sql.= " WHERE cpl.rowid > 0"; // To avoid error with other search and criteria // Filtrage de séléction if(!empty($filter)) {