From f564511bdad01d163c41aa4ec7cc80cc136fa262 Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Fri, 17 Apr 2015 23:40:08 +0200
Subject: [PATCH 1/1] Collation selection in installer and company creation,
 rewritten Create Companies page; fixed pre-login decimal settings.

---
 admin/create_coy.php              | 142 +++++++++++----------------
 admin/db/maintenance_db.inc       |   6 +-
 includes/current_user.inc         |   6 +-
 includes/db/connect_db.inc        |  42 ++++----
 includes/db/connect_db_mysql.inc  |  18 +++-
 includes/db/connect_db_mysqli.inc |  21 +++-
 includes/sysnames.inc             |  25 +++++
 includes/ui/ui_input.inc          |   6 +-
 includes/ui/ui_lists.inc          |  13 +++
 install/index.php                 |  17 ++--
 sql/alter2.4.php                  |  34 -------
 sql/en_US-demo.sql                | 158 +++++++++++++++---------------
 sql/en_US-new.sql                 | 158 +++++++++++++++---------------
 themes/aqua/renderer.php          |  10 +-
 themes/cool/renderer.php          |  11 ++-
 themes/default/renderer.php       |  11 ++-
 16 files changed, 359 insertions(+), 319 deletions(-)

diff --git a/admin/create_coy.php b/admin/create_coy.php
index 03267f96..588c727b 100644
--- a/admin/create_coy.php
+++ b/admin/create_coy.php
@@ -22,32 +22,23 @@ page(_($help_context = "Create/Update Company"));
 
 $comp_subdirs = array('images', 'pdf_files', 'backup','js_cache', 'reporting', 'attachments');
 
+simple_page_mode(true);
+/*
+	FIXME: tb_pref_counter should track prefix per database.
+*/
 //---------------------------------------------------------------------------------------------
-if (isset($_GET['selected_id']))
-{
-	$selected_id = (int)$_GET['selected_id'];
-}
-elseif (isset($_POST['selected_id']))
-{
-	$selected_id = (int)$_POST['selected_id'];
-}
-else
-	$selected_id = -1;
-
-//---------------------------------------------------------------------------------------------
-
 function check_data($selected_id)
 {
 	global $db_connections, $tb_pref_counter;
 
-	if($selected_id != -1) {
+	if ($selected_id != -1) {
 		if ($_POST['name'] == "")
 		{
 			display_error(_("Database settings are not specified."));
 	 		return false;
 		}
 	} else {
-		if ($_POST['name'] == "" || $_POST['host'] == "" || $_POST['dbuser'] == "" || $_POST['dbname'] == "")
+		if (!get_post('name') || !get_post('host') || !get_post('dbuser') || !get_post('dbname'))
 		{
 			display_error(_("Database settings are not specified."));
 	 		return false;
@@ -83,26 +74,23 @@ function remove_connection($id) {
 	unset($db_connections[$id]);
 	$conn = array_values($db_connections);
 	$db_connections = $conn;
-	//$$db_connections = array_values($db_connections);
     return $err;
 }
 //---------------------------------------------------------------------------------------------
 
 function handle_submit($selected_id)
 {
-	global $Ajax, $db_connections, $def_coy, $tb_pref_counter, $db,
-	    $comp_subdirs, $path_to_root;
+	global $db_connections, $def_coy, $tb_pref_counter, $db,
+	    $comp_subdirs, $path_to_root, $Mode;
 
 	$error = false;
-	if (!check_data($selected_id))
-		return false;
 
 	if ($selected_id==-1)
 		$selected_id = count($db_connections);
 
 	$new = !isset($db_connections[$selected_id]);
 
-	if ((bool)$_POST['def'] == true)
+	if (check_value('def'))
 		$def_coy = $selected_id;
 
 	$db_connections[$selected_id]['name'] = $_POST['name'];
@@ -112,6 +100,7 @@ function handle_submit($selected_id)
 		$db_connections[$selected_id]['dbpassword'] = html_entity_decode($_POST['dbpassword'], ENT_QUOTES, 
 			$_SESSION['language']->encoding=='iso-8859-2' ? 'ISO-8859-1' : $_SESSION['language']->encoding);
 		$db_connections[$selected_id]['dbname'] = $_POST['dbname'];
+		$db_connections[$selected_id]['collation'] = $_POST['collation'];
 		if (is_numeric($_POST['tbpref']))
 		{
 			$db_connections[$selected_id]['tbpref'] = $_POST['tbpref'] == 1 ?
@@ -146,9 +135,8 @@ function handle_submit($selected_id)
 			return false;
 		}
 	}
-
 	$error = write_config_db($new);
-	set_global_connection();
+
 	if ($error == -1)
 		display_error(_("Cannot open the configuration file - ") . $path_to_root . "/config_db.php");
 	else if ($error == -2)
@@ -163,11 +151,12 @@ function handle_submit($selected_id)
 	if ($new)
 	{
 		create_comp_dirs(company_path($selected_id), $comp_subdirs);
+		$exts = get_company_extensions();
+		write_extensions($exts, $selected_id);
 	}
-	$exts = get_company_extensions();
-	write_extensions($exts, $selected_id);
 	display_notification($new ? _('New company has been created.') : _('Company has been updated.'));
-	$Ajax->activate('_page_body');
+
+	$Mode = 'RESET';
 	return true;
 }
 
@@ -175,7 +164,7 @@ function handle_submit($selected_id)
 
 function handle_delete($id)
 {
-	global $Ajax, $def_coy, $db_connections, $comp_subdirs, $path_to_root;
+	global $Ajax, $def_coy, $db_connections, $comp_subdirs, $path_to_root, $Mode;
 
 	// First make sure all company directories from the one under removal are writable. 
 	// Without this after operation we end up with changed per-company owners!
@@ -235,28 +224,21 @@ function handle_delete($id)
 	}
 	display_notification(_("Selected company has been deleted"));
 	$Ajax->activate('_page_body');
+	$Mode = 'RESET';
 }
 
 //---------------------------------------------------------------------------------------------
 
 function display_companies()
 {
-	global $def_coy, $db_connections;
+	global $def_coy, $db_connections, $supported_collations;
 
 	$coyno = user_company();
 
-	echo "
-		<script type='text/javascript'>
-		function deleteCompany(id, name) {
-			if (!confirm('" . _("Are you sure you want to delete company no. ") . "'+id+' '+name+'?'))
-				return
-			document.location.replace('create_coy.php?c=df&id='+id)
-		}
-		</script>";
 	start_table(TABLESTYLE);
 
 	$th = array(_("Company"), _("Database Host"), _("Database User"),
-		_("Database Name"), _("Table Pref"), _("Default"), "", "");
+		_("Database Name"), _("Table Pref"), _("Charset"), _("Default"), "", "");
 	table_header($th);
 
 	$k=0;
@@ -264,10 +246,6 @@ function display_companies()
 	$n = count($conn);
 	for ($i = 0; $i < $n; $i++)
 	{
-		if ($i == $def_coy)
-			$what = _("Yes");
-		else
-			$what = _("No");
 		if ($i == $coyno)
     		start_row("class='stockmankobg'");
     	else
@@ -278,24 +256,23 @@ function display_companies()
 		label_cell($conn[$i]['dbuser']);
 		label_cell($conn[$i]['dbname']);
 		label_cell($conn[$i]['tbpref']);
-		label_cell($what);
-		$edit = _("Edit");
-		$delete = _("Delete");
-		if (user_graphic_links())
+		label_cell($supported_collations[$conn[$i]['collation']]);
+		label_cell($i == $def_coy ? _("Yes") : _("No"));
+	 	edit_button_cell("Edit".$i, _("Edit"));
+		if ($i != $coyno)
 		{
-			$edit = set_icon(ICON_EDIT, $edit);
-			$delete = set_icon(ICON_DELETE, $delete);
-		}
-    	label_cell("<a href='" . $_SERVER['PHP_SELF']. "?selected_id=$i'>$edit</a>");
-    	$name = "\"".$conn[$i]['name']."\"";
-		label_cell( $i == $coyno ? '' :
-			"<a href='javascript:deleteCompany($i, $name)'>$delete</a>");
+	 		delete_button_cell("Delete".$i, _("Delete"));
+			submit_js_confirm("Delete".$i, 
+				sprintf(_("You are about to remove company \'%s\'.\nDo you want to continue ?"), 
+					$conn[$i]['name']));
+	 	} else
+	 		label_cell('');
 		end_row();
 	}
 
 	end_table();
     display_note(_("The marked company is the current company which cannot be deleted."), 0, 0, "class='currentfg'");
-    display_note(_("If no Admin Password is entered, the new Admin Password will be '<b>password</b>' by default "), 1, 0, "class='currentfg'");
+    display_note(_("If no Admin Password is entered, the new Admin Password will be '<b>password</b>' by default "));
 }
 
 //---------------------------------------------------------------------------------------------
