X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fsales_people.php;h=333fe8968f9a2ea25c50019f2e1cef1b6ebf7515;hb=eb5b2d3ee7cc0fca5ec63dfada65ecf23b693e85;hp=723fabd30cee058991de2a9877ec60e529813b03;hpb=8259c324f645a39cb847d5a4346b70e225e1b02c;p=fa-stable.git

diff --git a/sales/manage/sales_people.php b/sales/manage/sales_people.php
index 723fabd3..333fe896 100644
--- a/sales/manage/sales_people.php
+++ b/sales/manage/sales_people.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    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="../..";
 include($path_to_root . "/includes/session.inc");
@@ -21,6 +30,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 	{
 		$input_error = 1;
 		display_error(_("The sales person name cannot be empty."));
+		set_focus('salesman_name');
 	}
 	$pr1 = check_num('provision', 0,100);
 	if (!$pr1 || !check_num('provision2', 0, 100)) {
@@ -88,23 +98,27 @@ if ($Mode == 'Delete')
 		$sql="DELETE FROM ".TB_PREF."salesman WHERE salesman_code='$selected_id'";
 		db_query($sql,"The sales-person could not be deleted");
 		display_notification(_('Selected sales person data have been deleted'));
-		$Mode = 'RESET';
 	}
+	$Mode = 'RESET';
 }
 
 if ($Mode == 'RESET')
 {
 	$selected_id = -1;
+	$sav = get_post('show_inactive');
 	unset($_POST);
+	$_POST['show_inactive'] = $sav;
 }
 //------------------------------------------------------------------------------------------------
 
 $sql = "SELECT * FROM ".TB_PREF."salesman";
+if (!check_value('show_inactive')) $sql .= " WHERE !inactive";
 $result = db_query($sql,"could not get sales persons");
 
 start_form();
 start_table("$table_style width=60%");
 $th = array(_("Name"), _("Phone"), _("Fax"), _("Email"), _("Provision"), _("Break Pt."), _("Provision")." 2", "", "");
+inactive_control_column($th);
 table_header($th);
 
 $k = 0;
@@ -117,24 +131,25 @@ while ($myrow = db_fetch($result))
     label_cell($myrow["salesman_name"]);
    	label_cell($myrow["salesman_phone"]);
    	label_cell($myrow["salesman_fax"]);
-   	label_cell($myrow["salesman_email"]);
+	email_cell($myrow["salesman_email"]);
 	label_cell(percent_format($myrow["provision"])." %", "nowrap align=right");
    	amount_cell($myrow["break_pt"]);
 	label_cell(percent_format($myrow["provision2"])." %", "nowrap align=right");
+	inactive_control_cell($myrow["salesman_code"], $myrow["inactive"],
+		'salesman', 'salesman_code');
  	edit_button_cell("Edit".$myrow["salesman_code"], _("Edit"));
- 	edit_button_cell("Delete".$myrow["salesman_code"], _("Delete"));
+ 	delete_button_cell("Delete".$myrow["salesman_code"], _("Delete"));
   	end_row();
 
 } //END WHILE LIST LOOP
 
+inactive_control_row($th);
 end_table();
-end_form();
 echo '<br>';
 
 //------------------------------------------------------------------------------------------------
 
-start_form();
-
+$_POST['salesman_email'] = "";
 if ($selected_id != -1) 
 {
  	if ($Mode == 'Edit') {
@@ -159,18 +174,18 @@ if ($selected_id != -1)
 		$_POST['provision2'] = percent_format(0);	
 }
 
-start_table("$table_style2 width=60%");
+start_table($table_style2);
 
 text_row_ex(_("Sales person name:"), 'salesman_name', 30);
 text_row_ex(_("Telephone number:"), 'salesman_phone', 20);
 text_row_ex(_("Fax number:"), 'salesman_fax', 20);
-text_row_ex(_("Email:"), 'salesman_email', 40);
+email_row_ex(_("E-mail:"), 'salesman_email', 40);
 percent_row(_("Provision").':', 'provision');
 amount_row(_("Break Pt.:"), 'break_pt');
 percent_row(_("Provision")." 2:", 'provision2');
 end_table(1);
 
-submit_add_or_update_center($selected_id == -1, '', true);
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();