Changed get_tax_type_default_rate function name to get_tax_type_rate.

diff --git a/doc/api_changes.txt b/doc/api_changes.txt
index e710b550e96d33ebe4c30c8ea8eddbda70bb3c15..2f4c9838abce8afb57cfe8fb3666cbdef043530a 100644 (file)
--- a/doc/api_changes.txt
+++ b/doc/api_changes.txt
@@ -11,7 +11,15 @@ Changed functions:
        db_backup($conn, $ext='no', $comm='', $path=null)
        db_export($conn, $filename, $zip='no', $comment='', $no_default=false)
        save_to_file($path, $zip, $fileData)
+ tax_types_db.inc:
+       get_tax_type_default_rate($type_id) => get_tax_type_rate($type_id)
 
+Before 2.4:
+       get_tax_type_default_rate($type_id)
+Now:
+       get_tax_type_rate($type_id)
+Description:
+       Misleading function name changed.
 
 Before 2.4:
        update_company_prefs( $params, $pref = TB_PREF )

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index e98f1d674c8bb0a93a3b935e8ffcc6a573a41462..63f540b640a70c91f9d4ec399e8f53bcc71bf814 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -610,7 +610,7 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
                                case "t+": // ditto & increase base amount
                                case "t-": // ditto & reduce base amount
                                        if (substr($row['action'],0,1) != 'T') 
-                                               $totrate += get_tax_type_default_rate($row['dest_id']);
+                                               $totrate += get_tax_type_rate($row['dest_id']);
                        }
                }
                $first = true;

diff --git a/taxes/db/tax_types_db.inc b/taxes/db/tax_types_db.inc
index f42470eff9b5b3134a02d70e9520ad44e211510f..f7ed2eb1e87cab62907cbe18069402d04d7ef595 100644 (file)
--- a/taxes/db/tax_types_db.inc
+++ b/taxes/db/tax_types_db.inc
@@ -64,7 +64,7 @@ function get_tax_type($type_id)
        return db_fetch($result);
 }
 
-function get_tax_type_default_rate($type_id)
+function get_tax_type_rate($type_id)
 {
        $sql = "SELECT rate FROM ".TB_PREF."tax_types WHERE id=".db_escape($type_id);