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

Uniformisation du mode d'appel de dolibarr_print_date

Browse Source
This commit is contained in:
Laurent Destailleur 2007-06-16 13:56:05 +00:00
parent 3e3239c2e9
commit facf08d676
54 changed files with 85 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/action/fiche.php
View File

@ -729,12 +729,12 @@ if ($_GET["id"])
// Date planification
print '<tr><td>'.$langs->trans("DateActionPlanned").'</td><td colspan="3">';
print dolibarr_print_date($act->datep,'%d %B %Y %H:%M');
print dolibarr_print_date($act->datep,'dayhour');
if ($act->percent < 100 && $act->datep < (time() - $conf->global->MAIN_DELAY_ACTIONS_TODO)) print img_warning($langs->trans("Late"));
print '</td></tr>';
// Date fin real
print '<tr><td>'.$langs->trans("DateActionDone").'</td><td colspan="3">'.dolibarr_print_date($act->date,'%d %B %Y %H:%M').'</td></tr>';
print '<tr><td>'.$langs->trans("DateActionDone").'</td><td colspan="3">'.dolibarr_print_date($act->date,'dayhour').'</td></tr>';
// Statut
print '<tr><td nowrap>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3">';

4
htdocs/comm/action/rapport/rapport.pdf.php
View File

@ -118,7 +118,7 @@ class CommActionRapport
$pdf->SetFont('Arial','',30);
$pdf->SetXY (10, 140);
$pdf->MultiCell(190, 20, $langs->trans("Date").': '.dolibarr_print_date($this->date_edition,"%d %B %Y"), 0, 'C', 0);
$pdf->MultiCell(190, 20, $langs->trans("Date").': '.dolibarr_print_date($this->date_edition,"day"), 0, 'C', 0);
$pdf->SetXY (10, 170);
$pdf->SetFont('Arial','B',18);
@ -171,7 +171,7 @@ class CommActionRapport
$y = max($y, $pdf->GetY(), $y0, $y1, $y2, $y3) + 1;
$pdf->SetXY(5, $y);
$pdf->MultiCell(22, 4, dolibarr_print_date($obj->da)."\n".dolibarr_print_date($obj->da,"%H:%m:%S"), 0, 'L', 0);
$pdf->MultiCell(22, 4, dolibarr_print_date($obj->da,"day")."\n".dolibarr_print_date($obj->da,"hour"), 0, 'L', 0);
$y0 = $pdf->GetY();
$pdf->SetXY(26, $y);

6
htdocs/comm/mailing/fiche.php
View File

@ -336,7 +336,7 @@ else
$uc->fetch();
print '<tr><td>'.$langs->trans("CreatedBy").'</td><td>'.$uc->getNomUrl(1).'</td>';
print '<td>'.$langs->trans("Date").'</td>';
print '<td>'.dolibarr_print_date($mil->date_creat,"%d %b %Y %H:%M").'</td></tr>';
print '<td>'.dolibarr_print_date($mil->date_creat,"dayhour").'</td></tr>';
if ($mil->statut > 0)
{
@ -344,14 +344,14 @@ else
$uv->fetch();
print '<tr><td>'.$langs->trans("ValidatedBy").'</td><td>'.$uv->getNomUrl(1).'</td>';
print '<td>'.$langs->trans("Date").'</td>';
print '<td>'.dolibarr_print_date($mil->date_valid,"%d %b %Y %H:%M").'</td></tr>';
print '<td>'.dolibarr_print_date($mil->date_valid,"dayhour").'</td></tr>';
}
if ($mil->statut > 1)
{
print '<tr><td>'.$langs->trans("SentBy").'</td><td>'.$langs->trans("Unknown").'</td>';
print '<td>'.$langs->trans("Date").'</td>';
print '<td>'.dolibarr_print_date($mil->date_envoi,"%d %b %Y %H:%M").'</td></tr>';
print '<td>'.dolibarr_print_date($mil->date_envoi,"dayhour").'</td></tr>';
}
// Sujet

2
htdocs/comm/multiprix.php
View File

@ -152,7 +152,7 @@ if ($_socid > 0)
$obj = $db->fetch_object($resql);
$tag = !$tag;
print '<tr '.$bc[$tag].'>';
print '<td>'.dolibarr_print_date($obj->dc,"%d %B %Y %H:%M").'</td>';
print '<td>'.dolibarr_print_date($obj->dc,"dayhour").'</td>';
print '<td>'.$obj->price_level.' </td>';
print '<td>'.$obj->login.'</td>';
print '</tr>';

4
htdocs/comm/propal.php
View File

