X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fsales_types.php;h=8749f221fa263cd96a70b717b43a2f9109e298a8;hb=7657fb038729a6ae3688a98ca3b18a74614dd79f;hp=1c4071bf866b0e2371c78b8cff96dfd9fbfca11a;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git

diff --git a/sales/manage/sales_types.php b/sales/manage/sales_types.php
index 1c4071bf..8749f221 100644
--- a/sales/manage/sales_types.php
+++ b/sales/manage/sales_types.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 = 14;
-$path_to_root="../..";
+$page_security = 'SA_SALESTYPES';
+$path_to_root = "../..";
 include_once($path_to_root . "/includes/session.inc");
 
-page(_("Sales Types"));
+page(_($help_context = "Sales Types"));
 
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/sales/includes/db/sales_types_db.inc");
@@ -43,7 +43,7 @@ function can_process()
 
 if ($Mode=='ADD_ITEM' && can_process())
 {
-	add_sales_type($_POST['sales_type'], isset($_POST['tax_included']) ? 1:0,
+	add_sales_type($_POST['sales_type'], check_value('tax_included'),
 	    input_num('factor'));
 	display_notification(_('New sales type has been added'));
 	$Mode = 'RESET';
@@ -54,7 +54,7 @@ if ($Mode=='ADD_ITEM' && can_process())
 if ($Mode=='UPDATE_ITEM' && can_process())
 {
 
-	update_sales_type($selected_id, $_POST['sales_type'], isset($_POST['tax_included']) ? 1:0,
+	update_sales_type($selected_id, $_POST['sales_type'], check_value('tax_included'),
 	     input_num('factor'));
 	display_notification(_('Selected sales type has been updated'));
 	$Mode = 'RESET';
@@ -65,26 +65,15 @@ if ($Mode=='UPDATE_ITEM' && can_process())
 if ($Mode == 'Delete')
 {
 	// PREVENT DELETES IF DEPENDENT RECORDS IN 'debtor_trans'
-
-	$sql= "SELECT COUNT(*) FROM ".TB_PREF."debtor_trans WHERE tpe='$selected_id'";
-	$result = db_query($sql,"check failed");
-	check_db_error("The number of transactions using this Sales type record could not be retrieved", $sql);
-
-	$myrow = db_fetch_row($result);
-	if ($myrow[0] > 0)
+	
+	if (key_in_foreign_table($selected_id, 'debtor_trans', 'tpe'))
 	{
 		display_error(_("Cannot delete this sale type because customer transactions have been created using this sales type."));
 
 	}
 	else
 	{
-
-		$sql = "SELECT COUNT(*) FROM ".TB_PREF."debtors_master WHERE sales_type='$selected_id'";
-		$result = db_query($sql,"check failed");
-  		check_db_error("The number of customers using this Sales type record could not be retrieved", $sql);
-
-		$myrow = db_fetch_row($result);
-		if ($myrow[0] > 0)
+		if (key_in_foreign_table($selected_id, 'debtors_master', 'sales_type'))
 		{
 			display_error(_("Cannot delete this sale type because customers are currently set up to use this sales type."));
 		}
@@ -100,16 +89,19 @@ if ($Mode == 'Delete')
 if ($Mode == 'RESET')
 {
 	$selected_id = -1;
+	$sav = get_post('show_inactive');
 	unset($_POST);
+	$_POST['show_inactive'] = $sav;
 }
 //----------------------------------------------------------------------------------------------------
 
-$result = get_all_sales_types();
+$result = get_all_sales_types(check_value('show_inactive'));
 
 start_form();
-start_table("$table_style width=30%");
+start_table(TABLESTYLE, "width='30%'");
 
 $th = array (_('Type Name'), _('Factor'), _('Tax Incl'), '','');
+inactive_control_column($th);
 table_header($th);
 $k = 0;
 $base_sales = get_base_sales_type();
@@ -125,24 +117,24 @@ while ($myrow = db_fetch($result))
 	if($myrow["id"] == $base_sales) $f = "<I>"._('Base')."</I>";
 	label_cell($f);
 	label_cell($myrow["tax_included"] ? _('Yes'):_('No'), 'align=center');
+	inactive_control_cell($myrow["id"], $myrow["inactive"], 'sales_types', 'id');
  	edit_button_cell("Edit".$myrow['id'], _("Edit"));
  	delete_button_cell("Delete".$myrow['id'], _("Delete"));
 	end_row();
 }
-
+inactive_control_row($th);
 end_table();
-end_form();
+
 display_note(_("Marked sales type is the company base pricelist for prices calculations."), 0, 0, "class='overduefg'");
 
 //----------------------------------------------------------------------------------------------------
 
-start_form();
  if (!isset($_POST['tax_included']))
 	$_POST['tax_included'] = 0;
  if (!isset($_POST['base']))
 	$_POST['base'] = 0;
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 if ($selected_id != -1)
 {
@@ -165,7 +157,7 @@ check_row(_("Tax included").':', 'tax_included', $_POST['tax_included']);
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == -1, '', true);
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();