Ajout du tri sur "Montant reçu"
Correction bug mineur: le tri sur "Montant TTC" renvoyait une erreur SQL. Correction bug mineur: la longueur de la liste affichée était 1 de trop.
This commit is contained in:
parent
d949cd718e
commit
c79adc7173
@ -468,7 +468,7 @@ if ($_GET["action"] == 'create')
|
|||||||
*/
|
*/
|
||||||
$sql = "SELECT p.rowid,p.label,p.ref,p.price FROM ".MAIN_DB_PREFIX."product as p ";
|
$sql = "SELECT p.rowid,p.label,p.ref,p.price FROM ".MAIN_DB_PREFIX."product as p ";
|
||||||
$sql .= " WHERE envente = 1";
|
$sql .= " WHERE envente = 1";
|
||||||
$sql .= " ORDER BY p.nbvente DESC LIMIT 20";
|
$sql .= " ORDER BY p.nbvente DESC LIMIT ".$conf->liste_limit;
|
||||||
if ( $db->query($sql) )
|
if ( $db->query($sql) )
|
||||||
{
|
{
|
||||||
$opt = "<option value=\"0\" SELECTED></option>";
|
$opt = "<option value=\"0\" SELECTED></option>";
|
||||||
@ -1284,7 +1284,7 @@ else
|
|||||||
|
|
||||||
$sql .= " ORDER BY $sortfield $sortorder, f.rowid DESC ";
|
$sql .= " ORDER BY $sortfield $sortorder, f.rowid DESC ";
|
||||||
|
|
||||||
$sql .= $db->plimit($limit + 1,$offset);
|
$sql .= $db->plimit($limit,$offset);
|
||||||
|
|
||||||
$result = $db->query($sql);
|
$result = $db->query($sql);
|
||||||
}
|
}
|
||||||
@ -1305,8 +1305,10 @@ else
|
|||||||
print '</td><td align="right">';
|
print '</td><td align="right">';
|
||||||
print_liste_field_titre("Montant HT",$PHP_SELF,"f.total","","&socidp=$socidp");
|
print_liste_field_titre("Montant HT",$PHP_SELF,"f.total","","&socidp=$socidp");
|
||||||
print '</td><td align="right">';
|
print '</td><td align="right">';
|
||||||
print_liste_field_titre("Montant TTC",$PHP_SELF,"f.totalttc","","&socidp=$socidp");
|
print_liste_field_titre("Montant TTC",$PHP_SELF,"f.total_ttc","","&socidp=$socidp");
|
||||||
print '</td><td align="right">Reçu</td>';
|
print '</td><td align="right">';
|
||||||
|
print_liste_field_titre("Reçu",$PHP_SELF,"am","","&socidp=$socidp");
|
||||||
|
print '</td>';
|
||||||
print '<td align="center">Status</td>';
|
print '<td align="center">Status</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user