X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdashboard.inc;h=9a5a9f4b5ce57e024ebc5292ffecdcfde36c7e31;hb=159af00183e3732314b508729b06eae88721954c;hp=b9799751a80782b156313e860aabe2aa98c8a5d4;hpb=845b3991baafeaf004abac0016430f398f71b232;p=fa-stable.git

diff --git a/includes/dashboard.inc b/includes/dashboard.inc
index b9799751..9a5a9f4b 100644
--- a/includes/dashboard.inc
+++ b/includes/dashboard.inc
@@ -195,7 +195,7 @@ function customer_top($today, $limit=10, $width="33", &$pg=null)
 	while ($myrow = db_fetch($result))
 	{
 		alt_table_row_color($k);
-		$name = $myrow["debtor_no"]." ".$myrow["name"];
+		$name = $myrow["debtor_no"]." ".htmlspecialchars_decode($myrow["name"]);
 		label_cell($name);
 		amount_cell($myrow['total']);
 		if ($pg != null)
@@ -232,7 +232,7 @@ function supplier_top($today, $limit=10, $width="33", &$pg=null)
 	while ($myrow = db_fetch($result))
 	{
 		alt_table_row_color($k);
-		$name = $myrow["supplier_id"]." ".$myrow["supp_name"];
+		$name = $myrow["supplier_id"]." ".htmlspecialchars_decode($myrow["supp_name"]);
 		label_cell($name);
 		amount_cell($myrow['total']);
 		if ($pg != null)
@@ -272,7 +272,7 @@ function stock_top($today, $limit=10, $width="33", $type=0, &$pg=null)
 			SUM(qty) AS qty FROM ".TB_PREF."stock_master AS s, ".TB_PREF."stock_moves AS m 
 			WHERE s.stock_id=m.stock_id ";
 		if ($type == 1)
-			$sql .= "AND s.mb_flag='M' ";
+			$sql .= "AND s.mb_flag='M' AND m.type <> ".ST_CUSTDELIVERY." AND m.type <> ".ST_CUSTCREDIT." ";
 		elseif ($type == 2)	
 			$sql .= "AND s.mb_flag='F' ";
 	}