Merged changes from stable branch up to 2.3.23.

[fa-stable.git] / gl / inquiry / balance_sheet.php

diff --git a/gl/inquiry/balance_sheet.php b/gl/inquiry/balance_sheet.php
index 7bec22c03eedbe89eb31d964f380879f0b389bb1..e3f8a454fa26804848b008dbbcef4b9c3d46414d 100644 (file)
--- a/gl/inquiry/balance_sheet.php
+++ b/gl/inquiry/balance_sheet.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 $js = "";
-if ($use_date_picker)
+if (user_use_date_picker())
        $js = get_js_date_picker();
 
 page(_($help_context = "Balance Sheet Drilldown"), false, false, "", $js);
@@ -47,9 +47,9 @@ if (isset($_GET["AccGrp"]))
 
 //----------------------------------------------------------------------------------------------------
 
-function display_type ($type, $typename, $from, $to, $convert, $dimension, $dimension2, $drilldown, $path_to_root)
+function display_type ($type, $typename, $from, $to, $convert, $dimension, $dimension2, $drilldown)
 {
-       global $levelptr, $k;
+       global $path_to_root, $levelptr, $k;
        
        $acctstotal = 0;
        $typestotal = 0;
@@ -86,7 +86,7 @@ function display_type ($type, $typename, $from, $to, $convert, $dimension, $dime
        while ($accounttype=db_fetch($result))
        {                       
                $typestotal += display_type($accounttype["id"], $accounttype["name"], $from, $to, 
-                       $convert, $dimension, $dimension2, $drilldown, $path_to_root);  
+                       $convert, $dimension, $dimension2, $drilldown);
        }
 
        //Display Type Summary if total is != 0  
@@ -185,7 +185,7 @@ function display_balance_sheet()
                        while ($accounttype=db_fetch($typeresult))
                        {
                                $TypeTotal = display_type($accounttype["id"], $accounttype["name"], $from, $to, 
-                                               $convert, $dimension, $dimension2, $drilldown, $path_to_root);  
+                                               $convert, $dimension, $dimension2, $drilldown); 
                                //Print Summary 
                                if ($TypeTotal != 0 )
                                {
@@ -252,7 +252,7 @@ function display_balance_sheet()
                table_section_title($_POST["AccGrp"]. " " . get_account_type_name($_POST["AccGrp"]));   
                
                $classclose = display_type($accounttype["id"], $accounttype["name"], $from, $to, 
-                       $convert, $dimension, $dimension2, $drilldown, $path_to_root);
+                       $convert, $dimension, $dimension2, $drilldown);
        }
        
        end_table(1); // outer table
@@ -271,5 +271,3 @@ end_form();
 
 end_page();
 
-?>
-