diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index 0d7281d6934e5eaed2fbf04c83bc2f3c1caf9b80..1fcfdb0854328a568f2fd4d2819f6a02a17e20ff 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -1,6 +1,6 @@ <?php /* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> - * Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net> + * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2008 Regis Houssin <regis@dolibarr.fr> * * This program is free software; you can redistribute it and/or modify @@ -276,12 +276,11 @@ class Entrepot extends CommonObject */ function info($id) { - $sql = "SELECT e.rowid, e.datec,"; - $sql .= " e.datem,"; - $sql .= " fk_user_author"; - $sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e"; - $sql .= " WHERE e.rowid = ".$id; + $sql = "SELECT e.rowid, e.datec, e.tms as datem, e.fk_user_author"; + $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e"; + $sql.= " WHERE e.rowid = ".$id; + dol_syslog("Entrepot::info sql=".$sql); $result=$this->db->query($sql); if ($result) { diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php index cd8e47ae46a2792bdd68e16ff0b6ee221cc20188..e7f64e273c285494ec7defbab92133609c59ca90 100644 --- a/htdocs/product/stock/fiche.php +++ b/htdocs/product/stock/fiche.php @@ -1,6 +1,6 @@ <?php /* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> - * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net> + * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005 Simon Tosser <simon@kornog-computing.com> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * @@ -124,14 +124,14 @@ if ($_POST["action"] == 'update' && $_POST["cancel"] <> $langs->trans("Cancel")) { $_GET["action"] = 'edit'; $_GET["id"] = $_POST["id"]; - $mesg = '<div class="error">Fiche non mise � jour !' . "<br>" . $entrepot->error.'</div>'; + $mesg = '<div class="error">'.$entrepot->error.'</div>'; } } else { $_GET["action"] = 'edit'; $_GET["id"] = $_POST["id"]; - $mesg = '<div class="error">Fiche non mise � jour !' . "<br>" . $entrepot->error.'</div>'; + $mesg = '<div class="error">'.$entrepot->error.'</div>'; } }