diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 2b8b40ce687..95c95597849 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -32,56 +32,14 @@ print '
';
/*
*
*/
+print '\n";
-if ($sortfield == "")
-{
- $sortfield="o.orders_status ASC, o.date_purchased";
-}
-if ($sortorder == "")
-{
- $sortorder="DESC";
-}
-
-if ($page == -1) { $page = 0 ; }
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-
-$sql = "SELECT o.orders_id, o.customers_name, o.orders_status FROM ".DB_NAME_OSC.".orders as o";
-
-$sql .= " ORDER BY $sortfield $sortorder ";
-$sql .= $db->plimit($limit + 1,$offset);
-
-if ( $db->query($sql) )
-{
- $num = $db->num_rows();
-
- $i = 0;
- print '';
- print '| ';
- print_liste_field_titre("Client",$PHP_SELF, "p.ref");
- print " | ";
- print " | ";
- print " \n";
- $var=True;
- while ($i < min($num,$limit))
- {
- $objp = $db->fetch_object( $i);
- $var=!$var;
- print "";
- print "| orders_id\">$objp->customers_name | \n";
- print "$objp->orders_status | \n";
- print " \n";
- $i++;
- }
- print " ";
- $db->free();
-}
-/*
- *
- */
-print ' | ';
-
/*
* Commandes à valider
*/
@@ -113,6 +71,11 @@ if ( $db->query($sql) )
print " ";
}
}
+/*
+ *
+ */
+print ' | ';
+
/*
* Commandes à traiter
*/
@@ -144,44 +107,42 @@ if ( $db->query($sql) )
print " ";
}
}
-
/*
- * Propales à facturer
+ * Commandes à traiter
*/
-if ($user->comm > 0 && $conf->commercial )
+$sql = "SELECT c.rowid, c.ref, s.nom, s.idp FROM llx_commande as c, llx_societe as s";
+$sql .= " WHERE c.fk_soc = s.idp AND c.fk_statut > 1 ";
+if ($socidp)
{
- $sql = "SELECT p.rowid, p.ref, s.nom, s.idp FROM llx_propal as p, llx_societe as s";
- $sql .= " WHERE p.fk_soc = s.idp AND p.fk_statut = 2";
- if ($socidp)
+ $sql .= " AND c.fk_soc = $socidp";
+}
+$sql .= " ORDER BY c.rowid DESC";
+$sql .= $db->plimit(5, 0);
+if ( $db->query($sql) )
+{
+ $num = $db->num_rows();
+ if ($num)
{
- $sql .= " AND p.fk_soc = $socidp";
- }
-
- if ( $db->query($sql) )
- {
- $num = $db->num_rows();
- if ($num)
+ $i = 0;
+ print '';
+ print '';
+ print '| 5 dernières commandes | ';
+
+ while ($i < $num)
{
- $i = 0;
- print '';
- print "";
- print '| '.translate("Propositions commerciales signées").' | ';
-
- while ($i < $num)
- {
- $var=!$var;
- $obj = $db->fetch_object($i);
- print "| rowid\">$obj->ref | ";
- print ''.$obj->nom.' | ';
- $i++;
- }
- print " ";
+ $var=!$var;
+ $obj = $db->fetch_object($i);
+ print "| rowid\">$obj->ref | ";
+ print ''.$obj->nom.' | ';
+ $i++;
}
+ print " ";
}
}
+
print ' |
';
$db->close();