Update from usntable branch.

[fa-stable.git] / sales / manage / sales_areas.php

diff --git a/sales/manage/sales_areas.php b/sales/manage/sales_areas.php
index c7baeee531a622c308ad750a8cac9d32f9fc897f..8bb0ffd10af033d72d2c1a77f81f4841dc2210bd 100644 (file)
--- a/sales/manage/sales_areas.php
+++ b/sales/manage/sales_areas.php
@@ -9,11 +9,11 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 3;
-$path_to_root="../..";
+$page_security = 'SA_SALESAREA';
+$path_to_root = "../..";
 include($path_to_root . "/includes/session.inc");
 
-page(_("Sales Areas"));
+page(_($help_context = "Sales Areas"));
 
 include($path_to_root . "/includes/ui.inc");
 
@@ -35,7 +35,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
        {
        if ($selected_id != -1) 
        {
-               $sql = "UPDATE ".TB_PREF."areas SET description=".db_escape($_POST['description'])." WHERE area_code = '$selected_id'";
+               $sql = "UPDATE ".TB_PREF."areas SET description=".db_escape($_POST['description'])." WHERE area_code = ".db_escape($selected_id);
                        $note = _('Selected sales area has been updated');
        } 
        else 
@@ -57,7 +57,7 @@ if ($Mode == 'Delete')
 
        // PREVENT DELETES IF DEPENDENT RECORDS IN 'debtors_master'
 
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE area='$selected_id'";
+       $sql= "SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE area=".db_escape($selected_id);
        $result = db_query($sql,"check failed");
        $myrow = db_fetch_row($result);
        if ($myrow[0] > 0) 
@@ -67,7 +67,7 @@ if ($Mode == 'Delete')
        } 
        if ($cancel_delete == 0) 
        {
-               $sql="DELETE FROM ".TB_PREF."areas WHERE area_code='" . $selected_id . "'";
+               $sql="DELETE FROM ".TB_PREF."areas WHERE area_code=".db_escape($selected_id);
                db_query($sql,"could not delete sales area");
 
                display_notification(_('Selected sales area has been deleted'));
@@ -78,16 +78,23 @@ if ($Mode == 'Delete')
 if ($Mode == 'RESET')
 {
        $selected_id = -1;
+       $sav = get_post('show_inactive');
        unset($_POST);
+       $_POST['show_inactive'] = $sav;
 }
+
 //-------------------------------------------------------------------------------------------------
 
 $sql = "SELECT * FROM ".TB_PREF."areas";
+if (!check_value('show_inactive')) $sql .= " WHERE !inactive";
 $result = db_query($sql,"could not get areas");
 
 start_form();
 start_table("$table_style width=30%");
+
 $th = array(_("Area Name"), "", "");
+inactive_control_column($th);
+
 table_header($th);
 $k = 0; 
 
@@ -97,27 +104,27 @@ while ($myrow = db_fetch($result))
        alt_table_row_color($k);
                
        label_cell($myrow["description"]);
+       
+       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();
 }
-
-
+       
+inactive_control_row($th);
 end_table();
-end_form();
 echo '<br>';
 
 //-------------------------------------------------------------------------------------------------
 
-start_form();
-
 start_table($table_style2);
 
 if ($selected_id != -1) 
 {
        if ($Mode == 'Edit') {
                //editing an existing area
-               $sql = "SELECT * FROM ".TB_PREF."areas WHERE area_code='$selected_id'";
+               $sql = "SELECT * FROM ".TB_PREF."areas WHERE area_code=".db_escape($selected_id);
 
                $result = db_query($sql,"could not get area");
                $myrow = db_fetch($result);
@@ -131,7 +138,7 @@ text_row_ex(_("Area Name:"), 'description', 30);
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == -1, '', true);
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();