X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fsales_types.php;h=ebf3a96f3277ad151c881eb8089a1d109d5ee68e;hb=a31195793c023906ab5da62f06ab84aefed445c3;hp=7ebd768594c14231cbbe796f329392a519601ac8;hpb=d2cc0860eccf02eaefcd90731ac3af141a841529;p=fa-stable.git

diff --git a/sales/manage/sales_types.php b/sales/manage/sales_types.php
index 7ebd7685..ebf3a96f 100644
--- a/sales/manage/sales_types.php
+++ b/sales/manage/sales_types.php
@@ -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=".db_escape($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=".db_escape($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."));
 		}
@@ -109,7 +98,7 @@ if ($Mode == 'RESET')
 $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);
@@ -145,7 +134,7 @@ display_note(_("Marked sales type is the company base pricelist for prices calcu
  if (!isset($_POST['base']))
 	$_POST['base'] = 0;
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 if ($selected_id != -1)
 {
@@ -174,4 +163,3 @@ end_form();
 
 end_page();
 
-?>