diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 031e4e920c0..4f547c22a9d 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -24,7 +24,7 @@ /** * \file htdocs/adherents/class/adherent.class.php * \ingroup member - * \brief Fichier de la classe permettant la gestion d'un adherent + * \brief File of class to manage members of a foundation * \version $Id$ */ @@ -36,7 +36,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); /** * \class Adherent - * \brief Classe permettant la gestion d'un adherent + * \brief Class to manage members of a foundation */ class Adherent extends CommonObject { diff --git a/htdocs/adherents/class/adherent_options.class.php b/htdocs/adherents/class/adherent_options.class.php index 0cc6dd99ff8..d34a679f307 100644 --- a/htdocs/adherents/class/adherent_options.class.php +++ b/htdocs/adherents/class/adherent_options.class.php @@ -24,13 +24,13 @@ /** * \file htdocs/adherents/class/adherent_options.class.php * \ingroup member - * \brief Fichier de la classe de gestion de la table des champs optionels adherents + * \brief File of class to manage optionnal fields * \version $Id$ */ /** * \class AdherentOptions - * \brief Classe de gestion de la table des champs optionels adherents + * \brief Class to manage table of optionnal fields */ class AdherentOptions { @@ -156,9 +156,9 @@ class AdherentOptions } /** - * \brief Fonction qui supprime un attribut - * \param attrname nom de l'atribut - * \TODO pouvoir gerer les entités + * Fonction qui supprime un attribut + * @param $attrname nom de l'atribut + * TODO pouvoir gerer les entités */ function delete($attrname) { diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index c8ed0e5d631..235e5f00516 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -21,7 +21,7 @@ /** * \file htdocs/adherents/class/adherent_type.class.php * \ingroup member - * \brief Fichier de la classe gerant les types d'adherents + * \brief File of class to manage members types * \author Rodolphe Quiedeville * \version $Id$ */ @@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); /** * \class AdherentType - * \brief Classe gerant les types d'adherents + * \brief Class to manage members type */ class AdherentType extends CommonObject { diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php index 6d52007542a..58c8ec5aacb 100644 --- a/htdocs/adherents/class/cotisation.class.php +++ b/htdocs/adherents/class/cotisation.class.php @@ -20,7 +20,7 @@ /** * \file htdocs/adherents/class/cotisation.class.php * \ingroup member - * \brief File of class to manage subscriptions + * \brief File of class to manage subscriptions of foundation members * \version $Id$ */ @@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); /** * \class Cotisation - * \brief Class to manage subscriptions + * \brief Class to manage subscriptions of foundation members */ class Cotisation extends CommonObject { diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 6d901dd95d6..60c1793c3ec 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -141,7 +141,7 @@ if ($_GET["action"] == 'setdoc') if ($_GET["action"] == 'setmod') { - // \todo Verifier si module numerotation choisi peut etre active + // TODO Verifier si module numerotation choisi peut etre active // par appel methode canBeActivated dolibarr_set_const($db, "COMMANDE_ADDON",$_GET["value"],'chaine',0,'',$conf->entity); diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index cb690a37cd7..d2724d3cb28 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -155,7 +155,7 @@ if ($_GET["action"] == 'setdoc') if ($_GET["action"] == 'setmod') { - // \todo Verifier si module numerotation choisi peut etre active + // TODO Verifier si module numerotation choisi peut etre active // par appel methode canBeActivated dolibarr_set_const($db, "FICHEINTER_ADDON",$_GET["value"],'chaine',0,'',$conf->entity); diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php index 541708aac57..f20a53fccea 100644 --- a/htdocs/admin/fournisseur.php +++ b/htdocs/admin/fournisseur.php @@ -126,7 +126,6 @@ if ($_GET["action"] == 'specimenfacture') if ($_GET["action"] == 'set') { - $type='supplier_order'; $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES ('".$_GET["value"]."','".$_GET["type"]."',".$conf->entity.")"; if ($db->query($sql)) { @@ -154,7 +153,7 @@ if ($_GET["action"] == 'setdoc') { $conf->global->COMMANDE_SUPPLIER_ADDON_PDF = $_GET["value"]; } - + if ($_GET["type"] == 'supplier_invoice' && dolibarr_set_const($db, "INVOICE_SUPPLIER_ADDON_PDF",$_GET["value"],'chaine',0,'',$conf->entity)) { $conf->global->INVOICE_SUPPLIER_ADDON_PDF = $_GET["value"]; @@ -181,7 +180,7 @@ if ($_GET["action"] == 'setdoc') if ($_GET["action"] == 'setmod') { - // \todo Verifier si module numerotation choisi peut etre active + // TODO Verifier si module numerotation choisi peut etre active // par appel methode canBeActivated dolibarr_set_const($db, "COMMANDE_SUPPLIER_ADDON",$_GET["value"],'chaine',0,'',$conf->entity); diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 24713357125..c49aa69c2a2 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -146,7 +146,7 @@ if ($_POST["action"] == 'set_DELIVERY_FREE_TEXT') if ($_GET["action"] == 'setmod') { - // \todo Verifier si module numerotation choisi peut etre active + // TODO Verifier si module numerotation choisi peut etre active // par appel methode canBeActivated dolibarr_set_const($db, "LIVRAISON_ADDON",$_GET["value"],'chaine',0,'',$conf->entity); diff --git a/htdocs/admin/project.php b/htdocs/admin/project.php index cfc9fe2cde1..1dd5c833a10 100644 --- a/htdocs/admin/project.php +++ b/htdocs/admin/project.php @@ -135,7 +135,7 @@ if ($_GET["action"] == 'setdoc') if ($_GET["action"] == 'setmod') { - // \todo Verifier si module numerotation choisi peut etre active + // TODO Verifier si module numerotation choisi peut etre active // par appel methode canBeActivated dolibarr_set_const($db, "PROJECT_ADDON",$_GET["value"],'chaine',0,'',$conf->entity); diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php index de5ae3e810e..0a26070b043 100644 --- a/htdocs/admin/propale.php +++ b/htdocs/admin/propale.php @@ -168,7 +168,7 @@ if ($_GET["action"] == 'setdoc') if ($_GET["action"] == 'setmod') { - // \todo Verifier si module numerotation choisi peut etre active + // TODO Verifier si module numerotation choisi peut etre active // par appel methode canBeActivated dolibarr_set_const($db, "PROPALE_ADDON",$_GET["value"],'chaine',0,'',$conf->entity); diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php index dc478065927..29fd0ecd645 100644 --- a/htdocs/bookmarks/class/bookmark.class.php +++ b/htdocs/bookmarks/class/bookmark.class.php @@ -19,16 +19,15 @@ /** * \file htdocs/bookmarks/class/bookmark.class.php * \ingroup bookmark - * \brief File the bookmark class + * \brief File of class to manage bookmarks * \version $Id$ */ /** * \class Bookmark - * \brief Class for managing bookmarks + * \brief Class to manage bookmarks */ - class Bookmark { var $db; diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 8d5ac95098e..3f5ae455806 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -24,7 +24,7 @@ /** * \file htdocs/categories/class/categorie.class.php * \ingroup categorie - * \brief Fichier de la classe des categorie + * \brief File of class to manage categories * \version $Id$ */ @@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php"); /** * \class Categorie - * \brief Classe permettant la gestion des categories + * \brief Class to manage categories */ class Categorie { diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 87975855cc3..c6702e56cd6 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -21,7 +21,7 @@ /** * \file htdocs/comm/action/class/actioncomm.class.php * \ingroup commercial - * \brief Fichier de la classe des actions commerciales + * \brief File of class to manage agenda events (actions) * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php'); @@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'); /** \class ActionComm - * \brief Classe permettant la gestion des actions commerciales + * \brief Class to manage agenda events (actions) */ class ActionComm extends CommonObject { diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php index dd506f2e5d5..6b9faaaad14 100644 --- a/htdocs/comm/action/class/cactioncomm.class.php +++ b/htdocs/comm/action/class/cactioncomm.class.php @@ -20,7 +20,7 @@ /** * \file htdocs/comm/action/class/cactioncomm.class.php * \ingroup commercial - * \brief Fichier de la classe des types d'actions commerciales + * \brief File of class to manage type of agenda events * \version $Id$ */ diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index b51904ca29f..bf7566784b4 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -481,7 +481,7 @@ if ($user->rights->agenda->myactions->read) * Derniers contrats * */ -if ($conf->contrat->enabled && $user->rights->contrat->lire && 0) // \todo A REFAIRE DEPUIS NOUVEAU CONTRAT +if ($conf->contrat->enabled && $user->rights->contrat->lire && 0) // TODO A REFAIRE DEPUIS NOUVEAU CONTRAT { $langs->load("contracts"); diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 177bdd6cf0b..e161ed529a5 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -145,12 +145,12 @@ class Propal extends CommonObject /** - * \brief Ajoute une ligne dans tableau products - * \param idproduct Id du produit a ajouter - * \param qty Quantity - * \param remise_percent Remise relative effectuee sur le produit - * \remarks $this->client doit etre charge - * \TODO Remplacer les appels a cette fonction par generation objet Ligne + * Add line into array products + * $this->client doit etre charge + * @param idproduct Id du produit a ajouter + * @param qty Quantity + * @param remise_percent Remise relative effectuee sur le produit + * TODO Remplacer les appels a cette fonction par generation objet Ligne * insere dans tableau $this->products */ function add_product($idproduct, $qty, $remise_percent=0) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 4958fc17e5b..38af54ccd7c 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -853,7 +853,7 @@ class Commande extends CommonObject $rangtouse = $rangmax + 1; } - // \TODO A virer + // TODO A virer // Anciens indicateurs: $price, $remise (a ne plus utiliser) $price = $pu; $remise = 0; @@ -889,7 +889,7 @@ class Commande extends CommonObject $this->line->date_start=$date_start; $this->line->date_end=$date_end; - // \TODO Ne plus utiliser + // TODO Ne plus utiliser $this->line->price=$price; $this->line->remise=$remise; @@ -897,7 +897,7 @@ class Commande extends CommonObject if ($result > 0) { // Mise a jour informations denormalisees au niveau de la commande meme - $this->id=$commandeid; // \TODO A virer + $this->id=$commandeid; // TODO A virer $result=$this->update_price($commandeid); if ($result > 0) { @@ -922,15 +922,15 @@ class Commande extends CommonObject /** - * \brief Ajoute une ligne dans tableau lines - * \param idproduct Id du produit a ajouter - * \param qty Quantite - * \param date_start Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html) - * \param date_end End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html) - * \remise_percent remise_percent Remise relative effectuee sur le produit - * \return void - * \remarks $this->client doit etre charge - * \TODO Remplacer les appels a cette fonction par generation objet Ligne + * Add line into array + * $this->client doit etre charge + * @param idproduct Id du produit a ajouter + * @param qty Quantite + * @param date_start Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html) + * @param date_end End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html) + * @remise_percent remise_percent Remise relative effectuee sur le produit + * @return void + * TODO Remplacer les appels a cette fonction par generation objet Ligne * insere dans tableau $this->products */ function add_product($idproduct, $qty, $remise_percent=0, $date_start='', $date_end='') diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 1da8a80dcf0..9ebb2ee11b3 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -457,7 +457,7 @@ if ($account || $_GET["ref"]) } if ($mode_search && $conf->adherent->enabled) { - // \TODO Mettre jointure sur adherent pour recherche sur un adherent + // TODO Mettre jointure sur adherent pour recherche sur un adherent //$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu3 ON bu3.fk_bank = b.rowid AND bu3.type='company'"; //$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON bu3.url_id = s.rowid"; } diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 2cee3af5905..09f0e0f2ebe 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -1166,7 +1166,7 @@ class AccountLine extends CommonObject } $this->date_creation = $this->db->jdate($obj->datec); - //$this->date_rappro = $obj->daterappro; // \todo pas encore g�r�e + //$this->date_rappro = $obj->daterappro; // Not yet managed } $this->db->free($result); } diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index 3727fe23b93..9907414aad7 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -257,7 +257,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) if ($obj->family == 'supplier_invoice') { - // \TODO This code is to avoid to count suppliers credit note (ff.type = 2) + // TODO This code is to avoid to count suppliers credit note (ff.type = 2) // Ajouter gestion des avoirs fournisseurs, champ if (($obj->total_ttc < 0 && $obj->type != 2) || ($obj->total_ttc > 0 && $obj->type == 2)) diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index 6b77c047a7e..3005de4a907 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -65,9 +65,9 @@ class Deplacement extends CommonObject /** * Create object in database * - * @param $user User that creat + * @param $user User that creates * @return int <0 if KO, >0 if OK - * @TODO Add ref number + * TODO Add ref number */ function create($user) { diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 8ec133bf206..0182fc729d6 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1415,13 +1415,12 @@ if ($_GET['action'] == 'create') print '
| '; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index ef6cfbfcb0c..6f3680c10c1 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -222,11 +222,11 @@ class Form } /** - * \brief Return combo list of activated countries, into language of user - * \param selected Id or Code or Label of preselected country - * \param htmlname Name of html select object - * \param htmloption Options html on select object - * \TODO trier liste sur noms apres traduction plutot que avant + * Return combo list of activated countries, into language of user + * @param selected Id or Code or Label of preselected country + * @param htmlname Name of html select object + * @param htmloption Options html on select object + * TODO trier liste sur noms apres traduction plutot que avant */ function select_pays($selected='',$htmlname='pays_id',$htmloption='') { @@ -234,11 +234,11 @@ class Form } /** - * \brief Return combo list of activated countries, into language of user - * \param selected Id or Code or Label of preselected country - * \param htmlname Name of html select object - * \param htmloption Options html on select object - * \TODO trier liste sur noms apres traduction plutot que avant + * Return combo list of activated countries, into language of user + * @param selected Id or Code or Label of preselected country + * @param htmlname Name of html select object + * @param htmloption Options html on select object + * TODO trier liste sur noms apres traduction plutot que avant */ function select_country($selected='',$htmlname='pays_id',$htmloption='') { @@ -398,12 +398,12 @@ class Form /** * Return list of types of lines (product or service) + * Example: 0=product, 1=service, 9=other (for external module) * @param selected Preselected type * @param htmlname Name of field in html form * @param showempty Add an empty field * @param hidetext Do not show label before combo box * @param forceall Force to show products and services in combo list, whatever are activated modules - * @example 0=product, 1=service, 9=other (for external module) */ function select_type_of_lines($selected='',$htmlname='type',$showempty=0,$hidetext=0,$forceall=0) { @@ -516,7 +516,7 @@ class Form if ($conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT && ! $forcecombo) { $minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2); - + $socid = 0; if ($selected) { diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index c8cfd36e6bc..cb4500d5524 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -794,17 +794,7 @@ class CMailFile */ function server_parse($socket, $response) { - /** - * Default return value - * - * Returns constructed SELECT Object string or boolean upon failure - * Default value is set at TRUE - * - * @var mixed $_retVal Indicates if Object was created or not - * @access private - * @static - */ - $_retVal = true; + $_retVal = true; // Indicates if Object was created or not $server_response = ''; while ( substr($server_response,3,1) != ' ' ) diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php index 6713fe3be6a..588eaed6e7a 100644 --- a/htdocs/societe/class/address.class.php +++ b/htdocs/societe/class/address.class.php @@ -28,7 +28,7 @@ /** * \class Address - * \brief Classe permettant la gestion des adresses des tiers + * \brief Class to manage addresses */ class Address { diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 5360ace0236..9e91796510e 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -33,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); /** * \class User - * \brief Classe permettant la gestion d'un utilisateur + * \brief Class to manage users */ class User extends CommonObject { diff --git a/scripts/banks/build-graph-sold-example.php b/scripts/banks/build-graph-sold-example.php index 56843566ec0..75a58efbaac 100644 --- a/scripts/banks/build-graph-sold-example.php +++ b/scripts/banks/build-graph-sold-example.php @@ -158,7 +158,7 @@ foreach ($accounts as $account) // print strftime("%Y%m%d",$max); // Chargement du tableau $amounts - // \todo peut etre optimise en virant les date_format + // TODO peut etre optimise en virant les date_format $amounts = array(); $sql = "SELECT date_format(datev,'%Y%m%d'), sum(amount)"; $sql .= " FROM ".MAIN_DB_PREFIX."bank"; @@ -252,7 +252,7 @@ foreach ($accounts as $account) // Chargement du tableau $amounts - // \todo peut etre optimise en virant les date_format + // TODO peut etre optimise en virant les date_format $amounts = array(); $sql = "SELECT date_format(datev,'%Y%m%d'), sum(amount)"; $sql .= " FROM ".MAIN_DB_PREFIX."bank"; @@ -346,7 +346,7 @@ foreach ($accounts as $account) // Chargement du tableau $amounts - // \todo peut etre optimise en virant les date_format + // TODO peut etre optimise en virant les date_format $amounts = array(); $sql = "SELECT date_format(datev,'%Y%m%d'), sum(amount)"; $sql .= " FROM ".MAIN_DB_PREFIX."bank"; |