@ -846,7 +846,7 @@ if ($_GET['propalid'] > 0)
// Dates
print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">';
print dolibarr_print_date($propal->date,'%a %d %B %Y');
print dolibarr_print_date($propal->date,'daytext');
print '</td>';
if ($conf->projet->enabled) $rowspan++;
@ -881,7 +881,7 @@ if ($_GET['propalid'] > 0)
{
if ($propal->fin_validite)
{
print dolibarr_print_date($propal->fin_validite,'%a %d %B %Y');
print dolibarr_print_date($propal->fin_validite,'daytext');
if ($propal->statut == 1 && $propal->fin_validite < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
}
else

4
htdocs/comm/propal/apercu.php
View File

@ -115,13 +115,13 @@ if ($_GET["propalid"] > 0)
// ligne 2
// partie Gauche
print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">';
print dolibarr_print_date($propal->date,'%a %e %B %Y');
print dolibarr_print_date($propal->date,'daytext');
print '</td>';
// partie Droite
print '<td>'.$langs->trans('DateEndPropal').'</td><td>';
if ($propal->fin_validite) {
print dolibarr_print_date($propal->fin_validite,'%a %d %B %Y');
print dolibarr_print_date($propal->fin_validite,'daytext');
} else {
print $langs->trans("Unknown");
}

4
htdocs/comm/propal/note.php
View File

@ -134,7 +134,7 @@ if ($_GET['propalid'])
// Date
print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">';
print dolibarr_print_date($propal->date,'%a %d %B %Y');
print dolibarr_print_date($propal->date,'daytext');
print '</td>';
print '</tr>';
@ -143,7 +143,7 @@ if ($_GET['propalid'])
print '<td>'.$langs->trans('DateEndPropal').'</td><td colspan="3">';
if ($propal->fin_validite)
{
print dolibarr_print_date($propal->fin_validite,'%a %d %B %Y');
print dolibarr_print_date($propal->fin_validite,'daytext');
if ($propal->statut == 1 && $propal->fin_validite < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
}
else

2
htdocs/comm/prospect/fiche.php
View File

@ -196,7 +196,7 @@ if ($socid > 0)
{
print " ".img_warning();
}
print "</td><td align=\"right\">".dolibarr_print_date($objp->dp,"%d %B %Y")."</td>\n";
print "</td><td align=\"right\">".dolibarr_print_date($objp->dp,"day")."</td>\n";
print "<td align=\"right\">".price($objp->price)."</td>\n";
print "<td align=\"right\">".$propal_static->LibStatut($objp->fk_statut,5)."</td></tr>\n";
$i++;

2
htdocs/comm/remise.php
View File

@ -159,7 +159,7 @@ if ($_socid > 0)
$obj = $db->fetch_object($resql);
$tag = !$tag;
print '<tr '.$bc[$tag].'>';
print '<td>'.dolibarr_print_date($obj->dc,"%d %B %Y %H:%M").'</td>';
print '<td>'.dolibarr_print_date($obj->dc,"dayhour").'</td>';
print '<td align="center">'.$obj->remise_client.' %</td>';
print '<td align="left">'.$obj->note.'</td>';
print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';

2
htdocs/commande/apercu.php
View File

@ -223,7 +223,7 @@ if ($_GET["id"] > 0) {
// Date
print '<tr><td>'.$langs->trans("Date").'</td>';
print "<td colspan=\"2\">".dolibarr_print_date($commande->date,"%A %d %B %Y")."</td>\n";
print "<td colspan=\"2\">".dolibarr_print_date($commande->date,"daytext")."</td>\n";
print '</tr>';
// ligne 6

4
htdocs/commande/fiche.php
View File

@ -1105,7 +1105,7 @@ else
// Date
print '<tr><td>'.$langs->trans('Date').'</td>';
print '<td colspan="2">'.dolibarr_print_date($commande->date,'%A %d %B %Y').'</td>';
print '<td colspan="2">'.dolibarr_print_date($commande->date,'daytext').'</td>';
print '<td width="50%">'.$langs->trans('Source').' : ' . $commande->sources[$commande->source] ;
if ($commande->source == 0)
{
@ -1138,7 +1138,7 @@ else
}
else
{
print dolibarr_print_date($commande->date_livraison,'%A %d %B %Y');
print dolibarr_print_date($commande->date_livraison,'daytext');
}
print '</td>';
print '<td rowspan="'.$nbrow.'" valign="top">'.$langs->trans('NotePublic').' :<br>';

4
htdocs/compta/bank/account.php
View File

@ -418,8 +418,8 @@ if ($account > 0)
}
print "<tr $bc[$var]>";
print "<td nowrap>".dolibarr_print_date($objp->do,"%d/%m/%y")."</td>\n";
print "<td nowrap>&nbsp;".dolibarr_print_date($objp->dv,"%d/%m/%y")."</td>\n";
print "<td nowrap>".dolibarr_print_date($objp->do,"day")."</td>\n";
print "<td nowrap>&nbsp;".dolibarr_print_date($objp->dv,"day")."</td>\n";
print "<td nowrap>&nbsp;".$objp->fk_type." ".($objp->num_chq?$objp->num_chq:"")."</td>\n";
print '<td><a href="ligne.php?rowid='.$objp->rowid.'&amp;account='.$acct->id.'">';
if (eregi('^\((.*)\)$',$objp->label,$reg))

4
htdocs/compta/bank/rappro.php
View File

@ -207,8 +207,8 @@ if ($resql)
print "<input type=\"hidden\" name=\"account\" value=\"".$_GET["account"]."\">";
print "<input type=\"hidden\" name=\"rowid\" value=\"".$objp->rowid."\">";
print '<td align="center" nowrap="nowrap">'.dolibarr_print_date($objp->do,"%d/%m/%Y").'</td>';
print '<td align="center" nowrap="nowrap">'.dolibarr_print_date($objp->dv,"%d/%m/%Y").'</td>';
print '<td align="center" nowrap="nowrap">'.dolibarr_print_date($objp->do,"day").'</td>';
print '<td align="center" nowrap="nowrap">'.dolibarr_print_date($objp->dv,"day").'</td>';
print '<td nowrap="nowrap">'.$objp->type.($objp->num_chq?' '.$objp->num_chq:'').'</td>';
// Description

4
htdocs/compta/bank/releve.php
View File

@ -236,13 +236,13 @@ else
print "<tr $bc[$var]>";
// Date operation
print '<td nowrap="nowrap" align="center">'.dolibarr_print_date($objp->do,"%d/%m/%Y").'</td>';
print '<td nowrap="nowrap" align="center">'.dolibarr_print_date($objp->do,"day").'</td>';
// Date de valeur
print '<td align="center" valign="center" nowrap="nowrap">';
print '<a href="releve.php?action=dvprev&amp;num='.$num.'&amp;account='.$_GET["account"].'&amp;dvid='.$objp->rowid.'">';
print img_previous().'</a> ';
print dolibarr_print_date($objp->dv,"%d/%m/%Y") .' ';
print dolibarr_print_date($objp->dv,"day") .' ';
print '<a href="releve.php?action=dvnext&amp;num='.$num.'&amp;account='.$_GET["account"].'&amp;dvid='.$objp->rowid.'">';
print img_next().'</a>';
print "</td>\n";

2
htdocs/compta/bank/search.php
View File

@ -166,7 +166,7 @@ if ($result)
$var=!$var;
print "<tr $bc[$var]>";
print '<td align="center">'.dolibarr_print_date($objp->do,"%d %b %y")."</td>\n";
print '<td align="center">'.dolibarr_print_date($objp->do,"day")."</td>\n";
print "<td><a href=\"ligne.php?rowid=$objp->rowid&amp;account=$objp->fk_account\">";
$reg=array();

4
htdocs/compta/commande/fiche.php
View File

@ -154,7 +154,7 @@ if ($_GET["id"] > 0)
// Date
print '<tr><td>'.$langs->trans('Date').'</td>';
print '<td colspan="2">'.dolibarr_print_date($commande->date,'%A %d %B %Y').'</td>';
print '<td colspan="2">'.dolibarr_print_date($commande->date,'daytext').'</td>';
print '<td width="50%">'.$langs->trans('Source').' : ' . $commande->sources[$commande->source] ;
if ($commande->source == 0)
{
@ -185,7 +185,7 @@ if ($_GET["id"] > 0)
}
else
{
print dolibarr_print_date($commande->date_livraison,'%A %d %B %Y');
print dolibarr_print_date($commande->date_livraison,'dayhourtext');
}
print '</td>';
print '<td rowspan="'.$nbrow.'" valign="top">'.$langs->trans('NotePublic').' :<br>';

2
htdocs/compta/dons/fiche.php
View File

@ -349,7 +349,7 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit')
print '<table class="border" width="100%">';
print "<tr><td>".$langs->trans("Date")."</td><td>";
print dolibarr_print_date($don->date,"%d %B %Y");
print dolibarr_print_date($don->date,"day");
print "</td>";
$nbrows=12;

2
htdocs/compta/export/liste.php
View File

@ -89,7 +89,7 @@ if ($result)
print "<tr $bc[$var]>";
print '<td>'.$obj->ref.'</td>';
print '<td>'.dolibarr_print_date($obj->date_export,"%a %e %b %Y %H:%M:%S").'</td>';
print '<td>'.dolibarr_print_date($obj->date_export,"dayhour").'</td>';
print '<td><a href="index.php?action=export&amp;id='.$obj->rowid.'">'.$langs->trans("ReBuild").'</a></td>';
print "</tr>\n";
$i++;

4
htdocs/compta/facture.php
View File

@ -1951,7 +1951,7 @@ else
// Dates
print '<tr><td>'.$langs->trans('Date').'</td>';
print '<td colspan="3">'.dolibarr_print_date($fac->date,'%A %d %B %Y').'</td>';
print '<td colspan="3">'.dolibarr_print_date($fac->date,'daytext').'</td>';
$nbrows=8;
if ($conf->global->FAC_USE_CUSTOMER_ORDER_REF) $nbrows++;
@ -2064,7 +2064,7 @@ else
print '<td colspan="3">';
if ($fac->type != 2)
{
print dolibarr_print_date($fac->date_lim_reglement,'%A %d %B %Y');
print dolibarr_print_date($fac->date_lim_reglement,'daytext');
if ($fac->date_lim_reglement < (time() - $conf->facture->client->warning_delay) && ! $fac->paye && $fac->statut == 1 && ! $fac->am) print img_warning($langs->trans('Late'));
}
else

4
htdocs/compta/facture/apercu.php
View File

@ -94,8 +94,8 @@ if ($_GET["facid"] > 0)
// Dates
print '<tr><td>'.$langs->trans("Date").'</td>';
print '<td colspan="3">'.dolibarr_print_date($fac->date,"%A %d %B %Y").'</td>';
print '<td>'.$langs->trans("DateMaxPayment").'</td><td>' . dolibarr_print_date($fac->date_lim_reglement,"%A %d %B %Y");
print '<td colspan="3">'.dolibarr_print_date($fac->date,"daytext").'</td>';
print '<td>'.$langs->trans("DateMaxPayment").'</td><td>' . dolibarr_print_date($fac->date_lim_reglement,"daytext");
if ($fac->paye == 0 && $fac->date_lim_reglement < (time() - $conf->facture->client->warning_delay)) print img_warning($langs->trans("Late"));
print "</td></tr>";

4
htdocs/compta/facture/prelevement.php
View File

@ -135,8 +135,8 @@ if ($_GET["facid"] > 0)
// Dates
print '<tr><td>'.$langs->trans("Date").'</td>';
print '<td colspan="3">'.dolibarr_print_date($fac->date,"%A %d %B %Y").'</td>';
print '<td>'.$langs->trans("DateMaxPayment").'</td><td>' . dolibarr_print_date($fac->date_lim_reglement,"%A %d %B %Y");
print '<td colspan="3">'.dolibarr_print_date($fac->date,"daytext").'</td>';
print '<td>'.$langs->trans("DateMaxPayment").'</td><td>' . dolibarr_print_date($fac->date_lim_reglement,"daytext");
if ($fac->date_lim_reglement < (time() - $conf->facture->client->warning_delay) && ! $fac->paye && $fac->statut == 1 && ! $fac->am) print img_warning($langs->trans("Late"));
print "</td></tr>";

2
htdocs/compta/fiche.php
View File

@ -331,7 +331,7 @@ if ($socid > 0)
print "<tr $bc[$var]>";
print '<td><a href="../projet/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowProject"),"project")." ".$obj->title.'</a></td>';
print "<td align=\"right\">".dolibarr_print_date($obj->do,"%d %b %Y") ."</td></tr>";
print "<td align=\"right\">".dolibarr_print_date($obj->do,"day") ."</td></tr>";
$i++;
}
$db->free();

2
htdocs/compta/index.php
View File

@ -655,7 +655,7 @@ if ($resql)
$obj = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]><td>".dolibarr_print_date($obj->da,"%d %b %Y")."</td>";
print "<tr $bc[$var]><td>".dolibarr_print_date($obj->da,"day")."</td>";
print "<td><a href=\"action/fiche.php\">$obj->libelle $obj->label</a></td></tr>";
$i++;
}