@@ -304,8 +281,6 @@ function display_company_edit($selected_id)
 {
 	global $def_coy, $db_connections, $tb_pref_counter;
 
-	start_form();
-
 	start_table(TABLESTYLE2);
 
 	if ($selected_id != -1)
@@ -317,25 +292,25 @@ function display_company_edit($selected_id)
 		$_POST['dbpassword']  = $conn['dbpassword'];
 		$_POST['dbname']  = $conn['dbname'];
 		$_POST['tbpref']  = $conn['tbpref'];
-		if ($selected_id == $def_coy)
-			$_POST['def'] = true;
-		else
-			$_POST['def'] = false;
+		$_POST['def'] = $selected_id == $def_coy;
 		$_POST['dbcreate']  = false;
-		hidden('selected_id', $selected_id);
+		$_POST['collation']  = $conn['collation'];
 		hidden('tbpref', $_POST['tbpref']);
 		hidden('dbpassword', $_POST['dbpassword']);
 	}
 	else
 	{
 		$_POST['tbpref'] = $tb_pref_counter."_";
-		// Insert the current settings as default
+
+		// Use current settings as default
 		$conn = $db_connections[user_company()];
 		$_POST['name'] = '';
 		$_POST['host']  = $conn['host'];
 		$_POST['dbuser']  = $conn['dbuser'];
 		$_POST['dbpassword']  = $conn['dbpassword'];
 		$_POST['dbname']  = $conn['dbname'];
+		$_POST['collation']  = $conn['collation'];
+		unset($_POST['def']);
 	}
 
 	text_row_ex(_("Company"), 'name', 50);
@@ -346,48 +321,49 @@ function display_company_edit($selected_id)
 		text_row_ex(_("Database User"), 'dbuser', 30);
 		text_row_ex(_("Database Password"), 'dbpassword', 30);
 		text_row_ex(_("Database Name"), 'dbname', 30);
+		collations_list_row(_("Database Collation:"), 'collation');
 		yesno_list_row(_("Table Pref"), 'tbpref', 1, $_POST['tbpref'], _("None"), false);
+		check_row(_("Default Company"), 'def');
+		coa_list_row(_("Database Script"), 'coa');
+		text_row_ex(_("New script Admin Password"), 'admpassword', 20);
 	} else {
 		label_row(_("Host"), $_POST['host']);
 		label_row(_("Database User"), $_POST['dbuser']);
 		label_row(_("Database Name"), $_POST['dbname']);
 		label_row(_("Table Pref"), $_POST['tbpref']);
+		if (!get_post('def'))
+			check_row(_("Default Company"), 'def');
+		else
+			label_row(_("Default Company"), _("Yes"));
 	}
-	yesno_list_row(_("Default"), 'def', null, "", "", false);
 
-	if ($selected_id == -1)
-	{
-		coa_list_row(_("Database Script"), 'coa');
-		text_row_ex(_("New script Admin Password"), 'admpassword', 20);
-	}
 	end_table(1);
-
-	submit_center('save', _("Save"));
-
-	end_form();
+	hidden('selected_id', $selected_id);
 }
 
-
 //---------------------------------------------------------------------------------------------
 
