projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0004161: g/l inquiry person/item displays number instead of person. Fixed. Rerun.
[fa-stable.git]
/
taxes
/
db
/
tax_groups_db.inc
diff --git
a/taxes/db/tax_groups_db.inc
b/taxes/db/tax_groups_db.inc
index 032cc560f6596b2fb54e5e4b29f1cf79e1179a38..fb40bf7de1dccd349c24fd98ddd727bd682d64ed 100644
(file)
--- a/
taxes/db/tax_groups_db.inc
+++ b/
taxes/db/tax_groups_db.inc
@@
-89,12
+89,11
@@
function delete_tax_group_items($id)
//
function get_tax_group_rates($group_id=null, $tax_shipping=false)
{
//
function get_tax_group_rates($group_id=null, $tax_shipping=false)
{
- global $
suppress_tax_rate
s;
+ global $
SysPref
s;
$sql =
"SELECT t.id as tax_type_id,"
$sql =
"SELECT t.id as tax_type_id,"
- .(isset($suppress_tax_rates) && $suppress_tax_rates == 1
- ? "t.name as tax_type_name,"
+ .($SysPrefs->suppress_tax_rates() == 1 ? "t.name as tax_type_name,"
: "CONCAT(t.name, ' (', t.rate, '%)') as tax_type_name,")
."t.sales_gl_code,
t.purchasing_gl_code,
: "CONCAT(t.name, ' (', t.rate, '%)') as tax_type_name,")
."t.sales_gl_code,
t.purchasing_gl_code,
@@
-126,7
+125,7
@@
function get_tax_group_items_as_array($id)
return $ret_tax_array;
}
return $ret_tax_array;
}
-function get_shipping_tax_as_array($id)
+function get_shipping_tax_as_array($id
=null
)
{
$ret_tax_array = array();
{
$ret_tax_array = array();
@@
-140,4
+139,3
@@
function get_shipping_tax_as_array($id)
return $ret_tax_array;
}
return $ret_tax_array;
}
-?>
\ No newline at end of file