From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Tue, 15 Sep 2009 07:56:36 +0000 (+0000)
Subject: A couple of minor bugs
X-Git-Tag: v2.4.2~19^2~1243
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=d478ad00de3c071c4586fbffa2c6bee43888ed73;p=fa-stable.git

A couple of minor bugs
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0f23316c..3abc3dff 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,12 +19,12 @@ Legend:
 ! -> Note
 $ -> Affected files
 
-
-15-Sep-2009 Janusz Dobrowolski
+15-Sep-2009 Janusz Dobrowolski/Joe Hunt
 # Fixed journal entry type and systype selectors
 $ /includes/types.inc
-! Clenaup
+! Cleanup
 $ /includes/ui/ui_lists.inc
+  /reporting/includes/reports_classes.inc
 
 14-Sep-2009 Joe Hunt
 ! Changed all numeric constants to the new defined constants. A huge task.
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index ef482505..be6004c6 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -1796,6 +1796,10 @@ function pagesizes_list_row($label, $name, $value=null)
 function systypes_list_cells($label, $name, $value=null, $submit_on_change=false)
 {
 	global $systypes_array;
+
+	if ($label != null)
+		echo "<td>$label</td>\n";
+	echo "<td>";
 	
 	$str = array_selector($name, $value, $systypes_array, 
 		array( 
diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index fd1fae78..b4ffa5c3 100644
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -448,9 +448,10 @@ function dup_systypes_list($name, &$selected_id, $all_option=false, $all_option_
 
 	foreach ($systypes_array as $i => $value)
 	{
-		if (!$all_types && ($i == 16 || $i == 18 || $i == 25 || ($i >= 28 && $i <= 30) || $i >= 40))
+		if (!$all_types && ($i == ST_LOCTRANSFER || $i == ST_PURCHORDER || $i == ST_SUPPRECEIVE || ($i >= ST_MANUISSUE && $i <= ST_SALESQUOTE) || 
+			$i >= ST_DIMENSION))
 			continue;
-    	$st .= "<option" . ($selected_id == $i ? " selected" : "") . " value='$i'>" . $value['name'] . "</option>\n";
+    	$st .= "<option" . ($selected_id == $i ? " selected" : "") . " value='$i'>" . $value . "</option>\n";
 	}
     $st .= "</select>";
 	return $st;