diff --git a/htdocs/cactioncomm.class.php b/htdocs/cactioncomm.class.php index 4e2d184c7cc..53705bbdbe8 100644 --- a/htdocs/cactioncomm.class.php +++ b/htdocs/cactioncomm.class.php @@ -18,17 +18,16 @@ */ /** - \file htdocs/cactioncomm.class.php - \ingroup commercial - \brief Fichier de la classe des types d'actions commerciales - \version $Id$ + * \file htdocs/cactioncomm.class.php + * \ingroup commercial + * \brief Fichier de la classe des types d'actions commerciales + * \version $Id$ */ -/** \class CActioncomm - \brief Classe permettant la gestion des diff�rents types d'actions commerciales -*/ - +/** \class CActionComm + * \brief Class to manage different types of events + */ class CActionComm { var $db; @@ -40,9 +39,9 @@ class CActionComm { var $active; var $error; - + var $type_actions=array(); - + /** * \brief Constructeur @@ -60,25 +59,25 @@ class CActionComm { */ function fetch($id) { - + $sql = "SELECT id, code, type, libelle, active"; $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm"; if (is_numeric($id)) $sql.= " WHERE id=".$id; else $sql.= " WHERE code='".$id."'"; - + $resql=$this->db->query($sql); if ($resql) { if ($this->db->num_rows($resql)) { $obj = $this->db->fetch_object($resql); - + $this->id = $obj->id; $this->code = $obj->code; $this->type = $obj->type; $this->libelle = $obj->libelle; $this->active = $obj->active; - + return 1; } else @@ -104,17 +103,17 @@ class CActionComm { { global $langs,$conf; $langs->load("commercial"); - + $repid = array(); $repcode = array(); - + $sql = "SELECT id, code, libelle, module"; $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm"; if ($active != '') { $sql.=" WHERE active=".$active; } - + dol_syslog("CActionComm::liste_array sql=".$sql); $resql=$this->db->query($sql); if ($resql) @@ -152,7 +151,7 @@ class CActionComm { } } - + /** * \brief Renvoie le nom sous forme d'un libelle traduit d'un type d'action * \param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul @@ -168,5 +167,5 @@ class CActionComm { if ($transcode != "Action".$this->code) return $transcode; } -} +} ?> diff --git a/htdocs/includes/modules/modImport.class.php b/htdocs/includes/modules/modImport.class.php index 34d482a9273..ad6355fc5b5 100644 --- a/htdocs/includes/modules/modImport.class.php +++ b/htdocs/includes/modules/modImport.class.php @@ -17,24 +17,23 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/** \defgroup import Module Iimport - \brief Module generique pour realiser des imports de donnees en base - \version $Id$ +/** \defgroup import Module import + * \brief Module to make generic import of data into dolibarr database + * \version $Id$ */ /** - \file htdocs/includes/modules/modImport.class.php - \ingroup import - \brief Fichier de description et activation du module Import + * \file htdocs/includes/modules/modImport.class.php + * \ingroup import + * \brief Fichier de description et activation du module Import */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); /** \class modImport - \brief Classe de description et activation du module Import + * \brief Classe de description et activation du module Import */ - class modImport extends DolibarrModules { diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 269f63c862b..2a7fb44ba82 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -482,8 +482,8 @@ function dol_print_date($time,$format='',$to_gmt=false,$outputlangs='',$encodeto * YYYYMMDDHHMMSS * DD/MM/YY or DD/MM/YYYY (this format should not be used anymore) * DD/MM/YY HH:MM:SS or DD/MM/YYYY HH:MM:SS (this format should not be used anymore) - * \return date Date - * \example 19700101020000 -> 7200 + * 19700101020000 -> 7200 + * \return date Date */ function dol_stringtotime($string) {