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

Fix: bad date format

Browse Source
This commit is contained in:
Regis Houssin 2010-09-27 06:51:03 +00:00
parent 63d66ecb95
commit 0fcdd8edad
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,7 @@ else
'%VILLE%'=>$objp->ville, '%VILLE%'=>$objp->ville,
'%PAYS%'=>$objp->pays, '%PAYS%'=>$objp->pays,
'%EMAIL%'=>$objp->email, '%EMAIL%'=>$objp->email,
'%NAISS%'=>$objp->naiss, '%NAISS%'=>dol_print_date($objp->naiss,'day'),
'%TYPE%'=>$objp->type, '%TYPE%'=>$objp->type,
'%ID%'=>$objp->rowid, '%ID%'=>$objp->rowid,
'%ANNEE%'=>$year, // For backward compatibility '%ANNEE%'=>$year, // For backward compatibility

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

@ -174,6 +174,8 @@ class Adherent extends CommonObject
function makeSubstitution($text) function makeSubstitution($text)
{ {
global $langs; global $langs;
$birthday = dol_print_date($this->naiss,'day');
$msgishtml = 0; $msgishtml = 0;
if (dol_textishtml($text,1)) $msgishtml = 1; if (dol_textishtml($text,1)) $msgishtml = 1;
@ -190,7 +192,7 @@ class Adherent extends CommonObject
$infos.= $langs->transnoentities("EMail").": ".$this->email."\n"; $infos.= $langs->transnoentities("EMail").": ".$this->email."\n";
$infos.= $langs->transnoentities("Login").": ".$this->login."\n"; $infos.= $langs->transnoentities("Login").": ".$this->login."\n";
$infos.= $langs->transnoentities("Password").": ".$this->pass."\n"; $infos.= $langs->transnoentities("Password").": ".$this->pass."\n";
$infos.= $langs->transnoentities("Birthday").": ".$this->naiss."\n"; $infos.= $langs->transnoentities("Birthday").": ".$birthday."\n";
$infos.= $langs->transnoentities("Photo").": ".$this->photo."\n"; $infos.= $langs->transnoentities("Photo").": ".$this->photo."\n";
$infos.= $langs->transnoentities("Public").": ".yn($this->public); $infos.= $langs->transnoentities("Public").": ".yn($this->public);
@ -207,7 +209,7 @@ class Adherent extends CommonObject
'%VILLE%'=>$msgishtml?dol_htmlentitiesbr($this->ville):$this->ville, '%VILLE%'=>$msgishtml?dol_htmlentitiesbr($this->ville):$this->ville,
'%PAYS%'=>$msgishtml?dol_htmlentitiesbr($this->pays):$this->pays, '%PAYS%'=>$msgishtml?dol_htmlentitiesbr($this->pays):$this->pays,
'%EMAIL%'=>$msgishtml?dol_htmlentitiesbr($this->email):$this->email, '%EMAIL%'=>$msgishtml?dol_htmlentitiesbr($this->email):$this->email,
'%NAISS%'=>$msgishtml?dol_htmlentitiesbr($this->naiss):$this->naiss, '%NAISS%'=>$msgishtml?dol_htmlentitiesbr($birthday):$birthday,
'%PHOTO%'=>$msgishtml?dol_htmlentitiesbr($this->photo):$this->photo, '%PHOTO%'=>$msgishtml?dol_htmlentitiesbr($this->photo):$this->photo,
'%LOGIN%'=>$msgishtml?dol_htmlentitiesbr($this->login):$this->login, '%LOGIN%'=>$msgishtml?dol_htmlentitiesbr($this->login):$this->login,
'%PASSWORD%'=>$msgishtml?dol_htmlentitiesbr($this->pass):$this->pass '%PASSWORD%'=>$msgishtml?dol_htmlentitiesbr($this->pass):$this->pass