lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix : english normalization

Browse Source
This commit is contained in:
Grand Philippe 2013-02-21 09:35:05 +01:00
parent 66ca0ba0e2
commit 9d28a1de75
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/adherents/cartes/carte.php
View File

@ -62,7 +62,7 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg
// requete en prenant que les adherents a jour de cotisation // 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 = "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.= " t.libelle as type,";
$sql.= " p.code as country_code, p.libelle as country"; $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"; $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, '%PRENOM%'=>$objp->firstname,
'%NOM%'=>$objp->lastname, '%NOM%'=>$objp->lastname,
'%SOCIETE%'=>$objp->company, '%SOCIETE%'=>$objp->company,
'%ADRESSE%'=>$objp->address, '%ADDRESS%'=>$objp->address,
'%CP%'=>$objp->zip, '%CP%'=>$objp->zip,
'%VILLE%'=>$objp->town, '%VILLE%'=>$objp->town,
'%PAYS%'=>$objp->country, '%PAYS%'=>$objp->country,

12
htdocs/adherents/class/adherent.class.php
View File

@ -51,7 +51,6 @@ class Adherent extends CommonObject
var $login; var $login;
var $pass; var $pass;
var $societe; var $societe;
//var $adresse;
var $address; var $address;
var $cp; var $cp;
var $zip; var $zip;
@ -233,7 +232,7 @@ class Adherent extends CommonObject
'%PRENOM%'=>$msgishtml?dol_htmlentitiesbr($this->firstname):$this->firstname, '%PRENOM%'=>$msgishtml?dol_htmlentitiesbr($this->firstname):$this->firstname,
'%NOM%'=>$msgishtml?dol_htmlentitiesbr($this->lastname):$this->lastname, '%NOM%'=>$msgishtml?dol_htmlentitiesbr($this->lastname):$this->lastname,
'%SOCIETE%'=>$msgishtml?dol_htmlentitiesbr($this->societe):$this->societe, '%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, '%CP%'=>$msgishtml?dol_htmlentitiesbr($this->zip):$this->zip,
'%VILLE%'=>$msgishtml?dol_htmlentitiesbr($this->town):$this->town, '%VILLE%'=>$msgishtml?dol_htmlentitiesbr($this->town):$this->town,
'%PAYS%'=>$msgishtml?dol_htmlentitiesbr($this->country):$this->country, '%PAYS%'=>$msgishtml?dol_htmlentitiesbr($this->country):$this->country,
@ -404,7 +403,7 @@ class Adherent extends CommonObject
// Clean parameters // Clean parameters
$this->lastname=trim($this->lastname)?trim($this->lastname):trim($this->nom); $this->lastname=trim($this->lastname)?trim($this->lastname):trim($this->nom);
$this->firstname=trim($this->firstname)?trim($this->firstname):trim($this->prenom); $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->zip=($this->zip?$this->zip:$this->cp);
$this->town=($this->town?$this->town:$this->ville); $this->town=($this->town?$this->town:$this->ville);
$this->country_id=($this->country_id > 0?$this->country_id:$this->fk_pays); $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->pass = $obj->pass;
$this->societe = $obj->societe; $this->societe = $obj->societe;
$this->fk_soc = $obj->fk_soc; $this->fk_soc = $obj->fk_soc;
//$this->adresse = $obj->address; // deprecated
$this->address = $obj->address; $this->address = $obj->address;
$this->cp = $obj->zip; // deprecated $this->cp = $obj->zip; // deprecated
$this->zip = $obj->zip; $this->zip = $obj->zip;
@ -1201,7 +1199,7 @@ class Adherent extends CommonObject
* Insert subscription into database and eventually add links to banks, mailman, etc... * Insert subscription into database and eventually add links to banks, mailman, etc...
* *
* @param timestamp $date Date d'effet de la cotisation * @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 int $accountid Id compte bancaire
* @param string $operation Type operation (si Id compte bancaire fourni) * @param string $operation Type operation (si Id compte bancaire fourni)
* @param string $label Label 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) * TODO Move this into member creation trigger (trigger of mailmanspip module)
* *
* @return int <0 if KO, >0 if OK * @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 * @param int $nohtmlentities 0=Encode with htmlentities for HTML output, 1=No htmlentities for memory translation
* @return string Name translated of civility * @return string Name translated of civility