diff --git a/htdocs/comm/bookmark.php b/htdocs/comm/bookmark.php index 97ef07178e3..5b159aca806 100644 --- a/htdocs/comm/bookmark.php +++ b/htdocs/comm/bookmark.php @@ -89,7 +89,7 @@ if ($_GET["action"] == 'delete') print_fiche_titre($langs->trans("Bookmarks")); -$sql = "SELECT s.rowid, s.nom, ".$db->pdate("b.dateb")." as dateb, b.rowid as bid, b.fk_user, b.url, b.target, u.name, u.firstname"; +$sql = "SELECT s.rowid, s.nom, b.dateb as dateb, b.rowid as bid, b.fk_user, b.url, b.target, u.name, u.firstname"; $sql.= " FROM ".MAIN_DB_PREFIX."bookmark as b, ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."user as u"; $sql.= " WHERE b.fk_soc = s.rowid AND b.fk_user=u.rowid"; if (! $user->admin) $sql.= " AND b.fk_user = ".$user->id; @@ -128,7 +128,7 @@ if ($resql) //print "" . ($i + 1 + ($limit * $page)) . ""; print "".$obj->bid.""; print "".img_object($langs->trans("ShowUser"),"user").' '.$obj->name." ".$obj->firstname."\n"; - print ''.dol_print_date($obj->dateb) .""; + print ''.dol_print_date($db->jdate($obj->dateb)).""; print "rowid."\">".img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom."\n"; print ''.$obj->url.""; print ''.$obj->target.""; diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index 1d7722cb9c5..a49dc5e4898 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -127,7 +127,7 @@ if ($_socid > 0) /* * Liste de l'historique des remises */ - $sql = "SELECT rc.rowid,rc.price_level,".$db->pdate("rc.datec")." as dc, u.rowid as uid, u.login"; + $sql = "SELECT rc.rowid,rc.price_level, rc.datec as dc, u.rowid as uid, u.login"; $sql .= " FROM ".MAIN_DB_PREFIX."societe_prices as rc, ".MAIN_DB_PREFIX."user as u"; $sql .= " WHERE rc.fk_soc =". $objsoc->id; $sql .= " AND u.rowid = rc.fk_user_author"; @@ -151,7 +151,7 @@ if ($_socid > 0) $obj = $db->fetch_object($resql); $tag = !$tag; print ''; - print ''.dol_print_date($obj->dc,"dayhour").''; + print ''.dol_print_date($db->jdate($obj->dc),"dayhour").''; print ''.$obj->price_level.' '; $userstatic->id=$obj->uid; $userstatic->nom=$obj->login; diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index ecf9441d47e..40e7e8fe69c 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -72,7 +72,7 @@ if ($_GET["propalid"] > 0) /* * Propal */ - $sql = 'SELECT s.nom, s.rowid, p.price, p.fk_projet, p.remise, p.tva, p.total, p.ref, p.fk_statut, '.$db->pdate('p.datep').' as dp, p.note,'; + $sql = 'SELECT s.nom, s.rowid, p.price, p.fk_projet, p.remise, p.tva, p.total, p.ref, p.fk_statut, p.datep as dp, p.note,'; $sql.= ' p.fk_user_author, p.fk_user_valid, p.fk_user_cloture, p.datec, p.date_valid, p.date_cloture'; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s'; $sql.= ', '.MAIN_DB_PREFIX.'propal as p'; diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index fe9fe14d534..fcf47a19bc2 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -136,7 +136,7 @@ if ($_socid > 0) /* * Liste de l'historique des avoirs */ - $sql = "SELECT rc.rowid,rc.remise_client,rc.note,".$db->pdate("rc.datec")." as dc,"; + $sql = "SELECT rc.rowid,rc.remise_client,rc.note, rc.datec as dc,"; $sql.= " u.login, u.rowid as user_id"; $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise as rc, ".MAIN_DB_PREFIX."user as u"; $sql.= " WHERE rc.fk_soc =". $objsoc->id; @@ -162,7 +162,7 @@ if ($_socid > 0) $obj = $db->fetch_object($resql); $tag = !$tag; print ''; - print ''.dol_print_date($obj->dc,"dayhour").''; + print ''.dol_print_date($db->jdate($obj->dc),"dayhour").''; print ''.$obj->remise_client.' %'; print ''.$obj->note.''; print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.''; diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index 2772e303943..c6f55aa9cfb 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -126,7 +126,7 @@ print ''; $max=5; $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.rowid as socid,"; -$sql.= " ".$db->pdate("date_cloture")." as datec"; +$sql.= " date_cloture as datec"; $sql.= " FROM ".MAIN_DB_PREFIX."commande as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -180,7 +180,7 @@ if ($resql) print ''; print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''; - print ''.dol_print_date($obj->datec).''; + print ''.dol_print_date($db->jdate($obj->datec)).''; print ''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).''; print ''; $i++; diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index abc224ab37b..c96229b4785 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -72,7 +72,7 @@ $limit = $conf->liste_limit; $offset = $limit * $_GET['page'] ; $sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_client,'; -$sql.= ' '.$db->pdate('c.date_commande').' as date_commande, c.fk_statut, c.facture as facturee'; +$sql.= ' c.date_commande, c.fk_statut, c.facture as facturee'; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s'; $sql.= ', '.MAIN_DB_PREFIX.'commande as c'; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -199,7 +199,7 @@ if ($resql) print ''; print ''; - if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && $objp->date_commande < ($now - $conf->commande->traitement->warning_delay)) print img_picto($langs->trans("Late"),"warning"); + if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && $db->jdate($objp->date_commande) < ($now - $conf->commande->traitement->warning_delay)) print img_picto($langs->trans("Late"),"warning"); print ''; print ''; @@ -222,10 +222,10 @@ if ($resql) print ''.$objp->ref_client.''; // Date - $y = dol_print_date($objp->date_commande,'%Y'); - $m = dol_print_date($objp->date_commande,'%m'); - $ml = dol_print_date($objp->date_commande,'%B'); - $d = dol_print_date($objp->date_commande,'%d'); + $y = dol_print_date($db->jdate($objp->date_commande),'%Y'); + $m = dol_print_date($db->jdate($objp->date_commande),'%m'); + $ml = dol_print_date($db->jdate($objp->date_commande),'%B'); + $d = dol_print_date($db->jdate($objp->date_commande),'%d'); print ''; print $d; print ' '.$ml.''; diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index 26a0c71f250..1ccd60285de 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -95,7 +95,7 @@ if ($mode == 'search') { * */ -$sql = "SELECT s.rowid, s.nom, s.ville, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea"; +$sql = "SELECT s.rowid, s.nom, s.ville, s.datec, s.datea"; $sql.= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta "; 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"; @@ -204,7 +204,7 @@ if ($result) print ''.$obj->ville.' '; print ''.$obj->code_client.' '; print ''.$obj->code_compta.' '; - print ''.dol_print_date($obj->datec).''; + print ''.dol_print_date($db->jdate($obj->datec)).''; print "\n"; $i++; } diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php index 48ab2b66f84..3dfff074c56 100644 --- a/htdocs/compta/commande/fiche.php +++ b/htdocs/compta/commande/fiche.php @@ -392,8 +392,8 @@ if ($id > 0 || ! empty($ref)) */ $sql = 'SELECT l.rowid, l.fk_product, l.product_type, l.description, l.price, l.qty, l.tva_tx, l.fk_remise_except, l.remise_percent, l.subprice,'; $sql.= ' l.info_bits, l.total_ht, l.total_tva, l.total_ttc,'; - $sql.= ' '.$db->pdate('l.date_start').' as date_start,'; - $sql.= ' '.$db->pdate('l.date_end').' as date_end,'; + $sql.= ' l.date_start,'; + $sql.= ' l.date_end,'; $sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid,'; $sql.= ' p.description as product_desc'; $sql.= ' FROM '.MAIN_DB_PREFIX."commandedet as l"; @@ -452,7 +452,7 @@ if ($id > 0 || ! empty($ref)) print $html->textwithtooltip($text,$description,3,'','',$i); // Show range - print_date_range($objp->date_start,$objp->date_end); + print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end)); // Add description in form if ($conf->global->PRODUIT_DESC_IN_FORM) @@ -492,7 +492,7 @@ if ($id > 0 || ! empty($ref)) print $text.' '.nl2br($objp->description); // Show range - print_date_range($objp->date_start,$objp->date_end); + print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end)); } print "\n"; } diff --git a/htdocs/compta/commande/liste.php b/htdocs/compta/commande/liste.php index b3d4193ced5..8a523208f6d 100644 --- a/htdocs/compta/commande/liste.php +++ b/htdocs/compta/commande/liste.php @@ -60,7 +60,7 @@ $now=gmmktime(); llxHeader(); $sql = "SELECT s.nom, s.rowid as socid,"; -$sql.= " c.rowid, c.ref, c.total_ht,".$db->pdate("c.date_commande")." as date_commande,"; +$sql.= " c.rowid, c.ref, c.total_ht, c.date_commande as date_commande,"; $sql.= " c.fk_statut, c.facture"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."commande as c"; @@ -144,7 +144,7 @@ if ($resql) print ''; print ''; - if (($objp->date_commande < ($now - $conf->commande->traitement->warning_delay)) && $objp->statutid == 1 ) print img_picto($langs->trans("Late"),"warning"); + if (($db->jdate($objp->date_commande) < ($now - $conf->commande->traitement->warning_delay)) && $objp->statutid == 1 ) print img_picto($langs->trans("Late"),"warning"); print ''; print ''; @@ -160,10 +160,10 @@ if ($resql) print ""; print ""; - $y = dol_print_date($objp->date_commande,"%Y"); - $m = dol_print_date($objp->date_commande,"%m"); - $mt = dol_print_date($objp->date_commande,"%b"); - $d = dol_print_date($objp->date_commande,"%d"); + $y = dol_print_date($db->jdate($objp->date_commande),"%Y"); + $m = dol_print_date($db->jdate($objp->date_commande),"%m"); + $mt = dol_print_date($db->jdate($objp->date_commande),"%b"); + $d = dol_print_date($db->jdate($objp->date_commande),"%d"); print $d."\n"; print " "; print $mt."\n"; diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 57c099c8016..d980d4fba59 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -175,8 +175,8 @@ if ($_GET["action"] == 'create') $sql.= ' l.fk_remise_except,'; $sql.= ' l.remise_percent, l.subprice, l.info_bits,'; $sql.= ' l.total_ht, l.total_tva, l.total_ttc,'; - $sql.= ' '.$db->pdate('l.date_start').' as date_start,'; - $sql.= ' '.$db->pdate('l.date_end').' as date_end,'; + $sql.= ' l.date_start,'; + $sql.= ' l.date_end,'; $sql.= ' l.product_type,'; $sql.= ' p.ref, p.fk_product_type, p.label as product,'; $sql.= ' p.description as product_desc'; @@ -237,7 +237,7 @@ if ($_GET["action"] == 'create') print $html->textwithtooltip($text,$description,3,'','',$i); // Show range - print_date_range($objp->date_start,$objp->date_end); + print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end)); // Add description in form if ($conf->global->PRODUIT_DESC_IN_FORM) print ($objp->description && $objp->description!=$objp->product_label)?'
'.dol_htmlentitiesbr($objp->description):''; @@ -254,7 +254,7 @@ if ($_GET["action"] == 'create') print $text.' '.nl2br($objp->description); // Show range - print_date_range($objp->date_start,$objp->date_end); + print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end)); print "\n"; } diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index aac3843ab31..110c3f671e1 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -162,7 +162,7 @@ $offset = $limit * $page ; $sql = "SELECT s.nom, s.rowid as socid"; $sql.= ", f.facnumber,f.increment,f.total as total_ht,f.total_ttc"; -$sql.= ", ".$db->pdate("f.datef")." as df, ".$db->pdate("f.date_lim_reglement")." as datelimite"; +$sql.= ", f.datef as df, f.date_lim_reglement as datelimite"; $sql.= ", f.paye as paye, f.rowid as facid, f.fk_statut"; $sql.= ", sum(pf.amount) as am"; if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user "; @@ -348,8 +348,8 @@ if ($result) print "\n"; - print "".dol_print_date($objp->df,'day')."\n"; - print "".dol_print_date($objp->datelimite,'day')."\n"; + print "".dol_print_date($db->jdate($objp->df),'day')."\n"; + print "".dol_print_date($db->jdate($objp->datelimite),'day')."\n"; print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,28).''; diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index acad855587a..6d57c36a06f 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -369,7 +369,7 @@ if ($socid > 0) { print ''; - $sql = "SELECT p.rowid,p.title,p.ref,p.public,".$db->pdate("p.dateo")." as do"; + $sql = "SELECT p.rowid,p.title,p.ref,p.public, p.dateo as do"; $sql .= " FROM ".MAIN_DB_PREFIX."projet as p"; $sql .= " WHERE p.fk_soc = $societe->id"; $sql .= " ORDER BY p.dateo DESC"; @@ -408,7 +408,7 @@ if ($socid > 0) // Label print ''; // Date - print ''; + print ''; print ''; } diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 5365606c09c..831c27ad0c4 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -328,7 +328,7 @@ if ($_GET['action'] == 'create' || $_POST['action'] == 'confirm_paiement' || $_P * List of unpaid invoices */ $sql = 'SELECT f.rowid as facid, f.facnumber, f.total_ttc, f.type, '; - $sql.= $db->pdate('f.datef').' as df'; + $sql.= ' f.datef as df'; $sql.= ' FROM '.MAIN_DB_PREFIX.'facture as f'; $sql.= ' WHERE f.fk_soc = '.$facture->socid; $sql.= ' AND f.paye = 0'; @@ -388,7 +388,7 @@ if ($_GET['action'] == 'create' || $_POST['action'] == 'confirm_paiement' || $_P print "\n"; // Date - print '\n"; + print '\n"; // Prix print ''; @@ -494,7 +494,7 @@ if (! $_GET['action'] && ! $_POST['action']) if (! $sortorder) $sortorder='DESC'; if (! $sortfield) $sortfield='p.datep'; - $sql = 'SELECT '.$db->pdate('p.datep').' as dp, p.amount, f.amount as fa_amount, f.facnumber'; + $sql = 'SELECT p.datep as dp, p.amount, f.amount as fa_amount, f.facnumber'; $sql .=', f.rowid as facid, c.libelle as paiement_type, p.num_paiement'; $sql .= ' FROM '.MAIN_DB_PREFIX.'paiement as p, '.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'c_paiement as c'; $sql .= ' WHERE p.fk_facture = f.rowid AND p.fk_paiement = c.id'; @@ -529,7 +529,7 @@ if (! $_GET['action'] && ! $_POST['action']) $var=!$var; print ''; print '\n"; - print '\n"; + print '\n"; print '\n"; print ''; print ''; diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index 73114b6a51b..ae4235bba98 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -229,7 +229,7 @@ if ($_GET['action'] == 'new') print ''; print '
'.$obj->title.''.dol_print_date($obj->do,"day").''.dol_print_date($db->jdate($obj->do),"day").'
'.dol_print_date($objp->df,'day')."'.dol_print_date($db->jdate($objp->df),'day')."'.price($objp->total_ttc).'
'.$objp->facnumber."'.dol_print_date($objp->dp)."'.dol_print_date($db->jdate($objp->dp))."'.$objp->paiement_type.' '.$objp->num_paiement."'.price($objp->amount).' 
'.$langs->trans('Date').''.dol_print_date($now,'day').'

