X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fsales_groups.php;h=c85d8f6d96847fac671747258e9b07280c25777d;hb=5a3cbfe6d2df1c8c32edcab8bf93e8a8432a15fc;hp=0fb676c6e070e611908c925c6c4cd3566cf47463;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/sales/manage/sales_groups.php b/sales/manage/sales_groups.php
index 0fb676c6..c85d8f6d 100644
--- a/sales/manage/sales_groups.php
+++ b/sales/manage/sales_groups.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_SALESGROUP';
+$path_to_root = "../..";
 include($path_to_root . "/includes/session.inc");
 
-page(_("Sales Groups"));
+page(_($help_context = "Sales Groups"));
 
 include($path_to_root . "/includes/ui.inc");
 
@@ -27,7 +27,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 	if (strlen($_POST['description']) == 0) 
 	{
 		$input_error = 1;
-		display_error(_("The area description cannot be empty."));
+		display_error(_("The sales group description cannot be empty."));
 		set_focus('description');
 	}
 
@@ -35,16 +35,15 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 	{
     	if ($selected_id != -1) 
     	{
-    		$sql = "UPDATE ".TB_PREF."groups SET description=".db_escape($_POST['description'])." WHERE id = '$selected_id'";
+    		update_sales_group($selected_id, $_POST['description']);
 			$note = _('Selected sales group has been updated');
     	} 
     	else 
     	{
-    		$sql = "INSERT INTO ".TB_PREF."groups (description) VALUES (".db_escape($_POST['description']) . ")";
+    		add_sales_group($_POST['description']);
 			$note = _('New sales group has been added');
     	}
     
-    	db_query($sql,"The sales group could not be updated or added");
 		display_notification($note);    	
 		$Mode = 'RESET';
 	}
@@ -57,37 +56,35 @@ if ($Mode == 'Delete')
 
 	// PREVENT DELETES IF DEPENDENT RECORDS IN 'debtors_master'
 
-	$sql= "SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE group_no='$selected_id'";
-	$result = db_query($sql,"check failed");
-	$myrow = db_fetch_row($result);
-	if ($myrow[0] > 0) 
+	if (key_in_foreign_table($selected_id, 'cust_branch', 'group_no'))
 	{
 		$cancel_delete = 1;
 		display_error(_("Cannot delete this group because customers have been created using this group."));
 	} 
 	if ($cancel_delete == 0) 
 	{
-		$sql="DELETE FROM ".TB_PREF."groups WHERE id='" . $selected_id . "'";
-		db_query($sql,"could not delete sales group");
-
+		delete_sales_group($selected_id);
 		display_notification(_('Selected sales group has been deleted'));
-	} //end if Delete area
+	} //end if Delete group
 	$Mode = 'RESET';
 } 
 
 if ($Mode == 'RESET')
 {
 	$selected_id = -1;
+	$sav = get_post('show_inactive');
 	unset($_POST);
+	if ($sav) $_POST['show_inactive'] = 1;
 }
 //-------------------------------------------------------------------------------------------------
 
-$sql = "SELECT * FROM ".TB_PREF."groups ORDER BY description";
-$result = db_query($sql,"could not get groups");
+$result = get_sales_groups(check_value('show_inactive'));
 
 start_form();
-start_table("$table_style width=30%");
-$th = array(_("Group Name"), "", "");
+start_table(TABLESTYLE, "width='30%'");
+$th = array(_("ID"), _("Group Name"), "", "");
+inactive_control_column($th);
+
 table_header($th);
 $k = 0; 
 
@@ -96,44 +93,39 @@ while ($myrow = db_fetch($result))
 	
 	alt_table_row_color($k);
 		
+	label_cell($myrow["id"], "nowrap align='right'");
 	label_cell($myrow["description"]);
+	inactive_control_cell($myrow["id"], $myrow["inactive"], 'groups', 'id');
  	edit_button_cell("Edit".$myrow["id"], _("Edit"));
  	delete_button_cell("Delete".$myrow["id"], _("Delete"));
 	end_row();
 }
 
-
-end_table();
-end_form();
-echo '<br>';
+inactive_control_row($th);
+end_table(1);
 
 //-------------------------------------------------------------------------------------------------
 
-start_form();
-
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 if ($selected_id != -1) 
 {
  	if ($Mode == 'Edit') {
-		//editing an existing area
-		$sql = "SELECT * FROM ".TB_PREF."groups WHERE id='$selected_id'";
-
-		$result = db_query($sql,"could not get group");
-		$myrow = db_fetch($result);
+		//editing an existing group
+		$myrow = get_sales_group($selected_id);
 
 		$_POST['description']  = $myrow["description"];
 	}
 	hidden("selected_id", $selected_id);
+	label_row(_("ID"), $myrow["id"]);
 } 
 
 text_row_ex(_("Group 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();
 
 end_page();
-?>