Merged changes from stable branch up to 2.3.23.

[fa-stable.git] / gl / gl_journal.php

diff --git a/gl/gl_journal.php b/gl/gl_journal.php
index d516bdac8eaa8ff8e03367d750ba5684903f70e9..e4fd2f8d02b29a9a9d6340cd5f2ea008438ea429 100644 (file)
--- a/gl/gl_journal.php
+++ b/gl/gl_journal.php
@@ -21,11 +21,12 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/gl/includes/ui/gl_journal_ui.inc");
 include_once($path_to_root . "/gl/includes/gl_db.inc");
 include_once($path_to_root . "/gl/includes/gl_ui.inc");
+include_once($path_to_root . "/taxes/db/tax_types_db.inc");
 
 $js = '';
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(800, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
 
 if (isset($_GET['ModifyGL'])) {
@@ -328,7 +329,7 @@ start_form();
 
 display_order_header($_SESSION['journal_items']);
 
-start_table(TABLESTYLE2, "width=90%", 10);
+start_table(TABLESTYLE2, "width='90%'", 10);
 start_row();
 echo "<td>";
 display_gl_items(_("Rows"), $_SESSION['journal_items']);
@@ -345,4 +346,3 @@ end_form();
 
 end_page();
 
-?>