diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 94accf43f38..7cd19c31de7 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -53,16 +53,12 @@ $sql .= " ,cf.rowid,cf.ref";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s ";
$sql .= " , ".MAIN_DB_PREFIX."commande_fournisseur as cf";
$sql .= " WHERE cf.fk_soc = s.idp ";
-
-if ($socidp) {
- $sql .= " AND s.idp=".$socidp;
-}
$sql .= " GROUP BY cf.fk_statut";
-$result = $db->query($sql);
-if ($result)
+$resql = $db->query($sql);
+if ($resql)
{
- $num = $db->num_rows();
+ $num = $db->num_rows($resql);
$i = 0;
print '
';
@@ -72,7 +68,7 @@ if ($result)
while ($i < $num)
{
- $row = $db->fetch_row();
+ $row = $db->fetch_row($resql);
$var=!$var;
print "";
@@ -84,14 +80,50 @@ if ($result)
$i++;
}
print "
";
- $db->free();
+ $db->free($resql);
+}
+else
+{
+ dolibarr_print_error($db);
+}
+
+print '';
+
+$sql = "SELECT u.name, u.firstname";
+$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+$sql .= " , ".MAIN_DB_PREFIX."user_rights as ur";
+$sql .= " WHERE u.rowid = ur.fk_user";
+$sql .= " AND ur.fk_id = 184";
+
+$resql = $db->query($sql);
+if ($resql)
+{
+ $num = $db->num_rows($resql);
+ $i = 0;
+
+ print '';
+ print '| Personnes habilitées à approuver les commandes | ';
+ print " \n";
+ $var=True;
+
+ while ($i < $num)
+ {
+ $row = $db->fetch_row($resql);
+ $var=!$var;
+
+ print "";
+ print '| '.$row[1].' '.$row[0].' | ';
+ print " \n";
+ $i++;
+ }
+ print " ";
+ $db->free($resql);
}
else
{
dolibarr_print_error($db);
}
-print ' | | ';
print '';