From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Sat, 10 Jan 2015 15:53:55 +0000 (+0100)
Subject: Access to system settings moved from global scope to SysPrefs.
X-Git-Tag: v2.4.2~19^2~272
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=5e63c6ace55729bbb5ee3b060035a25a4426eb0a;p=fa-stable.git

Access to system settings moved from global scope to SysPrefs.
---

diff --git a/access/login.php b/access/login.php
index d3154b52..9c58933d 100644
--- a/access/login.php
+++ b/access/login.php
@@ -21,15 +21,15 @@ function defaultCompany()
 }
 </script>";
 	add_js_file('login.js');
-	// Display demo user name and password within login form if "$allow_demo_mode" is true
-	if ($allow_demo_mode == true)
+	// Display demo user name and password within login form if allow_demo_mode option is true
+	if ($SysPrefs->allow_demo_mode == true)
 	{
 	    $demo_text = _("Login as user: demouser and password: password");
 	}
 	else
 	{
 		$demo_text = _("Please login here");
-    if (@$allow_password_reset) {
+    if (@$SysPrefs->allow_password_reset) {
       $demo_text .= " "._("or")." <a href='$path_to_root/index.php?reset=1'>"._("request new password")."</a>";
     }
 	}
@@ -40,7 +40,7 @@ function defaultCompany()
 
 	    $js .= "<script>setTimeout(function() {
 	    	document.getElementsByName('SubmitUser')[0].disabled=0;
-	    	document.getElementById('log_msg').innerHTML='$demo_text'}, 1000*$login_delay);</script>";
+	    	document.getElementById('log_msg').innerHTML='$demo_text'}, 1000*".$SysPrefs->login_delay.");</script>";
 	    $demo_text = $blocked_msg;
 	}
 	flush_dir(user_js_cache());
@@ -50,7 +50,7 @@ function defaultCompany()
 
 	$login_timeout = $_SESSION["wa_current_user"]->last_act;
 
-	$title = $login_timeout ? _('Authorization timeout') : $app_title." ".$version." - "._("Login");
+	$title = $login_timeout ? _('Authorization timeout') : $SysPrefs->app_title." ".$version." - "._("Login");
 	$encoding = isset($_SESSION['language']->encoding) ? $_SESSION['language']->encoding : "iso-8859-1";
 	$rtl = isset($_SESSION['language']->dir) ? $_SESSION['language']->dir : "ltr";
 	$onload = !$login_timeout ? "onload='defaultCompany()'" : "";
@@ -79,7 +79,7 @@ function defaultCompany()
 	start_row();
 	echo "<td align='center' colspan=2>";
 	if (!$login_timeout) { // FA logo
-    	echo "<a target='_blank' href='$power_url'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' /></a>";
+    	echo "<a target='_blank' href='".$SysPrefs->power_url."'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' /></a>";
 	} else { 
 		echo "<font size=5>"._('Authorization timeout')."</font>";
 	} 
@@ -88,12 +88,12 @@ function defaultCompany()
 
 	echo "<input type='hidden' id=ui_mode name='ui_mode' value='".$_SESSION["wa_current_user"]->ui_mode."' />\n";
 	if (!$login_timeout)
-		table_section_title(_("Version")." $version   Build $build_version - "._("Login"));
-	$value = $login_timeout ? $_SESSION['wa_current_user']->loginname : ($allow_demo_mode ? "demouser":"");
+		table_section_title(_("Version")." $version   Build ".$SysPrefs->build_version." - "._("Login"));
+	$value = $login_timeout ? $_SESSION['wa_current_user']->loginname : ($SysPrefs->allow_demo_mode ? "demouser":"");
 
 	text_row(_("User name"), "user_name_entry_field", $value, 20, 30);
 
-	$password = $allow_demo_mode ? "password":"";
+	$password = $SysPrefs->allow_demo_mode ? "password":"";
 
 	password_row(_("Password:"), 'password', $password);
 
@@ -104,7 +104,7 @@ function defaultCompany()
 			$coy =  $_SESSION['wa_current_user']->company;
 		else
 			$coy = $def_coy;
