X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_types_db.inc;h=6007eb257d1655e10280c1fd152e203ce7e88483;hb=6c40a3be4a79826087d7abbdd11b483f19decc2a;hp=3c40ba6376dd74b33840b38d0ec6e79063a6001a;hpb=e29ab37ef51f39c200c3772e07eeceef0ce39214;p=fa-stable.git

diff --git a/sales/includes/db/sales_types_db.inc b/sales/includes/db/sales_types_db.inc
index 3c40ba63..6007eb25 100644
--- a/sales/includes/db/sales_types_db.inc
+++ b/sales/includes/db/sales_types_db.inc
@@ -25,9 +25,11 @@ function update_sales_type($id, $name, $tax_included, $factor)
 	db_query($sql, "could not update sales type");			
 }
 
-function get_all_sales_types()
+function get_all_sales_types($all=false)
 {
 	$sql = "SELECT * FROM ".TB_PREF."sales_types";
+	if (!$all)
+		$sql .= " WHERE !inactive";
 	
 	return db_query($sql, "could not get all sales types");
 } 
@@ -48,7 +50,7 @@ function get_sales_type_name($id)
 	$result = db_query($sql, "could not get sales type");
 	
 	$row = db_fetch_row($result);
-	return $row[0];
+	return is_array($row) ? $row[0] : false;
 }
 
 function delete_sales_type($id)
@@ -60,4 +62,3 @@ function delete_sales_type($id)
 	db_query($sql,"The Sales type prices could not be deleted");
 }
 
-?>
\ No newline at end of file