projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compatibility regression fix for previous commit.
[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 3c40ba6376dd74b33840b38d0ec6e79063a6001a..6007eb257d1655e10280c1fd152e203ce7e88483 100644
(file)
--- 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");
}
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";
{
$sql = "SELECT * FROM ".TB_PREF."sales_types";
+ if (!$all)
+ $sql .= " WHERE !inactive";
return db_query($sql, "could not get all sales types");
}
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);
$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)
}
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");
}
db_query($sql,"The Sales type prices could not be deleted");
}
-?>
\ No newline at end of file