diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 705432eb486..311a2e037a5 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -627,13 +627,13 @@ if ($_GET["action"] == 'create' && ($user->rights->produit->creer || $user->righ $helpurl=''; if (isset($_GET["type"]) && $_GET["type"] == 0) $helpurl='EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos'; if (isset($_GET["type"]) && $_GET["type"] == 1) $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios'; - + llxHeader('',$langs->trans("CardProduct".$_GET["type"]),$helpurl); - + if (! isset($product)) { $canvas = new Canvas($db,$user); - + $product = $canvas->load_canvas('product',$_GET["canvas"]); $canvas->assign_values('create'); @@ -662,11 +662,11 @@ if ($_GET["id"] || $_GET["ref"]) if (!empty($productstatic->canvas)) { $canvas = new Canvas($db,$user); - + $product = $canvas->load_canvas('product',$productstatic->canvas); $canvas->fetch($productstatic->id,'',$_GET["action"]); } - + llxHeader('',$langs->trans("CardProduct".$product->type)); if ( $result ) @@ -695,7 +695,7 @@ if ($_GET["id"] || $_GET["ref"]) $ret=$html->form_confirm("fiche.php?id=".$product->id,$langs->trans("DeleteProduct"),$langs->trans("ConfirmDeleteProduct"),"confirm_delete",'',0,2); if ($ret == 'html') print '
'; } - + $canvas->assign_values('view'); $canvas->display_canvas(); } @@ -776,7 +776,7 @@ if ($product->id && $_GET["action"] == '' && $product->status) if($conf->propal->enabled && $user->rights->propale->creer) { $propal = new Propal($db); - + $langs->load("propal"); print ''; @@ -797,7 +797,7 @@ if ($product->id && $_GET["action"] == '' && $product->status) // Liste de "Mes propals" print ''; - $sql = "SELECT s.nom, s.rowid as socid, p.rowid as propalid, p.ref,".$db->pdate("p.datep")." as dp"; + $sql = "SELECT s.nom, s.rowid as socid, p.rowid as propalid, p.ref, p.datep as dp"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p"; $sql.= " WHERE p.fk_soc = s.rowid"; $sql.= " AND p.entity = ".$conf->entity; @@ -893,7 +893,7 @@ if ($product->id && $_GET["action"] == '' && $product->status) if($conf->commande->enabled && $user->rights->commande->creer) { $commande = new Commande($db); - + $langs->load("orders"); print ''; @@ -914,7 +914,7 @@ if ($product->id && $_GET["action"] == '' && $product->status) // Liste de "Mes commandes" print ''; - $sql = "SELECT s.nom, s.rowid as socid, c.rowid as commandeid, c.ref,".$db->pdate("c.date_commande")." as dc"; + $sql = "SELECT s.nom, s.rowid as socid, c.rowid as commandeid, c.ref, c.date_commande as dc"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c"; $sql.= " WHERE c.fk_soc = s.rowid"; $sql.= " AND c.entity = ".$conf->entity; @@ -942,7 +942,7 @@ if ($product->id && $_GET["action"] == '' && $product->status) print ""; print "commandeid."\">".img_object($langs->trans("ShowOrder"),"order")." ".$objc->ref."\n"; print "socid."\">".dol_trunc($objc->nom,18)."\n"; - print "".dol_print_date($objc->dc,"%d %b")."\n"; + print "".dol_print_date($db->jdate($objc->dc),"%d %b")."\n"; print ''; print ''.$langs->trans("ReductionShort"); print '%'; @@ -1027,7 +1027,7 @@ if ($product->id && $_GET["action"] == '' && $product->status) // Liste de Mes factures print ''; - $sql = "SELECT s.nom, s.rowid as socid, f.rowid as factureid, f.facnumber,".$db->pdate("f.datef")." as df"; + $sql = "SELECT s.nom, s.rowid as socid, f.rowid as factureid, f.facnumber, f.datef as df"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f"; $sql.= " WHERE f.fk_soc = s.rowid"; $sql.= " AND f.entity = ".$conf->entity; @@ -1055,7 +1055,7 @@ if ($product->id && $_GET["action"] == '' && $product->status) print ""; print "factureid."\">".img_object($langs->trans("ShowBills"),"bill")." ".$objp->facnumber."\n"; print "socid."\">".dol_trunc($objp->nom,18)."\n"; - print "".dol_print_date($objp->df,"%d %b")."\n"; + print "".dol_print_date($db->jdate($objp->df),"%d %b")."\n"; print ''; print ''.$langs->trans("ReductionShort"); print '%'; @@ -1089,7 +1089,7 @@ if ($product->id && $_GET["action"] == '' && $product->status) // Liste de Autres factures $var=true; - $sql = "SELECT s.nom, s.rowid as socid, f.rowid as factureid, f.facnumber,".$db->pdate("f.datef")." as df"; + $sql = "SELECT s.nom, s.rowid as socid, f.rowid as factureid, f.facnumber, f.datef as df"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f"; $sql.= " WHERE f.fk_soc = s.rowid"; $sql.= " AND f.entity = ".$conf->entity; diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 695139f0059..9e36ba8841a 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -413,7 +413,7 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user-> // Liste des evolutions du prix $sql = "SELECT p.rowid, p.price, p.price_ttc, p.price_base_type, p.tva_tx,"; $sql.= " p.price_level, p.price_min, p.price_min_ttc,"; -$sql.= " ".$db->pdate("p.date_price")." as dp, u.rowid as user_id, u.login"; +$sql.= " p.date_price as dp, u.rowid as user_id, u.login"; $sql.= " FROM ".MAIN_DB_PREFIX."product_price as p,"; $sql.= " ".MAIN_DB_PREFIX."user as u"; $sql.= " WHERE fk_product = ".$product->id; @@ -471,7 +471,7 @@ if ($result) $var=!$var; print ""; // Date - print "".dol_print_date($objp->dp,"dayhour").""; + print "".dol_print_date($db->jdate($objp->dp),"dayhour").""; // Price level if ($conf->global->PRODUIT_MULTIPRICES) diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index b31586cee20..38046c83fce 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -73,7 +73,7 @@ if (isset($_REQUEST['catid'])) $title=$langs->trans("ProductsAndServices"); -$sql = 'SELECT p.rowid, p.ref, p.label, p.price, p.fk_product_type, '.$db->pdate('p.tms').' as datem,'; +$sql = 'SELECT p.rowid, p.ref, p.label, p.price, p.fk_product_type, p.tms as datem,'; $sql.= ' p.duration, p.envente as statut, p.seuil_stock_alerte,'; $sql.= ' SUM(s.reel) as stock_physique'; $sql.= ' FROM '.MAIN_DB_PREFIX.'product_stock as s,'; diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php index f858511cdb7..2b6a5628aee 100644 --- a/htdocs/product/stock/index.php +++ b/htdocs/product/stock/index.php @@ -110,7 +110,7 @@ print ''; $max=10; $sql = "SELECT p.rowid, p.label as produit,"; $sql.= " s.label as stock, s.rowid as entrepot_id,"; -$sql.= " m.value, ".$db->pdate("m.datem")." as datem"; +$sql.= " m.value, m.datem"; $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as s"; $sql.= ", ".MAIN_DB_PREFIX."stock_mouvement as m"; $sql.= ", ".MAIN_DB_PREFIX."product as p"; @@ -143,7 +143,7 @@ if ($resql) $objp = $db->fetch_object($resql); $var=!$var; print ""; - print ''.dol_print_date($objp->datem,'dayhour').''; + print ''.dol_print_date($db->jdate($objp->datem),'dayhour').''; print "rowid\">"; print img_object($langs->trans("ShowProduct"),"product").' '.$objp->produit; print "\n"; diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index 86fd80ea963..1b7e4a1fe6e 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -54,7 +54,7 @@ llxHeader(); print_fiche_titre($langs->trans("ListOfGroups")); -$sql = "SELECT g.rowid, g.nom, g.entity, ".$db->pdate("g.datec")." as datec"; +$sql = "SELECT g.rowid, g.nom, g.entity, g.datec"; $sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g"; $sql .= " WHERE g.entity IN (0,".$conf->entity.")"; if ($_POST["search_group"]) @@ -91,7 +91,7 @@ if ($resql) print img_redstar($langs->trans("GlobalGroup")); } print ""; - print ''.dol_print_date($obj->datec,"day").''; + print ''.dol_print_date($db->jdate($obj->datec),"day").''; print "\n"; $i++; } diff --git a/htdocs/user/home.php b/htdocs/user/home.php index bc0a6aaa511..726ec9c0bed 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -80,7 +80,7 @@ print ''; */ $max=10; -$sql = "SELECT u.rowid, u.name, u.firstname, u.admin, u.login, u.fk_societe, ".$db->pdate("u.datec")." as datec,"; +$sql = "SELECT u.rowid, u.name, u.firstname, u.admin, u.login, u.fk_societe, u.datec,"; $sql.= " u.entity, u.ldap_sid, s.nom"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_societe = s.rowid"; @@ -125,7 +125,7 @@ if ($resql) } else print $langs->trans("InternalUser"); print ''; - print "".dol_print_date($obj->datec,'dayhour').""; + print "".dol_print_date($db->jdate($obj->datec),'dayhour').""; print ''; $i++; } @@ -144,7 +144,7 @@ else */ $max=5; -$sql = "SELECT g.rowid, g.nom, g.note, g.entity, ".$db->pdate("g.datec")." as datec"; +$sql = "SELECT g.rowid, g.nom, g.note, g.entity, g.datec"; $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g"; $sql.= " WHERE g.entity IN (0,".$conf->entity.")"; $sql.= " ORDER BY g.datec DESC"; @@ -170,7 +170,7 @@ if ( $db->query($sql) ) print img_picto($langs->trans("GlobalGroup"),'redstar'); } print ""; - print "".dol_print_date($obj->datec).""; + print "".dol_print_date($db->jdate($obj->datec)).""; print ""; $i++; } diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 5eb27ab6d2e..4e8257ddc81 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -57,9 +57,9 @@ llxHeader(); print_fiche_titre($langs->trans("ListOfUsers")); $sql = "SELECT u.rowid, u.name, u.firstname, u.admin, u.fk_societe, u.login,"; -$sql.= " ".$db->pdate("u.datec")." as datec,"; -$sql.= " ".$db->pdate("u.tms")." as datem,"; -$sql.= " ".$db->pdate("u.datelastlogin")." as datelastlogin,"; +$sql.= " u.datec,"; +$sql.= " u.tms as datem,"; +$sql.= " u.datelastlogin,"; $sql.= " u.ldap_sid, u.statut, u.entity,"; $sql.= " s.nom"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; @@ -121,10 +121,10 @@ if ($result) print ''; // Date creation - print ''.dol_print_date($obj->datec,"day").''; + print ''.dol_print_date($db->jdate($obj->datec),"day").''; // Date last login - print ''.dol_print_date($obj->datelastlogin,"dayhour").''; + print ''.dol_print_date($db->jdate($obj->datelastlogin),"dayhour").''; // Statut $userstatic->statut=$obj->statut;