diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php index df9206dfcc5..34b0f12f483 100644 --- a/htdocs/holiday/month_report.php +++ b/htdocs/holiday/month_report.php @@ -61,8 +61,8 @@ if(empty($year)) { } $sql = "SELECT cp.rowid, cp.fk_user, cp.date_debut, cp.date_fin, cp.halfday"; -$sql.= " FROM llx_holiday cp"; -$sql.= " LEFT JOIN llx_user u ON cp.fk_user = u.rowid"; +$sql.= " FROM " . MAIN_DB_PREFIX . "holiday cp"; +$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "user u ON cp.fk_user = u.rowid"; $sql.= " WHERE cp.statut = 3"; // Approved // TODO Use BETWEEN instead of date_format $sql.= " AND (date_format(cp.date_debut, '%Y-%c') = '$year-$month' OR date_format(cp.date_fin, '%Y-%c') = '$year-$month')"; diff --git a/htdocs/product/stock/lib/replenishment.lib.php b/htdocs/product/stock/lib/replenishment.lib.php index 09c39e7661d..2cc8337ae69 100644 --- a/htdocs/product/stock/lib/replenishment.lib.php +++ b/htdocs/product/stock/lib/replenishment.lib.php @@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php'; function dispatched($order_id) { global $db; - $sql = 'SELECT fk_product, SUM(qty) from llx_commande_fournisseur_dispatch'; + $sql = 'SELECT fk_product, SUM(qty) FROM ' . MAIN_DB_PREFIX . 'commande_fournisseur_dispatch'; $sql .= ' WHERE fk_commande = ' . $order_id . ' GROUP BY fk_product'; $sql .= ' ORDER by fk_product'; $resql = $db->query($sql); @@ -44,7 +44,7 @@ function dispatched($order_id) while($res = $db->fetch_object($resql)) $dispatched[] = $res; } - $sql = 'SELECT fk_product, SUM(qty) from llx_commande_fournisseurdet'; + $sql = 'SELECT fk_product, SUM(qty) FROM ' . MAIN_DB_PREFIX . 'commande_fournisseurdet'; $sql .= ' WHERE fk_commande = ' . $order_id . ' GROUP BY fk_product'; $sql .= ' ORDER by fk_product'; $resql = $db->query($sql);