[0004993] Sales Order: incorrect prepayment guess for wholesale (non tax included...

[fa-stable.git] / sales / includes / db / sales_types_db.inc

diff --git a/sales/includes/db/sales_types_db.inc b/sales/includes/db/sales_types_db.inc
index f52374769a182de5a1079ec91f403d1af9f3bf5a..a0279d3e5045f0947e71d9a5c3bd7e33f174793d 100644 (file)
--- a/sales/includes/db/sales_types_db.inc
+++ b/sales/includes/db/sales_types_db.inc
@@ -11,7 +11,8 @@
 ***********************************************************************/
 function add_sales_type($name, $tax_included, $factor)
 {
-       $sql = "INSERT INTO ".TB_PREF."sales_types (sales_type,tax_included,factor) VALUES (".db_escape($name).",'$tax_included',$factor)";
+       $sql = "INSERT INTO ".TB_PREF."sales_types (sales_type,tax_included,factor) VALUES (".db_escape($name).","
+               .db_escape($tax_included).",".db_escape($factor).")";
        db_query($sql, "could not add sales type");             
 }
 
@@ -19,21 +20,23 @@ function update_sales_type($id, $name, $tax_included, $factor)
 {
 
        $sql = "UPDATE ".TB_PREF."sales_types SET sales_type = ".db_escape($name).",
-       tax_included =$tax_included, factor=$factor WHERE id = $id";
+       tax_included =".db_escape($tax_included).", factor=".db_escape($factor)." WHERE id = ".db_escape($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");
 } 
 
 function get_sales_type($id)
 {
-       $sql = "SELECT * FROM ".TB_PREF."sales_types WHERE id=$id";
+       $sql = "SELECT * FROM ".TB_PREF."sales_types WHERE id=".db_escape($id);
        
        $result = db_query($sql, "could not get sales type");
        
@@ -42,7 +45,7 @@ function get_sales_type($id)
 
 function get_sales_type_name($id)
 {
-       $sql = "SELECT sales_type FROM ".TB_PREF."sales_types WHERE id=$id";
+       $sql = "SELECT sales_type FROM ".TB_PREF."sales_types WHERE id=".db_escape($id);
        
        $result = db_query($sql, "could not get sales type");
        
@@ -52,11 +55,10 @@ function get_sales_type_name($id)
 
 function delete_sales_type($id)
 {
-       $sql="DELETE FROM ".TB_PREF."sales_types WHERE id=$id";
+       $sql="DELETE FROM ".TB_PREF."sales_types WHERE id=".db_escape($id);
        db_query($sql,"The Sales type record could not be deleted");
 
-       $sql ="DELETE FROM ".TB_PREF."prices WHERE sales_type_id='$id'";
+       $sql ="DELETE FROM ".TB_PREF."prices WHERE sales_type_id=".db_escape($id);
        db_query($sql,"The Sales type prices could not be deleted");
 }
 
-?>
\ No newline at end of file