From 654788a6567aecd6e43dc0f0ee724bba0f887d43 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Wed, 30 Dec 2009 23:41:36 +0000 Subject: [PATCH] When updating tax rate, it didn't show and calculate correct in documents. --- CHANGELOG.txt | 4 ++++ taxes/db/tax_groups_db.inc | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d62db57a..f0963d07 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,10 @@ Legend: ! -> Note $ -> Affected files +31-Dec-2009 Joe Hunt +# When updating tax rate, it didn't show and calculate correct in documents. +$ /taxes/db/tax_groups_db.inc + 27-Dec-2009 Joe Hunt # Problems letting various currency bank accounts sharing the same GL account $ /gl/manage/bank_accounts.php diff --git a/taxes/db/tax_groups_db.inc b/taxes/db/tax_groups_db.inc index 392ec8cb..5c217aa2 100644 --- a/taxes/db/tax_groups_db.inc +++ b/taxes/db/tax_groups_db.inc @@ -96,7 +96,7 @@ function delete_tax_group_items($id) function get_tax_group_items($id) { - $sql = "SELECT ".TB_PREF."tax_group_items.*, ".TB_PREF."tax_types.name AS tax_type_name, + $sql = "SELECT ".TB_PREF."tax_group_items.*, ".TB_PREF."tax_types.name AS tax_type_name, ".TB_PREF."tax_types.rate, ".TB_PREF."tax_types.sales_gl_code, ".TB_PREF."tax_types.purchasing_gl_code FROM ".TB_PREF."tax_group_items, ".TB_PREF."tax_types WHERE tax_group_id=".db_escape($id)." @@ -128,7 +128,7 @@ function get_tax_group_items_as_array($id) function get_shipping_tax_group_items() { - $sql = "SELECT ".TB_PREF."tax_group_items.*, ".TB_PREF."tax_types.name AS tax_type_name, + $sql = "SELECT ".TB_PREF."tax_group_items.*, ".TB_PREF."tax_types.name AS tax_type_name, ".TB_PREF."tax_types.rate, ".TB_PREF."tax_types.sales_gl_code, ".TB_PREF."tax_types.purchasing_gl_code FROM " .TB_PREF."tax_group_items, ".TB_PREF."tax_types, ".TB_PREF."tax_groups WHERE " .TB_PREF."tax_groups.tax_shipping=1 -- 2.30.2