diff --git a/htdocs/compta/dons/pre.inc.php b/htdocs/compta/dons/pre.inc.php index 1161d7e085d..1d2878f78e5 100644 --- a/htdocs/compta/dons/pre.inc.php +++ b/htdocs/compta/dons/pre.inc.php @@ -28,7 +28,6 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projetdon.class.php"); $langs->load("donations"); $langs->load("propal"); diff --git a/htdocs/includes/modules/dons/html_cerfafr.modules.php b/htdocs/includes/modules/dons/html_cerfafr.modules.php index db63b00f181..60bc8b4c58c 100644 --- a/htdocs/includes/modules/dons/html_cerfafr.modules.php +++ b/htdocs/includes/modules/dons/html_cerfafr.modules.php @@ -15,31 +15,27 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ /** - \file htdocs/includes/dons/html_cerfafr.modules.php + \file htdocs/includes/modules/dons/html_cerfafr.modules.php \ingroup don \brief Formulaire de don - \version $Revision$ + \version $Id$ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/dons/modules_don.php"); -require_once(DOL_DOCUMENT_ROOT."/projetdon.class.php"); require_once(DOL_DOCUMENT_ROOT."/don.class.php"); /** \class html_cerfafr - \brief Classe permettant de générer les propales au modèle Azur + \brief Classe permettant de g�n�rer les propales au mod�le Azur */ class html_cerfafr extends ModeleDon { /** \brief Constructeur - \param db Handler accès base de donnée + \param db Handler acc�s base de donn�e */ function html_cerfafr($db) @@ -48,7 +44,7 @@ class html_cerfafr extends ModeleDon $this->db = $db; $this->name = "cerfafr"; - $this->description = "Modèle de reçu de dons"; + $this->description = "Modele de recu de dons"; // Dimension page pour format A4 $this->type = 'html'; @@ -56,8 +52,8 @@ class html_cerfafr extends ModeleDon /** - \brief Renvoi dernière erreur - \return string Dernière erreur + \brief Renvoi derni�re erreur + \return string Derni�re erreur */ function pdferror() { @@ -66,8 +62,8 @@ class html_cerfafr extends ModeleDon /** - \brief Fonction générant le recu sur le disque - \param id Id du recu à générer + \brief Fonction g�n�rant le recu sur le disque + \param id Id du recu � g�n�rer \return int >0 si ok, <0 si ko */ function write_file($don) @@ -77,7 +73,7 @@ class html_cerfafr extends ModeleDon if ($conf->don->dir_output) { - // Définition de l'objet $don (pour compatibilite ascendante) + // D�finition de l'objet $don (pour compatibilite ascendante) if (! is_object($don)) { $id = $don; @@ -85,7 +81,7 @@ class html_cerfafr extends ModeleDon $ret=$don->fetch($id); } - // Définition de $dir et $file + // D�finition de $dir et $file if ($don->specimen) { $dir = $conf->don->dir_output; diff --git a/htdocs/projetdon.class.php b/htdocs/projetdon.class.php deleted file mode 100644 index 1223910fbf7..00000000000 --- a/htdocs/projetdon.class.php +++ /dev/null @@ -1,72 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ - * - */ - - -class ProjetDon { - var $id; - var $db; - var $ref; - var $title; - var $socid; - - function ProjetDon($DB) { - $this->db = $DB; - } - - /* - * - * - * - */ - - function liste_array($id_societe='') - { - $projets = array(); - - $sql = "SELECT rowid, libelle FROM ".MAIN_DB_PREFIX."don_projet"; - - if ($this->db->query($sql) ) - { - $nump = $this->db->num_rows(); - - if ($nump) - { - $i = 0; - while ($i < $nump) - { - $obj = $this->db->fetch_object(); - - $projets[$obj->rowid] = $obj->libelle; - $i++; - } - } - return $projets; - } - else - { - print $this->db->error(); - } - - } - -} -?>