X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_types_db.inc;h=9e462bc2a26c60e9991e3911579b538eaa19dbb7;hb=5dec41f0d87e407e1c9ffcb8eb63b92e4e471a9b;hp=338ae59b309b7ea48ae942dec5d16697304dc005;hpb=0c1bcd8ce3c089d7ddb3722a097f8fc8417f41e6;p=fa-stable.git

diff --git a/sales/includes/db/sales_types_db.inc b/sales/includes/db/sales_types_db.inc
index 338ae59b..9e462bc2 100644
--- a/sales/includes/db/sales_types_db.inc
+++ b/sales/includes/db/sales_types_db.inc
@@ -1,23 +1,34 @@
 <?php
-
-function add_sales_type($name, $tax_included)
+/**********************************************************************
+    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>.
+***********************************************************************/
+function add_sales_type($name, $tax_included, $factor)
 {
-	$sql = "INSERT INTO ".TB_PREF."sales_types (sales_type,tax_included) VALUES ('$name','$tax_included')";
-		
+	$sql = "INSERT INTO ".TB_PREF."sales_types (sales_type,tax_included,factor) VALUES (".db_escape($name).",'$tax_included',$factor)";
 	db_query($sql, "could not add sales type");		
 }
 
-function update_sales_type($id, $name, $tax_included)
+function update_sales_type($id, $name, $tax_included, $factor)
 {
-	$sql = "UPDATE ".TB_PREF."sales_types SET sales_type = '$name',
-	tax_included =$tax_included WHERE id = $id";
+
+	$sql = "UPDATE ".TB_PREF."sales_types SET sales_type = ".db_escape($name).",
+	tax_included =$tax_included, factor=$factor WHERE id = $id";
 	
 	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");
 }