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

Fix: bad date format

Browse Source 
Fix: utf8
This commit is contained in:
Regis Houssin 2010-09-27 06:58:44 +00:00
parent 88f303b083
commit 43b4ebdd23
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,13 +20,13 @@
/** /**
* \file htdocs/adherents/cartes/carte.php * \file htdocs/adherents/cartes/carte.php
* \ingroup adherent * \ingroup member
* \brief Page to output members business cards * \brief Page to output members business cards
* \version $Id$ * \version $Id$
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/cards/modules_cards.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/cards/modules_cards.php");
@ -94,7 +94,7 @@ if ($result)
$objp->ville, $objp->ville,
$objp->pays, $objp->pays,
$objp->email, $objp->email,
$objp->naiss, dol_print_date($objp->naiss,'day'),
$objp->type, $objp->type,
$objp->rowid, $objp->rowid,
$year, $year,

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

@ -146,6 +146,8 @@ class Adherent extends CommonObject
{ {
global $conf,$langs; global $conf,$langs;
$birthday = dol_print_date($this->naiss,'day');
// Detect if message is HTML // Detect if message is HTML
if ($msgishtml == -1) if ($msgishtml == -1)
{ {
@ -154,20 +156,20 @@ class Adherent extends CommonObject
} }
$infos=''; $infos='';
if ($this->civilite_id) $infos.= $langs->trans("UserTitle").": ".$this->getCivilityLabel()."\n"; if ($this->civilite_id) $infos.= $langs->transnoentities("UserTitle").": ".$this->getCivilityLabel()."\n";
$infos.= $langs->trans("Lastname").": $this->nom\n"; $infos.= $langs->transnoentities("Lastname").": $this->nom\n";
$infos.= $langs->trans("Firstname").": $this->prenom\n"; $infos.= $langs->transnoentities("Firstname").": $this->prenom\n";
$infos.= $langs->trans("Company").": $this->societe\n"; $infos.= $langs->transnoentities("Company").": $this->societe\n";
$infos.= $langs->trans("Address").": $this->adresse\n"; $infos.= $langs->transnoentities("Address").": $this->adresse\n";
$infos.= $langs->trans("Zip").": $this->cp\n"; $infos.= $langs->transnoentities("Zip").": $this->cp\n";
$infos.= $langs->trans("Town").": $this->ville\n"; $infos.= $langs->transnoentities("Town").": $this->ville\n";
$infos.= $langs->trans("Country").": $this->pays\n"; $infos.= $langs->transnoentities("Country").": $this->pays\n";
$infos.= $langs->trans("EMail").": $this->email\n"; $infos.= $langs->transnoentities("EMail").": $this->email\n";
$infos.= $langs->trans("Login").": $this->login\n"; $infos.= $langs->transnoentities("Login").": $this->login\n";
$infos.= $langs->trans("Password").": $this->pass\n"; $infos.= $langs->transnoentities("Password").": $this->pass\n";
$infos.= $langs->trans("Birthday").": $this->naiss\n"; $infos.= $langs->transnoentities("Birthday").": $birthday\n";
$infos.= $langs->trans("Photo").": $this->photo\n"; $infos.= $langs->transnoentities("Photo").": $this->photo\n";
$infos.= $langs->trans("Public").": ".yn($this->public)."\n"; $infos.= $langs->transnoentities("Public").": ".yn($this->public)."\n";
if ($msgishtml) $infos = dol_htmlentitiesbr($infos); if ($msgishtml) $infos = dol_htmlentitiesbr($infos);
// Substitutions // Substitutions
@ -200,7 +202,7 @@ class Adherent extends CommonObject
$this->ville, $this->ville,
$this->pays, $this->pays,
$this->email, $this->email,
$this->naiss, $birthday,
$this->photo, $this->photo,
$this->login, $this->login,
$this->pass $this->pass