diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index e02b841863e..e55da222ae9 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -146,8 +146,8 @@ if ($modecompta == 'CREANCES-DETTES') {
}
$sql.= " AND f.entity = ".$conf->entity;
if ($socid) $sql.= " AND f.fk_soc = ".$socid;
-$sql.= " GROUP BY nom";
-$sql.= " ORDER BY nom";
+$sql.= " GROUP BY s.nom, s.rowid";
+$sql.= " ORDER BY s.nom";
/*
print dol_print_date($date_end,'dayhour',true).'
';
@@ -204,7 +204,7 @@ if ($modecompta != 'CREANCES-DETTES')
$sql.= " AND b.fk_account = ba.rowid";
$sql.= " AND ba.entity = ".$conf->entity;
if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
- $sql.= " GROUP BY nom";
+ $sql.= " GROUP BY nom, idp";
$sql.= " ORDER BY nom";
dol_syslog("get old customer payments not linked to invoices sql=".$sql);
@@ -255,7 +255,7 @@ print '';
*/
if ($modecompta == 'CREANCES-DETTES')
{
- $sql = "SELECT s.nom, s.rowid as socid, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm";
+ $sql = "SELECT s.nom, s.rowid as socid, date_format(f.datef,'%Y-%m') as dm, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
$sql.= " WHERE f.fk_soc = s.rowid";
@@ -274,8 +274,8 @@ if ($modecompta == 'CREANCES-DETTES')
}
$sql.= " AND f.entity = ".$conf->entity;
if ($socid) $sql.= " AND f.fk_soc = ".$socid;
-$sql .= " GROUP BY nom, s.rowid";
-$sql .= " ORDER BY nom, s.rowid";
+$sql .= " GROUP BY s.nom, s.rowid, dm";
+$sql .= " ORDER BY s.nom, s.rowid";
print '
| '.$langs->trans("SuppliersInvoices").' |
';
@@ -490,7 +490,7 @@ if ($modecompta == 'CREANCES-DETTES')
{
// TVA a payer
$amount=0;
- $sql = "SELECT sum(f.tva) as amount, date_format(f.datef,'%Y-%m') as dm";
+ $sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.tva) as amount";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql.= " WHERE f.fk_statut in (1,2)";
if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
@@ -527,7 +527,7 @@ if ($modecompta == 'CREANCES-DETTES')
// TVA a recuperer
$amount=0;
- $sql = "SELECT sum(f.total_tva) as amount, date_format(f.datef,'%Y-%m') as dm";
+ $sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total_tva) as amount";
$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
$sql.= " WHERE f.fk_statut in (1,2)";
if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
@@ -567,7 +567,7 @@ else
{
// TVA reellement deja payee
$amount=0;
- $sql = "SELECT sum(t.amount) as amount, date_format(t.datev,'%Y-%m') as dm";
+ $sql = "SELECT date_format(t.datev,'%Y-%m') as dm, sum(t.amount) as amount";
$sql.= " FROM ".MAIN_DB_PREFIX."tva as t";
$sql.= " WHERE amount > 0";
if ($date_start && $date_end) $sql.= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
@@ -606,7 +606,7 @@ else
// TVA recuperee
$amount=0;
- $sql = "SELECT sum(t.amount) as amount, date_format(t.datev,'%Y-%m') as dm";
+ $sql = "SELECT date_format(t.datev,'%Y-%m') as dm, sum(t.amount) as amount";
$sql.= " FROM ".MAIN_DB_PREFIX."tva as t";
$sql.= " WHERE amount < 0";
if ($date_start && $date_end) $sql.= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index e7cc6be0816..fc1b4e958c0 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -135,8 +135,8 @@ else
}
$sql.= " AND f.entity = ".$conf->entity;
if ($socid) $sql.= " AND f.fk_soc = ".$socid;
-$sql .= " GROUP BY rowid, name, firstname";
-$sql .= " ORDER BY rowid";
+$sql .= " GROUP BY u.rowid, u.name, u.firstname";
+$sql .= " ORDER BY u.rowid";
$result = $db->query($sql);
if ($result)
@@ -159,7 +159,7 @@ else {
// On ajoute les paiements anciennes version, non lies par paiement_facture
if ($modecompta != 'CREANCES-DETTES')
{
- $sql = "SELECT -1 as rowid, '' as name, '' as firstname, sum(p.amount) as amount_ttc";
+ $sql = "SELECT -1 as rowidx, '' as name, '' as firstname, sum(p.amount) as amount_ttc";
$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
$sql.= ", ".MAIN_DB_PREFIX."paiement as p";
@@ -169,8 +169,8 @@ if ($modecompta != 'CREANCES-DETTES')
$sql.= " AND b.fk_account = ba.rowid";
$sql.= " AND ba.entity = ".$conf->entity;
if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
- $sql.= " GROUP BY rowid";
- $sql.= " ORDER BY rowid";
+ $sql.= " GROUP BY rowidx, name, firstname";
+ $sql.= " ORDER BY rowidx";
$result = $db->query($sql);
if ($result)
@@ -180,8 +180,8 @@ if ($modecompta != 'CREANCES-DETTES')
while ($i < $num)
{
$obj = $db->fetch_object($result);
- $amount[$obj->rowid] = $obj->amount_ttc;
- $name[$obj->rowid] = $obj->name.' '.$obj->firstname;
+ $amount[$obj->rowidx] = $obj->amount_ttc;
+ $name[$obj->rowidx] = $obj->name.' '.$obj->firstname;
$catotal+=$obj->amount_ttc;
$i++;
}
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 1622ac23e66..774b8815d46 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -141,7 +141,7 @@ else
}
$sql.= " AND f.entity = ".$conf->entity;
if ($socid) $sql.= " AND f.fk_soc = ".$socid;
-$sql.= " GROUP BY s.rowid";
+$sql.= " GROUP BY s.rowid, s.nom";
$sql.= " ORDER BY s.rowid";
$result = $db->query($sql);
@@ -175,7 +175,7 @@ if ($modecompta != 'CREANCES-DETTES')
$sql.= " AND b.fk_account = ba.rowid";
$sql.= " AND ba.entity = ".$conf->entity;
if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
- $sql.= " GROUP BY nom";
+ $sql.= " GROUP BY nom, idp";
$sql.= " ORDER BY nom";
$result = $db->query($sql);
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index b21867036c1..af608796bee 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -80,7 +80,7 @@ report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportl
if ($modecompta == 'CREANCES-DETTES') {
- $sql = "SELECT sum(f.total) as amount, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm";
+ $sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total) as amount, sum(f.total_ttc) as amount_ttc";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql.= " WHERE f.fk_statut in (1,2)";
} else {
@@ -88,7 +88,7 @@ if ($modecompta == 'CREANCES-DETTES') {
* Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
* vieilles versions, ils n'etaient pas lies via paiement_facture. On les ajoute plus loin)
*/
- $sql = "SELECT sum(pf.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
+ $sql = "SELECT date_format(p.datep,'%Y-%m') as dm, sum(pf.amount) as amount_ttc";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql.= ", ".MAIN_DB_PREFIX."paiement_facture as pf";
$sql.= ", ".MAIN_DB_PREFIX."paiement as p";
@@ -97,7 +97,8 @@ if ($modecompta == 'CREANCES-DETTES') {
}
$sql.= " AND f.entity = ".$conf->entity;
if ($socid) $sql.= " AND f.fk_soc = ".$socid;
-$sql.= " GROUP BY dm DESC";
+$sql.= " GROUP BY dm";
+$sql.= " ORDER BY dm";
$result = $db->query($sql);
if ($result)
@@ -123,7 +124,7 @@ else {
// On ajoute les paiements anciennes version, non lies par paiement_facture
if ($modecompta != 'CREANCES-DETTES') {
- $sql = "SELECT sum(p.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
+ $sql = "SELECT date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount_ttc";
$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
$sql.= ", ".MAIN_DB_PREFIX."paiement as p";