Sales Area list, added 'No Area Filter'.

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 35fc2b703c985051c983b5d2cbcfdee494bf3f0b..ca85d26e74d9ae77e38d2a208b3b19433d9f5cc6 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -1311,25 +1311,27 @@ function sales_persons_list_row($label, $name, $selected_id=null, $spec_opt=fals
 
 //------------------------------------------------------------------------------------
 
-function sales_areas_list($name, $selected_id=null)
+function sales_areas_list($name, $selected_id=null, $special_option=false)
 {
        $sql = "SELECT area_code, description, inactive FROM ".TB_PREF."areas";
-       return combo_input($name, $selected_id, $sql, 'area_code', 'description', array());
+       return combo_input($name, $selected_id, $sql, 'area_code', 'description', 
+               array('spec_option' => $special_option===true ? ' ' : $special_option,
+               'order' => 'description', 'spec_id' => 0));
 }
 
-function sales_areas_list_cells($label, $name, $selected_id=null)
+function sales_areas_list_cells($label, $name, $selected_id=null, $special_option=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       echo sales_areas_list($name, $selected_id);
+       echo sales_areas_list($name, $selected_id, $special_option);
        echo "</td>\n";
 }
 
-function sales_areas_list_row($label, $name, $selected_id=null)
+function sales_areas_list_row($label, $name, $selected_id=null, $special_option=false)
 {
        echo "<tr><td class='label'>$label</td>";
-       sales_areas_list_cells(null, $name, $selected_id);
+       sales_areas_list_cells(null, $name, $selected_id, $special_option);
        echo "</tr>\n";
 }
 

diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index 0a67200324dd35da81983a585cc5e3e3407b18fe..c872cef040735a6c6c6a307701167ed396d9c711 100644 (file)
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -430,7 +430,7 @@ class BoxReports
                                        return sales_types_list($name);
 
                                case 'AREAS':
-                                       return sales_areas_list($name);
+                                       return sales_areas_list($name, null, _("No Areas Filter"));
 
                                case 'SALESMEN':
                                        return sales_persons_list($name, null, _("No Sales Folk Filter"));