From fe876b96fe784b9d6e7e5a8798fb89906e79226a Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 4 Apr 2020 18:49:30 +0200
Subject: [PATCH] Fix links + getEntity

---
 htdocs/compta/stats/supplier_turnover.php               | 6 +++---
 htdocs/compta/stats/supplier_turnover_by_thirdparty.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/stats/supplier_turnover.php b/htdocs/compta/stats/supplier_turnover.php
index 33cec605eed..72b3aa2e77c 100644
--- a/htdocs/compta/stats/supplier_turnover.php
+++ b/htdocs/compta/stats/supplier_turnover.php
@@ -163,7 +163,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 	$sql .= " WHERE f.fk_statut in (1,2)";
 	$sql .= " AND f.type IN (0,2)";
-	$sql .= " AND f.entity IN (".getEntity('invoice').")";
+	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
 }
 elseif ($modecompta == "RECETTES-DEPENSES")
@@ -174,7 +174,7 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$sql .= ", ".MAIN_DB_PREFIX."paiementfourn as p";
 	$sql .= " WHERE p.rowid = pf.fk_paiementfourn";
 	$sql .= " AND pf.fk_facturefourn = f.rowid";
-	$sql .= " AND f.entity IN (".getEntity('invoice').")";
+	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
 }
 elseif ($modecompta == "BOOKKEEPING")
@@ -227,7 +227,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 {
 	if ($modecompta == 'CREANCES-DETTES') print '<td align="center" width="10%" colspan="3">';
 	else print '<td align="center" width="10%" colspan="2" class="borderrightlight">';
-	if ($modecompta != 'BOOKKEEPING') print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee.'">';
+	if ($modecompta != 'BOOKKEEPING') print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee.($modecompta ? '&modecompta='.$modecompta : '').'">';
 	print $annee;
     if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee + 1);
     if ($modecompta != 'BOOKKEEPING') print '</a>';
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index 6894ac1b8f6..e4cfc53c59a 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -270,7 +270,7 @@ if (!empty($search_societe))  $sql .= natural_search('s.nom', $search_societe);
 if (!empty($search_zip))      $sql .= natural_search('s.zip', $search_zip);
 if (!empty($search_town))     $sql .= natural_search('s.town', $search_town);
 if ($search_country > 0)      $sql .= ' AND s.fk_pays = '.$search_country.'';
-$sql .= " AND f.entity IN (".getEntity('invoice').")";
+$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 if ($socid) $sql .= " AND f.fk_soc = ".$socid;
 $sql .= " GROUP BY s.rowid, s.nom, s.zip, s.town, s.fk_pays";
 $sql .= " ORDER BY s.rowid";