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

Remove pdate

Browse Source
This commit is contained in:
Laurent Destailleur 2010-05-08 17:17:17 +00:00
parent ed011d5342
commit 33d88a661f
18 changed files with 51 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1092,7 +1092,7 @@ class AccountLine
*/
function info($rowid)
{
$sql = 'SELECT b.rowid, '.$this->db->pdate('b.datec').' as datec,';
$sql = 'SELECT b.rowid, b.datec,';
$sql.= ' b.fk_user_author, b.fk_user_rappro';
$sql.= ' FROM '.MAIN_DB_PREFIX.'bank as b';
$sql.= ' WHERE b.rowid = '.$rowid;
@ -1118,7 +1118,7 @@ class AccountLine
$this->user_rappro = $ruser;
}
$this->date_creation = $obj->datec;
$this->date_creation = $this->db->jdate($obj->datec);
//$this->date_rappro = $obj->daterappro; // \todo pas encore g<>r<EFBFBD>e
}
$this->db->free($result);

4
htdocs/compta/deplacement/index.php
View File

@ -57,7 +57,7 @@ $pagenext = $page + 1;
$sql = "SELECT s.nom, s.rowid as socid,"; // Ou
$sql.= " d.rowid, d.type, ".$db->pdate("d.dated")." as dd, d.km, "; // Comment
$sql.= " d.rowid, d.type, d.dated as dd, d.km, "; // Comment
$sql.= " u.name, u.firstname"; // Qui
$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
$sql.= ", ".MAIN_DB_PREFIX."deplacement as d";
@ -100,7 +100,7 @@ if ($resql)
print "<tr $bc[$var]>";
print '<td><a href="fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowTrip"),"trip").' '.$objp->rowid.'</a></td>';
print '<td>'.$langs->trans($objp->type).'</td>';
print '<td>'.dol_print_date($objp->dd,'day').'</td>';
print '<td>'.dol_print_date($db->jdate($objp->dd),'day').'</td>';
if ($objp->socid) print '<td>'.$soc->getNomUrl(1).'</td>';
else print '<td>&nbsp;</td>';
print '<td align="left"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowUser"),"user").' '.$objp->firstname.' '.$objp->name.'</a></td>';

4
htdocs/compta/dons/liste.php
View File

@ -53,7 +53,7 @@ llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M
$donationstatic=new Don($db);
// Genere requete de liste des dons
$sql = "SELECT d.rowid, ".$db->pdate("d.datedon")." as datedon, d.prenom, d.nom, d.societe,";
$sql = "SELECT d.rowid, d.datedon, d.prenom, d.nom, d.societe,";
$sql.= " d.amount, d.fk_statut as statut, ";
$sql.= " p.title as projet";
$sql.= " FROM ".MAIN_DB_PREFIX."don as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p";
@ -108,7 +108,7 @@ if ($result)
print "<td>".stripslashes($objp->prenom)."</td>\n";
print "<td>".stripslashes($objp->nom)."</td>\n";
print "<td>".stripslashes($objp->societe)."</td>\n";
print '<td align="center">'.dol_print_date($objp->datedon).'</td>';
print '<td align="center">'.dol_print_date($db->jdate($objp->datedon)).'</td>';
if ($conf->projet->enabled) {
print "<td>$objp->projet</td>\n";
}

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

