diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php index edfe7dbd0de..27fde653695 100755 --- a/htdocs/adherents/cartes/carte.php +++ b/htdocs/adherents/cartes/carte.php @@ -62,7 +62,7 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg // requete en prenant que les adherents a jour de cotisation $sql = "SELECT d.rowid, d.prenom as firstname, d.nom as lastname, d.login, d.societe as company, d.datefin,"; - $sql.= " d.adresse as address, d.cp as zip, d.ville as town, d.naiss, d.email, d.photo,"; + $sql.= " d.address, d.cp as zip, d.ville as town, d.naiss, d.email, d.photo,"; $sql.= " t.libelle as type,"; $sql.= " p.code as country_code, p.libelle as country"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d"; @@ -112,7 +112,7 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg '%PRENOM%'=>$objp->firstname, '%NOM%'=>$objp->lastname, '%SOCIETE%'=>$objp->company, - '%ADRESSE%'=>$objp->address, + '%ADDRESS%'=>$objp->address, '%CP%'=>$objp->zip, '%VILLE%'=>$objp->town, '%PAYS%'=>$objp->country, diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 8e9c75e2423..c59d54d1508 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -51,7 +51,6 @@ class Adherent extends CommonObject var $login; var $pass; var $societe; - //var $adresse; var $address; var $cp; var $zip; @@ -233,7 +232,7 @@ class Adherent extends CommonObject '%PRENOM%'=>$msgishtml?dol_htmlentitiesbr($this->firstname):$this->firstname, '%NOM%'=>$msgishtml?dol_htmlentitiesbr($this->lastname):$this->lastname, '%SOCIETE%'=>$msgishtml?dol_htmlentitiesbr($this->societe):$this->societe, - '%ADRESSE%'=>$msgishtml?dol_htmlentitiesbr($this->address):$this->address, + '%ADDRESS%'=>$msgishtml?dol_htmlentitiesbr($this->address):$this->address, '%CP%'=>$msgishtml?dol_htmlentitiesbr($this->zip):$this->zip, '%VILLE%'=>$msgishtml?dol_htmlentitiesbr($this->town):$this->town, '%PAYS%'=>$msgishtml?dol_htmlentitiesbr($this->country):$this->country, @@ -404,7 +403,7 @@ class Adherent extends CommonObject // Clean parameters $this->lastname=trim($this->lastname)?trim($this->lastname):trim($this->nom); $this->firstname=trim($this->firstname)?trim($this->firstname):trim($this->prenom); - $this->address=($this->address?$this->address:$this->adresse); + $this->address=($this->address?$this->address:$this->address); $this->zip=($this->zip?$this->zip:$this->cp); $this->town=($this->town?$this->town:$this->ville); $this->country_id=($this->country_id > 0?$this->country_id:$this->fk_pays); @@ -1065,7 +1064,6 @@ class Adherent extends CommonObject $this->pass = $obj->pass; $this->societe = $obj->societe; $this->fk_soc = $obj->fk_soc; - //$this->adresse = $obj->address; // deprecated $this->address = $obj->address; $this->cp = $obj->zip; // deprecated $this->zip = $obj->zip; @@ -1201,7 +1199,7 @@ class Adherent extends CommonObject * Insert subscription into database and eventually add links to banks, mailman, etc... * * @param timestamp $date Date d'effet de la cotisation - * @param amount $montant Montant cotisation (accepte 0 pour les adherents non soumis e cotisation) + * @param amount $montant Montant cotisation (accepte 0 pour les adherents non soumis a cotisation) * @param int $accountid Id compte bancaire * @param string $operation Type operation (si Id compte bancaire fourni) * @param string $label Label operation (si Id compte bancaire fourni) @@ -1386,7 +1384,7 @@ class Adherent extends CommonObject /** - * Fonction qui ajoute l'adherent au abonnements automatiques mailing-list, spip, etc. + * Fonction qui ajoute l'adherent aux abonnements automatiques mailing-list, spip, etc. * TODO Move this into member creation trigger (trigger of mailmanspip module) * * @return int <0 if KO, >0 if OK @@ -1479,7 +1477,7 @@ class Adherent extends CommonObject /** - * Return label of a civility of a contact + * Return civility label of a contact * * @param int $nohtmlentities 0=Encode with htmlentities for HTML output, 1=No htmlentities for memory translation * @return string Name translated of civility diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index d1c8beb6426..b0bb18511e9 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -4,7 +4,7 @@ * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2012 Marcos García - * Copyright (C) 2012 Philippe Grand + * Copyright (C) 2012-2013 Philippe Grand * * 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 @@ -98,9 +98,9 @@ if ($rowid > 0) } } -// Define variables to know what current user can do on members +// Define variables to determine what the current user can do on the members $canaddmember=$user->rights->adherent->creer; -// Define variables to know what current user can do on properties of a member +// Define variables to determine what the current user can do on the properties of a member if ($rowid) { $caneditfieldmember=$user->rights->adherent->creer; @@ -259,7 +259,6 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer) $object->pass = trim($_POST["pass"]); $object->societe = trim($_POST["societe"]); - //$object->adresse = trim($_POST["address"]); // deprecated $object->address = trim($_POST["address"]); $object->cp = trim($_POST["zipcode"]); // deprecated $object->zip = trim($_POST["zipcode"]); @@ -440,7 +439,6 @@ if ($action == 'add' && $user->rights->adherent->creer) $object->firstname = $prenom; $object->lastname = $nom; $object->societe = $societe; - //$object->adresse = $address; // deprecated $object->address = $address; $object->cp = $zip; // deprecated $object->zip = $zip;