-if (isset($_GET['c']) && $_GET['c'] == 'df') {
-	handle_delete( (int)$_GET['id'] );
-	$selected_id = -1;
-}
+if (($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') && check_data($selected_id))
+	handle_submit($selected_id);
 
-if (get_post('save')) {
-	if (handle_submit($selected_id))
-		$selected_id = -1;
+if ($Mode == 'Delete')
+	handle_delete($selected_id);
+
+if ($Mode == 'RESET')
+{
+	$selected_id = -1;
+	unset($_POST);
 }
 
 //---------------------------------------------------------------------------------------------
 
-display_companies();
+start_form();
 
-hyperlink_no_params($_SERVER['PHP_SELF'], _("Create a new company"));
+	display_companies();
+	display_company_edit($selected_id);
+	submit_add_or_update_center($selected_id == -1, '', 'upgrade');
 
-display_company_edit($selected_id);
+end_form();
 
-//---------------------------------------------------------------------------------------------
 end_page();
 
diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index 6ab542d0..ad3a3278 100644
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -304,8 +304,12 @@ function db_import($filename, $connection, $force=true, $init=true, $protect=fal
 
 	$old_encoding = db_get_charset($db);
 
-	ini_set("max_execution_time", "180");
+	ini_set("max_execution_time", max("180", ini_get("max_execution_time")));
 	db_query("SET foreign_key_checks=0");
+
+	if (isset($connection['collation']))
+		db_set_collation($db, $connection['collation']);
+
 	$check_line_len = false;
 
 	// uncompress gziped backup files
diff --git a/includes/current_user.inc b/includes/current_user.inc
index 72a97118..fa676ec2 100644
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -450,21 +450,21 @@ function user_price_dec()
 {
 	global $SysPrefs;
 
-	return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->price_dec() : $SysPrefs->prices_dec;
+	return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->price_dec() : 2;
 }
 
 function user_exrate_dec()
 {
 	global $SysPrefs;
 
-	return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->exrate_dec() : $SysPrefs->rates_dec;
+	return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->exrate_dec() : 4;
 }
 
 function user_percent_dec()
 {
 	global $SysPrefs;
 
-	return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->percent_dec() : $SysPrefs->percent_dec;
+	return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->percent_dec() : 1;
 }
 
 function user_show_gl_info()
diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index 147f4a5f..b671945a 100644
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -62,35 +62,35 @@ function get_mysql_encoding_name($encoding)
 }
 
 /*
-	Returns 'best' collation for various locale language codes
+	Returns 'best' mysql collation for various FA backend language codes.
 */
 function get_mysql_collation($lang=null)
 {
 	if (!$lang)
-		$lang = substr($_SESSION['language']->code, 0, 2);
+		$lang = 'utf8_'.substr($_SESSION['language']->code, 0, 2);
 
 	$db_collation = array(
-		'is' => 'icelandic',
-		'lv' => 'latvian',
-		'ro' => 'romanian',
-		'sl' => 'slovenian',
-		'pl' => 'polish',
-		'et' => 'estonian',
-		'es' => 'spanish', // or 'spanish2',
-		'sw' => 'swedish',
-		'tr' => 'turkish',
-		'cs' => 'czech',
-		'da' => 'danish',
-		'lt' => 'lithuanian',
-		'sk' => 'slovak',
-		'sp' => 'spanish2',
-		'fa' => 'persian',
-		'hu' => 'hungarian',
-		'fr' => 'roman',
-		'it' => 'roman',
+		'utf8_is' => 'utf8_icelandic_ci',
+		'utf8_lv' => 'utf8_latvian_ci',
+		'utf8_ro' => 'utf8_romanian_ci',
+		'utf8_sl' => 'utf8_slovenian_ci',
+		'utf8_pl' => 'utf8_polish_ci',
+		'utf8_et' => 'utf8_estonian_ci',
+		'utf8_es' => 'utf8_spanish_ci', // or 'spanish2',
+		'utf8_sw' => 'utf8_swedish_ci',
+		'utf8_tr' => 'utf8_turkish_ci',
+		'utf8_cs' => 'utf8_czech_ci',
+		'utf8_da' => 'utf8_danish_ci',
+		'utf8_lt' => 'utf8_lithuanian_ci',
+		'utf8_sk' => 'utf8_slovak_ci',
+		'utf8_sp' => 'utf8_spanish2_ci',
+		'utf8_fa' => 'utf8_persian_ci',
+		'utf8_hu' => 'utf8_hungarian_ci',
+		'utf8_fr' => 'utf8_roman_ci',
+		'utf8_it' => 'utf8_roman_ci',
 	);
 
-	return 'utf8_'.(isset($db_collation[$lang]) ? $db_collation[$lang] : 'unicode').'_ci';
+	return isset($db_collation[$lang]) ? $db_collation[$lang] : 'utf8_unicode_ci';
 }
 
 /*
diff --git a/includes/db/connect_db_mysql.inc b/includes/db/connect_db_mysql.inc
index f6417e45..aa30740f 100644
--- a/includes/db/connect_db_mysql.inc
+++ b/includes/db/connect_db_mysql.inc
@@ -186,6 +186,15 @@ function db_field_name($result, $n)
 	return mysql_field_name($result, $n);
 }
 
+function db_set_collation($db, $fa_collation)
+{
+	return mysql_query("ALTER DATABASE COLLATE ".get_mysql_collation($fa_collation), $db);
+}
+
+/*
+	Create database for FA company. If database already exists,
+	just set collation to be sure nothing weird will happen later.
+*/
 function db_create_db($connection)
 {
 	$db = mysql_connect($connection["host"] ,
@@ -193,10 +202,15 @@ function db_create_db($connection)
 
 	if (!mysql_select_db($connection["dbname"], $db))
 	{
-		$sql = "CREATE DATABASE IF NOT EXISTS " . $connection["dbname"] . "";
+		$sql = "CREATE DATABASE IF NOT EXISTS `" . $connection["dbname"] . "`"
+			. " DEFAULT COLLATE '" . get_mysql_collation($connection["collation"]) . "'";
+
 		if (!mysql_query($sql) || !mysql_select_db($connection["dbname"], $db))
+				return 0;
+	} else
+		if (!db_set_collation($connection["collation"], $db))
 			return 0;
-	}
+
 	return $db;
 }
 
diff --git a/includes/db/connect_db_mysqli.inc b/includes/db/connect_db_mysqli.inc
index 0654c460..30e3f6c7 100644
--- a/includes/db/connect_db_mysqli.inc
+++ b/includes/db/connect_db_mysqli.inc
@@ -19,6 +19,7 @@ function set_global_connection($company=-1)
 	global $db, $path_to_root, $db_connections, $SysPrefs;
 
 	include ($path_to_root . "/config_db.php");
+
 	if ($company == -1) 
 		$company = user_company();
 
@@ -186,15 +187,33 @@ function db_field_name($result, $n)
     return $fieldinfo->name;
 }
 
+function db_set_collation($db, $fa_collation)
+{
+	return mysqli_query($db, "ALTER DATABASE COLLATE ".get_mysql_collation($fa_collation));
+}
+
+/*
+	Create database for FA company. If database already exists,
+	just set collation to be sure nothing weird will happen later.
+*/
 function db_create_db($connection)
 {
+	global $db;
+
 	$db = mysqli_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"]);
 
 	if (!mysqli_select_db($db, $connection["dbname"]))
 	{
-		$sql = "CREATE DATABASE IF NOT EXISTS `" . $connection["dbname"] . "`";
+		$sql = "CREATE DATABASE IF NOT EXISTS `" . $connection["dbname"] . "`"
+			. " DEFAULT COLLATE '" . get_mysql_collation($connection["collation"]) . "'";
+
 		if (!mysqli_query($db, $sql) || !mysqli_select_db($db, $connection["dbname"]))
 			return 0;
+	} else {
+		if (!db_set_collation($db, $connection["collation"]))
+		{
+			return 0;
+		}
 	}
 	return $db;
 }
diff --git a/includes/sysnames.inc b/includes/sysnames.inc
index c5667300..efb700ba 100644
--- a/includes/sysnames.inc
+++ b/includes/sysnames.inc
@@ -199,3 +199,28 @@ $bank_owner_types = array(
 // This month array is for use with the last 3 dateformats. 
 $tmonths = array("", _("Jan"),_("Feb"),_("Mar"),_("Apr"),_("May"),_("Jun"),_("Jul"),_("Aug"),_("Sep"),_("Oct"),_("Nov"),_("Dec"));
 
+//
+//	FA supported db backend language settings.
+//
+$supported_collations = array(
+  'utf8_xx' => _('Unicode (multilanguage)'),
+  'utf8_is' => _('Icelandic'),
+  'utf8_lv' => _('Latvian'),
+  'utf8_ro' => _('Romanian'),
+  'utf8_sl' => _('Slovenian'),
+  'utf8_pl' => _('Polish'),
+  'utf8_et' => _('Estonian'),
+  'utf8_es' => _('Spanish'), // or 'spanish2',
+  'utf8_sw' => _('Swedish'),
+  'utf8_tr' => _('Turkish'),
+  'utf8_cs' => _('Czech'),
+  'utf8_da' => _('Danish'),
+  'utf8_lt' => _('Lithuanian'),
+  'utf8_sk' => _('Slovak'),
+  'utf8_sp' => _('Spanish (alternative)'),
+  'utf8_fa' => _('Persian'),
+  'utf8_hu' => _('Hungarian'),
+  'utf8_fr' => _('French'),
+  'utf8_it' => _('Italian'),
+);
+
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 0d4d0bfe..ef8b9cac 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -202,6 +202,7 @@ function submit_center_last($name, $value, $title=false, $async=false, $icon=fal
 /*
 	For following controls:
 	'both' - use both Ctrl-Enter and Escape hotkeys 
+	'upgrade' - use Ctrl-Enter with progress ajax indicator and Escape hotkeys. Nonajax request for OK option is performed.
 	'cancel' - apply to 'RESET' button
 */
 function submit_add_or_update($add=true, $title=false, $async=false, $clone=false)
@@ -210,7 +211,10 @@ function submit_add_or_update($add=true, $title=false, $async=false, $clone=fals
 
 	if ($async === 'both') {
 		$async = 'default'; $cancel = 'cancel';
-	} 
+	}
+	elseif ($async === 'upgrade') {
+		$async = 'default nonajax process'; $cancel = 'cancel';
+	}
 	else if ($async === 'default')
 		$cancel = true;
 	else if ($async === 'cancel')
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 6170e79f..88b33f4f 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -2445,3 +2445,16 @@ function users_list_cells($label, $name, $selected_id=null, $submit_on_change=fa
 
 }
 
+function collations_list_row($label, $name, $selected_id=null)
+{
+	global $supported_collations;
+
+	echo "<tr>";
+	if ($label != null)
+		echo "<td class='label'>$label</td>\n";
+	echo "<td>";
+
+	echo array_selector($name, $selected_id, $supported_collations, 
+		array('select_submit'=> false) );
+	echo "</td></tr>\n";
+}
diff --git a/install/index.php b/install/index.php
index 9bc9a41e..68654246 100644
--- a/install/index.php
+++ b/install/index.php
@@ -144,10 +144,11 @@ function do_install() {
 		$db_connections = array (0=> array (
 		 'name' => $con['name'],
 		 'host' => $con['host'],
+		 'dbname' => $con['dbname'],
+		 'collation' => $con['collation'],
+		 'tbpref' => $table_prefix,
 		 'dbuser' => $con['dbuser'],
 		 'dbpassword' => $con['dbpassword'],
-		 'dbname' => $con['dbname'],
-		 'tbpref' => $table_prefix
 		));
 
 		$_SESSION['wa_current_user']->cur_con = 0;
@@ -194,7 +195,8 @@ if (!isset($_SESSION['inst_set']))  // default settings
 		'username' => 'admin',
 		'tbpref' => '0_',
 		'admin' => 'admin',
-		'inst_lang' => 'C'
+		'inst_lang' => 'C',
+		'collation' => 'xx',
 	);
 
 if (!@$_POST['Tests'])
@@ -231,6 +233,7 @@ elseif (isset($_POST['db_test'])) {
 			'tbpref' => $_POST['tbpref'] ? '0_' : '',
 			'sel_langs' => check_value('sel_langs'),
 			'sel_coas' => check_value('sel_coas'),
+			'collation' => $_POST['collation'],
 		));
 		if (install_connect_db()) {
 			$_POST['Page'] = check_value('sel_langs') ? 3 :
@@ -342,14 +345,16 @@ start_form();
 			subpage_title(_('Database Server Settings'));
 			start_table(TABLESTYLE);
 			text_row_ex(_("Server Host:"), 'host', 30, 60);
+			text_row_ex(_("Database Name:"), 'dbname', 30);
 			text_row_ex(_("Database User:"), 'dbuser', 30);
 			text_row_ex(_("Database Password:"), 'dbpassword', 30);
-			text_row_ex(_("Database Name:"), 'dbname', 30);
+			collations_list_row(_("Database Collation:"), 'collation');
 			yesno_list_row(_("Use '0_' Table Prefix:"), 'tbpref', 1, _('Yes'), _('No'), false);
 			check_row(_("Install Additional Language Packs from FA Repository:"), 'sel_langs');
 			check_row(_("Install Additional COAs from FA Repository:"), 'sel_coas');
 			end_table(1);
-			display_note(_('Use table prefix if you share selected database for more than one FA company.'));
+			display_note(_("Select collation you want to use. If you are unsure or you will use various languages, select unicode collation."));
+			display_note(_("Use table prefix if you share selected database for more than one FA company suing the same collation."));
 			display_note(_("Do not select additional langs nor COAs if you have no working internet connection right now. You can install them later."));
 			submit_center_first('back', _('<< Back'));
 			submit_center_last('db_test', _('Continue >>'));
@@ -390,7 +395,7 @@ start_form();
 			languages_list_row(_("Select Default Language:"), 'lang');
 			end_table(1);
 			submit_center_first('back', _('<< Back'));
-			submit_center_last('set_admin', _('Continue >>'));
+			submit_center_last('set_admin', _('Install'), _('Start installation process'), 'default nonajax');
 			break;
 
 		case '6': // final screen
diff --git a/sql/alter2.4.php b/sql/alter2.4.php
index 768da67b..ae2265c8 100644
--- a/sql/alter2.4.php
+++ b/sql/alter2.4.php
@@ -9,40 +9,6 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-function collations_list_row($label, $name, $selected_id=null)
-{
-
-$mysql_collations = array(
-  'xx' => 'Unicode (multilanguage)',
-  'is' => 'Icelandic',
-  'lv' => 'Latvian',
-  'ro' => 'Romanian',
-  'sl' => 'Slovenian',
-  'pl' => 'Polish',
-  'et' => 'Estonian',
-  'es' => 'Spanish', // or 'spanish2',
-  'sw' => 'Swedish',
-  'tr' => 'Turkish',
-  'cs' => 'Czech',
-  'da' => 'Danish',
-  'lt' => 'Lithuanian',
-  'sk' => 'Slovak',
-  'sp' => 'Spanish (alternative)',
-  'fa' => 'Persian',
-  'hu' => 'Hungarian',
-  'fr' => 'French',
-  'it' => 'Italian',
-);
-
-	echo "<tr>";
-	if ($label != null)
-		echo "<td class='label'>$label</td>\n";
-	echo "<td>";
-
-	echo array_selector($name, $selected_id, $mysql_collations, 
-		array('select_submit'=> false) );
-	echo "</td></tr>\n";
-}
 
 class fa2_4 extends fa_patch {
 	var $previous = '2.3rc';		// applicable database version
diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index 62a93c3f..2540c7bc 100644
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -24,7 +24,7 @@ CREATE TABLE IF NOT EXISTS `0_areas` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`area_code`),
   UNIQUE KEY `description` (`description`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
 
 --
 -- Dumping data for table `0_areas`
@@ -51,7 +51,7 @@ CREATE TABLE IF NOT EXISTS `0_attachments` (
   `filetype` varchar(60) NOT NULL default '',
   PRIMARY KEY  (`id`),
   KEY `type_no` (`type_no`,`trans_no`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_attachments`
@@ -78,7 +78,7 @@ CREATE TABLE IF NOT EXISTS `0_audit_trail` (
   PRIMARY KEY  (`id`),
   KEY `Seq` (`fiscal_year`,`gl_date`,`gl_seq`),
   KEY `Type_and_Number` (`type`,`trans_no`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_audit_trail`
@@ -110,7 +110,7 @@ CREATE TABLE IF NOT EXISTS `0_bank_accounts` (
   KEY `bank_account_name` (`bank_account_name`),
   KEY `bank_account_number` (`bank_account_number`),
   KEY `account_code` (`account_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=3 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=3 ;
 
 --
 -- Dumping data for table `0_bank_accounts`
@@ -144,7 +144,7 @@ CREATE TABLE IF NOT EXISTS `0_bank_trans` (
   KEY `type` (`type`,`trans_no`),
   KEY `bank_act_2` (`bank_act`,`reconciled`),
   KEY `bank_act_3` (`bank_act`,`trans_date`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=12 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=12 ;
 
 --
 -- Dumping data for table `0_bank_trans`
@@ -182,7 +182,7 @@ CREATE TABLE IF NOT EXISTS `0_bom` (
   KEY `loc_code` (`loc_code`),
   KEY `parent` (`parent`,`loc_code`),
   KEY `workcentre_added` (`workcentre_added`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=4 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=4 ;
 
 --
 -- Dumping data for table `0_bom`
@@ -209,7 +209,7 @@ CREATE TABLE IF NOT EXISTS `0_budget_trans` (
   `dimension2_id` int(11) default '0',
   PRIMARY KEY  (`id`),
   KEY `Account` (`account`,`tran_date`,`dimension_id`,`dimension2_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_budget_trans`
@@ -229,7 +229,7 @@ CREATE TABLE IF NOT EXISTS `0_chart_class` (
   `ctype` tinyint(1) NOT NULL default '0',
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`cid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_chart_class`
@@ -256,7 +256,7 @@ CREATE TABLE IF NOT EXISTS `0_chart_master` (
   PRIMARY KEY  (`account_code`),
   KEY `account_name` (`account_name`),
   KEY `accounts_by_type` (`account_type`,`account_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_chart_master`
@@ -357,7 +357,7 @@ CREATE TABLE IF NOT EXISTS `0_chart_types` (
   PRIMARY KEY  (`id`),
   KEY `name` (`name`),
   KEY `class_id` (`class_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ;
+) ENGINE=InnoDB ;
 
 --
 -- Dumping data for table `0_chart_types`
@@ -389,7 +389,7 @@ CREATE TABLE IF NOT EXISTS `0_comments` (
   `date_` date default '0000-00-00',
   `memo_` tinytext,
   KEY `type_and_id` (`type`,`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_comments`
@@ -410,7 +410,7 @@ CREATE TABLE IF NOT EXISTS `0_credit_status` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `reason_description` (`reason_description`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=5 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=5 ;
 
 --
 -- Dumping data for table `0_credit_status`
@@ -438,7 +438,7 @@ CREATE TABLE IF NOT EXISTS `0_crm_categories` (
   PRIMARY KEY  (`id`),
   UNIQUE KEY `type` (`type`,`action`),
   UNIQUE KEY `type_2` (`type`,`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=13 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=13 ;
 
 --
 -- Dumping data for table `0_crm_categories`
@@ -472,7 +472,7 @@ CREATE TABLE IF NOT EXISTS `0_crm_contacts` (
   `entity_id` varchar(11) default NULL COMMENT 'entity id in related class table',
   PRIMARY KEY  (`id`),
   KEY `type` (`type`,`action`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=10 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=10 ;
 
 --
 -- Dumping data for table `0_crm_contacts`
@@ -510,7 +510,7 @@ CREATE TABLE IF NOT EXISTS `0_crm_persons` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `ref` (`ref`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=10 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=10 ;
 
 --
 -- Dumping data for table `0_crm_persons`
@@ -542,7 +542,7 @@ CREATE TABLE IF NOT EXISTS `0_currencies` (
   `auto_update` tinyint(1) NOT NULL default '1',
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`curr_abrev`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_currencies`
@@ -574,7 +574,7 @@ CREATE TABLE IF NOT EXISTS `0_cust_allocations` (
   UNIQUE KEY `trans_type_from` (`person_id`,`trans_type_from`,`trans_no_from`,`trans_type_to`,`trans_no_to`),
   KEY `From` (`trans_type_from`,`trans_no_from`),
   KEY `To` (`trans_type_to`,`trans_no_to`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
 
 --
 -- Dumping data for table `0_cust_allocations`
@@ -613,7 +613,7 @@ CREATE TABLE IF NOT EXISTS `0_cust_branch` (
   KEY `branch_code` (`branch_code`),
   KEY `branch_ref` (`branch_ref`),
   KEY `group_no` (`group_no`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=4 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=4 ;
 
 --
 -- Dumping data for table `0_cust_branch`
@@ -650,7 +650,7 @@ CREATE TABLE IF NOT EXISTS `0_debtors_master` (
   PRIMARY KEY  (`debtor_no`),
   KEY `name` (`name`),
   UNIQUE KEY `debtor_ref` (`debtor_ref`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=4 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=4 ;
 
 --
 -- Dumping data for table `0_debtors_master`
@@ -695,7 +695,7 @@ CREATE TABLE IF NOT EXISTS `0_debtor_trans` (
   KEY `debtor_no` (`debtor_no`,`branch_code`),
   KEY `tran_date` (`tran_date`),
   KEY `order_` (`order_`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_debtor_trans`
@@ -733,7 +733,7 @@ CREATE TABLE IF NOT EXISTS `0_debtor_trans_details` (
   PRIMARY KEY  (`id`),
   KEY `Transaction` (`debtor_trans_type`,`debtor_trans_no`),
   KEY (`src_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=9 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=9 ;
 
 --
 -- Dumping data for table `0_debtor_trans_details`
@@ -768,7 +768,7 @@ CREATE TABLE IF NOT EXISTS `0_dimensions` (
   KEY `date_` (`date_`),
   KEY `due_date` (`due_date`),
   KEY `type_` (`type_`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=3 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=3 ;
 
 --
 -- Dumping data for table `0_dimensions`
@@ -792,7 +792,7 @@ CREATE TABLE IF NOT EXISTS `0_exchange_rates` (
   `date_` date NOT NULL default '0000-00-00',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `curr_code` (`curr_code`,`date_`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=4 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=4 ;
 
 --
 -- Dumping data for table `0_exchange_rates`
@@ -817,7 +817,7 @@ CREATE TABLE IF NOT EXISTS `0_fiscal_year` (
   PRIMARY KEY  (`id`),
   UNIQUE KEY `begin` (`begin`),
   UNIQUE KEY `end` (`end`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=3 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=3 ;
 
 --
 -- Dumping data for table `0_fiscal_year`
@@ -849,7 +849,7 @@ CREATE TABLE IF NOT EXISTS `0_gl_trans` (
   KEY `dimension2_id` (`dimension2_id`),
   KEY `tran_date` (`tran_date`),
   KEY `account_and_tran_date` (`account`,`tran_date`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=84 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=84 ;
 
 --
 -- Dumping data for table `0_gl_trans`
@@ -957,7 +957,7 @@ CREATE TABLE IF NOT EXISTS `0_grn_batch` (
   PRIMARY KEY  (`id`),
   KEY `delivery_date` (`delivery_date`),
   KEY `purch_order_no` (`purch_order_no`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
 
 --
 -- Dumping data for table `0_grn_batch`
@@ -982,7 +982,7 @@ CREATE TABLE IF NOT EXISTS `0_grn_items` (
   `quantity_inv` double NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `grn_batch_id` (`grn_batch_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=4 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=4 ;
 
 --
 -- Dumping data for table `0_grn_items`
@@ -1005,7 +1005,7 @@ CREATE TABLE IF NOT EXISTS `0_groups` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `description` (`description`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=4 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=4 ;
 
 --
 -- Dumping data for table `0_groups`
@@ -1034,7 +1034,7 @@ CREATE TABLE IF NOT EXISTS `0_item_codes` (
   PRIMARY KEY  (`id`),
   UNIQUE KEY `stock_id` (`stock_id`,`item_code`),
   KEY `item_code` (`item_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=6 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=6 ;
 
 --
 -- Dumping data for table `0_item_codes`
@@ -1060,7 +1060,7 @@ CREATE TABLE IF NOT EXISTS `0_item_tax_types` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
 
 --
 -- Dumping data for table `0_item_tax_types`
@@ -1079,7 +1079,7 @@ CREATE TABLE IF NOT EXISTS `0_item_tax_type_exemptions` (
   `item_tax_type_id` int(11) NOT NULL default '0',
   `tax_type_id` int(11) NOT NULL default '0',
   PRIMARY KEY  (`item_tax_type_id`,`tax_type_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_item_tax_type_exemptions`
@@ -1100,7 +1100,7 @@ CREATE TABLE IF NOT EXISTS `0_item_units` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`abbr`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_item_units`
@@ -1125,7 +1125,7 @@ CREATE TABLE `0_journal` (
   `rate` double NOT NULL DEFAULT '1',
   PRIMARY KEY (`type`,`trans_no`),
   KEY `tran_date` (`tran_date`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ;
+) ENGINE=InnoDB ;
 
 -- Data of table `0_journal`
 
@@ -1148,7 +1148,7 @@ CREATE TABLE IF NOT EXISTS `0_locations` (
   `contact` varchar(30) NOT NULL default '',
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`loc_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_locations`
@@ -1169,7 +1169,7 @@ CREATE TABLE IF NOT EXISTS `0_loc_stock` (
   `reorder_level` double NOT NULL default '0',
   PRIMARY KEY  (`loc_code`,`stock_id`),
   KEY `stock_id` (`stock_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_loc_stock`
@@ -1196,7 +1196,7 @@ CREATE TABLE IF NOT EXISTS `0_payment_terms` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`terms_indicator`),
   UNIQUE KEY `terms` (`terms`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=5 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=5 ;
 
 --
 -- Dumping data for table `0_payment_terms`
@@ -1222,7 +1222,7 @@ CREATE TABLE IF NOT EXISTS `0_prices` (
   `price` double NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `price` (`stock_id`,`sales_type_id`,`curr_abrev`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=5 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=5 ;
 
 --
 -- Dumping data for table `0_prices`
@@ -1250,7 +1250,7 @@ CREATE TABLE IF NOT EXISTS `0_printers` (
   `timeout` tinyint(3) unsigned NOT NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=4 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=4 ;
 
 --
 -- Dumping data for table `0_printers`
@@ -1274,7 +1274,7 @@ CREATE TABLE IF NOT EXISTS `0_print_profiles` (
   `printer` tinyint(3) unsigned default NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `profile` (`profile`,`report`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=10 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=10 ;
 
 --
 -- Dumping data for table `0_print_profiles`
@@ -1305,7 +1305,7 @@ CREATE TABLE IF NOT EXISTS `0_purch_data` (
   `conversion_factor` double NOT NULL default '1',
   `supplier_description` char(50) NOT NULL default '',
   PRIMARY KEY  (`supplier_id`,`stock_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_purch_data`
@@ -1337,7 +1337,7 @@ CREATE TABLE IF NOT EXISTS `0_purch_orders` (
   `tax_included` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`order_no`),
   KEY `ord_date` (`ord_date`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=3 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=3 ;
 
 --
 -- Dumping data for table `0_purch_orders`
@@ -1368,7 +1368,7 @@ CREATE TABLE IF NOT EXISTS `0_purch_order_details` (
   PRIMARY KEY  (`po_detail_item`),
   KEY `order` (`order_no`,`po_detail_item`),
   KEY `itemcode` (`item_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=6 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=6 ;
 
 --
 -- Dumping data for table `0_purch_order_details`
@@ -1397,7 +1397,7 @@ CREATE TABLE IF NOT EXISTS `0_quick_entries` (
   `bal_type` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `description` (`description`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=4 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=4 ;
 
 --
 -- Dumping data for table `0_quick_entries`
@@ -1425,7 +1425,7 @@ CREATE TABLE IF NOT EXISTS `0_quick_entry_lines` (
   `dimension2_id` smallint(6) unsigned default NULL,
   PRIMARY KEY  (`id`),
   KEY `qid` (`qid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=8 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=8 ;
 
 --
 -- Dumping data for table `0_quick_entry_lines`
@@ -1458,7 +1458,7 @@ CREATE TABLE IF NOT EXISTS `0_recurrent_invoices` (
   `last_sent` date NOT NULL default '0000-00-00',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `description` (`description`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_recurrent_invoices`
@@ -1478,7 +1478,7 @@ CREATE TABLE IF NOT EXISTS `0_refs` (
   `reference` varchar(100) NOT NULL default '',
   PRIMARY KEY  (`id`,`type`),
   KEY `Type_and_Reference` (`type`,`reference`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_refs`
@@ -1506,7 +1506,7 @@ CREATE TABLE IF NOT EXISTS `0_salesman` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`salesman_code`),
   UNIQUE KEY `salesman_name` (`salesman_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
 
 --
 -- Dumping data for table `0_salesman`
@@ -1546,7 +1546,7 @@ CREATE TABLE IF NOT EXISTS `0_sales_orders` (
   `prep_amount` double NOT NULL DEFAULT '0',
   `alloc` double NOT NULL DEFAULT '0',
   PRIMARY KEY  (`trans_type`,`order_no`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_sales_orders`
@@ -1579,7 +1579,7 @@ CREATE TABLE IF NOT EXISTS `0_sales_order_details` (
   PRIMARY KEY  (`id`),
   KEY `sorder` (`trans_type`,`order_no`),
   KEY `stkcode` (`stk_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=6 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=6 ;
 
 --
 -- Dumping data for table `0_sales_order_details`
@@ -1608,7 +1608,7 @@ CREATE TABLE IF NOT EXISTS `0_sales_pos` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `pos_name` (`pos_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
 
 --
 -- Dumping data for table `0_sales_pos`
@@ -1631,7 +1631,7 @@ CREATE TABLE IF NOT EXISTS `0_sales_types` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `sales_type` (`sales_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=3 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=3 ;
 
 --
 -- Dumping data for table `0_sales_types`
@@ -1656,7 +1656,7 @@ CREATE TABLE IF NOT EXISTS `0_security_roles` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `role` (`role`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=11 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=11 ;
 
 --
 -- Dumping data for table `0_security_roles`
@@ -1690,7 +1690,7 @@ CREATE TABLE IF NOT EXISTS `0_shippers` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`shipper_id`),
   UNIQUE KEY `name` (`shipper_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
 
 --
 -- Dumping data for table `0_shippers`
@@ -1711,7 +1711,7 @@ CREATE TABLE IF NOT EXISTS `0_sql_trail` (
   `result` tinyint(1) NOT NULL,
   `msg` varchar(255) NOT NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_sql_trail`
@@ -1743,7 +1743,7 @@ CREATE TABLE IF NOT EXISTS `0_stock_category` (
   `dflt_no_purchase` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`category_id`),
   UNIQUE KEY `description` (`description`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=5 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=5 ;
 
 --
 -- Dumping data for table `0_stock_category`
@@ -1786,7 +1786,7 @@ CREATE TABLE IF NOT EXISTS `0_stock_master` (
   `no_purchase` tinyint(1) NOT NULL default '0',
   `editable` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`stock_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_stock_master`
@@ -1819,7 +1819,7 @@ CREATE TABLE `0_stock_moves` (
   PRIMARY KEY (`trans_id`),
   KEY `type` (`type`,`trans_no`),
   KEY `Move` (`stock_id`,`loc_code`,`tran_date`)
-) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=utf8 ;
+) ENGINE=InnoDB AUTO_INCREMENT=37 ;
 
 --
 -- Dumping data for table `0_stock_moves`
@@ -1897,7 +1897,7 @@ CREATE TABLE IF NOT EXISTS `0_suppliers` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`supplier_id`),
   KEY `supp_ref` (`supp_ref`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=4 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=4 ;
 
 --
 -- Dumping data for table `0_suppliers`
@@ -1927,7 +1927,7 @@ CREATE TABLE IF NOT EXISTS `0_supp_allocations` (
   UNIQUE KEY `trans_type_from` (`person_id`,`trans_type_from`,`trans_no_from`,`trans_type_to`,`trans_no_to`),
   KEY `From` (`trans_type_from`,`trans_no_from`),
   KEY `To` (`trans_type_to`,`trans_no_to`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
 
 --
 -- Dumping data for table `0_supp_allocations`
@@ -1959,7 +1959,7 @@ CREATE TABLE IF NOT EXISTS `0_supp_invoice_items` (
   `dimension2_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY  (`id`),
   KEY `Transaction` (`supp_trans_type`,`supp_trans_no`,`stock_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=6 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=6 ;
 
 --
 -- Dumping data for table `0_supp_invoice_items`
@@ -1997,7 +1997,7 @@ CREATE TABLE IF NOT EXISTS `0_supp_trans` (
   KEY `SupplierID_2` (`supplier_id`,`supp_reference`),
   KEY `type` (`type`),
   KEY `tran_date` (`tran_date`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_supp_trans`
@@ -2022,7 +2022,7 @@ CREATE TABLE IF NOT EXISTS `0_sys_prefs` (
   `value` TEXT NOT NULL DEFAULT '',
   PRIMARY KEY  (`name`),
   KEY `category` (`category`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_sys_prefs`
@@ -2108,7 +2108,7 @@ CREATE TABLE IF NOT EXISTS `0_sys_types` (
   `type_no` int(11) NOT NULL default '1',
   `next_reference` varchar(100) NOT NULL default '',
   PRIMARY KEY  (`type_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_sys_types`
@@ -2152,7 +2152,7 @@ CREATE TABLE IF NOT EXISTS `0_tags` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `type` (`type`,`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_tags`
@@ -2170,7 +2170,7 @@ CREATE TABLE IF NOT EXISTS `0_tag_associations` (
   `record_id` varchar(15) NOT NULL,
   `tag_id` int(11) NOT NULL,
   UNIQUE KEY `record_id` (`record_id`,`tag_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_tag_associations`
@@ -2190,7 +2190,7 @@ CREATE TABLE IF NOT EXISTS `0_tax_groups` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=3 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=3 ;
 
 --
 -- Dumping data for table `0_tax_groups`
@@ -2211,7 +2211,7 @@ CREATE TABLE IF NOT EXISTS `0_tax_group_items` (
   `tax_type_id` int(11) NOT NULL default '0',
   `tax_shipping` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`tax_group_id`,`tax_type_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_tax_group_items`
@@ -2234,7 +2234,7 @@ CREATE TABLE IF NOT EXISTS `0_tax_types` (
   `name` varchar(60) NOT NULL default '',
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
 
 --
 -- Dumping data for table `0_tax_types`
@@ -2265,7 +2265,7 @@ CREATE TABLE IF NOT EXISTS `0_trans_tax_details` (
   PRIMARY KEY  (`id`),
   KEY `Type_and_Number` (`trans_type`,`trans_no`),
   KEY `tran_date` (`tran_date`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=12 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=12 ;
 
 --
 -- Dumping data for table `0_trans_tax_details`
@@ -2298,7 +2298,7 @@ CREATE TABLE IF NOT EXISTS `0_useronline` (
   PRIMARY KEY  (`id`),
   KEY `timestamp` (`timestamp`),
   KEY `ip` (`ip`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_useronline`
@@ -2350,7 +2350,7 @@ CREATE TABLE IF NOT EXISTS `0_users` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `user_id` (`user_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=3 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=3 ;
 
 --
 -- Dumping data for table `0_users`
@@ -2372,7 +2372,7 @@ CREATE TABLE IF NOT EXISTS `0_voided` (
   `date_` date NOT NULL default '0000-00-00',
   `memo_` tinytext NOT NULL,
   UNIQUE KEY `id` (`type`,`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_voided`
@@ -2393,7 +2393,7 @@ CREATE TABLE IF NOT EXISTS `0_workcentres` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
 
 --
 -- Dumping data for table `0_workcentres`
@@ -2424,7 +2424,7 @@ CREATE TABLE IF NOT EXISTS `0_workorders` (
   `additional_costs` double NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `wo_ref` (`wo_ref`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=8 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=8 ;
 
 --
 -- Dumping data for table `0_workorders`
@@ -2453,7 +2453,7 @@ CREATE TABLE `0_wo_costing` (
   `trans_no` int(11) NOT NULL default '0',
   `factor` double NOT NULL default '1',
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_wo_costing`
@@ -2476,7 +2476,7 @@ CREATE TABLE IF NOT EXISTS `0_wo_issues` (
   `workcentre_id` int(11) default NULL,
   PRIMARY KEY  (`issue_no`),
   KEY `workorder_id` (`workorder_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_wo_issues`
@@ -2496,7 +2496,7 @@ CREATE TABLE IF NOT EXISTS `0_wo_issue_items` (
   `issue_id` int(11) default NULL,
   `qty_issued` double default NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_wo_issue_items`
@@ -2518,7 +2518,7 @@ CREATE TABLE IF NOT EXISTS `0_wo_manufacture` (
   `date_` date NOT NULL default '0000-00-00',
   PRIMARY KEY  (`id`),
   KEY `workorder_id` (`workorder_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
 
 --
 -- Dumping data for table `0_wo_manufacture`
@@ -2544,7 +2544,7 @@ CREATE TABLE IF NOT EXISTS `0_wo_requirements` (
   `units_issued` double NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `workorder_id` (`workorder_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=22 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=22 ;
 
 --
 -- Dumping data for table `0_wo_requirements`
diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index 39257f71..27ec7b3a 100644
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -24,7 +24,7 @@ CREATE TABLE IF NOT EXISTS `0_areas` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`area_code`),
   UNIQUE KEY `description` (`description`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
 
 --
 -- Dumping data for table `0_areas`
@@ -51,7 +51,7 @@ CREATE TABLE IF NOT EXISTS `0_attachments` (
   `filetype` varchar(60) NOT NULL default '',
   PRIMARY KEY  (`id`),
   KEY `type_no` (`type_no`,`trans_no`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_attachments`
@@ -78,7 +78,7 @@ CREATE TABLE IF NOT EXISTS `0_audit_trail` (
   PRIMARY KEY  (`id`),
   KEY `Seq` (`fiscal_year`,`gl_date`,`gl_seq`),
   KEY `Type_and_Number` (`type`,`trans_no`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_audit_trail`
@@ -110,7 +110,7 @@ CREATE TABLE IF NOT EXISTS `0_bank_accounts` (
   KEY `bank_account_name` (`bank_account_name`),
   KEY `bank_account_number` (`bank_account_number`),
   KEY `account_code` (`account_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=3 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=3 ;
 
 --
 -- Dumping data for table `0_bank_accounts`
@@ -144,7 +144,7 @@ CREATE TABLE IF NOT EXISTS `0_bank_trans` (
   KEY `type` (`type`,`trans_no`),
   KEY `bank_act_2` (`bank_act`,`reconciled`),
   KEY `bank_act_3` (`bank_act`,`trans_date`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_bank_trans`
@@ -171,7 +171,7 @@ CREATE TABLE IF NOT EXISTS `0_bom` (
   KEY `loc_code` (`loc_code`),
   KEY `parent` (`parent`,`loc_code`),
   KEY `workcentre_added` (`workcentre_added`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_bom`
@@ -195,7 +195,7 @@ CREATE TABLE IF NOT EXISTS `0_budget_trans` (
   `dimension2_id` int(11) default '0',
   PRIMARY KEY  (`id`),
   KEY `Account` (`account`,`tran_date`,`dimension_id`,`dimension2_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_budget_trans`
@@ -215,7 +215,7 @@ CREATE TABLE IF NOT EXISTS `0_chart_class` (
   `ctype` tinyint(1) NOT NULL default '0',
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`cid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_chart_class`
@@ -242,7 +242,7 @@ CREATE TABLE IF NOT EXISTS `0_chart_master` (
   PRIMARY KEY  (`account_code`),
   KEY `account_name` (`account_name`),
   KEY `accounts_by_type` (`account_type`,`account_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_chart_master`
@@ -343,7 +343,7 @@ CREATE TABLE IF NOT EXISTS `0_chart_types` (
   PRIMARY KEY  (`id`),
   KEY `name` (`name`),
   KEY `class_id` (`class_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ;
+) ENGINE=InnoDB ;
 
 --
 -- Dumping data for table `0_chart_types`
@@ -375,7 +375,7 @@ CREATE TABLE IF NOT EXISTS `0_comments` (
   `date_` date default '0000-00-00',
   `memo_` tinytext,
   KEY `type_and_id` (`type`,`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_comments`
@@ -396,7 +396,7 @@ CREATE TABLE IF NOT EXISTS `0_credit_status` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `reason_description` (`reason_description`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=5 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=5 ;
 
 --
 -- Dumping data for table `0_credit_status`
@@ -424,7 +424,7 @@ CREATE TABLE IF NOT EXISTS `0_crm_categories` (
   PRIMARY KEY  (`id`),
   UNIQUE KEY `type` (`type`,`action`),
   UNIQUE KEY `type_2` (`type`,`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=13 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=13 ;
 
 --
 -- Dumping data for table `0_crm_categories`
@@ -458,7 +458,7 @@ CREATE TABLE IF NOT EXISTS `0_crm_contacts` (
   `entity_id` varchar(11) default NULL COMMENT 'entity id in related class table',
   PRIMARY KEY  (`id`),
   KEY `type` (`type`,`action`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_crm_contacts`
@@ -486,7 +486,7 @@ CREATE TABLE IF NOT EXISTS `0_crm_persons` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `ref` (`ref`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_crm_persons`
@@ -509,7 +509,7 @@ CREATE TABLE IF NOT EXISTS `0_currencies` (
   `auto_update` tinyint(1) NOT NULL default '1',
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`curr_abrev`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_currencies`
@@ -540,7 +540,7 @@ CREATE TABLE IF NOT EXISTS `0_cust_allocations` (
   UNIQUE KEY `trans_type_from` (`person_id`,`trans_type_from`,`trans_no_from`,`trans_type_to`,`trans_no_to`),
   KEY `From` (`trans_type_from`,`trans_no_from`),
   KEY `To` (`trans_type_to`,`trans_no_to`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_cust_allocations`
@@ -578,7 +578,7 @@ CREATE TABLE IF NOT EXISTS `0_cust_branch` (
   KEY `branch_code` (`branch_code`),
   KEY `branch_ref` (`branch_ref`),
   KEY `group_no` (`group_no`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_cust_branch`
@@ -612,7 +612,7 @@ CREATE TABLE IF NOT EXISTS `0_debtors_master` (
   PRIMARY KEY  (`debtor_no`),
   KEY `name` (`name`),
   UNIQUE KEY `debtor_ref` (`debtor_ref`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_debtors_master`
@@ -654,7 +654,7 @@ CREATE TABLE IF NOT EXISTS `0_debtor_trans` (
   KEY `debtor_no` (`debtor_no`,`branch_code`),
   KEY `tran_date` (`tran_date`),
   KEY `order_` (`order_`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_debtor_trans`
@@ -684,7 +684,7 @@ CREATE TABLE IF NOT EXISTS `0_debtor_trans_details` (
   PRIMARY KEY  (`id`),
   KEY `Transaction` (`debtor_trans_type`,`debtor_trans_no`),
   KEY (`src_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_debtor_trans_details`
@@ -711,7 +711,7 @@ CREATE TABLE IF NOT EXISTS `0_dimensions` (
   KEY `date_` (`date_`),
   KEY `due_date` (`due_date`),
   KEY `type_` (`type_`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_dimensions`
@@ -733,7 +733,7 @@ CREATE TABLE IF NOT EXISTS `0_exchange_rates` (
   `date_` date NOT NULL default '0000-00-00',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `curr_code` (`curr_code`,`date_`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_exchange_rates`
@@ -755,7 +755,7 @@ CREATE TABLE IF NOT EXISTS `0_fiscal_year` (
   PRIMARY KEY  (`id`),
   UNIQUE KEY `begin` (`begin`),
   UNIQUE KEY `end` (`end`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=3 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=3 ;
 
 --
 -- Dumping data for table `0_fiscal_year`
@@ -786,7 +786,7 @@ CREATE TABLE IF NOT EXISTS `0_gl_trans` (
   KEY `dimension2_id` (`dimension2_id`),
   KEY `tran_date` (`tran_date`),
   KEY `account_and_tran_date` (`account`,`tran_date`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_gl_trans`
@@ -811,7 +811,7 @@ CREATE TABLE IF NOT EXISTS `0_grn_batch` (
   PRIMARY KEY  (`id`),
   KEY `delivery_date` (`delivery_date`),
   KEY `purch_order_no` (`purch_order_no`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_grn_batch`
@@ -835,7 +835,7 @@ CREATE TABLE IF NOT EXISTS `0_grn_items` (
   `quantity_inv` double NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `grn_batch_id` (`grn_batch_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_grn_items`
@@ -855,7 +855,7 @@ CREATE TABLE IF NOT EXISTS `0_groups` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `description` (`description`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=4 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=4 ;
 
 --
 -- Dumping data for table `0_groups`
@@ -884,7 +884,7 @@ CREATE TABLE IF NOT EXISTS `0_item_codes` (
   PRIMARY KEY  (`id`),
   UNIQUE KEY `stock_id` (`stock_id`,`item_code`),
   KEY `item_code` (`item_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_item_codes`
@@ -905,7 +905,7 @@ CREATE TABLE IF NOT EXISTS `0_item_tax_types` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
 
 --
 -- Dumping data for table `0_item_tax_types`
@@ -924,7 +924,7 @@ CREATE TABLE IF NOT EXISTS `0_item_tax_type_exemptions` (
   `item_tax_type_id` int(11) NOT NULL default '0',
   `tax_type_id` int(11) NOT NULL default '0',
   PRIMARY KEY  (`item_tax_type_id`,`tax_type_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_item_tax_type_exemptions`
@@ -945,7 +945,7 @@ CREATE TABLE IF NOT EXISTS `0_item_units` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`abbr`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_item_units`
@@ -970,7 +970,7 @@ CREATE TABLE `0_journal` (
   `rate` double NOT NULL DEFAULT '1',
   PRIMARY KEY (`type`,`trans_no`),
   KEY `tran_date` (`tran_date`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ;
+) ENGINE=InnoDB ;
 
 -- Data of table `0_journal`
 
@@ -993,7 +993,7 @@ CREATE TABLE IF NOT EXISTS `0_locations` (
   `contact` varchar(30) NOT NULL default '',
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`loc_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_locations`
@@ -1014,7 +1014,7 @@ CREATE TABLE IF NOT EXISTS `0_loc_stock` (
   `reorder_level` double NOT NULL default '0',
   PRIMARY KEY  (`loc_code`,`stock_id`),
   KEY `stock_id` (`stock_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_loc_stock`
@@ -1035,7 +1035,7 @@ CREATE TABLE IF NOT EXISTS `0_payment_terms` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`terms_indicator`),
   UNIQUE KEY `terms` (`terms`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=5 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=5 ;
 
 --
 -- Dumping data for table `0_payment_terms`
@@ -1061,7 +1061,7 @@ CREATE TABLE IF NOT EXISTS `0_prices` (
   `price` double NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `price` (`stock_id`,`sales_type_id`,`curr_abrev`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_prices`
@@ -1085,7 +1085,7 @@ CREATE TABLE IF NOT EXISTS `0_printers` (
   `timeout` tinyint(3) unsigned NOT NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=4 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=4 ;
 
 --
 -- Dumping data for table `0_printers`
@@ -1109,7 +1109,7 @@ CREATE TABLE IF NOT EXISTS `0_print_profiles` (
   `printer` tinyint(3) unsigned default NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `profile` (`profile`,`report`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=10 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=10 ;
 
 --
 -- Dumping data for table `0_print_profiles`
@@ -1140,7 +1140,7 @@ CREATE TABLE IF NOT EXISTS `0_purch_data` (
   `conversion_factor` double NOT NULL default '1',
   `supplier_description` char(50) NOT NULL default '',
   PRIMARY KEY  (`supplier_id`,`stock_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_purch_data`
@@ -1169,7 +1169,7 @@ CREATE TABLE IF NOT EXISTS `0_purch_orders` (
   `tax_included` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`order_no`),
   KEY `ord_date` (`ord_date`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_purch_orders`
@@ -1198,7 +1198,7 @@ CREATE TABLE IF NOT EXISTS `0_purch_order_details` (
   PRIMARY KEY  (`po_detail_item`),
   KEY `order` (`order_no`,`po_detail_item`),
   KEY `itemcode` (`item_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_purch_order_details`
@@ -1222,7 +1222,7 @@ CREATE TABLE IF NOT EXISTS `0_quick_entries` (
   `bal_type` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `description` (`description`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=4 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=4 ;
 
 --
 -- Dumping data for table `0_quick_entries`
@@ -1250,7 +1250,7 @@ CREATE TABLE IF NOT EXISTS `0_quick_entry_lines` (
   `dimension2_id` smallint(6) unsigned default NULL,
   PRIMARY KEY  (`id`),
   KEY `qid` (`qid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=7 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=7 ;
 
 --
 -- Dumping data for table `0_quick_entry_lines`
@@ -1283,7 +1283,7 @@ CREATE TABLE IF NOT EXISTS `0_recurrent_invoices` (
   `last_sent` date NOT NULL default '0000-00-00',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `description` (`description`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_recurrent_invoices`
@@ -1303,7 +1303,7 @@ CREATE TABLE IF NOT EXISTS `0_refs` (
   `reference` varchar(100) NOT NULL default '',
   PRIMARY KEY  (`id`,`type`),
   KEY `Type_and_Reference` (`type`,`reference`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_refs`
@@ -1329,7 +1329,7 @@ CREATE TABLE IF NOT EXISTS `0_salesman` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`salesman_code`),
   UNIQUE KEY `salesman_name` (`salesman_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
 
 --
 -- Dumping data for table `0_salesman`
@@ -1369,7 +1369,7 @@ CREATE TABLE IF NOT EXISTS `0_sales_orders` (
   `prep_amount` double NOT NULL DEFAULT '0',
   `alloc` double NOT NULL DEFAULT '0',
   PRIMARY KEY  (`trans_type`,`order_no`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_sales_orders`
@@ -1397,7 +1397,7 @@ CREATE TABLE IF NOT EXISTS `0_sales_order_details` (
   PRIMARY KEY  (`id`),
   KEY `sorder` (`trans_type`,`order_no`),
   KEY `stkcode` (`stk_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_sales_order_details`
@@ -1421,7 +1421,7 @@ CREATE TABLE IF NOT EXISTS `0_sales_pos` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `pos_name` (`pos_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
 
 --
 -- Dumping data for table `0_sales_pos`
@@ -1444,7 +1444,7 @@ CREATE TABLE IF NOT EXISTS `0_sales_types` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `sales_type` (`sales_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=3 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=3 ;
 
 --
 -- Dumping data for table `0_sales_types`
@@ -1469,7 +1469,7 @@ CREATE TABLE IF NOT EXISTS `0_security_roles` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `role` (`role`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=11 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=11 ;
 
 --
 -- Dumping data for table `0_security_roles`
@@ -1503,7 +1503,7 @@ CREATE TABLE IF NOT EXISTS `0_shippers` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`shipper_id`),
   UNIQUE KEY `name` (`shipper_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
 
 --
 -- Dumping data for table `0_shippers`
@@ -1524,7 +1524,7 @@ CREATE TABLE IF NOT EXISTS `0_sql_trail` (
   `result` tinyint(1) NOT NULL,
   `msg` varchar(255) NOT NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_sql_trail`
@@ -1556,7 +1556,7 @@ CREATE TABLE IF NOT EXISTS `0_stock_category` (
   `dflt_no_purchase` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`category_id`),
   UNIQUE KEY `description` (`description`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=5 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=5 ;
 
 --
 -- Dumping data for table `0_stock_category`
@@ -1598,7 +1598,7 @@ CREATE TABLE IF NOT EXISTS `0_stock_master` (
   `no_purchase` tinyint(1) NOT NULL default '0',
   `editable` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`stock_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_stock_master`
@@ -1626,7 +1626,7 @@ CREATE TABLE `0_stock_moves` (
   PRIMARY KEY (`trans_id`),
   KEY `type` (`type`,`trans_no`),
   KEY `Move` (`stock_id`,`loc_code`,`tran_date`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ;
+) ENGINE=InnoDB ;
 --
 -- Dumping data for table `0_stock_moves`
 --
@@ -1664,7 +1664,7 @@ CREATE TABLE IF NOT EXISTS `0_suppliers` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`supplier_id`),
   KEY `supp_ref` (`supp_ref`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_suppliers`
@@ -1691,7 +1691,7 @@ CREATE TABLE IF NOT EXISTS `0_supp_allocations` (
   UNIQUE KEY `trans_type_from` (`person_id`,`trans_type_from`,`trans_no_from`,`trans_type_to`,`trans_no_to`),
   KEY `From` (`trans_type_from`,`trans_no_from`),
   KEY `To` (`trans_type_to`,`trans_no_to`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_supp_allocations`
@@ -1722,7 +1722,7 @@ CREATE TABLE IF NOT EXISTS `0_supp_invoice_items` (
   `dimension2_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY  (`id`),
   KEY `Transaction` (`supp_trans_type`,`supp_trans_no`,`stock_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_supp_invoice_items`
@@ -1755,7 +1755,7 @@ CREATE TABLE IF NOT EXISTS `0_supp_trans` (
   KEY `SupplierID_2` (`supplier_id`,`supp_reference`),
   KEY `type` (`type`),
   KEY `tran_date` (`tran_date`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_supp_trans`
@@ -1777,7 +1777,7 @@ CREATE TABLE IF NOT EXISTS `0_sys_prefs` (
   `value` TEXT NOT NULL DEFAULT '',
   PRIMARY KEY  (`name`),
   KEY `category` (`category`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_sys_prefs`
@@ -1862,7 +1862,7 @@ CREATE TABLE IF NOT EXISTS `0_sys_types` (
   `type_no` int(11) NOT NULL default '1',
   `next_reference` varchar(100) NOT NULL default '',
   PRIMARY KEY  (`type_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_sys_types`
@@ -1906,7 +1906,7 @@ CREATE TABLE IF NOT EXISTS `0_tags` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `type` (`type`,`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_tags`
@@ -1924,7 +1924,7 @@ CREATE TABLE IF NOT EXISTS `0_tag_associations` (
   `record_id` varchar(15) NOT NULL,
   `tag_id` int(11) NOT NULL,
   UNIQUE KEY `record_id` (`record_id`,`tag_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_tag_associations`
@@ -1944,7 +1944,7 @@ CREATE TABLE IF NOT EXISTS `0_tax_groups` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=3 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=3 ;
 
 --
 -- Dumping data for table `0_tax_groups`
@@ -1965,7 +1965,7 @@ CREATE TABLE IF NOT EXISTS `0_tax_group_items` (
   `tax_type_id` int(11) NOT NULL default '0',
   `tax_shipping` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`tax_group_id`,`tax_type_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_tax_group_items`
@@ -1988,7 +1988,7 @@ CREATE TABLE IF NOT EXISTS `0_tax_types` (
   `name` varchar(60) NOT NULL default '',
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
 
 --
 -- Dumping data for table `0_tax_types`
@@ -2019,7 +2019,7 @@ CREATE TABLE IF NOT EXISTS `0_trans_tax_details` (
   PRIMARY KEY  (`id`),
   KEY `Type_and_Number` (`trans_type`,`trans_no`),
   KEY `tran_date` (`tran_date`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_trans_tax_details`
@@ -2041,7 +2041,7 @@ CREATE TABLE IF NOT EXISTS `0_useronline` (
   PRIMARY KEY  (`id`),
   KEY `timestamp` (`timestamp`),
   KEY `ip` (`ip`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_useronline`
@@ -2093,7 +2093,7 @@ CREATE TABLE IF NOT EXISTS `0_users` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `user_id` (`user_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8  AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
 
 --
 -- Dumping data for table `0_users`
@@ -2114,7 +2114,7 @@ CREATE TABLE IF NOT EXISTS `0_voided` (
   `date_` date NOT NULL default '0000-00-00',
   `memo_` tinytext NOT NULL,
   UNIQUE KEY `id` (`type`,`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_voided`
@@ -2135,7 +2135,7 @@ CREATE TABLE IF NOT EXISTS `0_workcentres` (
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_workcentres`
@@ -2165,7 +2165,7 @@ CREATE TABLE IF NOT EXISTS `0_workorders` (
   `additional_costs` double NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `wo_ref` (`wo_ref`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_workorders`
@@ -2187,7 +2187,7 @@ CREATE TABLE `0_wo_costing` (
   `trans_no` int(11) NOT NULL default '0',
   `factor` double NOT NULL default '1',
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 --
 -- Dumping data for table `0_wo_costing`
@@ -2210,7 +2210,7 @@ CREATE TABLE IF NOT EXISTS `0_wo_issues` (
   `workcentre_id` int(11) default NULL,
   PRIMARY KEY  (`issue_no`),
   KEY `workorder_id` (`workorder_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_wo_issues`
@@ -2230,7 +2230,7 @@ CREATE TABLE IF NOT EXISTS `0_wo_issue_items` (
   `issue_id` int(11) default NULL,
   `qty_issued` double default NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_wo_issue_items`
@@ -2252,7 +2252,7 @@ CREATE TABLE IF NOT EXISTS `0_wo_manufacture` (
   `date_` date NOT NULL default '0000-00-00',
   PRIMARY KEY  (`id`),
   KEY `workorder_id` (`workorder_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_wo_manufacture`
@@ -2277,7 +2277,7 @@ CREATE TABLE IF NOT EXISTS `0_wo_requirements` (
   `units_issued` double NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `workorder_id` (`workorder_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
 --
 -- Dumping data for table `0_wo_requirements`
diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index cb7c4b5d..96eed076 100644
--- a/themes/aqua/renderer.php
+++ b/themes/aqua/renderer.php
@@ -45,6 +45,8 @@
 			echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 			echo "<tr>\n";
 			echo "<td class='quick_menu'>\n"; // tabs
+
+			$indicator = "$path_to_root/themes/".user_theme(). "/images/ajax-loader.gif";
 			if (!$no_menu)
 			{
 				$applications = $_SESSION['App']->applications;
@@ -70,7 +72,6 @@
 
 				echo "<table class='logoutBar'>";
 				echo "<tr><td class='headingtext3'>" . $db_connections[user_company()]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
-				$indicator = "$path_to_root/themes/".user_theme(). "/images/ajax-loader.gif";
 				echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;' alt='ajaxmark'></td>";
 				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";
@@ -84,8 +85,11 @@
 			}
 			echo "</td></tr></table>";
 			if ($no_menu)
-				echo "<br>";
-			elseif ($title && !$is_index)
+			{
+				echo "<center><table class='tablestyle_noborder'>"
+					."<tr><td><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;' alt='ajaxmark'></td></tr>"
+					."</table></center>";
+			} elseif ($title && !$is_index)
 			{
 				echo "<center><table id='title'><tr><td width='100%' class='titletext'>$title</td>"
 				."<td align=right>"
diff --git a/themes/cool/renderer.php b/themes/cool/renderer.php
index cc627051..d053d1b1 100644
--- a/themes/cool/renderer.php
+++ b/themes/cool/renderer.php
@@ -45,6 +45,8 @@
 			echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 			echo "<tr>\n";
 			echo "<td class='quick_menu'>\n"; // tabs
+
+			$indicator = "$path_to_root/themes/".user_theme(). "/images/ajax-loader.gif";
 			if (!$no_menu)
 			{
 				$applications = $_SESSION['App']->applications;
@@ -70,7 +72,6 @@
 
 				echo "<table class='logoutBar'>";
 				echo "<tr><td class='headingtext3'>" . $db_connections[user_company()]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
-				$indicator = "$path_to_root/themes/".user_theme(). "/images/ajax-loader.gif";
 				echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;' alt='ajaxmark'></td>";
 				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";
@@ -83,9 +84,13 @@
 				echo "</td></tr></table>";
 			}
 			echo "</td></tr></table>";
+
 			if ($no_menu)
-				echo "<br>";
-			elseif ($title && !$is_index)
+			{
+				echo "<center><table class='tablestyle_noborder'>"
+					."<tr><td><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;' alt='ajaxmark'></td></tr>"
+					."</table></center>";
+			} elseif ($title && !$is_index)
 			{
 				echo "<center><table id='title'><tr><td width='100%' class='titletext'>$title</td>"
 				."<td align=right>"
diff --git a/themes/default/renderer.php b/themes/default/renderer.php
index 98effdf2..e632284f 100644
--- a/themes/default/renderer.php
+++ b/themes/default/renderer.php
@@ -45,6 +45,8 @@
 			echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 			echo "<tr>\n";
 			echo "<td class='quick_menu'>\n"; // tabs
+
+			$indicator = "$path_to_root/themes/".user_theme(). "/images/ajax-loader.gif";
 			if (!$no_menu)
 			{
 				$applications = $_SESSION['App']->applications;
@@ -69,7 +71,6 @@
 				$himg = "<img src='$local_path_to_root/themes/default/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
 				echo "<table class='logoutBar'>";
 				echo "<tr><td class='headingtext3'>" . $db_connections[user_company()]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
-				$indicator = "$path_to_root/themes/".user_theme(). "/images/ajax-loader.gif";
 				echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;' alt='ajaxmark'></td>";
 				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";
@@ -83,9 +84,13 @@
 				echo "</td></tr></table>";
 			}
 			echo "</td></tr></table>";
+
 			if ($no_menu)
-				echo "<br>";
-			elseif ($title && !$is_index)
+			{	// ajax indicator for installer and popups
+				echo "<center><table class='tablestyle_noborder'>"
+					."<tr><td><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;' alt='ajaxmark'></td></tr>"
+					."</table></center>";
+			} elseif ($title && !$is_index)
 			{
 				echo "<center><table id='title'><tr><td width='100%' class='titletext'>$title</td>"
 				."<td align=right>"
-- 
2.30.2