@ -56,7 +56,7 @@ if ($sortfield == "") $sortfield="ec.date_export";
llxHeader('','Compta - Export');
$sql = "SELECT ec.rowid,".$db->pdate("ec.date_export")." as date_export, ec.ref";
$sql = "SELECT ec.rowid, ec.date_export as date_export, ec.ref";
$sql .= " FROM ".MAIN_DB_PREFIX."export_compta as ec";
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
@ -88,7 +88,7 @@ if ($result)
print "<tr $bc[$var]>";
print '<td>'.$obj->ref.'</td>';
print '<td>'.dol_print_date($obj->date_export,"dayhour").'</td>';
print '<td>'.dol_print_date($db->jdate($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++;

8
htdocs/compta/export/modules/compta.export.class.php
View File

@ -62,7 +62,7 @@ class ComptaExport
$error = 0;
$sql = "SELECT f.rowid as facid, f.facnumber, ".$this->db->pdate("f.datef")." as datef";
$sql = "SELECT f.rowid as facid, f.facnumber, f.datef";
$sql .= " , f.total_ttc, f.tva ";
$sql .= " ,s.nom, s.rowid as socid, s.code_compta";
$sql .= " , l.price, l.tva_tx";
@ -99,7 +99,7 @@ class ComptaExport
{
$obj = $this->db->fetch_object($resql);
$this->linec[$i][0] = $obj->datef;
$this->linec[$i][0] = $this->db->jdate($obj->datef);
$this->linec[$i][1] = $obj->facid;
$this->linec[$i][2] = $obj->code_compta;
$this->linec[$i][3] = $obj->nom;
@ -138,7 +138,7 @@ class ComptaExport
$error = 0;
$sql = "SELECT p.rowid as paymentid, f.facnumber";
$sql .= " ,".$this->db->pdate("p.datep")." as datep";
$sql .= " , p.datep";
$sql .= " , pf.amount";
$sql .= " , s.nom, s.code_compta";
$sql .= " , cp.libelle, f.increment";
@ -170,7 +170,7 @@ class ComptaExport
{
$obj = $this->db->fetch_object($resql);
$this->linep[$i][0] = $obj->datep;
$this->linep[$i][0] = $this->db->jdate($obj->datep);
$this->linep[$i][1] = $obj->paymentid;
$this->linep[$i][2] = $obj->code_compta;
$this->linep[$i][3] = $obj->nom;

4
htdocs/compta/index.php
View File

@ -470,7 +470,7 @@ if ($conf->societe->enabled && $user->rights->societe->lire)
$langs->load("boxes");
$sql = "SELECT s.nom, s.rowid, ".$db->pdate("s.datec")." as dc";
$sql = "SELECT s.nom, s.rowid, s.datec as dc";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.client IN (1, 3)";
@ -508,7 +508,7 @@ if ($conf->societe->enabled && $user->rights->societe->lire)
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td>'.$customerstatic->getNomUrl(1).'</td>';
print '<td align="right">'.dol_print_date($objp->dc,'day').'</td>';
print '<td align="right">'.dol_print_date($db->jdate($objp->dc),'day').'</td>';
print '</tr>';
$i++;

4
htdocs/compta/param/comptes/liste.php
View File

@ -46,7 +46,7 @@ $offset = $conf->liste_limit * $page ;
*
*/
$sql = "SELECT cg.rowid, cg.numero, cg.intitule, ".$db->pdate("cg.date_creation")." as dc";
$sql = "SELECT cg.rowid, cg.numero, cg.intitule, cg.date_creation as dc";
$sql .= " FROM ".MAIN_DB_PREFIX."compta_compte_generaux as cg";
@ -109,7 +109,7 @@ if ($resql)
print '<td>'.$obj->numero.'</td>'."\n";
print '<td>'.$obj->intitule.'</td>';
print '<td align="right" width="100">';
print dol_print_date($obj->dc);
print dol_print_date($db->jdate($obj->dc));
print '</td>';
print "</tr>\n";

22
htdocs/compta/propal.php
View File

@ -197,7 +197,7 @@ if ($id > 0 || ! empty($ref))
print '</td>';
if ($conf->projet->enabled) $rowspan++;
//Local taxes
if ($mysoc->pays_code=='ES' && $conf->global->MAIN_FEATURES_LEVEL >= 1)
{
@ -327,9 +327,9 @@ if ($id > 0 || ! empty($ref))
print '<td align="right" colspan="2">'.price($propal->total_localtax2).'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
}
}
}
print '<tr><td height="10">'.$langs->trans('AmountTTC').'</td><td align="right" colspan="2">'.price($propal->total_ttc).'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
@ -575,8 +575,8 @@ else
$sql = "SELECT s.nom, s.rowid as socid, s.client,";
$sql.= " p.rowid as propalid, p.ref, p.fk_statut,";
$sql.= " p.total_ht, p.tva, p.total,";
$sql.= $db->pdate("p.datep")." as dp, ";
$sql.= $db->pdate("p.fin_validite")." as dfin";
$sql.= " p.datep as dp,";
$sql.= " p.fin_validite as dfin";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."propal as p";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@ -676,7 +676,7 @@ else
print '</td>';
print '<td width="20" class="nobordernopadding" nowrap="nowrap">';
if ($objp->fk_statut == 1 && $objp->dfin < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
if ($objp->fk_statut == 1 && $db->jdate($objp->dfin) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
print '</td>';
print '<td width="16" align="right" class="nobordernopadding">';
@ -700,10 +700,10 @@ else
// Date
print "<td align=\"right\">";
$y = dol_print_date($objp->dp,"%Y");
$m = dol_print_date($objp->dp,"%m");
$mt = dol_print_date($objp->dp,"%b");
$d = dol_print_date($objp->dp,"%d");
$y = dol_print_date($db->jdate($objp->dp),"%Y");
$m = dol_print_date($db->jdate($objp->dp),"%m");
$mt = dol_print_date($db->jdate($objp->dp),"%b");
$d = dol_print_date($db->jdate($objp->dp),"%d");
print $d."\n";
print " <a href=\"propal.php?year=$y&month=$m\">";
print $mt."</a>\n";

4
htdocs/compta/stats/comp.php
View File

@ -40,7 +40,7 @@ function propals ($db, $year, $month)
{
global $bc,$langs,$conf;
$sql = "SELECT s.nom, s.rowid as socid, p.rowid as propalid, p.price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid";
$sql = "SELECT s.nom, s.rowid as socid, p.rowid as propalid, p.price, p.ref, p.datep as dp, c.label as statut, c.id as statutid";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."propal as p";
$sql.= ", ".MAIN_DB_PREFIX."c_propalst as c";
@ -91,7 +91,7 @@ function propals ($db, $year, $month)
print "<td><a href=\"".DOL_URL_ROOT."/comm/propal.php?propalid=".$objp->propalid."\">".$objp->ref."</a></td>\n";
print "<td align=\"right\">".dol_print_date($objp->dp)."</td>\n";
print "<td align=\"right\">".dol_print_date($db->jdate($objp->dp))."</td>\n";
print "<td align=\"right\">".price($objp->price)."</td>\n";
print "<td align=\"center\">".$objp->statut."</td>\n";

4
htdocs/compta/tva/reglement.php
View File

@ -48,7 +48,7 @@ $tva_static = new Tva($db);
print_fiche_titre($langs->trans("VATPayments"));
$sql = "SELECT rowid, amount, label, ".$db->pdate("f.datev")." as dm";
$sql = "SELECT rowid, amount, label, f.datev as dm";
$sql.= " FROM ".MAIN_DB_PREFIX."tva as f ";
$sql.= " WHERE f.entity = ".$conf->entity;
$sql.= " ORDER BY dm DESC";
@ -78,7 +78,7 @@ if ($result)
$tva_static->ref=$obj->rowid;
print "<td>".$tva_static->getNomUrl(1)."</td>\n";
print "<td>".dol_trunc($obj->label,40)."</td>\n";
print '<td align="left">'.dol_print_date($obj->dm,'day')."</td>\n";
print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day')."</td>\n";
$total = $total + $obj->amount;
print "<td align=\"right\">".price($obj->amount)."</td>";

3
htdocs/compta/ventilation/fiche.php
View File

@ -89,14 +89,13 @@ if($_GET["id"])
{
$sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.price,";
$sql .= " l.qty, l.rowid, l.tva_tx, l.remise_percent, l.subprice,";
$sql .= " ".$db->pdate("l.date_start")." as date_start, ".$db->pdate("l.date_end")." as date_end,";
$sql .= " l.date_start as date_start, l.date_end as date_end,";
$sql .= " l.fk_code_ventilation ";
$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as l";
$sql .= " , ".MAIN_DB_PREFIX."facture as f";
$sql .= " WHERE f.rowid = l.fk_facture AND f.fk_statut = 1 AND l.rowid = ".$_GET["id"];
$result = $db->query($sql);
if ($result)
{
$num_lignes = $db->num_rows($result);

8
htdocs/fichinter/fiche.php
View File

@ -667,8 +667,8 @@ elseif ($fichinterid)
/*
* Lignes d'intervention
*/
$sql = 'SELECT ft.rowid, ft.description, ft.fk_fichinter, ft.duree, ft.rang';
$sql.= ', '.$db->pdate('ft.date').' as date_intervention';
$sql = 'SELECT ft.rowid, ft.description, ft.fk_fichinter, ft.duree, ft.rang,';
$sql.= ' ft.date as date_intervention';
$sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft';
$sql.= ' WHERE ft.fk_fichinter = '.$fichinterid;
$sql.= ' ORDER BY ft.rang ASC, ft.rowid';
@ -705,7 +705,7 @@ elseif ($fichinterid)
print nl2br($objp->description);
// Date
print '<td align="center" width="150">'.dol_print_date($objp->date_intervention,'dayhour').'</td>';
print '<td align="center" width="150">'.dol_print_date($db->jdate($objp->date_intervention),'dayhour').'</td>';
// Duration
print '<td align="right" width="150">'.ConvertSecondToTime($objp->duree).'</td>';
@ -778,7 +778,7 @@ elseif ($fichinterid)
// Date d'intervention
print '<td align="center" nowrap="nowrap">';
$html->select_date($objp->date_intervention,'di',1,1,0,"date_intervention");
$html->select_date($db->jdate($objp->date_intervention),'di',1,1,0,"date_intervention");
print '</td>';
// Duration

4
htdocs/fichinter/index.php
View File

@ -66,7 +66,7 @@ llxHeader();
$sql = "SELECT";
$sql.= " f.ref, f.rowid as fichid, f.fk_statut, f.description,";
$sql.= " fd.description as descriptiondetail, ".$db->pdate("fd.date")." as dp, fd.duree,";
$sql.= " fd.description as descriptiondetail, fd.date as dp, fd.duree,";
$sql.= " s.nom, s.rowid as socid";
$sql.= " FROM (".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@ -135,7 +135,7 @@ if ($result)
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44)."</a></td>\n";
print '<td>'.dol_htmlentitiesbr(dol_trunc($objp->description,20)).'</td>';
print '<td>'.dol_htmlentitiesbr(dol_trunc($objp->descriptiondetail,20)).'</td>';
print '<td align="center">'.dol_print_date($objp->dp,'dayhour')."</td>\n";
print '<td align="center">'.dol_print_date($db->jdate($objp->dp),'dayhour')."</td>\n";
print '<td align="right">'.ConvertSecondToTime($objp->duree).'</td>';
print '<td align="right">'.$interventionstatic->LibStatut($objp->fk_statut,5).'</td>';

4
htdocs/fichinter/rapport.php
View File

@ -51,7 +51,7 @@ $pageprev = $page - 1;
$pagenext = $page + 1;
$sql = "SELECT s.nom, s.rowid as socid, f.description, f.ref";
$sql.= ", ".$db->pdate("f.datei")." as dp, f.rowid as fichid, f.fk_statut, f.duree";
$sql.= ", f.datei as dp, f.rowid as fichid, f.fk_statut, f.duree";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."fichinter as f ";
$sql.= " WHERE f.fk_soc = s.rowid";
@ -124,7 +124,7 @@ if ( $db->query($sql) )
print "<a href=\"".DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->rowid.$filter."\">".$objp->nom."</a></TD>\n";
}
print '<td>'.nl2br($objp->description).'</td>';
print "<td>".dol_print_date($objp->dp,"%d %B %Y")."</td>\n";
print "<td>".dol_print_date($db->jdate($objp->dp),"day")."</td>\n";
print '<td align="center">'.sprintf("%.1f",$objp->duree).'</td>';
$DureeTotal += $objp->duree;
print "</tr>\n";

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

@ -73,7 +73,7 @@ $offset = $conf->liste_limit * $page ;
* Mode Liste
*/
$sql = "SELECT s.rowid as socid, s.nom, ".$db->pdate("cf.date_commande")." as dc,";
$sql = "SELECT s.rowid as socid, s.nom, cf.date_commande as dc,";
$sql.= " cf.rowid,cf.ref, cf.fk_statut, cf.total_ttc, cf.fk_user_author,";
$sql.= " u.login";
$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,";
@ -177,7 +177,7 @@ if ($resql)
print "<td align=\"center\" width=\"100\">";
if ($obj->dc)
{
print dol_print_date($obj->dc,"day");
print dol_print_date($db->jdate($obj->dc),"day");
}
else
{

10
htdocs/fourn/fiche.php
View File

@ -139,7 +139,7 @@ if ( $societe->fetch($socid) )
print '</td></tr>';
}
}
print '</table>';
print '</td><td valign="top" width="50%" class="notopnoleftnoright">';
@ -178,7 +178,7 @@ if ( $societe->fetch($socid) )
if ($user->rights->fournisseur->commande->lire)
{
$sql = "SELECT p.rowid,p.ref,".$db->pdate("p.date_commande")." as dc, p.fk_statut";
$sql = "SELECT p.rowid,p.ref, p.date_commande as dc, p.fk_statut";
$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p ";
$sql.= " WHERE p.fk_soc =".$societe->id;
$sql.= " ORDER BY p.date_commande DESC";
@ -204,7 +204,7 @@ if ( $societe->fetch($socid) )
print '<td align="center" width="80">';
if ($obj->dc)
{
print dol_print_date($obj->dc,'day');
print dol_print_date($db->jdate($obj->dc),'day');
}
else
{
@ -234,7 +234,7 @@ if ( $societe->fetch($socid) )
if ($user->rights->fournisseur->facture->lire)
{
$sql = 'SELECT p.rowid,p.libelle,p.facnumber,p.fk_statut,'.$db->pdate('p.datef').' as df, total_ttc as amount, paye';
$sql = 'SELECT p.rowid,p.libelle,p.facnumber,p.fk_statut, p.datef as df, total_ttc as amount, paye';
$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as p';
$sql.= ' WHERE p.fk_soc = '.$societe->id;
$sql.= ' ORDER BY p.datef DESC';
@ -256,7 +256,7 @@ if ( $societe->fetch($socid) )
print '<td>';
print '<a href="facture/fiche.php?facid='.$obj->rowid.'">';
print img_object($langs->trans('ShowBill'),'bill').' '.$obj->facnumber.'</a> '.dol_trunc($obj->libelle,14).'</td>';
print '<td align="center" nowrap="nowrap">'.dol_print_date($obj->df,'day').'</td>';
print '<td align="center" nowrap="nowrap">'.dol_print_date($db->jdate($obj->df),'day').'</td>';
print '<td align="right" nowrap="nowrap">'.price($obj->amount).'</td>';
print '<td align="right" nowrap="nowrap">'.$facturestatic->LibStatut($obj->paye,$obj->fk_statut,5).'</td>';
print '</tr>';

4
htdocs/fourn/liste.php
View File

@ -67,7 +67,7 @@ $htmlother=new FormOther($db);
llxHeader();
$sql = "SELECT s.rowid as socid, s.nom, s.ville,".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea, st.libelle as stcomm, s.prefix_comm";
$sql = "SELECT s.rowid as socid, s.nom, s.ville, s.datec, s.datea, st.libelle as stcomm, s.prefix_comm";
$sql.= " , code_fournisseur, code_compta_fournisseur";
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st";
@ -177,7 +177,7 @@ if ($resql)
print "<td>".$obj->ville."</td>\n";
print '<td align="left">'.$obj->code_fournisseur.'&nbsp;</td>';
print '<td align="left">'.$obj->code_compta_fournisseur.'&nbsp;</td>';
print '<td align="center">'.dol_print_date($obj->datec).'</td>';
print '<td align="center">'.dol_print_date($db->jdate($obj->datec)).'</td>';
print "<td>&nbsp;</td>\n";
print "</tr>\n";
$i++;

4
htdocs/fourn/product/fourn.php
View File

@ -132,7 +132,7 @@ if ($_GET["id"])
* Prix
*/
$sql = "SELECT p.price, p.quantity,".$db->pdate("tms") ." as date_releve";
$sql = "SELECT p.price, p.quantity, tms as date_releve";
$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as p";
$sql .=" WHERE p.fk_soc = ".$product->fourn->id;
$sql .= " AND p.fk_product = ".$product->id;
@ -148,7 +148,7 @@ if ($_GET["id"])
$objp = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print '<td>'.dol_print_date($objp->date_releve).'</td>';
print '<td>'.dol_print_date($db->datej($objp->date_releve)).'</td>';
print '<td align="right">'.price($objp->price).'</td>';
print '<td align="center">'.$objp->quantity.'</td></tr>';