-		if (!@$text_company_selection) {
+		if (!@$SysPrefs->text_company_selection) {
 			echo "<tr><td>"._("Company")."</td><td><select name='company_login_name'>\n";
 			for ($i = 0; $i < count($db_connections); $i++)
 				echo "<option value=$i ".($i==$coy ? 'selected':'') .">" . $db_connections[$i]["name"] . "</option>";
@@ -154,10 +154,10 @@ function defaultCompany()
 	echo "</tr></table>\n";
 	echo "<table class='footer'>\n";
 	echo "<tr>\n";
-	echo "<td><a target='_blank' href='$power_url' tabindex='-1'>$app_title $version - " . _("Theme:") . " " . $def_theme . "</a></td>\n";
+	echo "<td><a target='_blank' href='".$SysPrefs->power_url."' tabindex='-1'>".$SysPrefs->app_title." $version - " . _("Theme:") . " " . $def_theme . "</a></td>\n";
 	echo "</tr>\n";
 	echo "<tr>\n";
-	echo "<td><a target='_blank' href='$power_url' tabindex='-1'>$power_by</a></td>\n";
+	echo "<td><a target='_blank' href='".$SysPrefs->power_url."' tabindex='-1'>".$SysPrefs->power_by."</a></td>\n";
 	echo "</tr>\n";
 	echo "</table><br><br>\n";
 	echo "</body></html>\n";
diff --git a/access/logout.php b/access/logout.php
index 0a2a2ba9..bb30e713 100644
--- a/access/logout.php
+++ b/access/logout.php
@@ -31,7 +31,7 @@ echo "<table width='100%' border='0'>
     <td><div align='center'><font size=2>";
 echo _("Thank you for using") . " ";
 
-echo "<strong>$app_title $version</strong>";
+echo "<strong>".$SysPrefs->app_title." $version</strong>";
 
 echo "</font></div></td>
   </tr>
diff --git a/access/password_reset.php b/access/password_reset.php
index b1fba1b0..afa2a1ec 100644
--- a/access/password_reset.php
+++ b/access/password_reset.php
@@ -28,7 +28,7 @@ function defaultCompany()
 
 	$login_timeout = $_SESSION["wa_current_user"]->last_act;
 
-	$title = $app_title." ".$version." - "._("Password reset");
+	$title = $SysPrefs->app_title." ".$version." - "._("Password reset");
 	$encoding = isset($_SESSION['language']->encoding) ? $_SESSION['language']->encoding : "iso-8859-1";
 	$rtl = isset($_SESSION['language']->dir) ? $_SESSION['language']->dir : "ltr";
 	$onload = !$login_timeout ? "onload='defaultCompany()'" : "";
@@ -53,12 +53,12 @@ function defaultCompany()
 	start_table(false, "class='login'");
 	start_row();
 	echo "<td align='center' colspan=2>";
-  echo "<a target='_blank' href='$power_url'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' /></a>";
+  echo "<a target='_blank' href='".$SysPrefs->power_url."'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' /></a>";
 	echo "</td>\n";
 	end_row();
 
 	echo "<input type='hidden' id=ui_mode name='ui_mode' value='".$_SESSION["wa_current_user"]->ui_mode."' />\n";
-	table_section_title(_("Version")." $version   Build $build_version - "._("Password reset"));
+	table_section_title(_("Version")." $version   Build ".$SysPrefs->build_version." - "._("Password reset"));
 
 	text_row(_("Email"), "email_entry_field", "", 20, 30);
 
@@ -66,7 +66,7 @@ function defaultCompany()
     $coy =  $_SESSION['wa_current_user']->company;
   else
     $coy = $def_coy;
-  if (!@$text_company_selection) {
+  if (!@$SysPrefs->text_company_selection) {
     echo "<tr><td>"._("Company")."</td><td><select name='company_login_name'>\n";
     for ($i = 0; $i < count($db_connections); $i++)
       echo "<option value=$i ".($i==$coy ? 'selected':'') .">" . $db_connections[$i]["name"] . "</option>";
@@ -105,10 +105,10 @@ function defaultCompany()
 	echo "</tr></table>\n";
 	echo "<table class='footer'>\n";
 	echo "<tr>\n";
-	echo "<td><a target='_blank' href='$power_url' tabindex='-1'>$app_title $version - " . _("Theme:") . " " . $def_theme . "</a></td>\n";
+	echo "<td><a target='_blank' href='".$SysPrefs->power_url."' tabindex='-1'>".$SysPrefs->app_title." $version - " . _("Theme:") . " " . $def_theme . "</a></td>\n";
 	echo "</tr>\n";
 	echo "<tr>\n";
-	echo "<td><a target='_blank' href='$power_url' tabindex='-1'>$power_by</a></td>\n";
+	echo "<td><a target='_blank' href='".$SysPrefs->power_url."' tabindex='-1'>".$SysPrefs->power_by."</a></td>\n";
 	echo "</tr>\n";
 	echo "</table><br><br>\n";
 	echo "</body></html>\n";
diff --git a/admin/attachments.php b/admin/attachments.php
index 347c1be5..4803ca77 100644
--- a/admin/attachments.php
+++ b/admin/attachments.php
@@ -69,7 +69,7 @@ if ($download_id != -1)
 }
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 page(_($help_context = "Attach Documents"), false, false, "", $js);
 
diff --git a/admin/backups.php b/admin/backups.php
index 07c6212b..63f15a01 100644
--- a/admin/backups.php
+++ b/admin/backups.php
@@ -16,6 +16,8 @@ include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/admin/db/maintenance_db.inc");
 
+define("BACKUP_PATH", $SysPrefs->comp_path.'/'.user_company()."/backup/");
+
 if (get_post('view')) {
 	if (!get_post('backups')) {
 		display_error(_('Select backup file first.'));
@@ -57,7 +59,7 @@ function check_paths()
 
 function generate_backup($conn, $ext='no', $comm='')
 {
-	$filename = db_backup($conn, $ext, $comm);
+	$filename = db_backup($conn, $ext, $comm, BACKUP_PATH);
 	if ($filename)
 		display_notification(_("Backup successfully generated."). ' '
 			. _("Filename") . ": " . $filename);
diff --git a/admin/change_current_user_password.php b/admin/change_current_user_password.php
index b226cd55..1b69e00e 100644
--- a/admin/change_current_user_password.php
+++ b/admin/change_current_user_password.php
@@ -64,7 +64,7 @@ if (isset($_POST['UPDATE_ITEM']) && check_csrf_token())
 
 	if (can_process())
 	{
-		if ($allow_demo_mode) {
+		if ($SysPrefs->allow_demo_mode) {
 		    display_warning(_("Password cannot be changed in demo mode."));
 		} else {
 			update_user_password($_SESSION["wa_current_user"]->user, 
diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index 9a7b772b..b889aeb9 100644
--- a/admin/company_preferences.php
+++ b/admin/company_preferences.php
@@ -52,9 +52,9 @@ if (isset($_POST['update']) && $_POST['update'] != "")
 			display_error(_('Only jpg and png files are supported - a file extension of .jpg or .png is expected'));
 			$input_error = 1;
 		}
-		elseif ( $_FILES['pic']['size'] > ($max_image_size * 1024))
+		elseif ( $_FILES['pic']['size'] > ($SysPrefs->max_image_size * 1024))
 		{ //File Size Check
-			display_error(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $max_image_size);
+			display_error(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $SysPrefs->max_image_size);
 			$input_error = 1;
 		}
 		elseif ( $_FILES['pic']['type'] == "text/plain" )
diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index 1346aa3a..3b66dc4c 100644
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -36,7 +36,7 @@ function get_company_pref($prefs = null)
 	
 	if (!isset($_SESSION['SysPrefs']->prefs)) { // cached preferences
 
-		$_SESSION['SysPrefs'] = new sys_prefs();
+//		$_SESSION['SysPrefs'] = new sys_prefs();
 
 		$sql = "SELECT name, value FROM ".TB_PREF."sys_prefs";
 		$result = @db_query($sql); // supress errors before 2.3 db structure upgrade
@@ -216,3 +216,20 @@ function clean_user_themes($theme)
 }
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/admin/db/fiscalyears_db.inc b/admin/db/fiscalyears_db.inc
index cec73805..0d9a9d21 100644
--- a/admin/db/fiscalyears_db.inc
+++ b/admin/db/fiscalyears_db.inc
@@ -48,8 +48,6 @@ function get_fiscalyear($id)
 
 function get_current_fiscalyear()
 {
-	global $path_to_root;
-	include_once($path_to_root . "/admin/db/company_db.inc");
 	$year = get_company_pref('f_year');
 
 	$sql = "SELECT * FROM ".TB_PREF."fiscal_year WHERE id=".db_escape($year);
diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index fd30bc2c..6a66ce08 100644
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -263,9 +263,10 @@ function write_lang()
 */
 function db_import($filename, $connection, $force=true, $init=true, $protect=false, $return_errors=false)
 {
-	global $db, $go_debug, $sql_trail;
+	global $db, $SysPrefs;
 
-	$sql_trail = false;
+	$trail = $SysPrefs->sql_trail;
+	$SysPrefs->sql_trail = false;
 
 	$allowed_commands = array(
 		"create"  => 'table_queries', 
@@ -413,8 +414,8 @@ function db_import($filename, $connection, $force=true, $init=true, $protect=fal
 /*/
 	if ($return_errors)
 	{	// prevent errors display
-		$save_debug = $go_debug;
-		$go_debug = 0;
+		$save_debug = $SysPrefs->go_debug;
+		$SysPrefs->go_debug = 0;
 	}
 	// execute drop tables if exists queries
 	if (is_array($drop_queries))
@@ -457,7 +458,9 @@ function db_import($filename, $connection, $force=true, $init=true, $protect=fal
 	}
 
 	if ($return_errors)
-		$go_debug = $save_debug;
+		$SysPrefs->go_debug = $save_debug;
+
+	$SysPrefs->sql_trail = $trail;
 
 	db_query("SET foreign_key_checks=1");
 	if ($delimiter != ';') db_query("delimiter ;"); // just for any case
@@ -530,16 +533,13 @@ function db_unzip($mode, $path)
     	return explode("\n", $file_data);
 }
 
-function db_backup($conn, $ext='no', $comm='', $path=null)
+function db_backup($conn, $ext='no', $comm='', $path='')
 {
 	if ($conn['tbpref'] != "")
 		$filename = $conn['dbname'] . "_" . $conn['tbpref'] . date("Ymd_Hi") . ".sql";
 	else
 		$filename = $conn['dbname'] . "_" . date("Ymd_Hi") . ".sql";
 
-	if (!isset($path))
-		$path = BACKUP_PATH;
-
 	return db_export($conn, $path . clean_file_name($filename), $ext, $comm);
 }
 //
@@ -548,7 +548,7 @@ function db_backup($conn, $ext='no', $comm='', $path=null)
 function db_export($conn, $filename, $zip='no', $comment='')
 {
 
-	global $app_title, $version, $power_url, $path_to_root;
+	global $SysPrefs, $version;
 
     $error = false;
     // set max string size before writing to file
@@ -572,8 +572,8 @@ function db_export($conn, $filename, $zip='no', $comment='')
     //create comment
     $out="# MySQL dump of database '".$conn["dbname"]."' on host '".$conn["host"]."'\n";
     $out.="# Backup Date and Time: ".date("Y-m-d H:i")."\n";
-    $out.="# Built by " . $app_title . " " . $version ."\n";
-    $out.="# ".$power_url."\n";
+    $out.="# Built by " . $SysPrefs->app_title . " " . $version ."\n";
+    $out.="# ".$SysPrefs->power_url."\n";
     $out.="# Company: ". @html_entity_decode($company, ENT_QUOTES, $_SESSION['language']->encoding)."\n";
     $out.="# User: ".$_SESSION["wa_current_user"]->name."\n\n";
     $out.="# Compatibility: ".get_company_pref('version_id')."\n\n";
@@ -809,7 +809,6 @@ function order_sql_tables($tables, $fks)
 // returns backup file name if name has changed (zip), else TRUE. If saving failed, return value is FALSE
 function save_to_file($path, $zip, $fileData)
 {
-	global $path_to_root;
 
 	$backupfile = basename($path);
 
diff --git a/admin/db/users_db.inc b/admin/db/users_db.inc
index 3e0bce22..8e215a20 100644
--- a/admin/db/users_db.inc
+++ b/admin/db/users_db.inc
@@ -171,9 +171,9 @@ function check_user_activity($id)
 //-----------------------------------------------------------------------------------------------
 function show_users_online()
 {
-	global $show_users_online, $db, $GetText;
-	
-	if (!isset($show_users_online) || $show_users_online == 0 || !defined('TB_PREF') || 
+	global $db, $GetText, $SysPrefs;
+
+	if (!isset($SysPrefs->show_users_online) || $SysPrefs->show_users_online == 0 || !defined('TB_PREF') || 
 		!isset($GetText) || !isset($db))
 		return "";
 	$result = db_query("SHOW TABLES LIKE '".TB_PREF."useronline'");	
diff --git a/admin/display_prefs.php b/admin/display_prefs.php
index 66acf88d..e686a81a 100644
--- a/admin/display_prefs.php
+++ b/admin/display_prefs.php
@@ -51,13 +51,13 @@ if (isset($_POST['setprefs']))
 
 		flush_dir(company_path().'/js_cache');	
 
-		if ($chg_theme && $allow_demo_mode)
+		if ($chg_theme && $SysPrefs->allow_demo_mode)
 			$_SESSION["wa_current_user"]->prefs->theme = $_POST['theme'];
 		if ($chg_theme || $chg_lang || $chg_date_format || $chg_date_sep)
 			meta_forward($_SERVER['PHP_SELF']);
 
 		
-		if ($allow_demo_mode)  
+		if ($SysPrefs->allow_demo_mode)  
 			display_warning(_("Display settings have been updated. Keep in mind that changed settings are restored on every login in demo mode."));
 		else
 			display_notification_centered(_("Display settings have been updated."));
diff --git a/admin/inst_chart.php b/admin/inst_chart.php
index bb41100d..c291a030 100644
--- a/admin/inst_chart.php
+++ b/admin/inst_chart.php
@@ -14,7 +14,7 @@ $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root."/includes/packages.inc");
 
-if ($use_popup_windows) {
+if ($SysPrefs->use_popup_windows) {
 	$js = get_js_open_window(900, 500);
 }
 page(_($help_context = "Install Charts of Accounts"), false, false, '', $js);
diff --git a/admin/inst_lang.php b/admin/inst_lang.php
index 73591b66..b2264c1d 100644
--- a/admin/inst_lang.php
+++ b/admin/inst_lang.php
@@ -17,7 +17,7 @@ include_once($path_to_root."/includes/packages.inc");
 include_once($path_to_root . "/admin/db/maintenance_db.inc");
 include_once($path_to_root . "/includes/ui.inc");
 
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js = get_js_open_window(900, 500);
 
 page(_($help_context = "Install/Update Languages"), false, false, "", $js);
@@ -30,7 +30,7 @@ simple_page_mode(true);
 //
 function display_languages()
 {
-	global $table_style, $installed_languages, $dflt_lang, $GetText;
+	global $installed_languages, $dflt_lang, $GetText;
 	
 	$th = array(_("Language"), _("Name"), _("Encoding"), _("Right To Left"),
 		_("Installed"), _("Available"), _("Default"), "", "");
diff --git a/admin/inst_module.php b/admin/inst_module.php
index d2f482c9..eda65097 100644
--- a/admin/inst_module.php
+++ b/admin/inst_module.php
@@ -14,7 +14,7 @@ $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root."/includes/packages.inc");
 
-if ($use_popup_windows) {
+if ($SysPrefs->use_popup_windows) {
 	$js = get_js_open_window(900, 500);
 }
 page(_($help_context = "Install/Activate extensions"));
diff --git a/admin/inst_theme.php b/admin/inst_theme.php
index 259ec7b1..70d8eb60 100644
--- a/admin/inst_theme.php
+++ b/admin/inst_theme.php
@@ -14,7 +14,7 @@ $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root."/includes/packages.inc");
 
-if ($use_popup_windows) {
+if ($SysPrefs->use_popup_windows) {
 	$js = get_js_open_window(900, 500);
 }
 page(_($help_context = "Install Themes"), false, false, '', $js);
diff --git a/admin/inst_upgrade.php b/admin/inst_upgrade.php
index 4ff67d52..e7b4667c 100644
--- a/admin/inst_upgrade.php
+++ b/admin/inst_upgrade.php
@@ -52,11 +52,10 @@ function get_installers()
 //
 //	Apply one differential data set.
 //
-function upgrade_step($index, $company, $conn) 
+function upgrade_step($inst, $company, $conn) 
 {
-	global $path_to_root, $installers;
+	global $path_to_root;
 
-	$inst = $installers[$index];
 	$pref = $conn['tbpref'];
 	$ret = true;
 
@@ -110,7 +109,8 @@ if (get_post('Upgrade'))
 	// apply all upgrade data
 		foreach ($installers as $i => $inst) 
 		{
-			$ret = upgrade_step($i, $comp, $conn);
+
+			$ret = upgrade_step($installers[$index], $i, $comp, $conn);
 			if (!$ret)
 			{
 				display_error(
diff --git a/admin/print_profiles.php b/admin/print_profiles.php
index ea5535af..bf3d698f 100644
--- a/admin/print_profiles.php
+++ b/admin/print_profiles.php
@@ -23,9 +23,9 @@ $selected_id = get_post('profile_id','');
 // Returns array of defined reports
 //
 function get_reports() {
-	global $path_to_root, $go_debug;
+	global $path_to_root, $SysPrefs;
 
-if ($go_debug || !isset($_SESSION['reports'])) {	
+if ($SysPrefs->go_debug || !isset($_SESSION['reports'])) {	
 	// to save time, store in session.
 		$paths = array (
 			$path_to_root.'/reporting/',
@@ -105,7 +105,7 @@ if ( get_post('submit'))
 		update_printer_profile($_POST['profile_id'], $prof);
 		if ($selected_id == '') {
 			display_notification_centered(_('New printing profile has been created')); 
-			clear_form();
+			clear_form($selected_id);
 		} else {
 			display_notification_centered(_('Printing profile has been updated'));
 		}
diff --git a/admin/view_print_transaction.php b/admin/view_print_transaction.php
index a386cbfd..0b4de2d2 100644
--- a/admin/view_print_transaction.php
+++ b/admin/view_print_transaction.php
@@ -22,7 +22,7 @@ include_once($path_to_root . "/admin/db/transactions_db.inc");
 
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 page(_($help_context = "View or Print Transactions"), false, false, "", $js);
 
diff --git a/admin/void_transaction.php b/admin/void_transaction.php
index a77cbce9..11051607 100644
--- a/admin/void_transaction.php
+++ b/admin/void_transaction.php
@@ -23,7 +23,7 @@ include_once($path_to_root . "/admin/db/voiding_db.inc");
 $js = "";
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 	
 page(_($help_context = "Void a Transaction"), false, false, "", $js);
diff --git a/config.default.php b/config.default.php
index c9651dd6..1b319a2b 100644
--- a/config.default.php
+++ b/config.default.php
@@ -21,14 +21,15 @@
 if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
 	die("Restricted access");
 
-	if (!ini_get('date.timezone'))
-       ini_set('date.timezone', 'Europe/Berlin');
+	// Server time zone. If leaved empty the time zone set in php init file will be used.
+	// If timezone is not set in this file nor in php.ini, Europe/Berlin' is used as defualt.
+	$server_time_zone = '';
 
 	// Log file for error/warning messages. Should be set to any location
 	// writable by www server. When set to empty string logging is switched off. 
 	// Special value 'syslog' can be used for system logger usage (see php manual).
 	//$error_logfile = '';
-	$error_logfile = dirname(__FILE__).'/tmp/errors.log';
+	$error_logfile = $path_to_root.'/tmp/errors.log';
 	$debug 			= 1;	// show sql on database errors
 
 	$show_sql 		= 0;	// show all sql queries in page footer for debugging purposes
@@ -41,23 +42,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
 	//
 	$sql_trail 		= 0; // save all sql queries in sql_trail
 	$select_trail 	= 0; // track also SELECT queries
-	if ($go_debug > 0)
-	{
-		error_reporting(-1);
-		ini_set("display_errors", "On");
-	}
-	else
-	{
-		error_reporting(E_USER_WARNING|E_USER_ERROR|E_USER_NOTICE);
-		// ini_alter("error_reporting","E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR|E_PARSE");
-		ini_set("display_errors", "On");
-	}
-
-	if($error_logfile != '') {
-		ini_set("error_log", $error_logfile);
-		ini_set("ignore_repeated_errors", "On");
-		ini_set("log_errors", "On");
-	}		
+
 	// Main Title
 	$app_title = "FrontAccounting";
 
@@ -170,41 +155,6 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
 	/* UTF-8 font for Business Graphics. Copy it to /reporting/fonts/ folder. */
 	$UTF8_fontfile	= "FreeSans.ttf";
 
-/*	
-	Before upgrade from pre-2.2 FA you have to move here your customized
-	security roles definitions. If you have used standard roles, you
-	can simply uncomment following two arrays. After upgrade both arrays need 
-	to be deleted or commented out. You may wish to change user roles to
-	new better defined in Users Setup. Old not used roles can be set inactive 
-	or deleted.
-*/
-/* Standard FA2.1 Security Group definitions
-
-	$security_headings = array(
-			_("Inquiries"),
-			_("Accountant"),
-			_("System Administrator"),
-	);
-
-	$security_groups = array(
-			array(1,2),
-			array(1,2,3,4,5,6,7,8,9,10,11,12,13,14,16),
-			array(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,20),
-	);
-*/
-
-	//MySQL Backup and Restore Settings
-
-if(isset($_SESSION["wa_current_user"])) {
-	define("BACKUP_PATH", $comp_path.'/'.user_company()."/backup/");
-}
-	// static js files path
-	$js_path = $path_to_root.'/js/';
-	// standard external js scripts included in all files
-	$js_static = array('JsHttpRequest.js', 'behaviour.js', 'utils.js', 'inserts.js');
-	// additional js source included in header
-	$js_lib = $js_userlib = array();
-
 /* 
 	Display a dropdown select box for choosing Company to login if false.
 	Show a blank editbox only if true where the Company NickName
diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php
index ea1781a1..2d7c8541 100644
--- a/dimensions/inquiry/search_dimensions.php
+++ b/dimensions/inquiry/search_dimensions.php
@@ -18,7 +18,7 @@ include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/doc/api_changes.txt b/doc/api_changes.txt
index 2f4c9838..36c94fe4 100644
--- a/doc/api_changes.txt
+++ b/doc/api_changes.txt
@@ -8,7 +8,7 @@ Changed functions:
 	get_company_pref($prefs = null)
 	get_company_prefs()
  maintenance_db.inc:
-	db_backup($conn, $ext='no', $comm='', $path=null)
+	db_backup($conn, $ext='no', $comm='', $path='')
 	db_export($conn, $filename, $zip='no', $comment='', $no_default=false)
 	save_to_file($path, $zip, $fileData)
  tax_types_db.inc:
@@ -48,7 +48,7 @@ Description:
 Before 2.4:
 	db_backup($conn, $ext='no', $comm='', $tbpref = TB_PREF)
 Now:
-	db_backup($conn, $ext='no', $comm='', $path=null)
+	db_backup($conn, $ext='no', $comm='', $path='')
 Description: 
 	$tbpref parameter has been removed. Calls should be done after switch to selected company database with 
 	set_global_connection($company).
diff --git a/gl/bank_account_reconcile.php b/gl/bank_account_reconcile.php
index a6d8dd65..e7b584b1 100644
--- a/gl/bank_account_reconcile.php
+++ b/gl/bank_account_reconcile.php
@@ -23,7 +23,7 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 include_once($path_to_root . "/includes/banking.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index a11352a6..7b987636 100644
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 include_once($path_to_root . "/gl/includes/gl_ui.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index 5815f683..de4bcc73 100644
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -25,7 +25,7 @@ include_once($path_to_root . "/gl/includes/gl_ui.inc");
 include_once($path_to_root . "/admin/db/attachments_db.inc");
 
 $js = '';
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/gl/gl_journal.php b/gl/gl_journal.php
index 003e8292..a6f26407 100644
--- a/gl/gl_journal.php
+++ b/gl/gl_journal.php
@@ -24,7 +24,7 @@ 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 (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/gl/includes/db/gl_db_rates.inc b/gl/includes/db/gl_db_rates.inc
index a6162ae2..0a1abf62 100644
--- a/gl/includes/db/gl_db_rates.inc
+++ b/gl/includes/db/gl_db_rates.inc
@@ -110,9 +110,11 @@ function delete_exchange_rate($rate_id)
 //
 function retrieve_exrate($curr_b, $date)
 {
-	global $xr_providers, $dflt_xr_provider;
-	$xchg_rate_provider = ((isset($xr_providers) && isset($dflt_xr_provider)) ? $xr_providers[$dflt_xr_provider] : 'ECB');
-	
+	global $SysPrefs;
+
+	$xchg_rate_provider = ((isset($SysPrefs->xr_providers) && isset($SysPrefs->dflt_xr_provider)) 
+		? $SysPrefs->xr_providers[$SysPrefs->dflt_xr_provider] : 'ECB');
+
 	$rate = hook_retrieve_exrate($curr_b, $date);
 	if (is_numeric($rate))
 		return $rate;
diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index 372c5161..cac714b0 100644
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -19,7 +19,7 @@
 function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension2, $memo_,
 	$amount, $currency=null, $person_type_id=null, $person_id=null,	$err_msg="", $rate=0)
 {
-	global $use_audit_trail;
+	global $SysPrefs;
 
 	$date = date2sql($date_);
 	if ($currency != null)
@@ -35,7 +35,7 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension
 		$dimension = 0;
 	if ($dimension2 == null || $dimension2 < 0)
 		$dimension2 = 0;
-	if (isset($use_audit_trail) && $use_audit_trail)
+	if (isset($SysPrefs->use_audit_trail) && $SysPrefs->use_audit_trail)
 	{
 		if ($memo_ == "" || $memo_ == null)
 			$memo_ = $_SESSION["wa_current_user"]->username;
@@ -106,7 +106,7 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
 	$account=null, $dimension=0, $dimension2=0, $filter_type=null,
 	$amount_min=null, $amount_max=null)
 {
-	global $show_voided_gl_trans;
+	global $SysPrefs;
 	
 	$from = date2sql($from_date);
 	$to = date2sql($to_date);
@@ -121,7 +121,7 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
 		AND ISNULL(v.date_)
 		AND tran_date >= '$from'
 		AND tran_date <= '$to'";
-	if (isset($show_voided_gl_trans) && $show_voided_gl_trans == 0)
+	if (isset($SysPrefs->show_voided_gl_trans) && $SysPrefs->show_voided_gl_trans == 0)
 		$sql .= " AND ".TB_PREF."gl_trans.amount <> 0"; 
 	if ($trans_no > 0)
 		$sql .= " AND ".TB_PREF."gl_trans.type_no LIKE ".db_escape('%'.$trans_no);
diff --git a/gl/inquiry/balance_sheet.php b/gl/inquiry/balance_sheet.php
index 0243be4d..85b22f28 100644
--- a/gl/inquiry/balance_sheet.php
+++ b/gl/inquiry/balance_sheet.php
@@ -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
diff --git a/gl/inquiry/bank_inquiry.php b/gl/inquiry/bank_inquiry.php
index e25e7ba8..efc0fd40 100644
--- a/gl/inquiry/bank_inquiry.php
+++ b/gl/inquiry/bank_inquiry.php
@@ -22,7 +22,7 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 include_once($path_to_root . "/includes/banking.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/gl/inquiry/gl_account_inquiry.php b/gl/inquiry/gl_account_inquiry.php
index 1fed9b30..3f81e035 100644
--- a/gl/inquiry/gl_account_inquiry.php
+++ b/gl/inquiry/gl_account_inquiry.php
@@ -23,7 +23,7 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 $js = '';
 set_focus('account');
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index c49b9a16..9d422037 100644
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -69,7 +69,7 @@ function gl_inquiry_controls()
 
 function display_trial_balance($type, $typename)
 {
-	global $path_to_root, $clear_trial_balance_opening,
+	global $path_to_root, $SysPrefs,
 		 $k, $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal;
 
 	$printtitle = 0; //Flag for printing type name
@@ -97,7 +97,7 @@ function display_trial_balance($type, $typename)
 
 		// FA doesn't really clear the closed year, therefore the brought forward balance includes all the transactions from the past, even though the balance is null.
 		// If we want to remove the balanced part for the past years, this option removes the common part from from the prev and tot figures.
-		if (@$clear_trial_balance_opening)
+		if (@$SysPrefs->clear_trial_balance_opening)
 		{
 			$open = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $begin,  $begin, false, true);
 			$offset = min($open['debit'], $open['credit']);
diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index 88e36a91..0b5a47dc 100644
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -19,7 +19,7 @@ include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/gl/inquiry/profit_loss.php b/gl/inquiry/profit_loss.php
index 1e236159..347b9ff8 100644
--- a/gl/inquiry/profit_loss.php
+++ b/gl/inquiry/profit_loss.php
@@ -168,8 +168,6 @@ function inquiry_controls()
     date_cells(_("From:"), 'TransFromDate');
 	date_cells(_("To:"), 'TransToDate');
 	
-	//Compare Combo
-	global $sel;
 	$sel = array(_("Accumulated"), _("Period Y-1"), _("Budget"));	
 	echo "<td>"._("Compare to").":</td>\n";
 	echo "<td>";
@@ -184,13 +182,15 @@ function inquiry_controls()
     end_table();
 
 	hidden('AccGrp');
+
+	return $sel[get_post('Compare')];
 }
 
 //----------------------------------------------------------------------------------------------------
 
-function display_profit_and_loss()
+function display_profit_and_loss($compare)
 {
-	global $path_to_root, $sel;
+	global $path_to_root;
 
 	if (!isset($_POST['Dimension']))
 		$_POST['Dimension'] = 0;
@@ -201,7 +201,6 @@ function display_profit_and_loss()
 
 	$from = $_POST['TransFromDate'];
 	$to = $_POST['TransToDate'];
-	$compare = $_POST['Compare'];
 	
 	if (isset($_POST["AccGrp"]) && (strlen($_POST['AccGrp']) > 0))
 		$drilldown = 1; // Deeper Level
@@ -234,7 +233,7 @@ function display_profit_and_loss()
 	$tableheader =  "<tr>
         <td class='tableheader'>" . _("Group/Account Name") . "</td>
         <td class='tableheader'>" . _("Period") . "</td>
-		<td class='tableheader'>" . $sel[$compare] . "</td>
+		<td class='tableheader'>" . $compare . "</td>
 		<td class='tableheader'>" . _("Achieved %") . "</td>
         </tr>";	
 	
@@ -332,9 +331,9 @@ function display_profit_and_loss()
 
 start_form();
 
-inquiry_controls();
+$sel = inquiry_controls();
 
-display_profit_and_loss();
+display_profit_and_loss($sel);
 
 end_form();
 
diff --git a/gl/inquiry/tax_inquiry.php b/gl/inquiry/tax_inquiry.php
index 4adc57bf..ec96716a 100644
--- a/gl/inquiry/tax_inquiry.php
+++ b/gl/inquiry/tax_inquiry.php
@@ -22,7 +22,7 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 $js = '';
 set_focus('account');
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/gl/manage/close_period.php b/gl/manage/close_period.php
index 68d75357..21a6aaee 100644
--- a/gl/manage/close_period.php
+++ b/gl/manage/close_period.php
@@ -27,7 +27,7 @@ page(_($help_context = "Closing GL Transactions"), false, false, "", $js);
 //---------------------------------------------------------------------------------------------
 function check_data()
 {
-	global $Refs, $allow_gl_reopen;
+	global $Refs, $SysPrefs;
 	
 	if (!is_date($_POST['date']) || date1_greater_date2($_POST['date'], Today()))
 	{
@@ -43,7 +43,7 @@ function check_data()
 	}
 	if (date1_greater_date2(sql2date(get_company_pref('gl_closing_date')), $_POST['date']))
 	{
-		if (!$allow_gl_reopen) {
+		if (!$SysPrefs->allow_gl_reopen) {
 			display_error(_("The entered date is earlier than date already selected as closing date."));
 			set_focus('date');
 			return false;
diff --git a/gl/manage/exchange_rates.php b/gl/manage/exchange_rates.php
index e2e989a1..05953c04 100644
--- a/gl/manage/exchange_rates.php
+++ b/gl/manage/exchange_rates.php
@@ -108,8 +108,9 @@ function display_rates($curr_code)
 
 function display_rate_edit()
 {
-	global $selected_id, $Ajax, $xr_providers, $dflt_xr_provider;
-	$xchg_rate_provider = ((isset($xr_providers) && isset($dflt_xr_provider)) ? $xr_providers[$dflt_xr_provider] : 'ECB');
+	global $selected_id, $Ajax, $SysPrefs;
+	$xchg_rate_provider = ((isset($SysPrefs->xr_providers) && isset($SysPrefs->dflt_xr_provider))
+		? $SysPrefs->xr_providers[$SysPrefs->dflt_xr_provider] : 'ECB');
 	start_table(TABLESTYLE2);
 
 	if ($selected_id != "")
diff --git a/gl/manage/gl_account_classes.php b/gl/manage/gl_account_classes.php
index 24b7c4e4..d02cfdb4 100644
--- a/gl/manage/gl_account_classes.php
+++ b/gl/manage/gl_account_classes.php
@@ -24,7 +24,7 @@ simple_page_mode(false);
 
 function can_process() 
 {
-	global $use_oldstyle_convert;
+	global $SysPrefs;
 
 	if (strlen(trim($_POST['id'])) == 0) 
 	{
@@ -38,7 +38,7 @@ function can_process()
 		set_focus('name');
 		return false;
 	}
-	if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+	if (isset($SysPrefs->use_oldstyle_convert) && $SysPrefs->use_oldstyle_convert == 1)
 		$_POST['Balance'] = check_value('Balance');
 	return true;
 }
@@ -108,7 +108,7 @@ $result = get_account_classes(check_value('show_inactive'));
 start_form();
 start_table(TABLESTYLE);
 $th = array(_("Class ID"), _("Class Name"), _("Class Type"), "", "");
-if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+if (isset($SysPrefs->use_oldstyle_convert) && $SysPrefs->use_oldstyle_convert == 1)
 	$th[2] = _("Balance Sheet");
 inactive_control_column($th);
 table_header($th);
@@ -121,7 +121,7 @@ while ($myrow = db_fetch($result))
 
 	label_cell($myrow["cid"]);
 	label_cell($myrow['class_name']);
-	if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+	if (isset($SysPrefs->use_oldstyle_convert) && $SysPrefs->use_oldstyle_convert == 1)
 	{
 		$myrow['ctype'] = ($myrow["ctype"] >= CL_ASSETS && $myrow["ctype"] < CL_INCOME ? 1 : 0);
 		label_cell(($myrow['ctype'] == 1 ? _("Yes") : _("No")));
@@ -147,7 +147,7 @@ if ($selected_id != "")
 	
 		$_POST['id']  = $myrow["cid"];
 		$_POST['name']  = $myrow["class_name"];
-		if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+		if (isset($SysPrefs->use_oldstyle_convert) && $SysPrefs->use_oldstyle_convert == 1)
 			$_POST['ctype'] = ($myrow["ctype"] >= CL_ASSETS && $myrow["ctype"] < CL_INCOME ? 1 : 0);
 		else
 			$_POST['ctype']  = $myrow["ctype"];
@@ -165,7 +165,7 @@ else
 
 text_row_ex(_("Class Name:"), 'name', 50, 60);
 
-if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+if (isset($SysPrefs->use_oldstyle_convert) && $SysPrefs->use_oldstyle_convert == 1)
 	check_row(_("Balance Sheet"), 'ctype', null);
 else
 	class_types_list_row(_("Class Type:"), 'ctype', null);
diff --git a/includes/access_levels.inc b/includes/access_levels.inc
index 51c0a4be..c54f02ed 100644
--- a/includes/access_levels.inc
+++ b/includes/access_levels.inc
@@ -250,7 +250,7 @@ $security_areas =array(
 	'SA_GLREP' => array(SS_GL_A|4, _("GL reports and inquiries")),
 );
 
-if (!@$allow_gl_reopen)
+if (!@$SysPrefs->allow_gl_reopen)
 	unset($security_areas['SA_GLREOPEN']);
 /*
 	This function should be called whenever we want to extend core access level system
diff --git a/includes/current_user.inc b/includes/current_user.inc
index 80aad22b..c5e2c975 100644
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -59,7 +59,7 @@ class current_user
 
 	function login($company, $loginname, $password)
 	{
-		global $security_areas, $security_groups, $security_headings, $path_to_root, $dflt_lang, $login_delay;
+		global $security_areas, $security_groups, $security_headings, $path_to_root, $dflt_lang, $SysPrefs;
 
 		$this->set_company($company);
 	    $this->logged = false;
@@ -77,7 +77,7 @@ class current_user
 		if (!isset($Auth_Result))	// if not used: standard method
 			$Auth_Result = get_user_auth($loginname, md5($password));
 
-		if ($login_delay > 0)
+		if ($SysPrefs->login_delay > 0)
 			write_login_filelog($loginname, $Auth_Result);
 
 		if ($Auth_Result)
@@ -143,7 +143,7 @@ class current_user
 	}
 
 	function reset_password($company, $email) {
-		global $app_title;
+		global $SysPrefs;
 
 		$this->set_company($company);
 		$this->logged = false;
@@ -161,7 +161,7 @@ class current_user
 
 			update_user_password($myrow['id'], $myrow['user_id'], $hash);
 
-			mail($myrow['email'], _("New password for")." ".$app_title, $password);
+			mail($myrow['email'], _("New password for")." ".$SysPrefs->app_title, $password);
 
 			return true;
 		}
@@ -258,9 +258,9 @@ class current_user
 
 	function hide_inaccessible_menu_items()
 	{
-		global $hide_inaccessible_menu_items;
+		global $SysPrefs;
 
-		if (!isset($hide_inaccessible_menu_items) || $hide_inaccessible_menu_items == 0)
+		if (!isset($SysPrefs->hide_inaccessible_menu_items) || $SysPrefs->hide_inaccessible_menu_items == 0)
 		{
 			return false;
 		}
@@ -278,9 +278,9 @@ class current_user
 
 	function update_prefs($prefs)
 	{
-		global $allow_demo_mode;
-		
-		if(!$allow_demo_mode) {
+		global $SysPrefs;
+
+		if (!$SysPrefs->allow_demo_mode) {
 			update_user_prefs($this->user, $prefs);
 		}
 
@@ -303,9 +303,9 @@ function round2($number, $decimals=0)
 */
 function number_format2($number, $decimals=0)
 {
-	global $thoseps, $decseps;
-	$tsep = $thoseps[$_SESSION["wa_current_user"]->prefs->tho_sep()];
-	$dsep = $decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()];
+	global $SysPrefs;
+	$tsep = $SysPrefs->thoseps[$_SESSION["wa_current_user"]->prefs->tho_sep()];
+	$dsep = $SysPrefs->decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()];
 	//return number_format($number, $decimals, $dsep,	$tsep);
 	if($decimals==='max')
 		$dec = 15 - floor(log10(abs($number)));
@@ -405,14 +405,14 @@ function percent_format($number) {
 }
 
 function user_numeric($input) {
-    global $decseps, $thoseps;
+    global $SysPrefs;
 
     $num = trim($input);
-    $sep = $thoseps[user_tho_sep()];
+    $sep = $SysPrefs->thoseps[user_tho_sep()];
     if ($sep!='')
     	$num = str_replace( $sep, '', $num);
 
-    $sep = $decseps[user_dec_sep()];
+    $sep = $SysPrefs->decseps[user_dec_sep()];
     if ($sep!='.')
     	$num = str_replace( $sep, '.', $num);
 
@@ -579,19 +579,19 @@ function set_user_prefs($prefs)
 }
 
 function add_user_js_data() {
-	global $path_to_root, $thoseps, $decseps, $date_system, $dateseps;
+	global $path_to_root, $SysPrefs;
 
-	$ts = $thoseps[user_tho_sep()];
-	$ds = $decseps[user_dec_sep()];
+	$ts = $SysPrefs->thoseps[user_tho_sep()];
+	$ds = $SysPrefs->decseps[user_dec_sep()];
 
     $js = "\n"
 	  . "var user = {\n"
 	  . "theme: '". $path_to_root . '/themes/'. user_theme().'/'."',\n"
 	  . "loadtxt: '"._('Requesting data...')."',\n"
 	  . "date: '".Today()."',\n"	// server date
-	  . "datesys: ".$date_system.",\n"
+	  . "datesys: ".$SysPrefs->date_system.",\n"
 	  . "datefmt: ".user_date_format().",\n"
-	  . "datesep: '".$dateseps[user_date_sep()]."',\n"
+	  . "datesep: '".$SysPrefs->dateseps[user_date_sep()]."',\n"
 	  . "ts: '$ts',\n"
 	  . "ds: '$ds',\n"
 	  . "pdec : " . user_price_dec() . "}\n";
@@ -720,7 +720,10 @@ function flush_dir($path, $wipe = false)
 */
 function company_path($comp=null)
 {
-	global $path_to_root, $comp_path;
+	global $path_to_root, $SysPrefs;
+
+	$comp_path = $SysPrefs->comp_path;
+
 
 	if (!isset($comp))
 		$comp = user_company();
diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index 623452e2..af054563 100644
--- a/includes/date_functions.inc
+++ b/includes/date_functions.inc
@@ -21,10 +21,10 @@ this can be a string either "d/m/Y" for UK/Australia/New Zealand dates or
 
 function __date($year, $month, $day)
 {
-	global $dateseps, $tmonths;
+	global $SysPrefs, $tmonths;
 	
 	$how = user_date_format();
-	$sep = $dateseps[user_date_sep()];
+	$sep = $SysPrefs->dateseps[user_date_sep()];
 	$day = (int)$day;
 	$month = (int)$month;
 	if ($how < 3)
@@ -50,12 +50,12 @@ function __date($year, $month, $day)
 
 function is_date($date_) 
 {
-	global $dateseps;
+	global $SysPrefs;
 
 	if ($date_ == null || $date_ == "")
 		return 0;
 	$how = user_date_format();
-	$sep = $dateseps[user_date_sep()];
+	$sep = $SysPrefs->dateseps[user_date_sep()];
 
 	$date_ = trim($date_);
 	$date = str_replace($sep, "", $date_);
@@ -134,10 +134,10 @@ function is_date($date_)
 
 	if (is_long((int)$day) && is_long((int)$month) && is_long((int)$year))
 	{
-		global $date_system;
-		if ($date_system == 1)
+		global $SysPrefs;
+		if ($SysPrefs->date_system == 1)
 			list($year, $month, $day) = jalali_to_gregorian($year, $month, $day);  
-		elseif ($date_system == 2)	
+		elseif ($SysPrefs->date_system == 2)	
 			list($year, $month, $day) = islamic_to_gregorian($year, $month, $day);  
 		if (checkdate((int)$month, (int)$day, (int)$year))
 		{
@@ -156,14 +156,14 @@ function is_date($date_)
 
 function Today() 
 {
-	global $date_system;
+	global $SysPrefs;
 
 	$year = date("Y");
 	$month = date("n");
 	$day = date("j");
-	if ($date_system == 1)
+	if ($SysPrefs->date_system == 1)
 		list($year, $month, $day) = gregorian_to_jalali($year, $month, $day);
-	elseif ($date_system == 2)	
+	elseif ($SysPrefs->date_system == 2)	
 		list($year, $month, $day) = gregorian_to_islamic($year, $month, $day);
 	return __date($year, $month, $day);	
 }
@@ -239,24 +239,24 @@ function end_fiscalyear()
 
 function begin_month($date)
 {
-	global $date_system;
+	global $SysPrefs;
     list($day, $month, $year) = explode_date_to_dmy($date);
-    if ($date_system == 1)
+    if ($SysPrefs->date_system == 1)
     	list($year, $month, $day) = gregorian_to_jalali($year, $month, $day);
-    elseif ($date_system == 2)	
+    elseif ($SysPrefs->date_system == 2)	
     	list($year, $month, $day) = gregorian_to_islamic($year, $month, $day);
    	return __date($year, $month, 1);
 }
 
 function days_in_month($month, $year)
 {
-	global $date_system;
+	global $SysPrefs;
 
-	if ($date_system == 1)
+	if ($SysPrefs->date_system == 1)
 	{
 		$days_in_month = array(31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, ((((((($year - (($year > 0) ? 474 : 473)) % 2820) + 474) + 38) * 682) % 2816) < 682 ? 30 : 29));
 	}
-	elseif ($date_system == 2)
+	elseif ($SysPrefs->date_system == 2)
 	{
 		$days_in_month = array(30, 29, 30, 29, 30, 29, 30, 29, 30, 29, 30, (((((11 * $year) + 14) % 30) < 11) ? 30 : 29));
 	}
@@ -268,14 +268,14 @@ function days_in_month($month, $year)
 
 function end_month($date)
 {
-	global $date_system;
+	global $SysPrefs;
 
     list($day, $month, $year) = explode_date_to_dmy($date);
-	if ($date_system == 1)
+	if ($SysPrefs->date_system == 1)
 	{
 		list($year, $month, $day) = gregorian_to_jalali($year, $month, $day);
 	}
-	elseif ($date_system == 2)
+	elseif ($SysPrefs->date_system == 2)
 	{
 		list($year, $month, $day) = gregorian_to_islamic($year, $month, $day);
 	}
@@ -285,14 +285,14 @@ function end_month($date)
 
 function add_days($date, $days) // accepts negative values as well
 {
-	global $date_system;
+	global $SysPrefs;
     list($day, $month, $year) = explode_date_to_dmy($date);
    	$timet = mktime(0,0,0, $month, $day + $days, $year);
-    if ($date_system == 1 || $date_system == 2)
+    if ($SysPrefs->date_system == 1 || $SysPrefs->date_system == 2)
     {
-    	if ($date_system == 1)
+    	if ($SysPrefs->date_system == 1)
     		list($year, $month, $day) = gregorian_to_jalali(date("Y", $timet), date("n", $timet), date("j", $timet));
-    	elseif ($date_system == 2) 	
+    	elseif ($SysPrefs->date_system == 2) 	
     		list($year, $month, $day) = gregorian_to_islamic(date("Y", $timet), date("n", $timet), date("j", $timet));
     	return __date($year, $month, $day);
     }
@@ -302,7 +302,8 @@ function add_days($date, $days) // accepts negative values as well
 
 function add_months($date, $months) // accepts negative values as well
 {
-	global $date_system;
+	global $SysPrefs;
+
     list($day, $month, $year) = explode_date_to_dmy($date);
 
 	$months += $year*12+$month;
@@ -311,11 +312,11 @@ function add_months($date, $months) // accepts negative values as well
 
    	$timet = mktime(0,0,0, $month, min($day, days_in_month($month, $year)), $year);
 
-    if ($date_system == 1 || $date_system == 2)
+    if ($SysPrefs->date_system == 1 || $SysPrefs->date_system == 2)
     {
-    	if ($date_system == 1)
+    	if ($SysPrefs->date_system == 1)
     		list($year, $month, $day) = gregorian_to_jalali(date("Y", $timet), date("n", $timet), date("j", $timet));
-    	elseif ($date_system == 2) 	
+    	elseif ($SysPrefs->date_system == 2) 	
     		list($year, $month, $day) = gregorian_to_islamic(date("Y", $timet), date("n", $timet), date("j", $timet));
     	return __date($year, $month, $day);
     }
@@ -325,14 +326,15 @@ function add_months($date, $months) // accepts negative values as well
 
 function add_years($date, $years) // accepts negative values as well
 {
-	global $date_system;
+	global $SysPrefs;
+
     list($day, $month, $year) = explode_date_to_dmy($date);
    	$timet = Mktime(0,0,0, $month, $day, $year + $years);
-    if ($date_system == 1 || $date_system == 2)
+    if ($SysPrefs->date_system == 1 || $SysPrefs->date_system == 2)
     {
-    	if ($date_system == 1)
+    	if ($SysPrefs->date_system == 1)
     		list($year, $month, $day) = gregorian_to_jalali(date("Y", $timet), date("n", $timet), date("j", $timet));
-    	elseif ($date_system == 2) 	
+    	elseif ($SysPrefs->date_system == 2) 	
     		list($year, $month, $day) = gregorian_to_islamic(date("Y", $timet), date("n", $timet), date("j", $timet));
     	return __date($year, $month, $day);
     }
@@ -344,7 +346,7 @@ function add_years($date, $years) // accepts negative values as well
 
 function sql2date($date_) 
 {
-	global $date_system;
+	global $SysPrefs;
 
 	//for MySQL dates are in the format YYYY-mm-dd
 
@@ -363,9 +365,9 @@ function sql2date($date_)
 	{  /*chop off the time stuff */
 		$day = substr($day, 0, 2);
 	}
-	if ($date_system == 1)
+	if ($SysPrefs->date_system == 1)
 		list($year, $month, $day) = gregorian_to_jalali($year, $month, $day);
-	elseif ($date_system == 2)
+	elseif ($SysPrefs->date_system == 2)
 		list($year, $month, $day) = gregorian_to_islamic($year, $month, $day);
 	return __date($year, $month, $day);	
 } // end function sql2date
@@ -373,12 +375,12 @@ function sql2date($date_)
 
 function date2sql($date_)
 {
-	global $dateseps, $date_system, $tmonths;
+	global $SysPrefs, $tmonths;
 /* takes a date in a the format specified in $DefaultDateFormat
 and converts to a yyyy/mm/dd format */
 
 	$how = user_date_format();
-	$sep = $dateseps[user_date_sep()];
+	$sep = $SysPrefs->dateseps[user_date_sep()];
 
 	if ($date_ == null || strlen($date_) == 0)
 		return "";
@@ -398,7 +400,7 @@ and converts to a yyyy/mm/dd format */
 		$month = array_search($month, $tmonths);
 	}	
 //to modify assumption in 2030
-	if ($date_system == 0 || $date_system == 3)
+	if ($SysPrefs->date_system == 0 || $SysPrefs->date_system == 3)
 	{
 		if ((int)$year < 60)
 		{
@@ -413,9 +415,9 @@ and converts to a yyyy/mm/dd format */
 	{
 		return 0;
 	}
-	if ($date_system == 1)
+	if ($SysPrefs->date_system == 1)
 		list($year, $month, $day) = jalali_to_gregorian($year, $month, $day); 
-	elseif ($date_system == 2)
+	elseif ($SysPrefs->date_system == 2)
 		list($year, $month, $day) = islamic_to_gregorian($year, $month, $day); 
 
 	return sprintf("%04d-%02d-%02d", $year, $month, $day);
diff --git a/includes/db/connect_db_mysql.inc b/includes/db/connect_db_mysql.inc
index 6767cb25..b25f0b23 100644
--- a/includes/db/connect_db_mysql.inc
+++ b/includes/db/connect_db_mysql.inc
@@ -9,17 +9,18 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
+define('DB_DUPLICATE_ERROR', 1062);
+define('SQL_MODE', ''); // STRICT_ALL_TABLES,NO_ZERO_IN_DATE ?
 
 function set_global_connection($company=-1)
 {
-	global $db, $transaction_level, $path_to_root, $db_connections;
+	global $db, $path_to_root, $db_connections;
 
 	include ($path_to_root . "/config_db.php");
 	if ($company == -1) 
 		$company = $_SESSION["wa_current_user"]->company;
 
 	cancel_transaction(); // cancel all aborted transactions if any
-	$transaction_level = 0;
 
 	$_SESSION["wa_current_user"]->cur_con = $company;
 
@@ -32,27 +33,23 @@ function set_global_connection($company=-1)
 	///// This non empty sql_mode values can interphere with FA, so all is set empty during
 	///// our sessions.
 	///// We are, however, investigating the existing code to be compatible in the future.
-	if (strncmp(db_get_version(), "5.6", 3) >= 0) 
-		db_query("SET sql_mode = ''");
+		db_query("SET sql_mode = '".SQL_MODE."'");
 	/////
 	return $db;
 }
 
-$db_duplicate_error_code = 1062;
-
 //DB wrapper functions to change only once for whole application
 
 function db_query($sql, $err_msg=null)
 {
-	global $db, $show_sql, $sql_trail, $select_trail, $go_debug, $sql_queries, $Ajax,
-		$db_connections, $db_last_inserted_id;
+	global $db, $SysPres, $sql_queries, $Ajax, $db_connections, $db_last_inserted_id;
 
 	// set current db prefix
 	$comp = isset($_SESSION["wa_current_user"]->cur_con) ? $_SESSION["wa_current_user"]->cur_con : 0;
 	$cur_prefix = $db_connections[$comp]['tbpref'];
 	$sql = str_replace(TB_PREF, $cur_prefix, $sql);
 
-	if ($show_sql)
+	if ($SysPrefs->show_sql)
 	{
 		$Ajax->activate('footer_debug');
 		$sql_queries .= "<pre>$sql</pre>\n<hr>";
@@ -64,9 +61,9 @@ function db_query($sql, $err_msg=null)
 
 	db_profile($sql);
 
-	if($sql_trail) {
+	if($SysPrefs->sql_trail) {
 		$db_last_inserted_id = mysql_insert_id($db);	// preserve in case trail insert is done
-		if ($select_trail || (strstr($sql, 'SELECT') === false)) {
+		if ($SysPrefs->select_trail || (strstr($sql, 'SELECT') === false)) {
 			mysql_query(
 			"INSERT INTO ".$cur_prefix."sql_trail
 				(`sql`, `result`, `msg`)
@@ -75,7 +72,7 @@ function db_query($sql, $err_msg=null)
 		}
 	}
 
-	if ($err_msg != null || $go_debug) {
+	if ($err_msg != null || $SysPrefs->go_debug) {
 		$exit = $err_msg != null;
 		if (function_exists('xdebug_call_file'))
 			check_db_error('<br>At file '.xdebug_call_file().':'.xdebug_call_line().':<br>'.$err_msg, $sql, $exit);
@@ -166,9 +163,9 @@ function db_error_msg($conn)
 
 function db_insert_id()
 {
-	global $db_last_inserted_id, $sql_trail, $db;
+	global $db_last_inserted_id, $SysPrefs, $db;
 
-	return $sql_trail ? $db_last_inserted_id : mysql_insert_id($db);
+	return $SysPrefs->sql_trail ? $db_last_inserted_id : mysql_insert_id($db);
 }
 
 function db_num_affected_rows()
diff --git a/includes/db/connect_db_mysqli.inc b/includes/db/connect_db_mysqli.inc
index bb452f2b..cc53bcfa 100644
--- a/includes/db/connect_db_mysqli.inc
+++ b/includes/db/connect_db_mysqli.inc
@@ -9,18 +9,20 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-define('SQL_MODE', 'STRICT_ALL_TABLES,NO_ZERO_IN_DATE');
+define('DB_DUPLICATE_ERROR', 1062);
+define('SQL_MODE', ''); // STRICT_ALL_TABLES,NO_ZERO_IN_DATE ?
+
+$db_last_inserted_id = 0;
 
 function set_global_connection($company=-1)
 {
-	global $db, $transaction_level, $path_to_root, $db_connections;
+	global $db, $path_to_root, $db_connections;
 
 	include ($path_to_root . "/config_db.php");
 	if ($company == -1) 
 		$company = $_SESSION["wa_current_user"]->company;
 
-	cancel_transaction(); // cancel all aborted transactions if any
-	$transaction_level = 0;
+	cancel_transaction(); // cancel all aborted transactions (if any)
 
 	$_SESSION["wa_current_user"]->cur_con = $company;
 
@@ -33,27 +35,23 @@ function set_global_connection($company=-1)
 	///// This non empty sql_mode values can interphere with FA, so all is set empty during
 	///// our sessions.
 	///// We are, however, investigating the existing code to be compatible in the future.
-//	if (strncmp(db_get_version(), "5.6", 3) >= 0) 
 		db_query("SET sql_mode = '".SQL_MODE."'");
 	/////
 	return $db;
 }
 
-$db_duplicate_error_code = 1062;
-
 //DB wrapper functions to change only once for whole application
 
 function db_query($sql, $err_msg=null)
 {
-	global $db, $show_sql, $sql_trail, $select_trail, $go_debug, $sql_queries, $Ajax,
-		$db_connections, $db_last_inserted_id;
-	
+	global $db, $SysPrefs, $sql_queries, $Ajax,	$db_connections, $db_last_inserted_id;
+
 	// set current db prefix
 	$comp = isset($_SESSION["wa_current_user"]->cur_con) ? $_SESSION["wa_current_user"]->cur_con : 0;
 	$cur_prefix = $db_connections[$comp]['tbpref'];
 	$sql = str_replace(TB_PREF, $cur_prefix, $sql);
 
-	if ($show_sql)
+	if ($SysPrefs->show_sql)
 	{
 		$Ajax->activate('footer_debug');
 		$sql_queries .= "<pre>$sql</pre>\n<hr>";
@@ -65,9 +63,9 @@ function db_query($sql, $err_msg=null)
 
 	db_profile($sql);
 
-	if($sql_trail) {
+	if($SysPrefs->sql_trail) {
 		$db_last_inserted_id = mysqli_insert_id($db);	// preserve in case trail insert is done
-		if ($select_trail || (strstr($sql, 'SELECT') === false)) {
+		if ($SysPrefs->select_trail || (strstr($sql, 'SELECT') === false)) {
 			mysqli_query($db, "INSERT INTO ".$cur_prefix."sql_trail
 				(`sql`, `result`, `msg`)
 				VALUES(".db_escape($sql).",".($result ? 1 : 0).",
@@ -75,7 +73,7 @@ function db_query($sql, $err_msg=null)
 		}
 	}
 
-	if ($err_msg != null || $go_debug) {
+	if ($err_msg != null || $SysPrefs->go_debug) {
 		$exit = $err_msg != null;
 		if (function_exists('xdebug_call_file'))
 			check_db_error('<br>At file '.xdebug_call_file().':'.xdebug_call_line().':<br>'.$err_msg, $sql, $exit);
@@ -164,9 +162,9 @@ function db_error_msg($conn)
 
 function db_insert_id()
 {
-	global $db_last_inserted_id, $sql_trail, $db;
+	global $db_last_inserted_id, $SysPrefs, $db;
 
-	return $sql_trail ? $db_last_inserted_id : mysqli_insert_id($db);
+	return $SysPrefs->sql_trail ? $db_last_inserted_id : mysqli_insert_id($db);
 }
 
 function db_num_affected_rows()
diff --git a/includes/db/sql_functions.inc b/includes/db/sql_functions.inc
index aead5d37..66a781d2 100644
--- a/includes/db/sql_functions.inc
+++ b/includes/db/sql_functions.inc
@@ -15,10 +15,11 @@
 //-------------------------------------------------------------------
 // Multilevel transaction control.
 //
+$transaction_level = 0;
 
 function begin_transaction()
 {
-	global $transaction_level; // set in set_global_connection()
+	global $transaction_level;
 
 	if (!$transaction_level) {
 		db_query("BEGIN", "could not start a transaction");
@@ -48,6 +49,7 @@ function cancel_transaction()
 	if ($transaction_level) {
 		db_query("ROLLBACK", "could not cancel a transaction");	
 	}
+	$transaction_level = 0;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/includes/db_pager.inc b/includes/db_pager.inc
index 51dfcccc..f9089e9e 100644
--- a/includes/db_pager.inc
+++ b/includes/db_pager.inc
@@ -77,6 +77,8 @@ class db_pager {
 	//
 	function set_sql($sql)
 	{
+		global $SysPrefs;
+
 		if ($sql != $this->sql) {
 		    $this->sql = $sql;
 		    $this->ready = false;
@@ -94,7 +96,7 @@ class db_pager {
 						$this->select = $parts[0];
 						$sql = $parts[1];
 					} else {
-						if ($go_debug)
+						if ($SysPrefs->go_debug)
 							display_error("Invalid sql input for db_pager");
 					}
 
@@ -346,7 +348,7 @@ class db_pager {
 	//
 	function _init() 
 	{
-		global $go_debug;
+		global $SysPrefs;
 		
 	    if ($this->ready == false ) {
 			$sql = $this->_sql_gen(true);
@@ -358,7 +360,7 @@ class db_pager {
 	  		$this->max_page = $this->page_len ?
 				ceil($this->rec_count/$this->page_len) : 0;
 		
-			if ($go_debug) { // FIX - need column name parsing, but for now:
+			if ($SysPrefs->go_debug) { // FIX - need column name parsing, but for now:
 				// check if field names are set explicite in col def
 				// for all initially ordered columns
 			    foreach ($this->columns as $col) {
diff --git a/includes/errors.inc b/includes/errors.inc
index 781e2232..7c911fce 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -56,7 +56,7 @@ function get_backtrace($html = false, $skip=0)
 //    display in message box.
 
 function error_handler($errno, $errstr, $file, $line) {
-    global $messages, $go_debug, $SysPrefs;
+    global $messages, $SysPrefs;
 
 	// skip well known warnings we don't care about.
 	// Please use restrainedly to not risk loss of important messages
@@ -71,7 +71,7 @@ function error_handler($errno, $errstr, $file, $line) {
 		}
 	}
 
-	$bt = $go_debug>1 ? get_backtrace(true, 1) : array();
+	$bt = $SysPrefs->go_debug>1 ? get_backtrace(true, 1) : array();
 
 	// error_reporting==0 when messages are set off with @ 
 	if ($errno & error_reporting()) {
@@ -91,7 +91,7 @@ function error_handler($errno, $errstr, $file, $line) {
 //	Formats system messages before insert them into message <div>
 // FIX center is unused now
 function fmt_errors($center=false) {
-    global $messages, $path_to_root, $go_debug;
+    global $messages, $path_to_root, $SysPrefs;
 
   $msg_class = array(
   	E_USER_ERROR => 'err_msg',
@@ -103,7 +103,7 @@ function fmt_errors($center=false) {
 //  $class = 'no_msg';
   if (count($messages)) {
 	foreach($messages as $cnt=>$msg) {
-		if ($go_debug && $msg[0]>E_USER_NOTICE)
+		if ($SysPrefs->go_debug && $msg[0]>E_USER_NOTICE)
 		 	$msg[0] = E_ERROR;
 
 		if ($msg[0]>$type) continue;
@@ -123,7 +123,7 @@ function fmt_errors($center=false) {
 		if (!in_array($msg[0], array(E_USER_NOTICE, E_USER_ERROR, E_USER_WARNING)) && $msg[2] != null)
 		  $str .= ' '._('in file').': '.$msg[2].' '._('at line ').$msg[3];
 
-		if ($go_debug>1 && $type!=E_USER_NOTICE && $type!=E_USER_WARNING)
+		if ($SysPrefs->go_debug>1 && $type!=E_USER_NOTICE && $type!=E_USER_WARNING)
 		  $str .= '<br>'.$msg[4];
 		$content .= ($cnt ? '<hr>' : '').$str;
 	}
@@ -168,7 +168,7 @@ function end_flush() {
 
 function display_db_error($msg, $sql_statement=null, $exit=true)
 {
-	global $db, $debug, $go_debug, $db_connections;
+	global $db, $SysPrefs, $db_connections;
 
 	$warning = $msg==null;
 	$db_error = db_error_no();
@@ -185,16 +185,16 @@ function display_db_error($msg, $sql_statement=null, $exit=true)
 		$str .= "error message : " . db_error_msg($db) . "<br>";
 	}
 	
-	if ($debug == 1) 
+	if ($SysPrefs->debug == 1) 
 	{
 		$cur_prefix = $db_connections[$_SESSION["wa_current_user"]->cur_con]['tbpref'];
 
 		$str .= "sql that failed was : ".str_replace(TB_PREF, $cur_prefix, $sql_statement)."<br>";
-//		if ($go_debug > 1) display_backtrace();
+//		if ($SysPrefs->go_debug > 1) display_backtrace();
 	}
 	
 	$str .= "<br><br>";
-	if (!$go_debug)
+	if (!$SysPrefs->go_debug)
 		error_log($str);
 	else {
 		if($msg)
@@ -208,10 +208,8 @@ function display_db_error($msg, $sql_statement=null, $exit=true)
 
 function frindly_db_error($db_error)
 {
-	global $db_duplicate_error_code;
-	
-	if ($db_error == $db_duplicate_error_code) 
-	{	
+	if ($db_error == DB_DUPLICATE_ERROR) 
+	{
 		display_error(_("The entered information is a duplicate. Please go back and enter different values."));
 		return true;
 	}
@@ -221,13 +219,13 @@ function frindly_db_error($db_error)
 
 function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_error=true)
 {
-	global $db, $go_debug;
+	global $db, $SysPrefs;
 	$db_error = db_error_no();
 	
 	if ($db_error != 0) 
 	{
 		
-		if ($go_debug || !frindly_db_error($db_error)) {
+		if ($SysPrefs->go_debug || !frindly_db_error($db_error)) {
 				display_db_error($msg, $sql_statement, false);
 		}
 		
@@ -241,6 +239,6 @@ function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_
 			end_page(); exit;
 		}
 	}
-	return $db_error;		
+	return $db_error;
 }
 
diff --git a/includes/main.inc b/includes/main.inc
index 6ac3fc14..11746a28 100644
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -23,6 +23,12 @@ include_once($path_to_root . "/includes/ui/ui_view.inc");
 include_once($path_to_root . "/includes/ui/ui_controls.inc");
 
 $page_nested = -1;
+// static js files path
+$js_path = $path_to_root.'/js/';
+// standard external js scripts included in all files
+$js_static = array('JsHttpRequest.js', 'behaviour.js', 'utils.js', 'inserts.js');
+// additional js source included in header
+$js_lib = $js_userlib = array();
 
 function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $script_only=false, $css='')
 {
@@ -64,9 +70,9 @@ function end_page($no_menu=false, $is_index=false, $final_screen=false, $type_no
 
 function cache_js_file($fpath, $text) 
 {
-	global $go_debug;
+	global $SysPrefs;
 
-	if(!$go_debug) $text = js_compress($text);
+	if (!$SysPrefs->go_debug) $text = js_compress($text);
 
     $file = force_open($fpath);
 	if (!$file) return false;
@@ -117,7 +123,7 @@ function add_js_ufile($filename)
 function add_js_source($text) 
 {
 	  global $js_lib;
-	  
+
 	  $search = array_search($text, $js_lib);
 	  if ($search === false || $search === null) // php>4.2.0 returns null
 		$js_lib[] = $text;
diff --git a/includes/page/header.inc b/includes/page/header.inc
index c7df5241..880c03f4 100644
--- a/includes/page/header.inc
+++ b/includes/page/header.inc
@@ -15,7 +15,7 @@
 function help_url($context=null)
 {
 
-	global $help_base_url, $help_context, $old_style_help;
+	global $SysPrefs, $help_context;
 
 	$country = $_SESSION['language']->code;
 	$clean = 0;
@@ -34,20 +34,20 @@ function help_url($context=null)
 		$clean = 1;
 	}
 
-	if (@$old_style_help)
+	if (@$SysPrefs->old_style_help)
 		$help_page_url = _($help_page_url);
 
 	if ($clean)
 		$help_page_url = access_string($help_page_url, true);
 
-	return $help_base_url
+	return $SysPrefs->help_base_url
 		.urlencode(strtr(ucwords($help_page_url), array(' '=>'', '/'=>'', '&'=>'And')))
 		.'&ctxhelp=1&lang='.$country;
 }
 
 function send_scripts()
 {
-    global $js_static, $js_path, $js_userlib, $path_to_root, $go_debug;
+    global $SysPrefs, $path_to_root, $js_static, $js_path, $js_userlib;
 
 	$js ='';
 	foreach($js_static as $jsfile)
@@ -55,7 +55,7 @@ function send_scripts()
 		$cached_name = basename($jsfile);
 		$fpath = user_js_cache().'/'.$cached_name;
 	    // compress also static files
-	  	if (!file_exists($fpath) || $go_debug)
+	  	if (!file_exists($fpath) || $SysPrefs->go_debug)
 			cache_js_file($fpath, file_get_contents($js_path.$jsfile));
 
 	  	$js .= '<script language="javascript" type="text/javascript" src="'.
@@ -73,7 +73,7 @@ function send_scripts()
 function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="", $css='')
 {
 	// titles and screen header
-	global $path_to_root, $def_app, $use_popup_windows, $help_base_url, $db_connections;
+	global $path_to_root, $SysPrefs, $db_connections;
 
 	if (in_ajax())
 		return; // just for speed up
@@ -85,7 +85,7 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
 
 	$theme = user_theme();
 
-	if ($help_base_url != null && $use_popup_windows && $js == '')
+	if ($SysPrefs->help_base_url != null && $SysPrefs->SysPrefs->use_popup_windows && $js == '')
 	{
 		if (!function_exists('get_js_open_window'))
 		{
diff --git a/includes/prefs/sysprefs.inc b/includes/prefs/sysprefs.inc
index 5639f043..bf685768 100644
--- a/includes/prefs/sysprefs.inc
+++ b/includes/prefs/sysprefs.inc
@@ -18,15 +18,29 @@ class sys_prefs
 
 	function sys_prefs()
 	{
-//		$this->prefs = get_company_prefs();
-	
+		global $path_to_root;
+
+		include $path_to_root.'/config.default.php';
+		include $path_to_root.'/config.php';
+
+		// set system wide preferences
+		foreach(get_defined_vars() as $name => $value)
+			$this->$name = $value;
+
+		if (!@$this->time_zone)
+			$this->time_zone = ini_get('date.timezone');
+
+		if (!$this->time_zone)
+			$this->time_zone = 'Europe/Berlin';
+
+   	    ini_set('date.timezone', $this->time_zone);
 	}
-	
+
 	function allow_negative_stock() 
 	{
 		return $this->prefs['allow_negative_stock'];
 	}
-	
+
     /* Sherifoz 26.06.03 Proportion by which items can be received over the quantity that is specified in a purchase
     invoice
     The figure entered is interpreted as a percentage ie 10 means 0.1 or 10% not 10 times
@@ -83,8 +97,7 @@ class sys_prefs
 	
 	function allocation_settled_allowance()
 	{
-		global $config_allocation_settled_allowance;
-		return $config_allocation_settled_allowance;
+		return $this->config_allocation_settled_allowance;
 	}
 
 	function no_zero_lines_amount() 
diff --git a/includes/prefs/userprefs.inc b/includes/prefs/userprefs.inc
index dcbc9fcd..060f764f 100644
--- a/includes/prefs/userprefs.inc
+++ b/includes/prefs/userprefs.inc
@@ -45,10 +45,10 @@ class user_prefs
 	{
 		if ($user == null) { 
 			// set default values, used before login
-			global $dflt_lang, $dflt_date_sep, $dflt_date_fmt;
-			
-			$this->date_sep = $dflt_date_sep;
-			$this->date_format = $dflt_date_fmt;
+			global $dflt_lang, $SysPrefs;
+
+			$this->date_sep = $SysPrefs->dflt_date_sep;
+			$this->date_format = $SysPrefs->dflt_date_fmt;
 			$this->tho_sep = 0;
 			$this->dec_sep = 0;
 			$this->price_dec = 2;
@@ -180,8 +180,8 @@ class user_prefs
 
 	function date_display() 
 	{
-		global $dateseps;
-		$sep = $dateseps[$this->date_sep];
+		global $SysPrefs;
+		$sep = $SysPrefs->dateseps[$this->date_sep];
 		if ($this->date_format == 0)
 			return "m".$sep."d".$sep."Y";
 		elseif ($this->date_format == 1)
diff --git a/includes/session.inc b/includes/session.inc
index 15d21d84..b5cb1e2e 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -175,11 +175,11 @@ function password_reset_success()
 
 function check_faillog()
 {
-	global $login_delay, $login_faillog, $login_max_attempts;
+	global $SysPrefs, $login_faillog;
 
 	$user = $_SESSION["wa_current_user"]->user;
 
-	if (@$login_delay && (@$login_faillog[$user][$_SERVER['REMOTE_ADDR']] >= @$login_max_attempts) && (time() < $login_faillog[$user]['last'] + $login_delay))
+	if (@$SysPrefs->login_delay && (@$login_faillog[$user][$_SERVER['REMOTE_ADDR']] >= @$SysPrefs->login_max_attempts) && (time() < $login_faillog[$user]['last'] + $SysPrefs->login_delay))
 		return true;
 
 	return false;
@@ -190,7 +190,7 @@ function check_faillog()
 */
 function write_login_filelog($login, $result)
 {
-	global $login_faillog, $login_max_attempts, $path_to_root;
+	global $login_faillog, $SysPrefs, $path_to_root;
 
 	$user = $_SESSION["wa_current_user"]->user;
 
@@ -201,7 +201,7 @@ function write_login_filelog($login, $result)
 
  	if (!$result)
 	{
-		if ($login_faillog[$user][$ip] < @$login_max_attempts) {
+		if ($login_faillog[$user][$ip] < @$SysPrefs->login_max_attempts) {
 
  			$login_faillog[$user][$ip]++;
  		} else {
@@ -345,11 +345,11 @@ if (!isset($path_to_root))
 //----------------------------------------------------------------------------------------
 // set to reasonable values if not set in config file (pre-2.3.12 installations)
 
-if ((!isset($login_delay)) || ($login_delay < 0))
-    $login_delay = 10;
+if ((!isset($SysPrefs->login_delay)) || ($SysPrefs->login_delay < 0))
+    $SysPrefs->login_delay = 10;
 
-if ((!isset($login_max_attempts)) || ($login_max_attempts < 0))
-    $login_max_attempts = 3; 
+if ((!isset($SysPrefs->login_max_attempts)) || ($SysPrefs->login_max_attempts < 0))
+    $SysPrefs->login_max_attempts = 3; 
 
 
 // Prevent register_globals vulnerability
@@ -379,6 +379,23 @@ foreach ($installed_extensions as $ext)
 		include_once($path_to_root.'/'.$ext['path'].'/hooks.php');
 }
 
+$_SESSION['SysPrefs'] = new sys_prefs();
+
+$SysPrefs = &$_SESSION['SysPrefs'];
+
+if ($SysPrefs->go_debug > 0)
+	error_reporting(-1);
+else
+	error_reporting(E_USER_WARNING|E_USER_ERROR|E_USER_NOTICE);
+ini_set("display_errors", "On");
+
+if ($SysPrefs->error_logfile != '') {
+	ini_set("error_log", $SysPrefs->error_logfile);
+	ini_set("ignore_repeated_errors", "On");
+	ini_set("log_errors", "On");
+}
+
+
 /*
 	Uncomment the setting below when using FA on shared hosting
 	to avoid unexpeced session timeouts.
@@ -396,10 +413,9 @@ $Session_manager->sessionStart('FA'.md5(dirname(__FILE__)));
 // this is to fix the "back-do-you-want-to-refresh" issue - thanx PHPFreaks
 header("Cache-control: private");
 
-include_once($path_to_root . "/config.php");
 get_text_init();
 
-if ($login_delay > 0)
+if ($SysPrefs->login_delay > 0)
 	@include_once($path_to_root . "/tmp/faillog.php");
 
 // Page Initialisation
@@ -456,7 +472,7 @@ if (!defined('FA_LOGOUT_PHP_FILE')){
 
 	if (!$_SESSION["wa_current_user"]->logged_in())
 	{
-      if (@$allow_password_reset && !$allow_demo_mode
+      if (@$SysPrefs->allow_password_reset && !$SysPrefs->allow_demo_mode
         && (isset($_GET['reset']) || isset($_POST['email_entry_field']))) {
 		  if (!isset($_POST["email_entry_field"])) {
         include($path_to_root . "/access/password_reset.php");
@@ -539,7 +555,6 @@ if (!defined('FA_LOGOUT_PHP_FILE')){
 	}
 }
 
-$SysPrefs = &$_SESSION['SysPrefs'];
 
 // POST vars cleanup needed for direct reuse.
 // We quote all values later with db_escape() before db update.
diff --git a/includes/system_tests.inc b/includes/system_tests.inc
index dca83e51..883ee038 100644
--- a/includes/system_tests.inc
+++ b/includes/system_tests.inc
@@ -120,10 +120,10 @@ function tst_gettext()
 
 function tst_debug() 
 {
-	global $go_debug;
+	global $SysPrefs;
 	$test['descr'] = _('Debugging mode');
 	$test['type'] = 0;
-	$test['test'] = $go_debug ? _("Yes") : _("No");
+	$test['test'] = $SysPrefs->go_debug ? _("Yes") : _("No");
 	$test['result'] = $go_debug != 0;
 	$test['comments'] = _('To switch debugging on set $go_debug>0 in config.php file');
 
@@ -132,8 +132,9 @@ function tst_debug()
 
 function tst_logging() 
 {
-	global $error_logfile;
+	global $SysPrefs;
 	
+	$error_logfile = $SysPrefs->error_logfile;
 	$test['descr'] = _('Error logging');
 	$test['type'] = 2;
 	// if error lgging is on, but log file does not exists try write
diff --git a/includes/types.inc b/includes/types.inc
index 65805a90..2c233be6 100644
--- a/includes/types.inc
+++ b/includes/types.inc
@@ -186,8 +186,9 @@ define('CL_EXPENSE', 6);
 
 function get_class_type_convert($ctype)
 {
-	global $use_oldstyle_convert;
-	if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+	global $SysPrefs;
+
+	if (isset($SysPrefs->use_oldstyle_convert) && $SysPrefs->use_oldstyle_convert == 1)
 		return (($ctype >= CL_INCOME || $ctype == CL_NONE) ? -1 : 1);
 	else	
 		return ((($ctype >= CL_LIABILITIES && $ctype <= CL_INCOME) || $ctype == CL_NONE) ? -1 : 1);
diff --git a/includes/ui/db_pager_view.inc b/includes/ui/db_pager_view.inc
index 717df95f..96609dc3 100644
--- a/includes/ui/db_pager_view.inc
+++ b/includes/ui/db_pager_view.inc
@@ -40,7 +40,7 @@ function navi_button_cell($name, $value, $enabled=true, $align='left') {
 //    Sql paged table view. Call this function inside form.
 //
 function display_db_pager(&$pager) {
-    global	$use_popup_windows, $path_to_root;
+    global	$path_to_root;
 
 	$pager->select_records();
 
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 68964662..f604f69a 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -13,13 +13,11 @@ include_once($path_to_root . "/includes/banking.inc");
 include_once($path_to_root . "/includes/types.inc");
 include_once($path_to_root . "/includes/current_user.inc");
 
-$_search_button = "<input %s type='submit' class='combo_submit' style='border:0;background:url($path_to_root/themes/"
-	."%s/images/locate.png) no-repeat;%s' aspect='fallback' name='%s' value=' ' title='"._("Set filter")."'> ";
+define('SEARCH_BUTTON', "<input %s type='submit' class='combo_submit' style='border:0;background:url($path_to_root/themes/"
+	."%s/images/locate.png) no-repeat;%s' aspect='fallback' name='%s' value=' ' title='"._("Set filter")."'> ");
 
-$_select_button = "<input %s type='submit' class='combo_select' style='border:0;background:url($path_to_root/themes/"
-	."%s/images/button_ok.png) no-repeat;%s' aspect='fallback' name='%s' value=' ' title='"._("Select")."'> ";
-
-$all_items = ALL_TEXT;
+define('SELECT_BUTTON', "<input %s type='submit' class='combo_select' style='border:0;background:url($path_to_root/themes/"
+	."%s/images/button_ok.png) no-repeat;%s' aspect='fallback' name='%s' value=' ' title='"._("Select")."'> ");
 
 //----------------------------------------------------------------------------
 //	Universal sql combo generator
@@ -266,9 +264,8 @@ $opts = array(		// default options
 
 	 // if selectable or editable list is used - add select button
 	if ($select_submit != false || $search_button) {
-		global $_select_button;
 	// button class selects form reload/ajax selector update
-		$selector .= sprintf($_select_button, $disabled, user_theme(),
+		$selector .= sprintf(SELECT_BUTTON, $disabled, user_theme(),
 			(fallback_mode() ? '' : 'display:none;'),
 			 '_'.$name.'_update')."\n";
 	}
@@ -282,8 +279,7 @@ $opts = array(		// default options
 			.(!fallback_mode() && !$by_id ? " style=display:none;":'')
 			.">\n";
 		if ($search_submit != false || $opts['editable']) {
-			global $_search_button;
-			$edit_entry .= sprintf($_search_button, $disabled, user_theme(),
+			$edit_entry .= sprintf(SEARCH_BUTTON, $disabled, user_theme(),
 				(fallback_mode() ? '' : 'display:none;'),
 				$search_submit ? $search_submit : "_{$name}_button")."\n";
 		}
@@ -394,8 +390,7 @@ $opts = array(		// default options
 	$selector = "<span id='_{$name}_sel'>".$selector."</span>\n";
 
 	if ($select_submit != false) { // if submit on change is used - add select button
-		global $_select_button;
-		$selector .= sprintf($_select_button, $disabled, user_theme(),
+		$selector .= sprintf(SELECT_BUTTON, $disabled, user_theme(),
 			(fallback_mode() ? '' : 'display:none;'),
 			 '_'.$name.'_update')."\n";
 	}
@@ -419,9 +414,9 @@ function _format_add_curr($row)
 
 function add_edit_combo($type)
 {
-	global $path_to_root, $popup_editors, $use_icon_for_editkey;
+	global $path_to_root, $popup_editors, $SysPrefs;
 
-	if (!isset($use_icon_for_editkey) || $use_icon_for_editkey==0)
+	if (!isset($SysPrefs->use_icon_for_editkey) || $SysPrefs->use_icon_for_editkey==0)
 		return "";
 	// Derive theme path
 	$theme_path = $path_to_root . '/themes/' . user_theme();
@@ -435,7 +430,6 @@ function add_edit_combo($type)
 function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
 	$all=false, $editkey = false)
 {
-	global $all_items;
 
 	$sql = "SELECT supplier_id, supp_ref, curr_code, inactive FROM ".TB_PREF."suppliers ";
 
@@ -452,7 +446,7 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_
 		'type' => 1,
         'search' => array("supp_ref","supp_name","gst_no"),        
 		'spec_option' => $spec_option === true ? _("All Suppliers") : $spec_option,
-		'spec_id' => $all_items,
+		'spec_id' => ALL_TEXT,
 		'select_submit'=> $submit_on_change,
 		'async' => false,
 		'sel_hint' => $mode ? _('Press Space tab to filter by name fragment') :
@@ -487,7 +481,6 @@ function supplier_list_row($label, $name, $selected_id=null, $all_option = false
 function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false, 
 	$show_inactive=false, $editkey = false)
 {
-	global $all_items;
 
 	$sql = "SELECT debtor_no, debtor_ref, curr_code, inactive FROM ".TB_PREF."debtors_master ";
 
@@ -505,7 +498,7 @@ function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_
 		'size' => 20,
         'search' => array("debtor_ref","name","tax_id"),        
 		'spec_option' => $spec_option === true ? _("All Customers") : $spec_option,
-		'spec_id' => $all_items,
+		'spec_id' => ALL_TEXT,
 		'select_submit'=> $submit_on_change,
 		'async' => false,
 		'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F2 - entry new customer') :
@@ -543,7 +536,6 @@ function customer_list_row($label, $name, $selected_id=null, $all_option = false
 function customer_branches_list($customer_id, $name, $selected_id=null,
 	$spec_option = true, $enabled=true, $submit_on_change=false, $editkey = false)
 {
-	global $all_items;
 
 	$sql = "SELECT branch_code, branch_ref FROM ".TB_PREF."cust_branch
 		WHERE debtor_no=" . db_escape($customer_id)." ";
@@ -557,7 +549,7 @@ function customer_branches_list($customer_id, $name, $selected_id=null,
 		'where' => $where,
 		'order' => array('branch_ref'),
 		'spec_option' => $spec_option === true ? _('All branches') : $spec_option,
-		'spec_id' => $all_items,
+		'spec_id' => ALL_TEXT,
 		'select_submit'=> $submit_on_change,
 		'sel_hint' => _('Select customer branch')
 	) );
@@ -593,14 +585,13 @@ function customer_branches_list_row($label, $customer_id, $name, $selected_id=nu
 
 function locations_list($name, $selected_id=null, $all_option=false, $submit_on_change=false)
 {
-	global $all_items;
 
 	$sql = "SELECT loc_code, location_name, inactive FROM ".TB_PREF."locations";
 
 return combo_input($name, $selected_id, $sql, 'loc_code', 'location_name',
 	array(
 		'spec_option' => $all_option === true ? _("All Locations") : $all_option,
-		'spec_id' => $all_items,
+		'spec_id' => ALL_TEXT,
 		'select_submit'=> $submit_on_change
 	) );
 }
@@ -739,7 +730,6 @@ function dimensions_list_row($label, $name, $selected_id=null, $no_option=false,
 function stock_items_list($name, $selected_id=null, $all_option=false, 
 	$submit_on_change=false, $opts=array(), $editkey = false)
 {
-	global $all_items;
 
 	$sql = "SELECT stock_id, s.description, c.description, s.inactive, s.editable
 			FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE s.category_id=c.category_id";
@@ -752,7 +742,7 @@ function stock_items_list($name, $selected_id=null, $all_option=false,
 	  array(
 		'format' => '_format_stock_items',
 		'spec_option' => $all_option===true ?  _("All Items") : $all_option,
-		'spec_id' => $all_items,
+		'spec_id' => ALL_TEXT,
 		'search_box' => true,
 		'search' => array("stock_id", "c.description","s.description"),
 		'search_submit' => get_company_pref('no_item_list')!=0,
@@ -794,7 +784,6 @@ function stock_items_list_row($label, $name, $selected_id=null, $all_option=fals
 function sales_items_list($name, $selected_id=null, $all_option=false, 
 	$submit_on_change=false, $type='', $opts=array())
 {
-	global $all_items;
 	// all sales codes
 	$sql = "SELECT i.item_code, i.description, c.description, count(*)>1 as kit,
 			 i.inactive, if(count(*)>1, '0', s.editable) as editable
@@ -820,7 +809,7 @@ function sales_items_list($name, $selected_id=null, $all_option=false,
 	  array(
 		'format' => '_format_stock_items',
 		'spec_option' => $all_option===true ?  _("All Items") : $all_option,
-		'spec_id' => $all_items,
+		'spec_id' => ALL_TEXT,
 		'search_box' => true,
 		'search' => array("i.item_code", "c.description", "i.description"),
 		'search_submit' => get_company_pref('no_item_list')!=0,
@@ -1382,14 +1371,13 @@ function bank_reconciliation_list_row($label, $account, $name, $selected_id=null
 
 function workcenter_list($name, $selected_id=null, $all_option=false)
 {
-	global $all_items;
 
 	$sql = "SELECT id, name, inactive FROM ".TB_PREF."workcentres";
 
 	return combo_input($name, $selected_id, $sql, 'id', 'name',
 	array(
 		'spec_option' =>$all_option===true ? _("All Suppliers") : $all_option,
-		'spec_id' => $all_items,
+		'spec_id' => ALL_TEXT,
 	) );
 }
 
@@ -1446,7 +1434,6 @@ function bank_accounts_list_row($label, $name, $selected_id=null, $submit_on_cha
 
 function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false, $all_option=false)
 {
-	global $all_items;
 
 	$sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code, inactive
 		FROM ".TB_PREF."bank_accounts
@@ -1458,7 +1445,7 @@ function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_cha
 	echo combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
 	array(
 		'spec_option' => $all_option,
-		'spec_id' => $all_items,
+		'spec_id' => ALL_TEXT,
 		'format' => '_format_add_curr',
 		'select_submit'=> $submit_on_change,
 		'async' => true
@@ -1583,7 +1570,6 @@ function stock_categories_list_row($label, $name, $selected_id=null, $spec_opt=f
 
 function gl_account_types_list($name, $selected_id=null, $all_option=false, $all=true)
 {
-	global $all_items;
 
 	$sql = "SELECT id, name FROM ".TB_PREF."chart_types";
 
@@ -1592,7 +1578,7 @@ function gl_account_types_list($name, $selected_id=null, $all_option=false, $all
 		'format' => '_format_account',
 		'order' => array('class_id', 'id', 'parent'),
 		'spec_option' =>$all_option,
-		'spec_id' => $all_items
+		'spec_id' => ALL_TEXT
 	) );
 }
 
@@ -1810,37 +1796,37 @@ function wo_types_list_row($label, $name, $selected_id=null)
 
 function dateformats_list_row($label, $name, $value=null)
 {
-	global $dateformats;
+	global $SysPrefs;
 
 	echo "<tr><td class='label'>$label</td>\n<td>";
-	echo array_selector( $name, $value, $dateformats );
+	echo array_selector( $name, $value, $SysPrefs->dateformats );
 	echo "</td></tr>\n";
 }
 
 function dateseps_list_row($label, $name, $value=null)
 {
-	global $dateseps;
+	global $SysPrefs;
 
 	echo "<tr><td class='label'>$label</td>\n<td>";
-	echo array_selector( $name, $value, $dateseps );
+	echo array_selector( $name, $value, $SysPrefs->dateseps );
 	echo "</td></tr>\n";
 }
 
 function thoseps_list_row($label, $name, $value=null)
 {
-	global $thoseps;
+	global $SysPrefs;
 
 	echo "<tr><td class='label'>$label</td>\n<td>";
-	echo array_selector( $name, $value, $thoseps );
+	echo array_selector( $name, $value, $SysPrefs->thoseps );
 	echo "</td></tr>\n";
 }
 
 function decseps_list_row($label, $name, $value=null)
 {
-	global $decseps;
+	global $SysPrefs;
 
 	echo "<tr><td class='label'>$label</td>\n<td>";
-	echo array_selector( $name, $value, $decseps );
+	echo array_selector( $name, $value, $SysPrefs->decseps );
 	echo "</td></tr>\n";
 }
 
@@ -1867,10 +1853,10 @@ function themes_list_row($label, $name, $value=null)
 
 function pagesizes_list_row($label, $name, $value=null)
 {
-	global $pagesizes;
+	global $SysPrefs;
 
 	$items = array();
-	foreach ($pagesizes as $pz)
+	foreach ($SysPrefs->pagesizes as $pz)
 		$items[$pz] = $pz;
 
 	echo "<tr><td class='label'>$label</td>\n<td>";
@@ -1937,13 +1923,12 @@ function journal_types_list_cells($label, $name, $value=null, $submit_on_change=
 
 function cust_allocations_list_cells($label, $name, $selected=null)
 {
-	global $all_items;
 
 	if ($label != null)
 		label_cell($label);
 	echo "<td>\n";
 	$allocs = array( 
-		$all_items=>_("All Types"),
+		ALL_TEXT=>_("All Types"),
 		'1'=> _("Sales Invoices"),
 		'2'=> _("Overdue Invoices"),
 		'3' => _("Payments"),
@@ -1956,11 +1941,10 @@ function cust_allocations_list_cells($label, $name, $selected=null)
 
 function supp_allocations_list_cell($name, $selected=null)
 {
-	global $all_items;
 
 	echo "<td>\n";
 	$allocs = array( 
-		$all_items=>_("All Types"),
+		ALL_TEXT=>_("All Types"),
 		'1'=> _("Invoices"),
 		'2'=> _("Overdue Invoices"),
 		'3' => _("Payments"),
@@ -1973,11 +1957,10 @@ function supp_allocations_list_cell($name, $selected=null)
 
 function supp_transactions_list_cell($name, $selected=null)
 {
-	global $all_items;
 
 	echo "<td>\n";
 	$allocs = array( 
-		$all_items=>_("All Types"),
+		ALL_TEXT=>_("All Types"),
 		'6'=>_("GRNs"),
 		'1'=> _("Invoices"),
 		'2'=> _("Overdue Invoices"),
@@ -2179,7 +2162,6 @@ function class_types_list_row($label, $name, $selected_id=null, $submit_on_chang
 function security_roles_list($name, $selected_id=null, $new_item=false, $submit_on_change=false,
 	$show_inactive = false)
 {
-	global $all_items;
 
 	$sql = "SELECT id, role, inactive FROM ".TB_PREF."security_roles";
 
@@ -2407,7 +2389,6 @@ function tax_algorithm_list_row($label, $name, $value=null, $submit_on_change=fa
 
 function subledger_list($name, $account, $selected_id=null)
 {
-	global $all_items;
 
 	$type = is_subledger_account($account);
 	if (!$type)
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 0b4f3113..8fee0ae0 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -272,7 +272,7 @@ function check_ui_refresh($name=null)
 //
 function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit=false)
 {
-    global $Ajax, $xr_provider_authoritative;
+    global $Ajax, $SysPrefs;
 
 	$readonly = false;
 
@@ -299,7 +299,7 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit
  					$rate = retrieve_exrate($currency, $date_);
 					if (!$rate)
 						display_warning(sprintf(_("Cannot retrieve exchange rate for currency %s. Please adjust approximate rate if needed."), $currency));
-					elseif ($xr_provider_authoritative) {
+					elseif ($SysPrefs->xr_provider_authoritative) {
 						// if the remote exrate is considered authoritative we can store the rate here,
 						// otherwise exrate will be stored during transaction write
 						$readonly = true;
@@ -424,6 +424,7 @@ function display_debit_or_credit_cells($value, $bold=false)
 function display_customer_trans_tax_details($tax_items, $columns)
 {
 	global $SysPrefs;
+
 	$first = true;
     while ($tax_item = db_fetch($tax_items))
     {
@@ -888,13 +889,14 @@ function reset_focus()
 
 function get_js_date_picker()
 {
-    global $go_debug;
-    $fpath = user_js_cache().'/'.'date_picker.js';
+    global $SysPrefs, $tmonths;
 
-    if (!file_exists($fpath) || $go_debug) {
+    $fpath = user_js_cache().'/'.'date_picker.js';
 
-	global $dateseps, $date_system, $tmonths;
+    if (!file_exists($fpath) || $SysPrefs->go_debug) {
 
+	$date_system = $SysPrefs->date_system;
+	$dateseps = $SysPrefs->dateseps;
 	$how = user_date_format();				// 0 = us/ca, 1 = eu, au, nz, 2 = jp, sw
 	$sep = $dateseps[user_date_sep()];		// date separator
 	$wstart = (($date_system == 1 || $date_system == 2 || $date_system == 3) ? 6 : ($how == 0 || $how == 3 ? 0 : 1));	// weekstart (sun = 0, mon = 1)
diff --git a/inventory/adjustments.php b/inventory/adjustments.php
index 8fde4077..0b47fa49 100644
--- a/inventory/adjustments.php
+++ b/inventory/adjustments.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/inventory/includes/item_adjustments_ui.inc");
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/inventory/cost_update.php b/inventory/cost_update.php
index 8abab671..4fcb852d 100644
--- a/inventory/cost_update.php
+++ b/inventory/cost_update.php
@@ -24,7 +24,7 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 page(_($help_context = "Inventory Item Cost Update"), false, false, "", $js);
 
diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php
index 892b6c64..c368d223 100644
--- a/inventory/inquiry/stock_movements.php
+++ b/inventory/inquiry/stock_movements.php
@@ -19,7 +19,7 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 include_once($path_to_root . "/includes/ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index 08a2d9a6..0b069ea3 100644
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -14,7 +14,7 @@ $path_to_root = "../..";
 include($path_to_root . "/includes/session.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
@@ -81,9 +81,9 @@ if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
 		display_warning(_('Only graphics files are supported - a file extension of .jpg, .png or .gif is expected'));
 		$upload_file ='No';
 	} 
-	elseif ( $_FILES['pic']['size'] > ($max_image_size * 1024)) 
+	elseif ( $_FILES['pic']['size'] > ($SysPrefs->max_image_size * 1024)) 
 	{ //File Size Check
-		display_warning(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $max_image_size);
+		display_warning(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $SysPrefs->max_image_size);
 		$upload_file ='No';
 	} 
 	elseif ( $_FILES['pic']['type'] == "text/plain" ) 
@@ -254,9 +254,9 @@ if (isset($_POST['delete']) && strlen($_POST['delete']) > 1)
 	}
 }
 
-function item_settings(&$stock_id) 
+function item_settings(&$stock_id, $new_id) 
 {
-	global $SysPrefs, $path_to_root, $new_item, $pic_height;
+	global $SysPrefs, $path_to_root;
 
 	start_outer_table(TABLESTYLE2);
 
@@ -396,7 +396,7 @@ function item_settings(&$stock_id)
 	 // 31/08/08 - rand() call is necessary here to avoid caching problems. Thanks to Peter D.
 		$stock_img_link .= "<img id='item_img' alt = '[".$_POST['NewStockID'].".jpg".
 			"]' src='".company_path().'/images/'.item_img_name($_POST['NewStockID']).
-			".jpg?nocache=".rand()."'"." height='$pic_height' border='0'>";
+			".jpg?nocache=".rand()."'"." height='".$SysPrefs->pic_height."' border='0'>";
 		$check_remove_image = true;
 	} 
 	else 
@@ -474,7 +474,7 @@ tabbed_content_start('tabs', array(
 	switch (get_post('_tabs_sel')) {
 		default:
 		case 'settings':
-			item_settings($stock_id); 
+			item_settings($stock_id, $new_id); 
 			break;
 		case 'sales_pricing':
 			$_GET['stock_id'] = $stock_id;
diff --git a/inventory/manage/sales_kits.php b/inventory/manage/sales_kits.php
index 1ccc5316..4368bb7a 100644
--- a/inventory/manage/sales_kits.php
+++ b/inventory/manage/sales_kits.php
@@ -141,7 +141,7 @@ if (get_post('update_name')) {
 }
 
 if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
-	update_component($_POST['item_code'], $selected_id);
+	update_component($_POST['item_code'], $selected_id, $selected_kit);
 
 if ($Mode == 'Delete')
 {
diff --git a/inventory/transfers.php b/inventory/transfers.php
index 2dbd00b3..155e1055 100644
--- a/inventory/transfers.php
+++ b/inventory/transfers.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/inventory/includes/stock_transfers_ui.inc");
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php
index b0c8688e..d79fc1dc 100644
--- a/manufacturing/search_work_orders.php
+++ b/manufacturing/search_work_orders.php
@@ -17,7 +17,7 @@ include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 if (isset($_GET['outstanding_only']) && ($_GET['outstanding_only'] == true))
 {
diff --git a/manufacturing/view/wo_costs_view.php b/manufacturing/view/wo_costs_view.php
index 9c63eb6c..ff474a97 100644
--- a/manufacturing/view/wo_costs_view.php
+++ b/manufacturing/view/wo_costs_view.php
@@ -15,7 +15,7 @@ $path_to_root = "../..";
 include_once($path_to_root . "/includes/session.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 page(_($help_context = "View Work Order Costs"), true, false, "", $js);
 
diff --git a/manufacturing/view/wo_issue_view.php b/manufacturing/view/wo_issue_view.php
index c1fb044f..6787dee6 100644
--- a/manufacturing/view/wo_issue_view.php
+++ b/manufacturing/view/wo_issue_view.php
@@ -14,7 +14,7 @@ $path_to_root = "../..";
 include_once($path_to_root . "/includes/session.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 page(_($help_context = "View Work Order Issue"), true, false, "", $js);
 
diff --git a/manufacturing/view/wo_production_view.php b/manufacturing/view/wo_production_view.php
index 95eedab0..0661fd1e 100644
--- a/manufacturing/view/wo_production_view.php
+++ b/manufacturing/view/wo_production_view.php
@@ -15,7 +15,7 @@ $path_to_root = "../..";
 include_once($path_to_root . "/includes/session.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 page(_($help_context = "View Work Order Production"), true, false, "", $js);
 
diff --git a/manufacturing/view/work_order_view.php b/manufacturing/view/work_order_view.php
index 2cd9619d..b298555e 100644
--- a/manufacturing/view/work_order_view.php
+++ b/manufacturing/view/work_order_view.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc");
 include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 page(_($help_context = "View Work Order"), true, false, "", $js);
 
diff --git a/manufacturing/work_order_add_finished.php b/manufacturing/work_order_add_finished.php
index 23d3d192..1d42cbf6 100644
--- a/manufacturing/work_order_add_finished.php
+++ b/manufacturing/work_order_add_finished.php
@@ -22,7 +22,7 @@ include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc");
 include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
@@ -68,9 +68,9 @@ if (strlen($wo_details[0]) == 0)
 
 //--------------------------------------------------------------------------------------------------
 
-function can_process()
+function can_process($wo_details)
 {
-	global $wo_details, $SysPrefs, $Refs;
+	global $SysPrefs, $Refs;
 
 	if (!$Refs->is_valid($_POST['ref']))
 	{
@@ -157,7 +157,7 @@ function can_process()
 
 //--------------------------------------------------------------------------------------------------
 
-if ((isset($_POST['Process']) || isset($_POST['ProcessAndClose'])) && can_process() == true)
+if ((isset($_POST['Process']) || isset($_POST['ProcessAndClose'])) && can_process($wo_details) == true)
 {
 
 	$close_wo = 0;
diff --git a/manufacturing/work_order_costs.php b/manufacturing/work_order_costs.php
index 87c59fe2..32184da9 100644
--- a/manufacturing/work_order_costs.php
+++ b/manufacturing/work_order_costs.php
@@ -22,7 +22,7 @@ include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc");
 include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php
index a1280391..37d761e1 100644
--- a/manufacturing/work_order_entry.php
+++ b/manufacturing/work_order_entry.php
@@ -22,7 +22,7 @@ include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc");
 include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/manufacturing/work_order_issue.php b/manufacturing/work_order_issue.php
index 66bf9fbd..4f7837b4 100644
--- a/manufacturing/work_order_issue.php
+++ b/manufacturing/work_order_issue.php
@@ -23,7 +23,7 @@ include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc");
 include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc");
 include_once($path_to_root . "/manufacturing/includes/work_order_issue_ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/manufacturing/work_order_release.php b/manufacturing/work_order_release.php
index 7e0f54f2..2837f5e9 100644
--- a/manufacturing/work_order_release.php
+++ b/manufacturing/work_order_release.php
@@ -20,7 +20,7 @@ include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc");
 include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/purchasing/allocations/supplier_allocate.php b/purchasing/allocations/supplier_allocate.php
index 80e23557..d26ed61b 100644
--- a/purchasing/allocations/supplier_allocate.php
+++ b/purchasing/allocations/supplier_allocate.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
 //include_once($path_to_root . "/purchasing/includes/ui/supp_alloc_ui.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 
 add_js_file('allocate.js');
diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php
index 907b1e53..d4fef640 100644
--- a/purchasing/allocations/supplier_allocation_main.php
+++ b/purchasing/allocations/supplier_allocation_main.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/includes/banking.inc");
 
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 page(_($help_context = "Supplier Allocations"), false, false, "", $js);
 
diff --git a/purchasing/inquiry/po_search.php b/purchasing/inquiry/po_search.php
index 5aa19b4e..42446bb2 100644
--- a/purchasing/inquiry/po_search.php
+++ b/purchasing/inquiry/po_search.php
@@ -18,7 +18,7 @@ include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php
index 7a89e4eb..74b8f719 100644
--- a/purchasing/inquiry/po_search_completed.php
+++ b/purchasing/inquiry/po_search_completed.php
@@ -18,7 +18,7 @@ include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php
index 62dddd94..fe80c722 100644
--- a/purchasing/inquiry/supplier_allocation_inquiry.php
+++ b/purchasing/inquiry/supplier_allocation_inquiry.php
@@ -16,7 +16,7 @@ include($path_to_root . "/includes/session.inc");
 
 include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index 4abd0000..88c30d23 100644
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@ -18,7 +18,7 @@ include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php
index 058f2bc1..f3621311 100644
--- a/purchasing/manage/suppliers.php
+++ b/purchasing/manage/suppliers.php
@@ -14,7 +14,7 @@ $path_to_root = "../..";
 include($path_to_root . "/includes/db_pager.inc");
 include_once($path_to_root . "/includes/session.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index 77ace907..086303bd 100644
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -31,7 +31,7 @@ set_page_security( @$_SESSION['PO']->trans_type,
 );
 
 $js = '';
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index bc111589..30d18878 100644
--- a/purchasing/po_receive_items.php
+++ b/purchasing/po_receive_items.php
@@ -18,7 +18,7 @@ include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index e57ef09f..c2fe7c61 100644
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
@@ -161,7 +161,7 @@ if (isset($_POST['AddGLCodeToTrans'])) {
 
 function check_data()
 {
-	global $total_grn_value, $total_gl_value, $Refs, $SysPrefs;
+	global $Refs, $SysPrefs;
 
 	if (!$_SESSION['supp_trans']->is_valid_trans_to_post())
 	{
@@ -210,12 +210,6 @@ function check_data()
 		return false;
 	}
 
-	if ($_SESSION['supp_trans']->ov_amount < ($total_gl_value + $total_grn_value))
-	{
-		display_error(_("The credit note total as entered is less than the sum of the the general ledger entires (if any) and the charges for goods received. There must be a mistake somewhere, the credit note as entered will not be processed."));
-		return false;
-	}
-
 	if (!$SysPrefs->allow_negative_stock()) {
 		foreach ($_SESSION['supp_trans']->grn_items as $n => $item) {
 			if (is_inventory_item($item->item_code))
@@ -356,9 +350,9 @@ invoice_header($_SESSION['supp_trans']);
 if ($_POST['supplier_id']=='') 
 	display_error('No supplier found for entered search text');
 else {
-	$total_grn_value = display_grn_items($_SESSION['supp_trans'], 1);
+	display_grn_items($_SESSION['supp_trans'], 1);
 
-	$total_gl_value = display_gl_items($_SESSION['supp_trans'], 1);
+	display_gl_items($_SESSION['supp_trans'], 1);
 
 	div_start('inv_tot');
 	invoice_totals($_SESSION['supp_trans']);
diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 94b65f4d..7bc308af 100644
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/includes/data_checks.inc");
 
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
@@ -257,8 +257,7 @@ if (isset($_POST['PostInvoice']))
 
 function check_item_data($n)
 {
-	global $check_price_charged_vs_order_price,
-		$check_qty_charged_vs_del_qty, $SysPrefs;
+	global $SysPrefs;
 
 	if (!check_num('this_quantity_inv'.$n, 0) || input_num('this_quantity_inv'.$n)==0)
 	{
@@ -275,7 +274,7 @@ function check_item_data($n)
 	}
 
 	$margin = $SysPrefs->over_charge_allowance();
-	if ($check_price_charged_vs_order_price == True)
+	if ($SysPrefs->check_price_charged_vs_order_price == True)
 	{
 		if ($_POST['order_price'.$n]!=input_num('ChgPrice'.$n)) {
 		     if ($_POST['order_price'.$n]==0 ||
@@ -290,7 +289,7 @@ function check_item_data($n)
 		}
 	}
 
-	if ($check_qty_charged_vs_del_qty == true && ($_POST['qty_recd'.$n] != $_POST['prev_quantity_inv'.$n]))
+	if ($SysPrefs->check_qty_charged_vs_del_qty == true && ($_POST['qty_recd'.$n] != $_POST['prev_quantity_inv'.$n]))
 	{
 		if (input_num('this_quantity_inv'.$n) / ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]) >
 			(1+ ($margin / 100)))
diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index d43f2273..babb02d9 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/purchasing/view/view_grn.php b/purchasing/view/view_grn.php
index 79f38a71..addb95fe 100644
--- a/purchasing/view/view_grn.php
+++ b/purchasing/view/view_grn.php
@@ -16,7 +16,7 @@ include($path_to_root . "/purchasing/includes/po_class.inc");
 include($path_to_root . "/includes/session.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 page(_($help_context = "View Purchase Order Delivery"), true, false, "", $js);
 
diff --git a/purchasing/view/view_po.php b/purchasing/view/view_po.php
index dd2ffeb5..666a637b 100644
--- a/purchasing/view/view_po.php
+++ b/purchasing/view/view_po.php
@@ -17,7 +17,7 @@ include($path_to_root . "/includes/session.inc");
 include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 page(_($help_context = "View Purchase Order"), true, false, "", $js);
 
diff --git a/purchasing/view/view_supp_credit.php b/purchasing/view/view_supp_credit.php
index 243f8e60..0025962a 100644
--- a/purchasing/view/view_supp_credit.php
+++ b/purchasing/view/view_supp_credit.php
@@ -18,7 +18,7 @@ include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 page(_($help_context = "View Supplier Credit Note"), true, false, "", $js);
 
diff --git a/purchasing/view/view_supp_invoice.php b/purchasing/view/view_supp_invoice.php
index e2e0710e..98d5cdc4 100644
--- a/purchasing/view/view_supp_invoice.php
+++ b/purchasing/view/view_supp_invoice.php
@@ -19,7 +19,7 @@ include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 page(_($help_context = "View Supplier Invoice"), true, false, "", $js);
 
diff --git a/purchasing/view/view_supp_payment.php b/purchasing/view/view_supp_payment.php
index 43877659..1cee060e 100644
--- a/purchasing/view/view_supp_payment.php
+++ b/purchasing/view/view_supp_payment.php
@@ -17,7 +17,7 @@ include($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 page(_($help_context = "View Payment to Supplier"), true, false, "", $js);
 
diff --git a/reporting/includes/Workbook.php b/reporting/includes/Workbook.php
index bfc0c8ef..718bdb66 100644
--- a/reporting/includes/Workbook.php
+++ b/reporting/includes/Workbook.php
@@ -102,7 +102,6 @@ define('SPREADSHEET_EXCEL_WRITER_EQ', "=");
 */
 define('SPREADSHEET_EXCEL_WRITER_NE', "<>");
 
-$encoding_string='';
 /**
 * Class for creating OLE streams for Excel Spreadsheets
 *
@@ -4878,11 +4877,10 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
     */
     function setInputEncoding($encoding)
     {
-    	global $encoding_string; 
          if ($encoding != 'UTF-16LE' && !function_exists('iconv')) {
              die("Using an input encoding other than UTF-16LE requires PHP support for iconv");
          }
-         $this->_input_encoding = $encoding_string = $encoding;
+         $this->_input_encoding = $encoding;
     }
 
     /** added 2009-03-05 by Joe Hunt, FA for arabic languages */
@@ -7744,7 +7742,7 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri
 /*        
         if ($this->_BIFF_version == 0x0600) 	// Tried to fix the correct handling here, with the
         {										// corrected specification from M$ - Joe Hunt 2009-03-08
-        	global $encoding_string;
+        	$encoding_string = $this->_input_encoding;
         	if ($encoding_string == 'UTF-16LE')
         	{
         	    $strlen = function_exists('mb_strlen') ? mb_strlen($sheetname, 'UTF-16LE') : (strlen($sheetname) / 2);
diff --git a/reporting/includes/class.graphic.inc b/reporting/includes/class.graphic.inc
index d5e86fb4..60b41021 100644
--- a/reporting/includes/class.graphic.inc
+++ b/reporting/includes/class.graphic.inc
@@ -151,15 +151,15 @@ class graph
 	
     function graph()
     {
-    	global $UTF8_fontfile;
+    	global $SysPrefs;
 		$this->encoding = strtoupper($_SESSION['language']->encoding);
 		$path = dirname(__FILE__).'/../fonts/';
 
 		// If you use UTF-8 encoding you have to download and install FreeSans.ttf font.
 		// It is not bundled with application due to its size.
 		// You can also use another UTF-8 font and put it in config.php with the name in $UTF8_fontfile 
-		$this->fontfile = $this->encoding == 'UTF-8' ? (isset($UTF8_fontfile) && $UTF8_fontfile != "" ? $path.$UTF8_fontfile : $path.'FreeSans.ttf') : 
-			$path.'LiberationSans-Regular.ttf';
+		$this->fontfile = $this->encoding == 'UTF-8' ? (isset($SysPrefs->UTF8_fontfile) && $SysPrefs->UTF8_fontfile != "" ?
+			$path.$SysPrefs->UTF8_fontfile : $path.'FreeSans.ttf') : $path.'LiberationSans-Regular.ttf';
 		
         $this->x = $this->y = $this->z = array();
         $this->biggest_x        = NULL;
@@ -1074,7 +1074,9 @@ function utf8_chr($uni)
 	return $r;
 }
 
-global $p_chars;
+///
+function arabic($str,$z="",$method='normal')
+{
 $p_chars = array (
     utf8_chr(0x0622) => array (utf8_chr(0xfe82), utf8_chr(0xfe82), utf8_chr(0x0622)),
     utf8_chr(0x0627) => array (utf8_chr(0xfe8e), utf8_chr(0xfe8e), utf8_chr(0x0627)),
@@ -1117,29 +1119,22 @@ $p_chars = array (
     utf8_chr(0x0629) => array (utf8_chr(0xfe94), utf8_chr(0xfe98), utf8_chr(0xfe97))
 );
 
-global $nastaligh;
 $nastaligh = array (
     utf8_chr(0x0647) => array (utf8_chr(0xfbab), utf8_chr(0xfbad), utf8_chr(0xfbac))
 );
-global $normal;
+
 $normal = array (
     utf8_chr(0x0647) => array (utf8_chr(0xfeea), utf8_chr(0xfeec), utf8_chr(0xfeeb))
 );
 
-global $mp_chars;
 $mp_chars = array (utf8_chr(0x0622), utf8_chr(0x0627), utf8_chr(0x062f), utf8_chr(0x0630), utf8_chr(0x0631), utf8_chr(0x0632), 
 	utf8_chr(0x0698), utf8_chr(0x0648), utf8_chr(0x0623), utf8_chr(0x0625), utf8_chr(0x0624));
 
-global $ignorelist;
 $ignorelist = array (utf8_chr(0x0000), utf8_chr(0x064c), utf8_chr(0x064d), utf8_chr(0x064b), utf8_chr(0x064f), utf8_chr(0x0650), 
 	utf8_chr(0x064e), utf8_chr(0x0651), utf8_chr(0x0653), utf8_chr(0x0670), utf8_chr(0x0654), utf8_chr(0xfe76), utf8_chr(0xfe7a), 
 	utf8_chr(0xfe78), utf8_chr(0xfe7c), utf8_chr(0xfe7e), utf8_chr(0xfe74), utf8_chr(0xfe70), utf8_chr(0xfc5e), utf8_chr(0xfc5f), 
 	utf8_chr(0xfc60), utf8_chr(0xfc61), utf8_chr(0xfc62), utf8_chr(0xfc63));
 
-///
-function arabic($str,$z="",$method='normal')
-{
-	global $p_chars,$mp_chars, $ignorelist,$nastaligh,$normal;
 	$str_back = $output = $e_output = $str_next = $str1 = $num = "";
 	if ($method == 'nastaligh')
 		$p_chars = array_merge($p_chars, $nastaligh);
diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index be391fde..439d7b8f 100644
--- a/reporting/includes/doctext.inc
+++ b/reporting/includes/doctext.inc
@@ -14,6 +14,8 @@
 *	Set document type dependent elements of common page layout.
 *
 */
+	global $SysPrefs;
+
 	$Addr1 = array(
 			'title' => _("Charge To"),
 			'name' => @$this->formData['br_name'] ? $this->formData['br_name'] : @$this->formData['DebtorName'],
diff --git a/reporting/includes/excel_report.inc b/reporting/includes/excel_report.inc
index 214bcfde..f139ba83 100644
--- a/reporting/includes/excel_report.inc
+++ b/reporting/includes/excel_report.inc
@@ -61,7 +61,8 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 
 	function FrontReport($title, $filename, $size = 'A4', $fontsize = 9, $orientation = 'P', $margins = NULL, $excelColWidthFactor = 6.5)
 	{
-		global $dateseps, $page_security;
+		global $SysPrefs, $page_security;
+
 		if (!$_SESSION["wa_current_user"]->can_access_page($page_security))
 		{
 			display_error(_("The security settings on your account do not permit you to print this report"));
@@ -99,7 +100,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 		$this->formatTitle->setTopColor('gray');
 
 		$how = user_date_format();
-		$sep = $dateseps[user_date_sep()];
+		$sep = $SysPrefs->dateseps[user_date_sep()];
 		if ($sep == '.')
 			$sep = "\\.";
 		if ($how == 0)
@@ -225,7 +226,6 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 	function Info($params, $cols, $headers, $aligns,
 		$cols2 = null, $headers2 = null, $aligns2 = null)
 	{
-		global $app_title, $version, $power_by, $power_url;
 		$this->company = get_company_prefs();
 		$year = get_current_fiscalyear();
 		if ($year['closed'] == 0)
diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index 70a7e88d..e64b7f5a 100644
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -253,12 +253,12 @@ class FrontReport extends Cpdf
 		$cols2 = null, $headers2 = null, $aligns2 = null,
 		$companylogoenable = false, $footerenable = false, $footertext = '')
 	{
-		global $app_title, $version, $power_by, $power_url;
+		global $SysPrefs, $version;
 
 		$this->addInfo('Title', $this->title);
 		$this->addInfo('Subject', $this->title);
-		$this->addInfo('Author', $app_title . ' ' . $version);
-		$this->addInfo('Creator',$power_by . ' - ' . $power_url);
+		$this->addInfo('Author', $SysPrefs->app_title . ' ' . $version);
+		$this->addInfo('Creator',$SysPrefs->power_by . ' - ' . $SysPrefs->power_url);
 		$year = get_current_fiscalyear();
 		if ($year['closed'] == 0)
 			$how = _("Active");
@@ -423,8 +423,7 @@ class FrontReport extends Cpdf
 	*/
 	function Header2()
 	{
-		global $path_to_root, $print_as_quote,
-			$SysPrefs, $packing_slip, $dflt_lang; // FIXME should be passed as params
+		global $dflt_lang; // FIXME should be passed as params
 
 		$doctype = $this->formData['doctype'];
 		$header2type = true;
@@ -947,9 +946,9 @@ class FrontReport extends Cpdf
 
 	function End($email=0, $subject='')
 	{
-		global $pdf_debug, $path_to_root;
+		global $SysPrefs, $path_to_root;
 
-		if ($pdf_debug == 1)
+		if ($SysPrefs->pdf_debug == 1)
 		{
 			$pdfcode = $this->Output('','S');
 			$pdfcode = str_replace("\n", "\n<br>", htmlspecialchars($pdfcode));
diff --git a/reporting/includes/reporting.inc b/reporting/includes/reporting.inc
index caffb688..707bb172 100644
--- a/reporting/includes/reporting.inc
+++ b/reporting/includes/reporting.inc
@@ -125,7 +125,7 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
 function print_link($link_text, $rep, $pars = array(), $dir = '', 
 	$icon=false, $class='printlink', $id='')
 {
-	global $path_to_root, $pdf_debug;
+	global $path_to_root, $SysPrefs;
 
 	$url = $dir == '' ?  $path_to_root.'/reporting/prn_redirect.php?' : $dir;
 
@@ -137,7 +137,7 @@ function print_link($link_text, $rep, $pars = array(), $dir = '',
 	$url .= implode ('&', $pars);
 
 	if ($class != '')
-		$class = $pdf_debug ? '' : " class='$class'";
+		$class = $SysPrefs->pdf_debug ? '' : " class='$class'";
 	if ($id != '')
 		$id = " id='$id'";
 	$pars = access_string($link_text);
diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index ffeb42be..dd2e069f 100644
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -47,7 +47,7 @@ class BoxReports
 
 	function getDisplay($class=null)
 	{
-		global $path_to_root, $pdf_debug, $Ajax;
+		global $path_to_root, $SysPrefs, $Ajax;
 
 		if (find_submit('Rep') != -1) {
 			include($path_to_root.'/reporting/prn_redirect.php');
@@ -99,7 +99,7 @@ class BoxReports
 						. "<form method='POST' action='$action' target='_blank'>\n";
 					$st_params .= submit('Rep'.$report->id,  
 						_("Display: ") . access_string($report->name, true),
-						false, '', $pdf_debug ? false : 'default process') . hidden('REP_ID', $report->id, false).'<br><br>';
+						false, '', $SysPrefs->pdf_debug ? false : 'default process') . hidden('REP_ID', $report->id, false).'<br><br>';
 					$st_params .= $this->getOptions($report->get_controls(), $report->id);
 					$st_params .= "\n<input type=hidden name='Class' value=".$cur_class.">"
 						."\n</form></td></tr></table>\n";
@@ -167,7 +167,7 @@ class BoxReports
 	//
 	function get_ctrl($name, $type)
 	{
-		global $path_to_root, $pdf_debug, $SysPrefs,
+		global $path_to_root, $SysPrefs,
 			$type_shortcuts;
 
 		$st = '';
diff --git a/reporting/rep102.php b/reporting/rep102.php
index d0856e0c..ca14dc03 100644
--- a/reporting/rep102.php
+++ b/reporting/rep102.php
@@ -238,16 +238,16 @@ function print_aged_customer_analysis()
    	$rep->Line($rep->row - 8);
    	if ($graphics)
    	{
-   		global $decseps, $graph_skin;
+   		global $SysPrefs;
 		$pg->x = array(_('Current'), $nowdue, $pastdue1, $pastdue2);
 		$pg->title     = $rep->title;
 		$pg->axis_x    = _("Days");
 		$pg->axis_y    = _("Amount");
 		$pg->graphic_1 = $to;
 		$pg->type      = $graphics;
-		$pg->skin      = $graph_skin;
+		$pg->skin      = $SysPrefs->graph_skin;
 		$pg->built_in  = false;
-		$pg->latin_notation = ($decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != ".");
+		$pg->latin_notation = ($SysPrefs->decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != ".");
 		$filename = company_path(). "/pdf_files/". uniqid("").".png";
 		$pg->display($filename, true);
 		$w = $pg->width / 1.5;
diff --git a/reporting/rep104.php b/reporting/rep104.php
index b431fe3e..f73a2c4a 100644
--- a/reporting/rep104.php
+++ b/reporting/rep104.php
@@ -66,7 +66,7 @@ function get_kits($category=0)
 
 function print_price_listing()
 {
-    global $path_to_root, $pic_height, $pic_width;
+    global $path_to_root, $SysPrefs;
 
     $currency = $_POST['PARAM_0'];
     $category = $_POST['PARAM_1'];
@@ -169,10 +169,10 @@ function print_price_listing()
 			if (file_exists($image))
 			{
 				$rep->NewLine();
-				if ($rep->row - $pic_height < $rep->bottomMargin)
+				if ($rep->row - $SysPrefs->pic_height < $rep->bottomMargin)
 					$rep->NewPage();
-				$rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, 0, $pic_height);
-				$rep->row -= $pic_height;
+				$rep->AddImage($image, $rep->cols[1], $rep->row - $SysPrefs->pic_height, 0, $SysPrefs->pic_height);
+				$rep->row -= $SysPrefs->pic_height;
 				$rep->NewLine();
 			}
 		}
diff --git a/reporting/rep109.php b/reporting/rep109.php
index d01c9bda..a7dfbf13 100644
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -29,11 +29,9 @@ include_once($path_to_root . "/taxes/tax_calc.inc");
 
 print_sales_orders();
 
-$print_as_quote = 0;
-
 function print_sales_orders()
 {
-	global $path_to_root, $print_as_quote, $SysPrefs;
+	global $path_to_root, $SysPrefs;
 
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
diff --git a/reporting/rep110.php b/reporting/rep110.php
index 665d20f3..85b17ddb 100644
--- a/reporting/rep110.php
+++ b/reporting/rep110.php
@@ -25,7 +25,6 @@ include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 
-$packing_slip = 0;
 //----------------------------------------------------------------------------------------------------
 
 print_deliveries();
@@ -34,7 +33,7 @@ print_deliveries();
 
 function print_deliveries()
 {
-	global $path_to_root, $packing_slip, $SysPrefs;
+	global $path_to_root, $SysPrefs;
 
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
diff --git a/reporting/rep111.php b/reporting/rep111.php
index 11284eda..95ce5318 100644
--- a/reporting/rep111.php
+++ b/reporting/rep111.php
@@ -31,7 +31,7 @@ print_sales_quotations();
 
 function print_sales_quotations()
 {
-	global $path_to_root, $print_as_quote, $SysPrefs, $pic_height;
+	global $path_to_root, $SysPrefs;
 
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -48,8 +48,8 @@ function print_sales_quotations()
 	$dec = user_price_dec();
 
 	$pictures = $SysPrefs->print_item_images_on_quote();
-	// If you want a larger image, then increase $pic_height f.i.
-	// $pic_height += 25;
+	// If you want a larger image, then increase pic_height f.i.
+	// $SysPrefs->pic_height += 25;
 	
 	$cols = array(4, 60, 225, 300, 325, 385, 450, 515);
 
@@ -127,10 +127,10 @@ function print_sales_quotations()
 				if (file_exists($image))
 				{
 					//$rep->NewLine();
-					if ($rep->row - $pic_height < $rep->bottomMargin)
+					if ($rep->row - $SysPrefs->pic_height < $rep->bottomMargin)
 						$rep->NewPage();
-					$rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, 0, $pic_height);
-					$rep->row -= $pic_height;
+					$rep->AddImage($image, $rep->cols[1], $rep->row - $SysPrefs->pic_height, 0, $SysPrefs->pic_height);
+					$rep->row -= $SysPrefs->pic_height;
 					$rep->NewLine();
 				}
 			}
diff --git a/reporting/rep202.php b/reporting/rep202.php
index e6cc707b..61303541 100644
--- a/reporting/rep202.php
+++ b/reporting/rep202.php
@@ -72,7 +72,7 @@ function get_invoices($supplier_id, $to, $all=true)
 
 function print_aged_supplier_analysis()
 {
-    global $path_to_root, $systypes_array;
+    global $path_to_root, $systypes_array, $SysPrefs;
 
     $to = $_POST['PARAM_0'];
     $fromsupp = $_POST['PARAM_1'];
@@ -246,16 +246,15 @@ function print_aged_supplier_analysis()
    	$rep->NewLine();
    	if ($graphics)
    	{
-   		global $decseps, $graph_skin;
 		$pg->x = array(_('Current'), $nowdue, $pastdue1, $pastdue2);
 		$pg->title     = $rep->title;
 		$pg->axis_x    = _("Days");
 		$pg->axis_y    = _("Amount");
 		$pg->graphic_1 = $to;
 		$pg->type      = $graphics;
-		$pg->skin      = $graph_skin;
+		$pg->skin      = $SysPrefs->graph_skin;
 		$pg->built_in  = false;
-		$pg->latin_notation = ($decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != ".");
+		$pg->latin_notation = ($SysPrefs->decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != ".");
 		$filename = company_path(). "/pdf_files/". uniqid("").".png";
 		$pg->display($filename, true);
 		$w = $pg->width / 1.5;
diff --git a/reporting/rep301.php b/reporting/rep301.php
index 953bafca..fe8b58e7 100644
--- a/reporting/rep301.php
+++ b/reporting/rep301.php
@@ -133,7 +133,7 @@ function getTransactions($category, $location, $date)
 
 function print_inventory_valuation_report()
 {
-    global $path_to_root, $use_costed_values;;
+    global $path_to_root, $SysPrefs;
 
 	$date = $_POST['PARAM_0'];
     $category = $_POST['PARAM_1'];
@@ -211,7 +211,7 @@ function print_inventory_valuation_report()
 			if ($detail)
 				$rep->NewLine();
 		}
-		if (isset($use_costed_values) && $use_costed_values==1)
+		if (isset($SysPrefs->use_costed_values) && $SysPrefs->use_costed_values==1)
 		{
 			$UnitCost = getAverageCost($trans['stock_id'], $date);
 			$ItemTotal = $trans['QtyOnHand'] * $UnitCost;
diff --git a/reporting/rep303.php b/reporting/rep303.php
index 4549a02a..9794e8c7 100644
--- a/reporting/rep303.php
+++ b/reporting/rep303.php
@@ -71,7 +71,7 @@ function getTransactions($category, $location, $item_like)
 
 function print_stock_check()
 {
-    global $path_to_root, $pic_height;
+    global $path_to_root, $SysPrefs;
 
     	$category = $_POST['PARAM_0'];
     	$location = $_POST['PARAM_1'];
@@ -204,10 +204,10 @@ function print_stock_check()
 			if (file_exists($image))
 			{
 				$rep->NewLine();
-				if ($rep->row - $pic_height < $rep->bottomMargin)
+				if ($rep->row - $SysPrefs->pic_height < $rep->bottomMargin)
 					$rep->NewPage();
-				$rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, 0, $pic_height);
-				$rep->row -= $pic_height;
+				$rep->AddImage($image, $rep->cols[1], $rep->row - $SysPrefs->pic_height, 0, $SysPrefs->pic_height);
+				$rep->row -= $SysPrefs->pic_height;
 				$rep->NewLine();
 			}
 		}
diff --git a/reporting/rep705.php b/reporting/rep705.php
index c09d0a47..c9b3fd1a 100644
--- a/reporting/rep705.php
+++ b/reporting/rep705.php
@@ -163,7 +163,7 @@ function display_type ($type, $typename, $yr, $mo, $convert, &$dec, &$rep, $dime
 
 function print_annual_expense_breakdown()
 {
-	global $path_to_root, $date_system;
+	global $path_to_root, $SysPrefs;
 
 	$dim = get_company_pref('use_dimension');
 	$dimension = $dimension2 = 0;
@@ -218,9 +218,9 @@ function print_annual_expense_breakdown()
 	$yr = $row['yr'];
 	$mo = $row['mo'];
 	$da = 1;
-	if ($date_system == 1)
+	if ($SysPrefs->date_system == 1)
 		list($yr, $mo, $da) = jalali_to_gregorian($yr, $mo, $da);
-	elseif ($date_system == 2)
+	elseif ($SysPrefs->date_system == 2)
 		list($yr, $mo, $da) = islamic_to_gregorian($yr, $mo, $da);
 	$per12 = strftime('%b',mktime(0,0,0,$mo,$da,$yr));
 	$per11 = strftime('%b',mktime(0,0,0,$mo-1,$da,$yr));
diff --git a/reporting/rep706.php b/reporting/rep706.php
index 6c7f5c64..f54fddc6 100644
--- a/reporting/rep706.php
+++ b/reporting/rep706.php
@@ -127,7 +127,7 @@ print_balance_sheet();
 
 function print_balance_sheet()
 {
-	global $path_to_root;
+	global $path_to_root, $SysPrefs;
 
 	$dim = get_company_pref('use_dimension');
 	$dimension = $dimension2 = 0;
@@ -303,16 +303,15 @@ function print_balance_sheet()
 		$pg->x[] = _('Calculated Return');
 		$pg->y[] = abs($calc_open);
 		$pg->z[] = abs($calc_period);
-		global $decseps, $graph_skin;
 		$pg->title     = $rep->title;
 		$pg->axis_x    = _("Group");
 		$pg->axis_y    = _("Amount");
 		$pg->graphic_1 = $headers[2];
 		$pg->graphic_2 = $headers[3];
 		$pg->type      = $graphics;
-		$pg->skin      = $graph_skin;
+		$pg->skin      = $SysPrefs->graph_skin;
 		$pg->built_in  = false;
-		$pg->latin_notation = ($decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != ".");
+		$pg->latin_notation = ($SysPrefs->decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != ".");
 		$filename = company_path(). "/pdf_files/". uniqid("").".png";
 		$pg->display($filename, true);
 		$w = $pg->width / 1.5;
diff --git a/reporting/rep707.php b/reporting/rep707.php
index fe3efedd..bdf8c3ba 100644
--- a/reporting/rep707.php
+++ b/reporting/rep707.php
@@ -150,7 +150,7 @@ function Achieve($d1, $d2)
 
 function print_profit_and_loss_statement()
 {
-	global $path_to_root;
+	global $path_to_root, $SysPrefs;
 
 	$dim = get_company_pref('use_dimension');
 	$dimension = $dimension2 = 0;
@@ -321,16 +321,15 @@ function print_profit_and_loss_statement()
 	$rep->Line($rep->row);
 	if ($graphics)
 	{
-		global $decseps, $graph_skin;
 		$pg->title     = $rep->title;
 		$pg->axis_x    = _("Group");
 		$pg->axis_y    = _("Amount");
 		$pg->graphic_1 = $headers[2];
 		$pg->graphic_2 = $headers[3];
 		$pg->type      = $graphics;
-		$pg->skin      = $graph_skin;
+		$pg->skin      = $SysPrefs->graph_skin;
 		$pg->built_in  = false;
-		$pg->latin_notation = ($decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != ".");
+		$pg->latin_notation = ($SysPrefs->decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != ".");
 		$filename = company_path(). "/pdf_files/". uniqid("").".png";
 		$pg->display($filename, true);
 		$w = $pg->width / 1.5;
diff --git a/reporting/rep708.php b/reporting/rep708.php
index e965ae18..a7a0df3a 100644
--- a/reporting/rep708.php
+++ b/reporting/rep708.php
@@ -31,7 +31,7 @@ $pdeb = $pcre = $cdeb = $ccre = $tdeb = $tcre = $pbal = $cbal = $tbal = 0;
 
 function display_type ($type, $typename, &$dec, &$rep, $from, $to, $zero, $balances, $dimension, $dimension2)
 {
-	global $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal, $clear_trial_balance_opening;
+	global $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal, $SysPrefs;
 	
 	$printtitle = 0; //Flag for printing type name	
 	
@@ -57,7 +57,7 @@ function display_type ($type, $typename, &$dec, &$rep, $from, $to, $zero, $balan
 		
 		// FA doesn't really clear the closed year, therefore the brought forward balance includes all the transactions from the past, even though the balance is null.
 		// If we want to remove the balanced part for the past years, this option removes the common part from from the prev and tot figures.
-		if (@$clear_trial_balance_opening)
+		if (@$SysPregs->clear_trial_balance_opening)
 		{
 			$open = get_balance($account["account_code"], $dimension, $dimension2, $begin,  $begin, false, true);
 			$offset = min($open['debit'], $open['credit']);
diff --git a/reporting/rep709.php b/reporting/rep709.php
index 46aae6ba..b9cd1171 100644
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -78,7 +78,7 @@ function getTaxInfo($id)
 
 function print_tax_report()
 {
-	global $path_to_root, $trans_dir, $Hooks, $systypes_array;
+	global $path_to_root, $Hooks, $systypes_array;
 
 	$from = $_POST['PARAM_0'];
 	$to = $_POST['PARAM_1'];
diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php
index 2c5da35d..ab3a3001 100644
--- a/sales/allocations/customer_allocate.php
+++ b/sales/allocations/customer_allocate.php
@@ -20,7 +20,7 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
 //include_once($path_to_root . "/sales/includes/ui/cust_alloc_ui.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 
 add_js_file('allocate.js');
diff --git a/sales/allocations/customer_allocation_main.php b/sales/allocations/customer_allocation_main.php
index bac9c899..766f6312 100644
--- a/sales/allocations/customer_allocation_main.php
+++ b/sales/allocations/customer_allocation_main.php
@@ -17,7 +17,7 @@ include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 page(_($help_context = "Customer Allocations"), false, false, "", $js);
 
diff --git a/sales/create_recurrent_invoices.php b/sales/create_recurrent_invoices.php
index 7a626e4a..9b825d01 100644
--- a/sales/create_recurrent_invoices.php
+++ b/sales/create_recurrent_invoices.php
@@ -18,7 +18,7 @@ include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 600);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index 0673415b..f32e2268 100644
--- a/sales/credit_note_entry.php
+++ b/sales/credit_note_entry.php
@@ -26,7 +26,7 @@ include_once($path_to_root . "/sales/includes/ui/sales_order_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows) {
+if ($SysPrefs->use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
 }
 if (user_use_date_picker()) {
diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index e87113ff..b64a57a0 100644
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -26,7 +26,7 @@ include_once($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows) {
+if ($SysPrefs->use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
 }
 
diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index fb7efe0a..9cbd2527 100644
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -26,7 +26,7 @@ include_once($path_to_root . "/reporting/includes/reporting.inc");
 include_once($path_to_root . "/taxes/tax_calc.inc");
 
 $js = "";
-if ($use_popup_windows) {
+if ($SysPrefs->use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
 }
 if (user_use_date_picker()) {
diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index 588f0f56..7f46f169 100644
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -27,7 +27,7 @@ include_once($path_to_root . "/taxes/tax_calc.inc");
 include_once($path_to_root . "/admin/db/shipping_db.inc");
 
 $js = "";
-if ($use_popup_windows) {
+if ($SysPrefs->use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
 }
 if (user_use_date_picker()) {
diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index 1f49461c..956023bb 100644
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows) {
+if ($SysPrefs->use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
 }
 if (user_use_date_picker()) {
diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index 61239164..4a99d3cd 100644
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -116,10 +116,10 @@ class cart
 	*/
 	function get_items()
 	{
-		global $sort_sales_items;
+		global $SysPrefs;
 
 		$items = $this->line_items;
-		if (@$sort_sales_items)
+		if (@$SysPrefs->sort_sales_items)
 			uasort($items, array($this, '_cmp_lines'));
 
 		return $items;
diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index f9c12a4d..65db5a75 100644
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -119,7 +119,7 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
 
 function get_customer_trans($trans_id, $trans_type)
 {
-	global $go_debug;
+	global $SysPrefs;
 
 	$sql = "SELECT trans.*,"
 		."ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,"
@@ -188,14 +188,14 @@ function get_customer_trans($trans_id, $trans_type)
 
 	if (db_num_rows($result) == 0) {
 		// can't return nothing
-		if($go_debug)
+		if ($SysPrefs->go_debug)
 			display_backtrace();
 		display_db_error("no debtor trans found for given params", $sql, true);
 		exit;
 	}
 	if (db_num_rows($result) > 1) {
 		// can't return multiple
-		if($go_debug)
+		if($SysPrefs->go_debug)
 			display_backtrace();
 		display_db_error("duplicate debtor transactions found for given params", $sql, true);
 		exit;
diff --git a/sales/includes/sales_ui.inc b/sales/includes/sales_ui.inc
index 378f3361..73b99ca6 100644
--- a/sales/includes/sales_ui.inc
+++ b/sales/includes/sales_ui.inc
@@ -44,9 +44,9 @@ function processing_active()
 */
 function check_edit_conflicts($cart_id, $cartname='Items')
 {
-	global $Ajax, $no_check_edit_conflicts;
+	global $Ajax, $SysPrefs;
 
-	if ((!isset($no_check_edit_conflicts) || $no_check_edit_conflicts==0) && get_post('cart_id') && $cart_id != $_SESSION[$cartname]->cart_id) {
+	if ((!isset($SysPrefs->no_check_edit_conflicts) || $SysPrefs->no_check_edit_conflicts==0) && get_post('cart_id') && $cart_id != $_SESSION[$cartname]->cart_id) {
 		display_error(_('This edit session has been abandoned by opening sales document in another browser tab. You cannot edit more than one sales document at once.'));
 		$Ajax->activate('_page_body');
 		display_footer_exit();
diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php
index a67a7b24..968600bb 100644
--- a/sales/inquiry/customer_allocation_inquiry.php
+++ b/sales/inquiry/customer_allocation_inquiry.php
@@ -18,7 +18,7 @@ include_once($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index 123066ed..34b06832 100644
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -19,7 +19,7 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php
index b9ed9b6e..7bcea70f 100644
--- a/sales/inquiry/sales_deliveries_view.php
+++ b/sales/inquiry/sales_deliveries_view.php
@@ -18,7 +18,7 @@ include($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 600);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index f5977aa7..0095a418 100644
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -71,7 +71,7 @@ else
 }
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 600);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index 84bdfe68..e7e21e89 100644
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -15,7 +15,7 @@ $path_to_root = "../..";
 include_once($path_to_root . "/includes/db_pager.inc");
 include_once($path_to_root . "/includes/session.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
@@ -79,7 +79,7 @@ function can_process()
 
 function handle_submit(&$selected_id)
 {
-	global $path_to_root, $Ajax, $auto_create_branch;
+	global $path_to_root, $Ajax, $SysPrefs;
 
 	if (!can_process())
 		return;
@@ -108,7 +108,7 @@ function handle_submit(&$selected_id)
 
 		$selected_id = $_POST['customer_id'] = db_insert_id();
          
-		if (isset($auto_create_branch) && $auto_create_branch == 1)
+		if (isset($SysPrefs->auto_create_branch) && $SysPrefs->auto_create_branch == 1)
 		{
         	add_branch($selected_id, $_POST['CustName'], $_POST['cust_ref'],
                 $_POST['address'], $_POST['salesman'], $_POST['area'], $_POST['tax_group_id'], '',
@@ -129,7 +129,7 @@ function handle_submit(&$selected_id)
 
 		display_notification(_("A new customer has been added."));
 
-		if (isset($auto_create_branch) && $auto_create_branch == 1)
+		if (isset($SysPrefs->auto_create_branch) && $SysPrefs->auto_create_branch == 1)
 			display_notification(_("A default Branch has been automatically created, please check default Branch values by using link below."));
 		
 		$Ajax->activate('_page_body');
@@ -187,7 +187,7 @@ if (isset($_POST['delete']))
 
 function customer_settings($selected_id) 
 {
-	global $SysPrefs, $path_to_root, $auto_create_branch;
+	global $SysPrefs, $path_to_root;
 	
 	if (!$selected_id) 
 	{
@@ -250,7 +250,7 @@ function customer_settings($selected_id)
 
 	if($selected_id)
 		record_status_list_row(_("Customer status:"), 'inactive');
-	elseif (isset($auto_create_branch) && $auto_create_branch == 1)
+	elseif (isset($SysPrefs->auto_create_branch) && $SysPrefs->auto_create_branch == 1)
 	{
 		table_section_title(_("Branch"));
 		text_row(_("Phone:"), 'phone', null, 32, 30);
@@ -290,7 +290,7 @@ function customer_settings($selected_id)
 	}
 
 	textarea_row(_("General Notes:"), 'notes', null, 35, 5);
-	if (!$selected_id && isset($auto_create_branch) && $auto_create_branch == 1)
+	if (!$selected_id && isset($SysPrefs->auto_create_branch) && $SysPrefs->auto_create_branch == 1)
 	{
 		table_section_title(_("Branch"));
 		locations_list_row(_("Default Inventory Location:"), 'location');
diff --git a/sales/manage/recurrent_invoices.php b/sales/manage/recurrent_invoices.php
index bce635a8..8a08a6d1 100644
--- a/sales/manage/recurrent_invoices.php
+++ b/sales/manage/recurrent_invoices.php
@@ -16,7 +16,7 @@ include($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 600);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index fa9fee18..2a0aa0b6 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -51,7 +51,7 @@ set_page_security( @$_SESSION['Items']->trans_type,
 
 $js = '';
 
-if ($use_popup_windows) {
+if ($SysPrefs->SysPrefs->use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
 }
 
diff --git a/sales/view/view_credit.php b/sales/view/view_credit.php
index f006f4f3..f7e8c299 100644
--- a/sales/view/view_credit.php
+++ b/sales/view/view_credit.php
@@ -19,7 +19,7 @@ include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 page(_($help_context = "View Credit Note"), true, false, "", $js);
 
diff --git a/sales/view/view_dispatch.php b/sales/view/view_dispatch.php
index b71738d5..d8a7cc95 100644
--- a/sales/view/view_dispatch.php
+++ b/sales/view/view_dispatch.php
@@ -18,7 +18,7 @@ include_once($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 600);
 page(_($help_context = "View Sales Dispatch"), true, false, "", $js);
 
diff --git a/sales/view/view_invoice.php b/sales/view/view_invoice.php
index 7ad6743a..9532bb77 100644
--- a/sales/view/view_invoice.php
+++ b/sales/view/view_invoice.php
@@ -18,7 +18,7 @@ include_once($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 600);
 page(_($help_context = "View Sales Invoice"), true, false, "", $js);
 
diff --git a/sales/view/view_receipt.php b/sales/view/view_receipt.php
index 210b7bc2..a481f27d 100644
--- a/sales/view/view_receipt.php
+++ b/sales/view/view_receipt.php
@@ -18,7 +18,7 @@ include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 600);
 
 page(_($help_context = "View Customer Payment"), true, false, "", $js);
diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index b9c9c867..605350af 100644
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -20,7 +20,7 @@ include_once($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 600);
 
 if ($_GET['trans_type'] == ST_SALESQUOTE)
diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index ec70782b..51dc9700 100644
--- a/themes/aqua/renderer.php
+++ b/themes/aqua/renderer.php
@@ -13,9 +13,9 @@
 	{
 		function get_icon($category)
 		{
-			global  $path_to_root, $show_menu_category_icons;
+			global  $path_to_root, $SysPrefs;
 
-			if ($show_menu_category_icons)
+			if ($SysPrefs->show_menu_category_icons)
 				$img = $category == '' ? 'right.gif' : $category.'.png';
 			else	
 				$img = 'right.gif';
@@ -34,7 +34,7 @@
 
 		function menu_header($title, $no_menu, $is_index)
 		{
-			global $path_to_root, $help_base_url, $db_connections;
+			global $path_to_root, $SysPrefs, $db_connections;
 			echo "<table class='callout_main' border='0' cellpadding='0' cellspacing='0'>\n";
 			echo "<tr>";
 			echo "<td colspan='2' rowspan='2'>\n";
@@ -77,7 +77,7 @@
 				echo "  <td class='logoutBarRight'><a class='shortcut' href='$path_to_root/admin/display_prefs.php?'>" . _("Preferences") . "</a>&nbsp;&nbsp;&nbsp;\n";
 				echo "  <a class='shortcut' href='$path_to_root/admin/change_current_user_password.php?selected_id=" . $_SESSION["wa_current_user"]->username . "'>" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
 
-				if ($help_base_url != null)
+				if ($SysPrefs->help_base_url != null)
 				{
 					echo "$himg<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url()."'>" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
 				}
@@ -102,8 +102,8 @@
 
 		function menu_footer($no_menu, $is_index)
 		{
-			global $version, $allow_demo_mode, $app_title, $power_url,
-				$power_by, $path_to_root, $Pagehelp, $Ajax;
+			global $version, $path_to_root, $Pagehelp, $Ajax, $SysPrefs;
+
 			include_once($path_to_root . "/includes/date_functions.inc");
 
 			echo "</td></tr></table>\n"; // 'main_page'
@@ -127,15 +127,16 @@
 			{
 				echo "<table align='center' id='footer'>\n";
 				echo "<tr>\n";
-				echo "<td align='center' class='footer'><a target='_blank' href='$power_url'><font color='#ffffff'>$app_title $version - " . _("Theme:") . " " . user_theme() . " - ".show_users_online()."</font></a></td>\n";
+				echo "<td align='center' class='footer'><a target='_blank' href='".$SysPrefs->power_url."'><font color='#ffffff'>"
+					.$SysPrefs->app_title." $version - " . _("Theme:") . " " . user_theme() . " - ".show_users_online()."</font></a></td>\n";
 				echo "</tr>\n";
 				echo "<tr>\n";
-				echo "<td align='center' class='footer'><a target='_blank' href='$power_url'><font color='#ffff00'>$power_by</font></a></td>\n";
+				echo "<td align='center' class='footer'><a target='_blank' href='".$SysPrefs->power_url."'><font color='#ffff00'>"
+					.$SysPrefs->power_by."</font></a></td>\n";
 				echo "</tr>\n";
-				if ($allow_demo_mode==true)
+				if ($SysPrefs->allow_demo_mode==true)
 				{
 					echo "<tr>\n";
-					//echo "<td><br><div align='center'><a href='http://sourceforge.net'><img src='http://sourceforge.net/sflogo.php?group_id=89967&amp;type=5' alt='SourceForge.net Logo' width='210' height='62' border='0' align='middle' /></a></div></td>\n";
 					echo "</tr>\n";
 				}
 				echo "</table><br><br>\n";
diff --git a/themes/cool/renderer.php b/themes/cool/renderer.php
index bbfc4475..5e7e8b65 100644
--- a/themes/cool/renderer.php
+++ b/themes/cool/renderer.php
@@ -13,9 +13,9 @@
 	{
 		function get_icon($category)
 		{
-			global  $path_to_root, $show_menu_category_icons;
+			global  $path_to_root, $SysPrefs;
 
-			if ($show_menu_category_icons)
+			if ($SysPrefs->show_menu_category_icons)
 				$img = $category == '' ? 'right.gif' : $category.'.png';
 			else	
 				$img = 'right.gif';
@@ -34,7 +34,7 @@
 
 		function menu_header($title, $no_menu, $is_index)
 		{
-			global $path_to_root, $help_base_url, $db_connections;
+			global $path_to_root, $SysPrefs, $db_connections;
 			echo "<table class='callout_main' border='0' cellpadding='0' cellspacing='0'>\n";
 			echo "<tr>";
 			echo "<td colspan='2' rowspan='2'>\n";
@@ -77,7 +77,7 @@
 				echo "  <td class='logoutBarRight'><a class='shortcut' href='$path_to_root/admin/display_prefs.php?'>" . _("Preferences") . "</a>&nbsp;&nbsp;&nbsp;\n";
 				echo "  <a class='shortcut' href='$path_to_root/admin/change_current_user_password.php?selected_id=" . $_SESSION["wa_current_user"]->username . "'>" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
 
-				if ($help_base_url != null)
+				if ($SysPrefs->help_base_url != null)
 				{
 					echo "$himg<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url()."'>" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
 				}
@@ -101,8 +101,7 @@
 
 		function menu_footer($no_menu, $is_index)
 		{
-			global $version, $allow_demo_mode, $app_title, $power_url, 
-				$power_by, $path_to_root, $Pagehelp, $Ajax;
+			global $version, $SysPrefs, $path_to_root, $Pagehelp, $Ajax;
 			include_once($path_to_root . "/includes/date_functions.inc");
 
 			echo "</td></tr></table>\n"; // 'main_page'
@@ -126,17 +125,13 @@
 			{
 				echo "<table align='center' id='footer'>\n";
 				echo "<tr>\n";
-				echo "<td align='center' class='footer'><a target='_blank' href='$power_url'><font color='#ffffff'>$app_title $version - " . _("Theme:") . " " . user_theme() ." - ".show_users_online(). "</font></a></td>\n";
+				echo "<td align='center' class='footer'><a target='_blank' href='".$SysPrefs->power_url."'><font color='#ffffff'>".$SysPrefs->app_title
+					." $version - " . _("Theme:") . " " . user_theme() ." - ".show_users_online(). "</font></a></td>\n";
 				echo "</tr>\n";
 				echo "<tr>\n";
-				echo "<td align='center' class='footer'><a target='_blank' href='$power_url'><font color='#ffff00'>$power_by</font></a></td>\n";
+				echo "<td align='center' class='footer'><a target='_blank' href='".$SysPrefs->power_url."'><font color='#ffff00'".$SysPrefs->power_by
+					."</font></a></td>\n";
 				echo "</tr>\n";
-				if ($allow_demo_mode==true)
-				{
-					echo "<tr>\n";
-					//echo "<td><br><div align='center'><a href='http://sourceforge.net'><img src='http://sourceforge.net/sflogo.php?group_id=89967&amp;type=5' alt='SourceForge.net Logo' width='210' height='62' border='0' align='middle' /></a></div></td>\n";
-					echo "</tr>\n";
-				}
 				echo "</table><br><br>\n";
 			}
 		}
diff --git a/themes/default/renderer.php b/themes/default/renderer.php
index e1c03f42..d9ae2b00 100644
--- a/themes/default/renderer.php
+++ b/themes/default/renderer.php
@@ -14,9 +14,9 @@
 	{
 		function get_icon($category)
 		{
-			global  $path_to_root, $show_menu_category_icons;
+			global  $path_to_root, $SysPrefs;
 
-			if ($show_menu_category_icons)
+			if ($SysPrefs->show_menu_category_icons)
 				$img = $category == '' ? 'right.gif' : $category.'.png';
 			else	
 				$img = 'right.gif';
@@ -35,7 +35,7 @@
 
 		function menu_header($title, $no_menu, $is_index)
 		{
-			global $path_to_root, $help_base_url, $db_connections;
+			global $path_to_root, $SysPrefs, $db_connections;
 			echo "<table class='callout_main' border='0' cellpadding='0' cellspacing='0'>\n";
 			echo "<tr>\n";
 			echo "<td colspan='2' rowspan='2'>\n";
@@ -76,7 +76,7 @@
 				echo "  <td class='logoutBarRight'><a class='shortcut' href='$path_to_root/admin/display_prefs.php?'>" . _("Preferences") . "</a>&nbsp;&nbsp;&nbsp;\n";
 				echo "  <a class='shortcut' href='$path_to_root/admin/change_current_user_password.php?selected_id=" . $_SESSION["wa_current_user"]->username . "'>" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
 
-				if ($help_base_url != null)
+				if ($SysPrefs->help_base_url != null)
 				{
 					echo "$himg<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url()."'>" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
 				}
@@ -100,8 +100,7 @@
 
 		function menu_footer($no_menu, $is_index)
 		{
-			global $version, $allow_demo_mode, $app_title, $power_url, 
-				$power_by, $path_to_root, $Pagehelp, $Ajax;
+			global $version, $path_to_root, $Pagehelp, $Ajax, $SysPrefs;
 			include_once($path_to_root . "/includes/date_functions.inc");
 
 			echo "</td></tr></table>\n"; // 'main_page'
@@ -126,17 +125,13 @@
 			{
 				echo "<table align='center' id='footer'>\n";
 				echo "<tr>\n";
-				echo "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><font color='#ffffff'>$app_title $version - " . _("Theme:") . " " . user_theme() . " - ".show_users_online()."</font></a></td>\n";
+				echo "<td align='center' class='footer'><a target='_blank' href='".$SysPrefs->power_url."' tabindex='-1'><font color='#ffffff'>".$SysPrefs->app_title
+					." $version - " . _("Theme:") . " " . user_theme() . " - ".show_users_online()."</font></a></td>\n";
 				echo "</tr>\n";
 				echo "<tr>\n";
-				echo "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><font color='#ffff00'>$power_by</font></a></td>\n";
+				echo "<td align='center' class='footer'><a target='_blank' href='".$SysPrefs->power_url
+					."' tabindex='-1'><font color='#ffff00'>".$SysPrefs->power_by."</font></a></td>\n";
 				echo "</tr>\n";
-				if ($allow_demo_mode==true)
-				{
-					echo "<tr>\n";
-					//echo "<td><br><div align='center'><a href='http://sourceforge.net'><img src='http://sourceforge.net/sflogo.php?group_id=89967&amp;type=5' alt='SourceForge.net Logo' width='210' height='62' border='0' align='middle' /></a></div></td>\n";
-					echo "</tr>\n";
-				}
 				echo "</table><br><br>\n";
 			}
 		}