From 4f6923442a14da233b0554437d3add737cb155e0 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 10 Dec 2020 13:19:10 +0100
Subject: [PATCH] fix merge and sql synthax

---
 htdocs/core/boxes/box_funnel_of_prospection.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index 5669fab7fe5..50b61f8de0e 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -97,8 +97,8 @@ class box_funnel_of_prospection extends ModeleBoxes
 		$sql = "SELECT cls.rowid, cls.code, cls.percent, cls.label";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "c_lead_status as cls";
 		$sql .= " WHERE active=1";
-		$sql .= " Order by cls.rowid";
-		$sql .= " AND cls.code != 'LOST'";
+		$sql .= " AND cls.code <> 'LOST'";
+		$sql .= $this->db->order('cls.rowid','ASC');
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -201,7 +201,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 						}
 
 						$data[] = (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0);
-
+						$liststatus[] = $labelStatus;
 						if (!$conf->use_javascript_ajax) {
 							$stringtoprint .= '<tr class="oddeven">';
 							$stringtoprint .= '<td>' . $labelStatus . '</td>';