Slightly changed inactive records support.

diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index effc0c9e0a59edc06d66a2103713241e9f24013e..578fbc5205666d502bd3909de1011406e371579e 100644 (file)
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -195,13 +195,15 @@ if (db_has_customers())
 {
        start_table("class = 'tablestyle_noborder'");
        start_row();
-       check_cells(_("Show inactive:"), 'show_inactive', null, true);
        customer_list_cells(_("Select a customer: "), 'customer_id', null,
                _('New customer'), true, check_value('show_inactive'));
+       check_cells(_("Show inactive:"), 'show_inactive', null, true);
        end_row();
        end_table();
-       if (get_post('_show_inactive_update'))
+       if (get_post('_show_inactive_update')) {
                $Ajax->activate('customer_id');
+               set_focus('customer_id');
+       }
 } 
 else 
 {

diff --git a/sales/manage/sales_areas.php b/sales/manage/sales_areas.php
index e8acb9120e85653a0880ab1f43d7e46dbeeb0712..ad9d87d8b6a8c2bb26bb782caff3793a05499dd0 100644 (file)
--- a/sales/manage/sales_areas.php
+++ b/sales/manage/sales_areas.php
@@ -80,7 +80,7 @@ if ($Mode == 'RESET')
        $selected_id = -1;
        $sav = get_post('show_inactive');
        unset($_POST);
-       if ($sav) $_POST['show_inactive'] = 1;
+       $_POST['show_inactive'] = $sav;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -93,12 +93,7 @@ start_form();
 start_table("$table_style width=30%");
 
 $th = array(_("Area Name"), "", "");
-
-if (check_value('show_inactive')) 
-       array_insert($th, 1 , _("Inactive"));
-if (get_post('_show_inactive_update')) {
-       $Ajax->activate('_page_body');
-}
+inactive_control_column($th);
 
 table_header($th);
 $k = 0; 
@@ -110,22 +105,19 @@ while ($myrow = db_fetch($result))
                
        label_cell($myrow["description"]);
        
-       inactive_status_cell($myrow["area_code"], $myrow["inactive"], 'areas', 'area_code');
+       inactive_control_cell($myrow["area_code"], $myrow["inactive"], 'areas', 'area_code');
 
        edit_button_cell("Edit".$myrow["area_code"], _("Edit"));
        delete_button_cell("Delete".$myrow["area_code"], _("Delete"));
        end_row();
 }
        
-show_inactive_row($th);
+inactive_control_row($th);
 end_table();
-//end_form();
 echo '<br>';
 
 //-------------------------------------------------------------------------------------------------
 
-//start_form();
-
 start_table($table_style2);
 
 if ($selected_id != -1)