diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index af98d7162da7a9aa29f6781c74472e087ee547a8..71f41d84e00e43fb58385026ec1095191b3e7886 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -2,6 +2,7 @@ /* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2009 Regis Houssin <regis.houssin@capnetworks.com> + * Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com> * * 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 @@ -35,10 +36,14 @@ class AdherentType extends CommonObject public $table_element = 'adherent_type'; public $element = 'adherent_type'; + var $id; + var $ref; var $libelle; - var $cotisation; // Soumis a la cotisation - var $vote; // droit de vote - var $mail_valid; //mail envoye lors de la validation + var $cotisation; // Soumis a la cotisation + var $note; + var $vote; // droit de vote + var $mail_valid; //mail envoye lors de la validation + var $statut; /** @@ -110,7 +115,7 @@ class AdherentType extends CommonObject $sql.= "note = '".$this->db->escape($this->note)."',"; $sql.= "vote = '".$this->vote."',"; $sql.= "mail_valid = '".$this->db->escape($this->mail_valid)."'"; - $sql .= " WHERE rowid = $this->id"; + $sql .= " WHERE rowid =".$this->id; $result = $this->db->query($sql); if ($result) @@ -164,7 +169,7 @@ class AdherentType extends CommonObject return 1; } else - { + { return 0; } } @@ -223,7 +228,7 @@ class AdherentType extends CommonObject { global $conf,$langs; - $projets = array(); + $adherenttypes = array(); $sql = "SELECT rowid, libelle"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type"; @@ -241,7 +246,7 @@ class AdherentType extends CommonObject { $obj = $this->db->fetch_object($resql); - $projets[$obj->rowid] = $langs->trans($obj->libelle); + $adherenttypes[$obj->rowid] = $langs->trans($obj->libelle); $i++; } } @@ -250,8 +255,7 @@ class AdherentType extends CommonObject { print $this->db->error(); } - - return $projets; + return $adherenttypes; } @@ -308,7 +312,7 @@ class AdherentType extends CommonObject function getMailOnSubscription() { global $conf; - + // mail_subscription not defined so never used if (! empty($this->mail_subscription) && trim(dol_htmlentitiesbr_decode($this->mail_subscription))) // Property not yet defined { return $this->mail_subscription; @@ -327,7 +331,7 @@ class AdherentType extends CommonObject function getMailOnResiliate() { global $conf; - + // NOTE mail_resiliate not defined so never used if (! empty($this->mail_resiliate) && trim(dol_htmlentitiesbr_decode($this->mail_resiliate))) // Property not yet defined { return $this->mail_resiliate; diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index f46b6d0268c77e3a4a21d75ba484dda420543aa7..bae064bef346fe0ea5251ccdbb562c84756ad52e 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -200,7 +200,10 @@ if (! $rowid && $action != 'create' && $action != 'edit') print '<td>'.dol_escape_htmltag($objp->libelle).'</td>'; print '<td align="center">'.yn($objp->cotisation).'</td>'; print '<td align="center">'.yn($objp->vote).'</td>'; - print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>'; + if ($user->rights->adherent->configurer) + print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>'; + else + print '<td align="right"> </td>'; print "</tr>"; $i++; }