From f74440aa652b4d97e232f8578c47d7f33de9f8ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Feb 2012 23:51:00 +0100
Subject: [PATCH] Fix: request

---
 htdocs/compta/resultat/clientfourn.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index d9f764f5e87..e023149849a 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -272,13 +272,13 @@ if ($modecompta == 'CREANCES-DETTES')
 else
 {
     $sql = "SELECT s.nom, s.rowid as socid, date_format(p.datep,'%Y-%m') as dm, sum(pf.amount) as amount_ttc";
-    $sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
+    $sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
     $sql.= ", ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as f";
-    $sql .= " ON pf.fk_facturefourn = f.rowid";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s";
-    $sql .= " ON f.fk_soc = s.rowid";
-    $sql .= " WHERE p.rowid = pf.fk_paiementfourn ";
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as f";
+    $sql.= " ON pf.fk_facturefourn = f.rowid";
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s";
+    $sql.= " ON f.fk_soc = s.rowid";
+    $sql.= " WHERE p.rowid = pf.fk_paiementfourn ";
     if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 }
 $sql.= " AND f.entity = ".$conf->entity;
@@ -364,6 +364,7 @@ else
 }
 $sql.= " AND cs.entity = ".$conf->entity;
 $sql.= " GROUP BY c.libelle";
+$sql.= " ORDER BY c.libelle";
 
 dol_syslog("get social contributions deductible=0 sql=".$sql);
 $result=$db->query($sql);
@@ -421,20 +422,22 @@ if ($modecompta == 'CREANCES-DETTES')
     $sql.= " AND c.deductible = 1";
     if ($date_start && $date_end) $sql.= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
     $sql.= " AND cs.entity = ".$conf->entity;
-    $sql.= " GROUP BY c.libelle DESC";
+    $sql.= " GROUP BY c.libelle";
+    $sql.= " ORDER BY c.libelle";
 }
 else
 {
     $sql = "SELECT c.libelle as nom, sum(p.amount) as amount";
-    $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+    $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
     $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs";
     $sql.= ", ".MAIN_DB_PREFIX."paiementcharge as p";
-    $sql .= " WHERE p.fk_charge = cs.rowid";
+    $sql.= " WHERE p.fk_charge = cs.rowid";
     $sql.= " AND cs.fk_type = c.id";
     $sql.= " AND c.deductible = 1";
     if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
     $sql.= " AND cs.entity = ".$conf->entity;
     $sql.= " GROUP BY c.libelle";
+    $sql.= " ORDER BY c.libelle";
 }
 
 dol_syslog("get social contributions deductible=1 sql=".$sql);
@@ -593,7 +596,7 @@ else
     if ($date_start && $date_end) $sql.= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
     $sql.= " AND t.entity = ".$conf->entity;
     $sql.= " GROUP BY dm";
-    $sql.= " ORDER BY dm DESC";
+    $sql.= " ORDER BY dm";
 
     dol_syslog("get vat really paid sql=".$sql);
     $result=$db->query($sql);
@@ -632,7 +635,7 @@ else
     if ($date_start && $date_end) $sql.= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
     $sql.= " AND t.entity = ".$conf->entity;
     $sql.= " GROUP BY dm";
-    $sql.= " ORDER BY dm DESC";
+    $sql.= " ORDER BY dm";
 
     dol_syslog("get vat really received back sql=".$sql);
     $result=$db->query($sql);