diff --git a/htdocs/actioncomm.class.php b/htdocs/actioncomm.class.php index 0a8e3e030bd..43806b7e643 100644 --- a/htdocs/actioncomm.class.php +++ b/htdocs/actioncomm.class.php @@ -477,9 +477,9 @@ class ActionComm /** - * \brief Retourne le libell� du statut de la commande - * \param mode 0=libell� long, 1=libell� court, 2=Picto + Libell� court, 3=Picto, 4=Picto + Libell� long, 5=Libell� court + Picto - * \return string Libell� + * \brief Retourne le libelle du statut de la commande + * \param mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto + * \return string Libelle */ function getLibStatut($mode) { @@ -487,10 +487,10 @@ class ActionComm } /** - * \brief Renvoi le libell� d'un statut donn� + * \brief Renvoi le libelle d'un statut donne * \param percent Pourcentage avancement - * \param mode 0=libell� long, 1=libell� court, 2=Picto + Libell� court, 3=Picto, 4=Picto + Libell� long, 5=Libell� court + Picto - * \return string Libell� + * \param mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto + * \return string Libelle */ function LibStatut($percent,$mode) { diff --git a/htdocs/project.class.php b/htdocs/project.class.php index c8084d0b329..1f866271763 100644 --- a/htdocs/project.class.php +++ b/htdocs/project.class.php @@ -265,7 +265,7 @@ class Project extends CommonObject if ($type == 'order_supplier') $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE fk_projet=".$this->id; if ($type == 'invoice_supplier') $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture_fourn WHERE fk_projet=".$this->id; if ($type == 'contract') $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."contrat WHERE fk_projet=".$this->id; - if ($type == 'agenda') $sql = "SELECT id as rowid FROM ".MAIN_DB_PREFIX."actioncomm WHERE fk_project=".$this->id; + if ($type == 'agenda') $sql = "SELECT id as rowid FROM ".MAIN_DB_PREFIX."actioncomm WHERE fk_projet=".$this->id; if (! $sql) return -1; dol_syslog("Project::get_element_list sql=".$sql);