diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 8c8c2d604ca37fad5448658ecc58d81678db6b16..8b1a456ee797bae3164435f8aed9208d027d0cb6 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -45,7 +45,10 @@ class Adherent extends CommonObject var $mesgs; var $id; + var $ref; + public $ref_ext; + var $civility_id; var $firstname; var $lastname; @@ -107,6 +110,7 @@ class Adherent extends CommonObject var $oldcopy; // To contains a clone of this when we need to save old properties of object + public $entity; /** * Constructor @@ -1237,7 +1241,7 @@ class Adherent extends CommonObject /** * Insert subscription into database and eventually add links to banks, mailman, etc... * - * @param timestamp $date Date of effect of subscription + * @param int $date Date of effect of subscription * @param double $montant Amount of subscription (0 accepted for some members) * @param int $accountid Id bank account * @param string $operation Type operation (if Id bank account provided) @@ -1245,7 +1249,7 @@ class Adherent extends CommonObject * @param string $num_chq Numero cheque (if Id bank account provided) * @param string $emetteur_nom Name of cheque writer * @param string $emetteur_banque Name of bank of cheque - * @param timestamp $datesubend Date end subscription + * @param int $datesubend Date end subscription * @return int rowid of record added, <0 if KO */ function cotisation($date, $montant, $accountid=0, $operation='', $label='', $num_chq='', $emetteur_nom='', $emetteur_banque='', $datesubend=0) @@ -1601,7 +1605,7 @@ class Adherent extends CommonObject * * @param int $statut Id statut * @param int $need_subscription 1 si type adherent avec cotisation, 0 sinon - * @param timestamp $date_end_subscription Date fin adhesion + * @param int $date_end_subscription Date fin adhesion * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Label */ diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index 2d5f3d835be71c8ed2dc8f2392b7db7fe82d85f0..5c340de1fdfd50d3379ac0268b3cbfd643a6983e 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -60,7 +60,7 @@ class AdherentType extends CommonObject * Fonction qui permet de creer le status de l'adherent * * @param User $user User making creation - * @return >0 if OK, < 0 if KO + * @return int >0 if OK, < 0 if KO */ function create($user) { @@ -248,13 +248,13 @@ class AdherentType extends CommonObject $i++; } } - return $projets; } else { print $this->db->error(); } + return $projets; } @@ -287,7 +287,7 @@ class AdherentType extends CommonObject /** * getMailOnValid * - * @return Return mail model + * @return string Return mail model */ function getMailOnValid() { @@ -306,7 +306,7 @@ class AdherentType extends CommonObject /** * getMailOnSubscription * - * @return Return mail model + * @return string Return mail model */ function getMailOnSubscription() { @@ -325,7 +325,7 @@ class AdherentType extends CommonObject /** * getMailOnResiliate * - * @return Return mail model + * @return string Return mail model */ function getMailOnResiliate() {