2
htdocs/compta/paiement/rapport.php
View File

@ -147,7 +147,7 @@ if ($year)
$relativepath = $year.'/'.$file;
print "<tr $bc[$var]>".'<td><a href="'.DOL_URL_ROOT . '/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
print '<td align="right">'.filesize($tfile). ' '.$langs->trans("Bytes").'</td>';
print '<td align="right">'.dolibarr_print_date(filemtime($tfile),"%d %b %Y %H:%M:%S").'</td></tr>';
print '<td align="right">'.dolibarr_print_date(filemtime($tfile),"dayhour").'</td></tr>';
}
}
print '</table>';

2
htdocs/compta/prelevement/index.php
View File

@ -109,7 +109,7 @@ if ($result)
print '<a href="fiche.php?id='.$obj->rowid.'">'.$obj->ref."</a></td>\n";
print '<td>'.dolibarr_print_date($obj->datec,"%d/%m/%Y %H:%M")."</td>\n";
print '<td>'.dolibarr_print_date($obj->datec,"dayhour")."</td>\n";
print '<td align="right">'.price($obj->amount)."</td>\n";

4
htdocs/compta/propal.php
View File

@ -182,7 +182,7 @@ if ($_GET["propalid"] > 0)
// Dates
print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">';
print dolibarr_print_date($propal->date,'%a %d %B %Y');
print dolibarr_print_date($propal->date,'daytext');
print '</td>';
if ($conf->projet->enabled) $rowspan++;
@ -196,7 +196,7 @@ if ($_GET["propalid"] > 0)
print '<td>'.$langs->trans('DateEndPropal').'</td><td colspan="3">';
if ($propal->fin_validite)
{
print dolibarr_print_date($propal->fin_validite,'%a %d %B %Y');
print dolibarr_print_date($propal->fin_validite,'daytext');
if ($propal->statut == 1 && $propal->fin_validite < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
}
else

2
htdocs/contact/fiche.php
View File

@ -709,7 +709,7 @@ if ($_GET["id"] && $_GET["action"] != 'edit')
print "<tr $bc[$var]>";
// Date
print "<td>". dolibarr_print_date($histo[$key]['date'],"%d %b %Y %H:%M") ."</td>";
print "<td>". dolibarr_print_date($histo[$key]['date'],"dayhour") ."</td>";
// Action
print '<td>';

2
htdocs/contact/perso.php
View File

@ -198,7 +198,7 @@ else
if ($contact->birthday)
{
print '<tr><td>'.$langs->trans("Birthdate").'</td><td colspan="3">'.dolibarr_print_date($contact->birthday);
print '<tr><td>'.$langs->trans("Birthdate").'</td><td colspan="3">'.dolibarr_print_date($contact->birthday,'day");
if ($contact->birthday_alert)
print ' (alerte anniversaire active)</td>';

2
htdocs/contrat/fiche.php
View File

@ -618,7 +618,7 @@ else
// Date
print '<tr><td>'.$langs->trans("Date").'</td>';
print '<td colspan="3">'.dolibarr_print_date($contrat->date_contrat,"%A %d %B %Y")."</td></tr>\n";
print '<td colspan="3">'.dolibarr_print_date($contrat->date_contrat,"dayhour")."</td></tr>\n";
// Factures associées
/*

2
htdocs/contrat/ligne.php
View File

@ -185,7 +185,7 @@ if ($id > 0)
// Date
print '<tr><td>'.$langs->trans("Date").'</td>';
print '<td colspan="3">'.dolibarr_print_date($contrat->date_contrat,"%A %d %B %Y")."</td></tr>\n";
print '<td colspan="3">'.dolibarr_print_date($contrat->date_contrat,"dayhour")."</td></tr>\n";
// Factures associées
/*

4
htdocs/docsoc.php
View File

@ -173,7 +173,7 @@ if ($socid > 0)
echo '<a href="'.DOL_URL_ROOT.'/document.php?modulepart=societe&type=application/binary&file='.urlencode($socid.'/'.$file).'">'.$file.'</a>';
print "</td>\n";
print '<td align="right">'.filesize($upload_dir."/".$file). ' '.$langs->trans("bytes").'</td>';
print '<td align="center">'.dolibarr_print_date(filemtime($upload_dir."/".$file),"%d %b %Y %H:%M:%S").'</td>';
print '<td align="center">'.dolibarr_print_date(filemtime($upload_dir."/".$file),"dayhour").'</td>';
print '<td align="center">';
echo '<a href="docsoc.php?socid='.$socid.'&amp;action=delete_file&urlfile='.urlencode($file).'">'.img_delete().'</a>';
print "</td></tr>\n";
@ -218,7 +218,7 @@ if ($socid > 0)
print "</td>\n";
print '<td align="right">'.filesize($courrier_dir."/".$file). ' '.$langs->trans("bytes").'</td>';
print '<td align="center">'.dolibarr_print_date(filemtime($courrier_dir."/".$file),"%d %b %Y %H:%M:%S").'</td>';
print '<td align="center">'.dolibarr_print_date(filemtime($courrier_dir."/".$file),"dayhour").'</td>';
print "</tr>\n";
}
}

4
htdocs/expedition/commande.php
View File

@ -148,7 +148,7 @@ if ($_GET["id"] > 0)
// Date
print '<tr><td>'.$langs->trans('Date').'</td>';
print '<td colspan="2">'.dolibarr_print_date($commande->date,'%A %d %B %Y').'</td>';
print '<td colspan="2">'.dolibarr_print_date($commande->date,'day').'</td>';
print '<td width="50%">'.$langs->trans('Source').' : ' . $commande->sources[$commande->source] ;
if ($commande->source == 0)
{
@ -179,7 +179,7 @@ if ($_GET["id"] > 0)
}
else
{
print dolibarr_print_date($commande->date_livraison,'%A %d %B %Y');
print dolibarr_print_date($commande->date_livraison,'dayhour');
}
print '</td>';
print '<td rowspan="'.$nbrow.'" valign="top">'.$langs->trans('NotePublic').' :<br>';

4
htdocs/expedition/fiche.php
View File

@ -248,7 +248,7 @@ if ($_GET["action"] == 'create')
// Date
print "<tr><td>".$langs->trans("Date")."</td>";
print '<td colspan="3">'.dolibarr_print_date($commande->date,"%A %d %B %Y")."</td></tr>\n";
print '<td colspan="3">'.dolibarr_print_date($commande->date,"dayhour")."</td></tr>\n";
// Entrepot (si forcé)
if ($conf->stock->enabled && $_GET["entrepot_id"])
@ -525,7 +525,7 @@ else
// Date
print '<tr><td>'.$langs->trans("Date").'</td>';
print '<td colspan="3">'.dolibarr_print_date($expedition->date,"%A %d %B %Y")."</td>\n";
print '<td colspan="3">'.dolibarr_print_date($expedition->date,"dayhour")."</td>\n";
print '</tr>';
// Poids Total

1
htdocs/facture.class.php
View File

@ -429,7 +429,6 @@ class Facture extends CommonObject
if ($this->db->num_rows($result))
{
$obj = $this->db->fetch_object($result);
//print strftime('%Y%m%d%H%M%S',$obj->df).' '.$obj->df.' '.dolibarr_print_date($obj->df);
$this->id = $rowid;
$this->ref = $obj->facnumber;

2
htdocs/fichinter/fiche.php
View File

@ -368,7 +368,7 @@ elseif ($_GET["id"] > 0)
print "<tr><td>".$langs->trans("Company")."</td><td>".$fichinter->client->getNomUrl(1)."</td></tr>";
// Date
print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dolibarr_print_date($fichinter->date,"%A %d %B %Y").'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dolibarr_print_date($fichinter->date,"day").'</td></tr>';
// Durée
print '<tr><td>'.$langs->trans("Duration").'</td><td>'.$fichinter->duree.'</td></tr>';

2
htdocs/fourn/commande/dispatch.php
View File

@ -161,7 +161,7 @@ if ($id > 0)
if ($commande->date_commande)
{
print dolibarr_print_date($commande->date_commande,"%A %d %B %Y")."\n";
print dolibarr_print_date($commande->date_commande,"dayhourtext")."\n";
}
print '</td><td width="50%" colspan="3">';

2
htdocs/fourn/commande/fiche.php
View File

@ -570,7 +570,7 @@ else
if ($commande->date_commande)
{
print dolibarr_print_date($commande->date_commande,"%A %d %B %Y")."\n";
print dolibarr_print_date($commande->date_commande,"dayhour")."\n";
}
print '</td><td width="50%" colspan="3">';

4
htdocs/fourn/commande/history.php
View File

@ -110,7 +110,7 @@ if ($_GET["id"] > 0)
if ($commande->methode_commande_id > 0)
{
print '<tr><td>'.$langs->trans("Date").'</td>';
print '<td colspan="2">'.dolibarr_print_date($commande->date_commande,"%A %d %B %Y")."</td>\n";
print '<td colspan="2">'.dolibarr_print_date($commande->date_commande,"dayhourtext")."</td>\n";
print '<td width="50%">&nbsp;';
print "</td></tr>";
}
@ -149,7 +149,7 @@ if ($_GET["id"] > 0)
$obj = $db->fetch_object($resql);
print "<tr $bc[$var]>";
print '<td width="20%">'.dolibarr_print_date($obj->dl,"%a %d %b %Y %H:%M:%S")."</td>\n";
print '<td width="20%">'.dolibarr_print_date($obj->dl,"dayhour")."</td>\n";
// Statut
print '<td width="100px" nowrap="1">'.$commande->LibStatut($obj->fk_statut,4)."</td>\n";

2
htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php
View File

@ -689,7 +689,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$posy+=6;
$pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($com->date,"%d %b %Y"), '', 'R');
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($com->date,"day"), '', 'R');
if ($showadress)
{

4
htdocs/fourn/facture/fiche.php
View File

@ -578,11 +578,11 @@ else
print '</tr>';
print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3" nowrap="nowrap">';
print dolibarr_print_date($fac->datep,'%A %d %B %Y').'</td></tr>';
print dolibarr_print_date($fac->datep,'dayhourtext').'</td></tr>';
print '<tr>';
print '<td>'.$langs->trans('DateEcheance').'</td><td colspan="3">';
print dolibarr_print_date($fac->date_echeance,'%A %d %B %Y');
print dolibarr_print_date($fac->date_echeance,'dayhourtext');
if (($fac->paye == 0) && ($fac->statut > 0) && $fac->date_echeance < (time() - $conf->facture->fournisseur->warning_delay)) print img_picto($langs->trans("Late"),"warning");
print '</td></tr>';

4
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@ -934,14 +934,14 @@ class pdf_crabe extends ModelePDFFactures
$posy+=5;
$pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateInvoice")." : " . dolibarr_print_date($object->date,"%d %b %Y"), '', 'R');
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateInvoice")." : " . dolibarr_print_date($object->date,"day"), '', 'R');
if ($object->type != 2)
{
$posy+=5;
$pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEcheance")." : " . dolibarr_print_date($object->date_lim_reglement,"%d %b %Y"), '', 'R');
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEcheance")." : " . dolibarr_print_date($object->date_lim_reglement,"day"), '', 'R');
}
if ($showadress)

4
htdocs/includes/modules/propale/pdf_propale_azur.modules.php
View File

@ -823,12 +823,12 @@ class pdf_propale_azur extends ModelePDFPropales
$posy+=5;
$pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($object->date,"%d %b %Y"), '', 'R');
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($object->date,"day"), '', 'R');
$posy+=5;
$pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : " . dolibarr_print_date($object->fin_validite,"%d %b %Y"), '', 'R');
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : " . dolibarr_print_date($object->fin_validite,"day"), '', 'R');
if ($showadress)
{

2
htdocs/includes/modules/rapport/pdf_paiement.class.php
View File

@ -71,7 +71,7 @@ class pdf_paiement
$pdf->Text(76, 10, $title);
$pdf->SetFont('Arial','B',12);
$pdf->Text(11, 16, $langs->transnoentities("Date")." : ".dolibarr_print_date(time(),"%d %b %Y"));
$pdf->Text(11, 16, $langs->transnoentities("Date")." : ".dolibarr_print_date(time(),"day"));
$pdf->SetFont('Arial','',12);
$pdf->Text(11, 22, $langs->transnoentities("Page")." : ".$page);

2
htdocs/index.php
View File

@ -93,7 +93,7 @@ $userstring=$user->fullname;
print '<td nowrap>'.$langs->trans("User").'</td><td>'.$userstring.'</td></tr>';
print '<tr '.$bc[true].'>';
print '<td nowrap>'.$langs->trans("PreviousConnexion").'</td><td>';
if ($user->datepreviouslogin) print dolibarr_print_date($user->datepreviouslogin,"%d %b %Y %H:%M:%S");
if ($user->datepreviouslogin) print dolibarr_print_date($user->datepreviouslogin,"dayhour");
else print $langs->trans("Unknown");
print '</td>';
print "</tr>\n";

10
htdocs/lib/functions.inc.php
View File

@ -599,31 +599,31 @@ function dolibarr_print_object_info($object)
print $langs->trans("CreatedBy")." : " . $object->user_creation->fullname . '<br>';
if (isset($object->date_creation))
print $langs->trans("DateCreation")." : " . dolibarr_print_date($object->date_creation,"%A %d %B %Y %H:%M:%S") . '<br>';
print $langs->trans("DateCreation")." : " . dolibarr_print_date($object->date_creation,"dayhourtext") . '<br>';
if (isset($object->user_modification) && $object->user_modification->fullname)
print $langs->trans("ModifiedBy")." : " . $object->user_modification->fullname . '<br>';
if (isset($object->date_modification))
print $langs->trans("DateLastModification")." : " . dolibarr_print_date($object->date_modification,"%A %d %B %Y %H:%M:%S") . '<br>';
print $langs->trans("DateLastModification")." : " . dolibarr_print_date($object->date_modification,"dayhourtext") . '<br>';
if (isset($object->user_validation) && $object->user_validation->fullname)
print $langs->trans("ValidatedBy")." : " . $object->user_validation->fullname . '<br>';
if (isset($object->date_validation))
print $langs->trans("DateValidation")." : " . dolibarr_print_date($object->date_validation,"%A %d %B %Y %H:%M:%S") . '<br>';
print $langs->trans("DateValidation")." : " . dolibarr_print_date($object->date_validation,"dayhourtext") . '<br>';
if (isset($object->user_cloture) && $object->user_cloture->fullname )
print $langs->trans("ClosedBy")." : " . $object->user_cloture->fullname . '<br>';
if (isset($object->date_cloture))
print $langs->trans("DateClosing")." : " . dolibarr_print_date($object->date_cloture,"%A %d %B %Y %H:%M:%S") . '<br>';
print $langs->trans("DateClosing")." : " . dolibarr_print_date($object->date_cloture,"dayhourtext") . '<br>';
if (isset($object->user_rappro) && $object->user_rappro->fullname )
print $langs->trans("ConciliatedBy")." : " . $object->user_rappro->fullname . '<br>';
if (isset($object->date_rappro))
print $langs->trans("DateConciliating")." : " . dolibarr_print_date($object->date_rappro,"%A %d %B %Y %H:%M:%S") . '<br>';
print $langs->trans("DateConciliating")." : " . dolibarr_print_date($object->date_rappro,"dayhourtext") . '<br>';
}
/**

4
htdocs/livraison/fiche.php
View File

@ -442,7 +442,7 @@ else
// Date
print '<tr><td>'.$langs->trans("Date").'</td>';
print '<td colspan="3">'.dolibarr_print_date($livraison->date_creation,'%A %d %B %Y')."</td>\n";
print '<td colspan="3">'.dolibarr_print_date($livraison->date_creation,'dayhourtext')."</td>\n";
print '</tr>';
// Statut
@ -633,7 +633,7 @@ else
print "<td>".stripslashes(nl2br($objp->description))."</td>\n";
}
print '<td align="center">'.$objp->qty_livre.'</td>';
print '<td align="center">'.dolibarr_print_date($objp->date_livraison).'</td>';
print '<td align="center">'.dolibarr_print_date($objp->date_livraison,"dayhour").'</td>';
print '</tr>';
$i++;
}

2
htdocs/livraison/mods/pdf/pdf_sirocco.modules.php
View File

@ -349,7 +349,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
$pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',12);
$pdf->Text(11, 88, $langs->transnoentities("Date")." : " . dolibarr_print_date($delivery->date_valid,"%d %b %Y"));
$pdf->Text(11, 88, $langs->transnoentities("Date")." : " . dolibarr_print_date($delivery->date_valid,"day"));
$pdf->Text(11, 94, $langs->transnoentities("DeliveryOrder")." ".$delivery->ref);
$pdf->SetFont('Arial','B',9);

6
htdocs/main.inc.php
View File

@ -355,8 +355,8 @@ if (! session_id() || ! isset($_SESSION["dol_login"]))
$ldap->fetch($login);
if ($ldapdebug) print "DEBUG: UACF = ".join(',',$ldap->uacf)."<br>\n";
if ($ldapdebug) print "DEBUG: pwdLastSet = ".dolibarr_print_date($ldap->pwdlastset,'%d %b %Y')."<br>\n";
if ($ldapdebug) print "DEBUG: badPasswordTime = ".dolibarr_print_date($ldap->badpwdtime,'%d %b %Y')."<br>\n";
if ($ldapdebug) print "DEBUG: pwdLastSet = ".dolibarr_print_date($ldap->pwdlastset,'day')."<br>\n";
if ($ldapdebug) print "DEBUG: badPasswordTime = ".dolibarr_print_date($ldap->badpwdtime,'day')."<br>\n";
//TODO : doit etre géré au niveau de PEAR
/*
@ -733,7 +733,7 @@ function top_menu($head, $title="", $target="")
if (! isset($_SERVER["REMOTE_USER"]) || ! $_SERVER["REMOTE_USER"])
{
$title=$langs->trans("Logout");
$title.='<br><b>'.$langs->trans("ConnectedSince").'</b>: '.dolibarr_print_date($user->datelastlogin,"%d/%m/%Y %H:%M:%S");
$title.='<br><b>'.$langs->trans("ConnectedSince").'</b>: '.dolibarr_print_date($user->datelastlogin,"dayhour");
if ($dolibarr_main_authentication) $title.='<br><b>'.$langs->trans("AuthenticationMode").'</b>: '.$dolibarr_main_authentication;
$text.='<a href="'.DOL_URL_ROOT.'/user/logout.php"';

2
htdocs/product/price.php
View File

@ -350,7 +350,7 @@ if ($result)
$var=!$var;
print "<tr $bc[$var]>";
// Date
print "<td>".dolibarr_print_date($objp->dp,"%d %b %Y %H:%M:%S")."</td>";
print "<td>".dolibarr_print_date($objp->dp,"dayhour")."</td>";
// catégorie de Prix
if ($conf->global->PRODUIT_MULTIPRICES)

2
htdocs/product/stats/fiche.php
View File

@ -248,7 +248,7 @@ if ($_GET["id"] || $_GET["ref"])
print '<tr>';
if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file']) && ! $px->isGraphKo())
{
print '<td>'.$langs->trans("GeneratedOn",dolibarr_print_date(filemtime($dir."/".$graphfiles[$key]['file']),"%d %b %Y %H:%M:%S")).'</td>';
print '<td>'.$langs->trans("GeneratedOn",dolibarr_print_date(filemtime($dir."/".$graphfiles[$key]['file']),"dayhour")).'</td>';
}
else
{

4
htdocs/telephonie/client/facture.php
View File

@ -237,8 +237,8 @@ if ($_GET["facid"] > 0)
print "<td>Conditions de réglement</td><td>" . $fac->cond_reglement ."</td></tr>";
print '<tr><td>'.$langs->trans("Date").'</td>';
print "<td colspan=\"3\">".dolibarr_print_date($fac->date,"%A %d %B %Y")."</td>\n";
print '<td>'.$langs->trans("DateMaxPayment").'</td><td>' . dolibarr_print_date($fac->date_lim_reglement,"%A %d %B %Y");
print "<td colspan=\"3\">".dolibarr_print_date($fac->date,"dayhourtext")."</td>\n";
print '<td>'.$langs->trans("DateMaxPayment").'</td><td>' . dolibarr_print_date($fac->date_lim_reglement,"dayhourtext");
print "</td></tr>";
print '<tr>';

4
htdocs/user/fiche.php
View File

@ -918,11 +918,11 @@ else
print '</td></tr>';
print '<tr><td width="25%" valign="top">'.$langs->trans("LastConnexion").'</td>';
print '<td>'.dolibarr_print_date($fuser->datelastlogin,"%d/%m/%Y %H:%M:%S").'</td>';
print '<td>'.dolibarr_print_date($fuser->datelastlogin,"dayhour").'</td>';
print "</tr>\n";
print '<tr><td width="25%" valign="top">'.$langs->trans("PreviousConnexion").'</td>';
print '<td>'.dolibarr_print_date($fuser->datepreviouslogin,"%d/%m/%Y %H:%M:%S").'</td>';
print '<td>'.dolibarr_print_date($fuser->datepreviouslogin,"dayhour").'</td>';
print "</tr>\n";
// Note

2
htdocs/user/group/index.php
View File

@ -86,7 +86,7 @@ if ($resql)
print "<tr $bc[$var]>";
print '<td><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.'</a></td>';
print '<td width="100" align="center">'.dolibarr_print_date($obj->datec,"%d %b %Y").'</td>';
print '<td width="100" align="center">'.dolibarr_print_date($obj->datec,"day").'</td>';
print "</tr>\n";
$i++;
}

2
htdocs/user/index.php
View File

@ -113,7 +113,7 @@ if ($result)
}
else print $langs->trans("InternalUser");
print '</td>';
print '<td width="100" align="center">'.dolibarr_print_date($obj->datec,"%d %b %Y").'</td>';
print '<td width="100" align="center">'.dolibarr_print_date($obj->datec,"day").'</td>';
// Statut
$userstatic->statut=$obj->statut;