A couple of minor bugs

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0f23316ce161147dd2c6e8be96b84556ce005b8a..3abc3dffaa2354cca733c08d1ced2b6d200ab10f 100644 (file)
--- 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 ef4825050101ebf0d3a26595f23ff975aeb60b76..be6004c6d5a67c9ab27b9363a1b88e8fde1476cb 100644 (file)
--- 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 fd1fae781bc19f721652aa26b2bc5e3cd60d4a0c..b4ffa5c323e1a9982274babeb0820f7455ea9e55 100644 (file)
--- 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;