'; - $sql = "SELECT ba.rowid as bid, ".$db->pdate("b.dateo")." as date,"; + $sql = "SELECT ba.rowid as bid, b.dateo as date,"; $sql.= " b.amount, ba.label, b.emetteur, b.num_chq, b.banque"; $sql.= " FROM ".MAIN_DB_PREFIX."bank as b "; $sql.= ",".MAIN_DB_PREFIX."bank_account as ba "; @@ -247,7 +247,7 @@ if ($_GET['action'] == 'new') while ( $obj = $db->fetch_object($resql) ) { $accounts[$obj->bid] = $obj->label; - $lines[$obj->bid][$i]["date"] = $obj->date; + $lines[$obj->bid][$i]["date"] = $db->jdate($obj->date); $lines[$obj->bid][$i]["amount"] = $obj->amount; $lines[$obj->bid][$i]["emetteur"] = $obj->emetteur; $lines[$obj->bid][$i]["numero"] = $obj->num_chq; @@ -401,7 +401,7 @@ else print ' '; } print ''; - print ''.dol_print_date($objp->datec,'day').''; + print ''.dol_print_date($db->jdate($objp->datec),'day').''; if($remisecheque->statut == 0) { print ''.img_delete().''; diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index 8306ca39512..9b56c592127 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + /** \file htdocs/compta/paiement/cheque/index.php \ingroup compta @@ -91,13 +91,13 @@ else print ''; -$sql = "SELECT bc.rowid,".$db->pdate("bc.date_bordereau")." as db, bc.amount, bc.number"; +$sql = "SELECT bc.rowid, bc.date_bordereau as db, bc.amount, bc.number"; $sql.= ", bc.statut, bc.nbcheque"; $sql.= ", ba.label, ba.rowid as bid"; $sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE ba.rowid = bc.fk_bank_account"; -$sql.= " AND bc.entity = ".$conf->entity; +$sql.= " AND bc.entity = ".$conf->entity; $sql.= " ORDER BY bc.rowid"; $sql.= " DESC LIMIT 10"; @@ -129,7 +129,7 @@ if ($resql) print "\n"; print ''.$checkdepositstatic->getNomUrl(1).''; - print ''.dol_print_date($objp->db,'day').''; + print ''.dol_print_date($db->jdate($objp->db),'day').''; print ''.$accountstatic->getNomUrl(1).''; print ''.$objp->nbcheque.''; print ''.price($objp->amount).''; diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/liste.php index 6c4846fec65..2e9ffe3fd97 100644 --- a/htdocs/compta/paiement/cheque/liste.php +++ b/htdocs/compta/paiement/cheque/liste.php @@ -54,7 +54,7 @@ $accountstatic=new Account($db); llxHeader('',$langs->trans("ChequesReceipts")); -$sql = "SELECT bc.rowid, bc.number as ref, ".$db->pdate("bc.date_bordereau") ." as dp,"; +$sql = "SELECT bc.rowid, bc.number as ref, bc.date_bordereau as dp,"; $sql.= " bc.nbcheque, bc.amount, bc.statut,"; $sql.= " ba.rowid as bid, ba.label"; $sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc,"; @@ -119,7 +119,7 @@ if ($resql) print ''; // Date - print ''.dol_print_date($objp->dp,'day').''; + print ''.dol_print_date($db->jdate($objp->dp),'day').''; // Banque print ''; diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 9d94119ca13..dfc0dadc69e 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -55,7 +55,7 @@ if (! $sortfield) $sortfield="p.datec"; * */ $sql = "SELECT p.rowid, p.ref, p.amount, p.statut"; -$sql.= ", ".$db->pdate("p.datec")." as datec"; +$sql.= ", p.datec"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; $sql.= " WHERE p.entity = ".$conf->entity; $sql.= " ORDER BY $sortfield $sortorder "; @@ -100,7 +100,7 @@ if ($result) print ''.$obj->ref."\n"; - print ''.dol_print_date($obj->datec,'day')."\n"; + print ''.dol_print_date($db->jdate($obj->datec),'day')."\n"; print ''.price($obj->amount)."\n"; diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 51d66e68fd1..001e13c6521 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -131,7 +131,7 @@ print '
'; $limit=5; $sql = "SELECT p.rowid, p.ref, p.amount, p.statut"; -$sql.= ", ".$db->pdate("p.datec")." as datec"; +$sql.= ", p.datec"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; $sql.= " WHERE p.entity = ".$conf->entity; $sql.= " ORDER BY datec DESC"; @@ -161,7 +161,7 @@ if ($result) $bprev->ref=$obj->ref; print $bprev->getNomUrl(1); print "\n"; - print ''.dol_print_date($obj->datec,'day')."\n"; + print ''.dol_print_date($db->jdate($obj->datec),'day')."\n"; print ''.price($obj->amount).' '.$langs->trans("Currency".$conf->monnaie)."\n"; diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index 8e170ebf524..0590713d359 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -65,7 +65,7 @@ if (! $sortfield) $sortfield="f.facnumber"; */ $sql= "SELECT f.facnumber, f.rowid, s.nom, s.rowid as socid"; -$sql.= ", ".$db->pdate("pfd.date_demande")." as date_demande"; +$sql.= ", pfd.date_demande as date_demande"; $sql.= ", pfd.fk_user_demande"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; @@ -136,7 +136,7 @@ if ( $db->query($sql) ) print $thirdpartystatic->getNomUrl(1,'customer'); print ''; - print ''.dol_print_date($obj->date_demande,'day').''; + print ''.dol_print_date($db->jdate($obj->date_demande),'day').''; if (!array_key_exists($obj->fk_user_demande,$users)) { diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index 93c59b70949..aebba32e0ee 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -134,7 +134,7 @@ else * */ $limit=5; -$sql = "SELECT p.rowid, p.ref, p.amount,".$db->pdate("p.datec")." as datec"; +$sql = "SELECT p.rowid, p.ref, p.amount, p.datec"; $sql .= " ,p.statut "; $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; $sql .= " ORDER BY datec DESC LIMIT ".$limit; @@ -164,7 +164,7 @@ if ($result) print ''.$obj->ref."\n"; - print ''.dol_print_date($obj->datec,"dayhour")."\n"; + print ''.dol_print_date($db->jdate($obj->datec),"dayhour")."\n"; print ''.price($obj->amount)."\n"; diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php index ef2f7588ad2..8c598a969ff 100644 --- a/htdocs/compta/prelevement/liste.php +++ b/htdocs/compta/prelevement/liste.php @@ -49,7 +49,7 @@ $sortorder = (empty($_GET["sortorder"])) ? "DESC" : $_GET["sortorder"]; $sortfield = (empty($_GET["sortfield"])) ? "p.datec" : $_GET["sortfield"]; $offset = $conf->liste_limit * $page ; -$sql = "SELECT p.rowid, p.statut, p.ref, pl.amount,".$db->pdate("p.datec")." as datec"; +$sql = "SELECT p.rowid, p.statut, p.ref, pl.amount, p.datec"; $sql.= " , s.nom, s.code_client"; $sql.= " , pl.rowid as rowid_ligne, pl.statut as statut_ligne"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; @@ -138,7 +138,7 @@ if ($result) print ''.$obj->ref."\n"; print ''.$obj->nom."\n"; - print ''.dol_print_date($obj->datec,'day')."\n"; + print ''.dol_print_date($db->jdate($obj->datec),'day')."\n"; print ''.price($obj->amount)."\n"; print ''.$obj->code_client."\n"; print ' ';