From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Thu, 4 Feb 2010 11:18:30 +0000 (+0000)
Subject: Extended account id's to 15 chars. Changed account type to varchar(10)
X-Git-Tag: v2.4.2~19^2~965
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=3d154c1be37111f3659ad0d1a28b2576a51fdd38;p=fa-stable.git

Extended account id's to 15 chars. Changed account type to varchar(10)
and class id varchar(3). Ability to change account groups online.
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a0afe478..93efc65f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,16 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+04-Feb-2010 Joe Hunt
+! Extended account id's to 15 chars. Changed account type to varchar(10)
+  and class id varchar(3). Ability to change account groups online.
+$ /gl/manage/gl_account_classes.php
+  /gl/manage/gl_account_types.php
+  /gl/includes/db/gl_db_account_types.inc
+  /sql/alter2.3.sql
+  /sql/en_US-demo.sql
+  /sql/en_US-new.sql
+  
 02-Feb-2010 Janusz Dobrowolski
 # Payment terms were not retrieved atinvoice edit start.
 $ /sales/customer_invoice.php
diff --git a/gl/includes/db/gl_db_account_types.inc b/gl/includes/db/gl_db_account_types.inc
index 1c25db71..0ea366ec 100644
--- a/gl/includes/db/gl_db_account_types.inc
+++ b/gl/includes/db/gl_db_account_types.inc
@@ -17,13 +17,39 @@ function add_account_type($id, $name, $class_id, $parent)
 	return db_query($sql);
 }
 
-function update_account_type($id, $name, $class_id, $parent)
+function update_account_type($id, $name, $class_id, $parent, $old_id)
 {
-    $sql = "UPDATE ".TB_PREF."chart_types SET name=".db_escape($name).",
+	begin_transaction();
+	if ($old_id != $id)
+	{
+		$sql = "SELECT id FROM ".TB_PREF."chart_types WHERE parent = ".db_escape($old_id);
+
+		$result = db_query($sql, "could not get account type");
+
+		while ($myrow = db_fetch($result))
+		{
+    		$sql = "UPDATE ".TB_PREF."chart_types SET parent=".db_escape($id)
+				." WHERE id = '".$myrow['id']."'";
+			db_query($sql, "could not update account type");
+		}
+		$sql = "SELECT account_code FROM ".TB_PREF."chart_master WHERE account_type = ".db_escape($old_id);
+
+		$result = db_query($sql, "could not get account");
+
+		while ($myrow = db_fetch($result))
+		{
+    		$sql = "UPDATE ".TB_PREF."chart_master SET account_type=".db_escape($id)
+				." WHERE account_code = '".$myrow['account_code']."'";
+			db_query($sql, "could not update account");
+		}
+	}
+    $sql = "UPDATE ".TB_PREF."chart_types SET id=".db_escape($id) .", name=".db_escape($name).",
 		class_id=".db_escape($class_id).", parent=".db_escape($parent)
-		." WHERE id = ".db_escape($id);
+		." WHERE id = ".db_escape($old_id);
 
-	return db_query($sql, "could not update account type");
+	$ret = db_query($sql, "could not update account type");
+	commit_transaction();
+	return $ret;
 }
 
 function get_account_types($all=false)
diff --git a/gl/manage/gl_account_classes.php b/gl/manage/gl_account_classes.php
index 9e7e1362..fc617c07 100644
--- a/gl/manage/gl_account_classes.php
+++ b/gl/manage/gl_account_classes.php
@@ -140,18 +140,18 @@ start_table($table_style2);
 
 if ($selected_id != -1) 
 {
- if ($Mode == 'Edit') {
-	//editing an existing status code
-	$myrow = get_account_class($selected_id);
-
-	$_POST['id']  = $myrow["cid"];
-	$_POST['name']  = $myrow["class_name"];
-	if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
-		$_POST['ctype'] = ($myrow["ctype"] >= CL_ASSETS && $myrow["ctype"] < CL_INCOME ? 1 : 0);
-	else
-		$_POST['ctype']  = $myrow["ctype"];
-	hidden('selected_id', $selected_id);
- }
+ 	if ($Mode == 'Edit') {
+		//editing an existing status code
+		$myrow = get_account_class($selected_id);
+	
+		$_POST['id']  = $myrow["cid"];
+		$_POST['name']  = $myrow["class_name"];
+		if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+			$_POST['ctype'] = ($myrow["ctype"] >= CL_ASSETS && $myrow["ctype"] < CL_INCOME ? 1 : 0);
+		else
+			$_POST['ctype']  = $myrow["ctype"];
+		hidden('selected_id', $selected_id);
+ 	}
 	hidden('id');
 	label_row(_("Class ID:"), $_POST['id']);
 
diff --git a/gl/manage/gl_account_types.php b/gl/manage/gl_account_types.php
index 57ab4a65..ef8207b1 100644
--- a/gl/manage/gl_account_types.php
+++ b/gl/manage/gl_account_types.php
@@ -58,7 +58,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 
     	if ($selected_id != -1) 
     	{
-    		if (update_account_type($selected_id, $_POST['name'], $_POST['class_id'], $_POST['parent']))
+    		if (update_account_type($_POST['id'], $_POST['name'], $_POST['class_id'], $_POST['parent'], $_POST['old_id']))
 				display_notification(_('Selected account type has been updated'));
     	} 
     	else 
@@ -169,9 +169,10 @@ if ($selected_id != -1)
 		$_POST['parent']  = $myrow["parent"];
 		$_POST['class_id']  = $myrow["class_id"];
 		hidden('selected_id', $selected_id);
+		hidden('old_id', $myrow["id"]);
  	}
  	hidden('id');
-	label_row(_("ID:"), $_POST['id']);
+	text_row_ex(_("ID:"), 'id', 10);
 }
 else
 	text_row_ex(_("ID:"), 'id', 10);
diff --git a/sql/alter2.3.php b/sql/alter2.3.php
index bafd38d7..69d3b171 100644
--- a/sql/alter2.3.php
+++ b/sql/alter2.3.php
@@ -79,6 +79,6 @@ class fa2_3 {
 		$n -= $patchcnt;
 		return $n == 0 ? true : $patchcnt;
 	}
-	
+}	
 $install = new fa2_3;
 ?>
\ No newline at end of file
diff --git a/sql/alter2.3.sql b/sql/alter2.3.sql
index 94ae34e6..31c14e60 100644
--- a/sql/alter2.3.sql
+++ b/sql/alter2.3.sql
@@ -76,42 +76,79 @@ INSERT INTO `0_sys_prefs` SELECT 'login_tout','setup.company', 'smallint','6', c
 #INSERT INTO `0_sys_prefs` SELECT 'foreign_codes','setup.company', 'tinyint','1', c.foreign_codes FROM `0_company` c;
 
 INSERT INTO `0_sys_prefs` SELECT 'past_due_days','glsetup.general', 'int','11', c.past_due_days FROM `0_company` c;
-INSERT INTO `0_sys_prefs` SELECT 'profit_loss_year_act','glsetup.general', 'varchar','11', c.profit_loss_year_act FROM `0_company` c;
-INSERT INTO `0_sys_prefs` SELECT 'retained_earnings_act','glsetup.general', 'varchar','11', c.retained_earnings_act FROM `0_company` c;
-INSERT INTO `0_sys_prefs` SELECT 'bank_charge_act','glsetup.general', 'varchar','11',  c.bank_charge_act FROM `0_company` c;
-INSERT INTO `0_sys_prefs` SELECT 'exchange_diff_act','glsetup.general', 'varchar','11', c.exchange_diff_act FROM `0_company` c;
+INSERT INTO `0_sys_prefs` SELECT 'profit_loss_year_act','glsetup.general', 'varchar','15', c.profit_loss_year_act FROM `0_company` c;
+INSERT INTO `0_sys_prefs` SELECT 'retained_earnings_act','glsetup.general', 'varchar','15', c.retained_earnings_act FROM `0_company` c;
+INSERT INTO `0_sys_prefs` SELECT 'bank_charge_act','glsetup.general', 'varchar','15',  c.bank_charge_act FROM `0_company` c;
+INSERT INTO `0_sys_prefs` SELECT 'exchange_diff_act','glsetup.general', 'varchar','15', c.exchange_diff_act FROM `0_company` c;
 
 INSERT INTO `0_sys_prefs` SELECT 'default_credit_limit','glsetup.customer', 'int','11', c.default_credit_limit FROM `0_company` c;
 INSERT INTO `0_sys_prefs` SELECT 'accumulate_shipping','glsetup.customer', 'tinyint','1', c.accumulate_shipping FROM `0_company` c;
 INSERT INTO `0_sys_prefs` SELECT 'legal_text','glsetup.customer', 'tinytext','', c.legal_text FROM `0_company` c;
-INSERT INTO `0_sys_prefs` SELECT 'freight_act','glsetup.customer', 'varchar','11', c.freight_act FROM `0_company` c;
+INSERT INTO `0_sys_prefs` SELECT 'freight_act','glsetup.customer', 'varchar','15', c.freight_act FROM `0_company` c;
 
-INSERT INTO `0_sys_prefs` SELECT 'debtors_act','glsetup.sales', 'varchar','11', c.debtors_act FROM `0_company` c;
-INSERT INTO `0_sys_prefs` SELECT 'default_sales_act','glsetup.sales', 'varchar','11', c.default_sales_act FROM `0_company` c;
-INSERT INTO `0_sys_prefs` SELECT 'default_sales_discount_act','glsetup.sales', 'varchar','11', c.default_sales_discount_act FROM `0_company` c;
-INSERT INTO `0_sys_prefs` SELECT 'default_prompt_payment_act','glsetup.sales', 'varchar','11', c.default_prompt_payment_act FROM `0_company` c;
+INSERT INTO `0_sys_prefs` SELECT 'debtors_act','glsetup.sales', 'varchar','15', c.debtors_act FROM `0_company` c;
+INSERT INTO `0_sys_prefs` SELECT 'default_sales_act','glsetup.sales', 'varchar','15', c.default_sales_act FROM `0_company` c;
+INSERT INTO `0_sys_prefs` SELECT 'default_sales_discount_act','glsetup.sales', 'varchar','15', c.default_sales_discount_act FROM `0_company` c;
+INSERT INTO `0_sys_prefs` SELECT 'default_prompt_payment_act','glsetup.sales', 'varchar','15', c.default_prompt_payment_act FROM `0_company` c;
 INSERT INTO `0_sys_prefs` SELECT 'default_delivery_required','glsetup.sales', 'smallint','6', c.default_delivery_required FROM `0_company` c;
 
 INSERT INTO `0_sys_prefs` SELECT 'default_dim_required','glsetup.dims', 'int','11', c.default_dim_required FROM `0_company` c;
 
-INSERT INTO `0_sys_prefs` SELECT 'pyt_discount_act','glsetup.purchase', 'varchar','11', c.pyt_discount_act FROM `0_company` c;
-INSERT INTO `0_sys_prefs` SELECT 'creditors_act','glsetup.purchase', 'varchar','11', c.creditors_act FROM `0_company` c;
+INSERT INTO `0_sys_prefs` SELECT 'pyt_discount_act','glsetup.purchase', 'varchar','15', c.pyt_discount_act FROM `0_company` c;
+INSERT INTO `0_sys_prefs` SELECT 'creditors_act','glsetup.purchase', 'varchar','15', c.creditors_act FROM `0_company` c;
 INSERT INTO `0_sys_prefs` SELECT 'po_over_receive','glsetup.purchase', 'int','11', c.po_over_receive FROM `0_company` c;
 INSERT INTO `0_sys_prefs` SELECT 'po_over_charge','glsetup.purchase', 'int','11', c.po_over_charge FROM `0_company` c;
 
 INSERT INTO `0_sys_prefs` SELECT 'allow_negative_stock','glsetup.inventory', 'tinyint','1', c.allow_negative_stock FROM `0_company` c;
 
-INSERT INTO `0_sys_prefs` SELECT 'default_inventory_act','glsetup.items', 'varchar','11', c.default_inventory_act FROM `0_company` c;
-INSERT INTO `0_sys_prefs` SELECT 'default_cogs_act','glsetup.items', 'varchar','11', c.default_cogs_act FROM `0_company` c;
-INSERT INTO `0_sys_prefs` SELECT 'default_adj_act','glsetup.items', 'varchar','11', c.default_adj_act FROM `0_company` c;
-INSERT INTO `0_sys_prefs` SELECT 'default_inv_sales_act','glsetup.items', 'varchar','11', c.default_inv_sales_act FROM `0_company` c;
-INSERT INTO `0_sys_prefs` SELECT 'default_assembly_act','glsetup.items', 'varchar','11', c.default_assembly_act FROM `0_company` c;
+INSERT INTO `0_sys_prefs` SELECT 'default_inventory_act','glsetup.items', 'varchar','15', c.default_inventory_act FROM `0_company` c;
+INSERT INTO `0_sys_prefs` SELECT 'default_cogs_act','glsetup.items', 'varchar','15', c.default_cogs_act FROM `0_company` c;
+INSERT INTO `0_sys_prefs` SELECT 'default_adj_act','glsetup.items', 'varchar','15', c.default_adj_act FROM `0_company` c;
+INSERT INTO `0_sys_prefs` SELECT 'default_inv_sales_act','glsetup.items', 'varchar','15', c.default_inv_sales_act FROM `0_company` c;
+INSERT INTO `0_sys_prefs` SELECT 'default_assembly_act','glsetup.items', 'varchar','15', c.default_assembly_act FROM `0_company` c;
 
 INSERT INTO `0_sys_prefs` SELECT 'default_workorder_required','glsetup.manuf', 'int', '11', c.default_workorder_required FROM `0_company` c;
 
-#INSERT INTO `0_sys_prefs` SELECT 'payroll_act','glsetup.payroll', 'varchar','11', c.payroll_act FROM `0_company` c;
+#INSERT INTO `0_sys_prefs` SELECT 'payroll_act','glsetup.payroll', 'varchar','15', c.payroll_act FROM `0_company` c;
 INSERT INTO `0_sys_prefs` SELECT 'version_id', 'system', 'varchar', '11', c.version_id FROM `0_company` c;
 
 ALTER TABLE `0_stock_master` ADD COLUMN `editable` TINYINT(1) NOT NULL default '0';
 ALTER TABLE `0_debtor_trans` ADD COLUMN `payment_terms` int(11) default NULL;
 ALTER TABLE `0_sales_orders` ADD COLUMN `payment_terms` int(11) default NULL;
+
+# change account, groups and classes id's
+ALTER TABLE `0_bank_accounts` CHANGE `account_code` `account_code` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_bank_trans` CHANGE `bank_act` `bank_act` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_budget_trans` CHANGE `account` `account` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_chart_master` CHANGE `account_code` `account_code` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_chart_master` CHANGE `account_code2` `account_code2` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_cust_branch` CHANGE `sales_account` `sales_account` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_cust_branch` CHANGE `sales_discount_account` `sales_discount_account` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_cust_branch` CHANGE `receivables_account` `receivables_account` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_cust_branch` CHANGE `payment_discount_account` `payment_discount_account` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_gl_trans` CHANGE `account` `account` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_quick_entry_lines` CHANGE `dest_id` `dest_id` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_stock_category` CHANGE `dflt_sales_act` `dflt_sales_act` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_stock_category` CHANGE `dflt_cogs_act` `dflt_cogs_act` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_stock_category` CHANGE `dflt_inventory_act` `dflt_inventory_act` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_stock_category` CHANGE `dflt_adjustment_act` `dflt_adjustment_act` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_stock_category` CHANGE `dflt_assembly_act` `dflt_assembly_act` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_stock_master` CHANGE `sales_account` `sales_account` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_stock_master` CHANGE `cogs_account` `cogs_account` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_stock_master` CHANGE `inventory_account` `inventory_account` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_stock_master` CHANGE `adjustment_account` `adjustment_account` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_stock_master` CHANGE `assembly_account` `assembly_account` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_supp_invoice_items` CHANGE `gl_code` `gl_code` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_suppliers` CHANGE `purchase_account` `purchase_account` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_suppliers` CHANGE `payable_account` `payable_account` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_suppliers` CHANGE `payment_discount_account` `payment_discount_account` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_tax_types` CHANGE `sales_gl_code` `sales_gl_code` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_tax_types` CHANGE `purchasing_gl_code` `purchasing_gl_code` VARCHAR(15) NOT NULL DEFAULT '';
+ALTER TABLE `0_tag_associations` CHANGE `record_id` `record_id` VARCHAR(15) NOT NULL;
+ALTER TABLE `0_chart_class` CHANGE `cid` `cid` VARCHAR(3) NOT NULL;
+ALTER TABLE `0_chart_master` CHANGE `account_type` `account_type` VARCHAR(10) NOT NULL DEFAULT '0';
+ALTER TABLE `0_chart_types` CHANGE `id` `id` VARCHAR(10) NOT NULL;
+ALTER TABLE `0_chart_types` CHANGE `parent` `parent` VARCHAR(10) NOT NULL DEFAULT '-1';
+ALTER TABLE `0_chart_types` CHANGE `class_id` `class_id` VARCHAR(3) NOT NULL DEFAULT '';
+.
+
diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index 239b41a2..6373df64 100644
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -74,7 +74,7 @@ CREATE TABLE `0_audit_trail` (
 DROP TABLE IF EXISTS `0_bank_accounts`;
 
 CREATE TABLE `0_bank_accounts` (
-  `account_code` varchar(11) NOT NULL default '',
+  `account_code` varchar(15) NOT NULL default '',
   `account_type` smallint(6) NOT NULL default '0',
   `bank_account_name` varchar(60) NOT NULL default '',
   `bank_account_number` varchar(100) NOT NULL default '',
@@ -107,7 +107,7 @@ CREATE TABLE `0_bank_trans` (
   `id` int(11) NOT NULL auto_increment,
   `type` smallint(6) default NULL,
   `trans_no` int(11) default NULL,
-  `bank_act` varchar(11) default NULL,
+  `bank_act` varchar(15) default NULL,
   `ref` varchar(40) default NULL,
   `trans_date` date NOT NULL default '0000-00-00',
   `amount` double default NULL,
@@ -175,7 +175,7 @@ CREATE TABLE `0_budget_trans` (
   `type` smallint(6) NOT NULL default '0',
   `type_no` bigint(16) NOT NULL default '1',
   `tran_date` date NOT NULL default '0000-00-00',
-  `account` varchar(11) NOT NULL default '',
+  `account` varchar(15) NOT NULL default '',
   `memo_` tinytext NOT NULL,
   `amount` double NOT NULL default '0',
   `dimension_id` int(11) default '0',
@@ -197,7 +197,7 @@ CREATE TABLE `0_budget_trans` (
 DROP TABLE IF EXISTS `0_chart_class`;
 
 CREATE TABLE `0_chart_class` (
-  `cid` int(11) NOT NULL default '0',
+  `cid` varchar(3) NOT NULL,
   `class_name` varchar(60) NOT NULL default '',
   `ctype` tinyint(1) NOT NULL default '0',
   `inactive` tinyint(1) NOT NULL default '0',
@@ -218,10 +218,10 @@ INSERT INTO `0_chart_class` VALUES ('4', 'Costs', '6', '0');
 DROP TABLE IF EXISTS `0_chart_master`;
 
 CREATE TABLE `0_chart_master` (
-  `account_code` varchar(11) NOT NULL default '',
-  `account_code2` varchar(11) default '',
+  `account_code` varchar(15) NOT NULL default '',
+  `account_code2` varchar(15) default '',
   `account_name` varchar(60) NOT NULL default '',
-  `account_type` int(11) NOT NULL default '0',
+  `account_type` varchar(10) NOT NULL default '0',
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`account_code`),
   KEY `account_name` (`account_name`),
@@ -316,15 +316,15 @@ INSERT INTO `0_chart_master` VALUES ('9990', '', 'Year Profit/Loss', '12', '0');
 DROP TABLE IF EXISTS `0_chart_types`;
 
 CREATE TABLE `0_chart_types` (
-  `id` int(11) NOT NULL auto_increment,
+  `id` varchar(10) NOT NULL,
   `name` varchar(60) NOT NULL default '',
-  `class_id` tinyint(1) NOT NULL default '0',
-  `parent` int(11) NOT NULL default '-1',
+  `class_id` varchart(3) NOT NULL default '',
+  `parent` varchar(10) NOT NULL default '-1',
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY  (`class_id`),
   KEY `name` (`name`)
-) TYPE=MyISAM AUTO_INCREMENT=13 ;
+) TYPE=MyISAM ;
 
 
 ### Data of table `0_chart_types` ###
@@ -378,23 +378,23 @@ CREATE TABLE `0_company` (
   `coy_logo` varchar(100) NOT NULL default '',
   `domicile` varchar(55) NOT NULL default '',
   `curr_default` char(3) NOT NULL default '',
-  `debtors_act` varchar(11) NOT NULL default '',
-  `pyt_discount_act` varchar(11) NOT NULL default '',
-  `creditors_act` varchar(11) NOT NULL default '',
-  `bank_charge_act` varchar(11) NOT NULL default '',
-  `exchange_diff_act` varchar(11) NOT NULL default '',
-  `profit_loss_year_act` varchar(11) NOT NULL default '',
-  `retained_earnings_act` varchar(11) NOT NULL default '',
-  `freight_act` varchar(11) NOT NULL default '',
-  `default_sales_act` varchar(11) NOT NULL default '',
-  `default_sales_discount_act` varchar(11) NOT NULL default '',
-  `default_prompt_payment_act` varchar(11) NOT NULL default '',
-  `default_inventory_act` varchar(11) NOT NULL default '',
-  `default_cogs_act` varchar(11) NOT NULL default '',
-  `default_adj_act` varchar(11) NOT NULL default '',
-  `default_inv_sales_act` varchar(11) NOT NULL default '',
-  `default_assembly_act` varchar(11) NOT NULL default '',
-  `payroll_act` varchar(11) NOT NULL default '',
+  `debtors_act` varchar(15) NOT NULL default '',
+  `pyt_discount_act` varchar(15) NOT NULL default '',
+  `creditors_act` varchar(15) NOT NULL default '',
+  `bank_charge_act` varchar(15) NOT NULL default '',
+  `exchange_diff_act` varchar(15) NOT NULL default '',
+  `profit_loss_year_act` varchar(15) NOT NULL default '',
+  `retained_earnings_act` varchar(15) NOT NULL default '',
+  `freight_act` varchar(15) NOT NULL default '',
+  `default_sales_act` varchar(15) NOT NULL default '',
+  `default_sales_discount_act` varchar(15) NOT NULL default '',
+  `default_prompt_payment_act` varchar(15) NOT NULL default '',
+  `default_inventory_act` varchar(15) NOT NULL default '',
+  `default_cogs_act` varchar(15) NOT NULL default '',
+  `default_adj_act` varchar(15) NOT NULL default '',
+  `default_inv_sales_act` varchar(15) NOT NULL default '',
+  `default_assembly_act` varchar(15) NOT NULL default '',
+  `payroll_act` varchar(15) NOT NULL default '',
   `allow_negative_stock` tinyint(1) NOT NULL default '0',
   `po_over_receive` int(11) NOT NULL default '10',
   `po_over_charge` int(11) NOT NULL default '10',
@@ -511,10 +511,10 @@ CREATE TABLE `0_cust_branch` (
   `email` varchar(100) NOT NULL default '',
   `default_location` varchar(5) NOT NULL default '',
   `tax_group_id` int(11) default NULL,
-  `sales_account` varchar(11) default NULL,
-  `sales_discount_account` varchar(11) default NULL,
-  `receivables_account` varchar(11) default NULL,
-  `payment_discount_account` varchar(11) default NULL,
+  `sales_account` varchar(15) default NULL,
+  `sales_discount_account` varchar(15) default NULL,
+  `receivables_account` varchar(15) default NULL,
+  `payment_discount_account` varchar(15) default NULL,
   `default_ship_via` int(11) NOT NULL default '1',
   `disable_trans` tinyint(4) NOT NULL default '0',
   `br_post_address` tinytext NOT NULL,
@@ -726,7 +726,7 @@ CREATE TABLE `0_gl_trans` (
   `type` smallint(6) NOT NULL default '0',
   `type_no` bigint(16) NOT NULL default '1',
   `tran_date` date NOT NULL default '0000-00-00',
-  `account` varchar(11) NOT NULL default '',
+  `account` varchar(15) NOT NULL default '',
   `memo_` tinytext NOT NULL,
   `amount` double NOT NULL default '0',
   `dimension_id` int(11) NOT NULL default '0',
@@ -1244,7 +1244,7 @@ CREATE TABLE `0_quick_entry_lines` (
   `qid` smallint(6) unsigned NOT NULL,
   `amount` double default '0',
   `action` varchar(2) NOT NULL,
-  `dest_id` varchar(11) NOT NULL,
+  `dest_id` varchar(15) NOT NULL,
   `dimension_id` smallint(6) unsigned default NULL,
   `dimension2_id` smallint(6) unsigned default NULL,
   PRIMARY KEY  (`id`),
@@ -1514,11 +1514,11 @@ CREATE TABLE `0_stock_category` (
   `dflt_tax_type` int(11) NOT NULL default '1',
   `dflt_units` varchar(20) NOT NULL default 'each',
   `dflt_mb_flag` char(1) NOT NULL default 'B',
-  `dflt_sales_act` varchar(11) NOT NULL default '',
-  `dflt_cogs_act` varchar(11) NOT NULL default '',
-  `dflt_inventory_act` varchar(11) NOT NULL default '',
-  `dflt_adjustment_act` varchar(11) NOT NULL default '',
-  `dflt_assembly_act` varchar(11) NOT NULL default '',
+  `dflt_sales_act` varchar(15) NOT NULL default '',
+  `dflt_cogs_act` varchar(15) NOT NULL default '',
+  `dflt_inventory_act` varchar(15) NOT NULL default '',
+  `dflt_adjustment_act` varchar(15) NOT NULL default '',
+  `dflt_assembly_act` varchar(15) NOT NULL default '',
   `dflt_dim1` int(11) default NULL,
   `dflt_dim2` int(11) default NULL,
   `inactive` tinyint(1) NOT NULL default '0',
@@ -1547,11 +1547,11 @@ CREATE TABLE `0_stock_master` (
   `long_description` tinytext NOT NULL,
   `units` varchar(20) NOT NULL default 'each',
   `mb_flag` char(1) NOT NULL default 'B',
-  `sales_account` varchar(11) NOT NULL default '',
-  `cogs_account` varchar(11) NOT NULL default '',
-  `inventory_account` varchar(11) NOT NULL default '',
-  `adjustment_account` varchar(11) NOT NULL default '',
-  `assembly_account` varchar(11) NOT NULL default '',
+  `sales_account` varchar(15) NOT NULL default '',
+  `cogs_account` varchar(15) NOT NULL default '',
+  `inventory_account` varchar(15) NOT NULL default '',
+  `adjustment_account` varchar(15) NOT NULL default '',
+  `assembly_account` varchar(15) NOT NULL default '',
   `dimension_id` int(11) default NULL,
   `dimension2_id` int(11) default NULL,
   `actual_cost` double NOT NULL default '0',
@@ -1670,7 +1670,7 @@ CREATE TABLE `0_supp_invoice_items` (
   `id` int(11) NOT NULL auto_increment,
   `supp_trans_no` int(11) default NULL,
   `supp_trans_type` int(11) default NULL,
-  `gl_code` varchar(11) NOT NULL default '0',
+  `gl_code` varchar(15) NOT NULL default '0',
   `grn_item_id` int(11) default NULL,
   `po_detail_item_id` int(11) default NULL,
   `stock_id` varchar(20) NOT NULL default '',
@@ -1750,9 +1750,9 @@ CREATE TABLE `0_suppliers` (
   `dimension2_id` int(11) default '0',
   `tax_group_id` int(11) default NULL,
   `credit_limit` double NOT NULL default '0',
-  `purchase_account` varchar(11) default NULL,
-  `payable_account` varchar(11) default NULL,
-  `payment_discount_account` varchar(11) default NULL,
+  `purchase_account` varchar(15) default NULL,
+  `payable_account` varchar(15) default NULL,
+  `payment_discount_account` varchar(15) default NULL,
   `notes` tinytext NOT NULL,
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`supplier_id`),
@@ -1806,30 +1806,30 @@ INSERT INTO `0_sys_prefs` VALUES ('add_pct', 'setup.company', 'int', '5', '-1');
 INSERT INTO `0_sys_prefs` VALUES ('round_to', 'setup.company', 'int', '5', '1');
 INSERT INTO `0_sys_prefs` VALUES ('login_tout', 'setup.company', 'smallint', '6', '600');
 INSERT INTO `0_sys_prefs` VALUES ('past_due_days', 'glsetup.general', 'int', '11', '30');
-INSERT INTO `0_sys_prefs` VALUES ('profit_loss_year_act', 'glsetup.general', 'varchar', '11', '9990');
-INSERT INTO `0_sys_prefs` VALUES ('retained_earnings_act', 'glsetup.general', 'varchar', '11', '3590');
-INSERT INTO `0_sys_prefs` VALUES ('bank_charge_act', 'glsetup.general', 'varchar', '11', '5690');
-INSERT INTO `0_sys_prefs` VALUES ('exchange_diff_act', 'glsetup.general', 'varchar', '11', '4450');
-INSERT INTO `0_sys_prefs` VALUES ('default_credit_limit', 'glsetup.customer', 'int', '11', '1000');
+INSERT INTO `0_sys_prefs` VALUES ('profit_loss_year_act', 'glsetup.general', 'varchar', '15', '9990');
+INSERT INTO `0_sys_prefs` VALUES ('retained_earnings_act', 'glsetup.general', 'varchar', '15', '3590');
+INSERT INTO `0_sys_prefs` VALUES ('bank_charge_act', 'glsetup.general', 'varchar', '15', '5690');
+INSERT INTO `0_sys_prefs` VALUES ('exchange_diff_act', 'glsetup.general', 'varchar', '15', '4450');
+INSERT INTO `0_sys_prefs` VALUES ('default_credit_limit', 'glsetup.customer', 'int', '15', '1000');
 INSERT INTO `0_sys_prefs` VALUES ('accumulate_shipping', 'glsetup.customer', 'tinyint', '1', '0');
 INSERT INTO `0_sys_prefs` VALUES ('legal_text', 'glsetup.customer', 'tinytext', '0', NULL);
-INSERT INTO `0_sys_prefs` VALUES ('freight_act', 'glsetup.customer', 'varchar', '11', '4430');
-INSERT INTO `0_sys_prefs` VALUES ('debtors_act', 'glsetup.sales', 'varchar', '11', '1200');
-INSERT INTO `0_sys_prefs` VALUES ('default_sales_act', 'glsetup.sales', 'varchar', '11', '4010');
-INSERT INTO `0_sys_prefs` VALUES ('default_sales_discount_act', 'glsetup.sales', 'varchar', '11', '4510');
-INSERT INTO `0_sys_prefs` VALUES ('default_prompt_payment_act', 'glsetup.sales', 'varchar', '11', '4500');
+INSERT INTO `0_sys_prefs` VALUES ('freight_act', 'glsetup.customer', 'varchar', '15', '4430');
+INSERT INTO `0_sys_prefs` VALUES ('debtors_act', 'glsetup.sales', 'varchar', '15', '1200');
+INSERT INTO `0_sys_prefs` VALUES ('default_sales_act', 'glsetup.sales', 'varchar', '15', '4010');
+INSERT INTO `0_sys_prefs` VALUES ('default_sales_discount_act', 'glsetup.sales', 'varchar', '15', '4510');
+INSERT INTO `0_sys_prefs` VALUES ('default_prompt_payment_act', 'glsetup.sales', 'varchar', '15', '4500');
 INSERT INTO `0_sys_prefs` VALUES ('default_delivery_required', 'glsetup.sales', 'smallint', '6', '1');
 INSERT INTO `0_sys_prefs` VALUES ('default_dim_required', 'glsetup.dims', 'int', '11', '20');
-INSERT INTO `0_sys_prefs` VALUES ('pyt_discount_act', 'glsetup.purchase', 'varchar', '11', '5060');
-INSERT INTO `0_sys_prefs` VALUES ('creditors_act', 'glsetup.purchase', 'varchar', '11', '2100');
+INSERT INTO `0_sys_prefs` VALUES ('pyt_discount_act', 'glsetup.purchase', 'varchar', '15', '5060');
+INSERT INTO `0_sys_prefs` VALUES ('creditors_act', 'glsetup.purchase', 'varchar', '15', '2100');
 INSERT INTO `0_sys_prefs` VALUES ('po_over_receive', 'glsetup.purchase', 'int', '11', '10');
 INSERT INTO `0_sys_prefs` VALUES ('po_over_charge', 'glsetup.purchase', 'int', '11', '10');
 INSERT INTO `0_sys_prefs` VALUES ('allow_negative_stock', 'glsetup.inventory', 'tinyint', '1', '0');
-INSERT INTO `0_sys_prefs` VALUES ('default_inventory_act', 'glsetup.items', 'varchar', '11', '1510');
-INSERT INTO `0_sys_prefs` VALUES ('default_cogs_act', 'glsetup.items', 'varchar', '11', '5010');
-INSERT INTO `0_sys_prefs` VALUES ('default_adj_act', 'glsetup.items', 'varchar', '11', '5040');
-INSERT INTO `0_sys_prefs` VALUES ('default_inv_sales_act', 'glsetup.items', 'varchar', '11', '4010');
-INSERT INTO `0_sys_prefs` VALUES ('default_assembly_act', 'glsetup.items', 'varchar', '11', '1530');
+INSERT INTO `0_sys_prefs` VALUES ('default_inventory_act', 'glsetup.items', 'varchar', '15', '1510');
+INSERT INTO `0_sys_prefs` VALUES ('default_cogs_act', 'glsetup.items', 'varchar', '15', '5010');
+INSERT INTO `0_sys_prefs` VALUES ('default_adj_act', 'glsetup.items', 'varchar', '15', '5040');
+INSERT INTO `0_sys_prefs` VALUES ('default_inv_sales_act', 'glsetup.items', 'varchar', '15', '4010');
+INSERT INTO `0_sys_prefs` VALUES ('default_assembly_act', 'glsetup.items', 'varchar', '15', '1530');
 INSERT INTO `0_sys_prefs` VALUES ('default_workorder_required', 'glsetup.manuf', 'int', '11', '20');
 INSERT INTO `0_sys_prefs` VALUES ('version_id', 'system', 'varchar', '11', '2.3');
 
@@ -1916,8 +1916,8 @@ DROP TABLE IF EXISTS `0_tax_types`;
 CREATE TABLE `0_tax_types` (
   `id` int(11) NOT NULL auto_increment,
   `rate` double NOT NULL default '0',
-  `sales_gl_code` varchar(11) NOT NULL default '',
-  `purchasing_gl_code` varchar(11) NOT NULL default '',
+  `sales_gl_code` varchar(15) NOT NULL default '',
+  `purchasing_gl_code` varchar(15) NOT NULL default '',
   `name` varchar(60) NOT NULL default '',
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`)
@@ -2203,7 +2203,7 @@ CREATE TABLE `0_tags` (
 DROP TABLE IF EXISTS `0_tag_associations`;
 
 CREATE TABLE `0_tag_associations` (
-  `record_id` varchar(11) NOT NULL,
+  `record_id` varchar(15) NOT NULL,
   `tag_id` int(11) NOT NULL,
   UNIQUE KEY(`record_id`,`tag_id`)
 ) TYPE=MyISAM;
diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index d107e9ba..613b2b73 100644
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -71,7 +71,7 @@ CREATE TABLE `0_audit_trail` (
 DROP TABLE IF EXISTS `0_bank_accounts`;
 
 CREATE TABLE `0_bank_accounts` (
-  `account_code` varchar(11) NOT NULL default '',
+  `account_code` varchar(15) NOT NULL default '',
   `account_type` smallint(6) NOT NULL default '0',
   `bank_account_name` varchar(60) NOT NULL default '',
   `bank_account_number` varchar(100) NOT NULL default '',
@@ -104,7 +104,7 @@ CREATE TABLE `0_bank_trans` (
   `id` int(11) NOT NULL auto_increment,
   `type` smallint(6) default NULL,
   `trans_no` int(11) default NULL,
-  `bank_act` varchar(11) default NULL,
+  `bank_act` varchar(15) default NULL,
   `ref` varchar(40) default NULL,
   `trans_date` date NOT NULL default '0000-00-00',
   `amount` double default NULL,
@@ -158,7 +158,7 @@ CREATE TABLE `0_budget_trans` (
   `type` smallint(6) NOT NULL default '0',
   `type_no` bigint(16) NOT NULL default '1',
   `tran_date` date NOT NULL default '0000-00-00',
-  `account` varchar(11) NOT NULL default '',
+  `account` varchar(15) NOT NULL default '',
   `memo_` tinytext NOT NULL,
   `amount` double NOT NULL default '0',
   `dimension_id` int(11) default '0',
@@ -180,7 +180,7 @@ CREATE TABLE `0_budget_trans` (
 DROP TABLE IF EXISTS `0_chart_class`;
 
 CREATE TABLE `0_chart_class` (
-  `cid` int(11) NOT NULL default '0',
+  `cid` varchar(3) NOT NULL,
   `class_name` varchar(60) NOT NULL default '',
   `ctype` tinyint(1) NOT NULL default '0',
   `inactive` tinyint(1) NOT NULL default '0',
@@ -200,10 +200,10 @@ INSERT INTO `0_chart_class` VALUES ('4', 'Costs', '6', '0');
 DROP TABLE IF EXISTS `0_chart_master`;
 
 CREATE TABLE `0_chart_master` (
-  `account_code` varchar(11) NOT NULL default '',
-  `account_code2` varchar(11) default '',
+  `account_code` varchar(15) NOT NULL default '',
+  `account_code2` varchar(15) default '',
   `account_name` varchar(60) NOT NULL default '',
-  `account_type` int(11) NOT NULL default '0',
+  `account_type` varchar(10) NOT NULL default '0',
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`account_code`),
   KEY `account_name` (`account_name`),
@@ -299,15 +299,15 @@ INSERT INTO `0_chart_master` VALUES ('9990', '', 'Year Profit/Loss', '12', '0');
 DROP TABLE IF EXISTS `0_chart_types`;
 
 CREATE TABLE `0_chart_types` (
-  `id` int(11) NOT NULL auto_increment,
+  `id` varchar(10) NOT NULL,
   `name` varchar(60) NOT NULL default '',
-  `class_id` tinyint(1) NOT NULL default '0',
-  `parent` int(11) NOT NULL default '-1',
+  `class_id` varchar(3) NOT NULL default '',
+  `parent` varchar(10) NOT NULL default '-1',
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY  (`class_id`),
   KEY `name` (`name`)
-) TYPE=MyISAM AUTO_INCREMENT=13 ;
+) TYPE=MyISAM ;
 
 
 ### Data of table `0_chart_types` ###
@@ -361,23 +361,23 @@ CREATE TABLE `0_company` (
   `coy_logo` varchar(100) NOT NULL default '',
   `domicile` varchar(55) NOT NULL default '',
   `curr_default` char(3) NOT NULL default '',
-  `debtors_act` varchar(11) NOT NULL default '',
-  `pyt_discount_act` varchar(11) NOT NULL default '',
-  `creditors_act` varchar(11) NOT NULL default '',
-  `bank_charge_act` varchar(11) NOT NULL default '',
-  `exchange_diff_act` varchar(11) NOT NULL default '',
-  `profit_loss_year_act` varchar(11) NOT NULL default '',
-  `retained_earnings_act` varchar(11) NOT NULL default '',
-  `freight_act` varchar(11) NOT NULL default '',
-  `default_sales_act` varchar(11) NOT NULL default '',
-  `default_sales_discount_act` varchar(11) NOT NULL default '',
-  `default_prompt_payment_act` varchar(11) NOT NULL default '',
-  `default_inventory_act` varchar(11) NOT NULL default '',
-  `default_cogs_act` varchar(11) NOT NULL default '',
-  `default_adj_act` varchar(11) NOT NULL default '',
-  `default_inv_sales_act` varchar(11) NOT NULL default '',
-  `default_assembly_act` varchar(11) NOT NULL default '',
-  `payroll_act` varchar(11) NOT NULL default '',
+  `debtors_act` varchar(15) NOT NULL default '',
+  `pyt_discount_act` varchar(15) NOT NULL default '',
+  `creditors_act` varchar(15) NOT NULL default '',
+  `bank_charge_act` varchar(15) NOT NULL default '',
+  `exchange_diff_act` varchar(15) NOT NULL default '',
+  `profit_loss_year_act` varchar(15) NOT NULL default '',
+  `retained_earnings_act` varchar(15) NOT NULL default '',
+  `freight_act` varchar(15) NOT NULL default '',
+  `default_sales_act` varchar(15) NOT NULL default '',
+  `default_sales_discount_act` varchar(15) NOT NULL default '',
+  `default_prompt_payment_act` varchar(15) NOT NULL default '',
+  `default_inventory_act` varchar(15) NOT NULL default '',
+  `default_cogs_act` varchar(15) NOT NULL default '',
+  `default_adj_act` varchar(15) NOT NULL default '',
+  `default_inv_sales_act` varchar(15) NOT NULL default '',
+  `default_assembly_act` varchar(15) NOT NULL default '',
+  `payroll_act` varchar(15) NOT NULL default '',
   `allow_negative_stock` tinyint(1) NOT NULL default '0',
   `po_over_receive` int(11) NOT NULL default '10',
   `po_over_charge` int(11) NOT NULL default '10',
@@ -492,10 +492,10 @@ CREATE TABLE `0_cust_branch` (
   `email` varchar(100) NOT NULL default '',
   `default_location` varchar(5) NOT NULL default '',
   `tax_group_id` int(11) default NULL,
-  `sales_account` varchar(11) default NULL,
-  `sales_discount_account` varchar(11) default NULL,
-  `receivables_account` varchar(11) default NULL,
-  `payment_discount_account` varchar(11) default NULL,
+  `sales_account` varchar(15) default NULL,
+  `sales_discount_account` varchar(15) default NULL,
+  `receivables_account` varchar(15) default NULL,
+  `payment_discount_account` varchar(15) default NULL,
   `default_ship_via` int(11) NOT NULL default '1',
   `disable_trans` tinyint(4) NOT NULL default '0',
   `br_post_address` tinytext NOT NULL,
@@ -679,7 +679,7 @@ CREATE TABLE `0_gl_trans` (
   `type` smallint(6) NOT NULL default '0',
   `type_no` bigint(16) NOT NULL default '1',
   `tran_date` date NOT NULL default '0000-00-00',
-  `account` varchar(11) NOT NULL default '',
+  `account` varchar(15) NOT NULL default '',
   `memo_` tinytext NOT NULL,
   `amount` double NOT NULL default '0',
   `dimension_id` int(11) NOT NULL default '0',
@@ -1086,7 +1086,7 @@ CREATE TABLE `0_quick_entry_lines` (
   `qid` smallint(6) unsigned NOT NULL,
   `amount` double default '0',
   `action` varchar(2) NOT NULL,
-  `dest_id` varchar(11) NOT NULL,
+  `dest_id` varchar(15) NOT NULL,
   `dimension_id` smallint(6) unsigned default NULL,
   `dimension2_id` smallint(6) unsigned default NULL,
   PRIMARY KEY  (`id`),
@@ -1345,11 +1345,11 @@ CREATE TABLE `0_stock_category` (
   `dflt_tax_type` int(11) NOT NULL default '1',
   `dflt_units` varchar(20) NOT NULL default 'each',
   `dflt_mb_flag` char(1) NOT NULL default 'B',
-  `dflt_sales_act` varchar(11) NOT NULL default '',
-  `dflt_cogs_act` varchar(11) NOT NULL default '',
-  `dflt_inventory_act` varchar(11) NOT NULL default '',
-  `dflt_adjustment_act` varchar(11) NOT NULL default '',
-  `dflt_assembly_act` varchar(11) NOT NULL default '',
+  `dflt_sales_act` varchar(15) NOT NULL default '',
+  `dflt_cogs_act` varchar(15) NOT NULL default '',
+  `dflt_inventory_act` varchar(15) NOT NULL default '',
+  `dflt_adjustment_act` varchar(15) NOT NULL default '',
+  `dflt_assembly_act` varchar(15) NOT NULL default '',
   `dflt_dim1` int(11) default NULL,
   `dflt_dim2` int(11) default NULL,
   `inactive` tinyint(1) NOT NULL default '0',
@@ -1379,11 +1379,11 @@ CREATE TABLE `0_stock_master` (
   `long_description` tinytext NOT NULL,
   `units` varchar(20) NOT NULL default 'each',
   `mb_flag` char(1) NOT NULL default 'B',
-  `sales_account` varchar(11) NOT NULL default '',
-  `cogs_account` varchar(11) NOT NULL default '',
-  `inventory_account` varchar(11) NOT NULL default '',
-  `adjustment_account` varchar(11) NOT NULL default '',
-  `assembly_account` varchar(11) NOT NULL default '',
+  `sales_account` varchar(15) NOT NULL default '',
+  `cogs_account` varchar(15) NOT NULL default '',
+  `inventory_account` varchar(15) NOT NULL default '',
+  `adjustment_account` varchar(15) NOT NULL default '',
+  `assembly_account` varchar(15) NOT NULL default '',
   `dimension_id` int(11) default NULL,
   `dimension2_id` int(11) default NULL,
   `actual_cost` double NOT NULL default '0',
@@ -1460,7 +1460,7 @@ CREATE TABLE `0_supp_invoice_items` (
   `id` int(11) NOT NULL auto_increment,
   `supp_trans_no` int(11) default NULL,
   `supp_trans_type` int(11) default NULL,
-  `gl_code` varchar(11) NOT NULL default '0',
+  `gl_code` varchar(15) NOT NULL default '0',
   `grn_item_id` int(11) default NULL,
   `po_detail_item_id` int(11) default NULL,
   `stock_id` varchar(20) NOT NULL default '',
@@ -1532,9 +1532,9 @@ CREATE TABLE `0_suppliers` (
   `dimension2_id` int(11) default '0',
   `tax_group_id` int(11) default NULL,
   `credit_limit` double NOT NULL default '0',
-  `purchase_account` varchar(11) default NULL,
-  `payable_account` varchar(11) default NULL,
-  `payment_discount_account` varchar(11) default NULL,
+  `purchase_account` varchar(15) default NULL,
+  `payable_account` varchar(15) default NULL,
+  `payment_discount_account` varchar(15) default NULL,
   `notes` tinytext NOT NULL,
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`supplier_id`),
@@ -1585,30 +1585,30 @@ INSERT INTO `0_sys_prefs` VALUES ('add_pct', 'setup.company', 'int', '5', '-1');
 INSERT INTO `0_sys_prefs` VALUES ('round_to', 'setup.company', 'int', '5', '1');
 INSERT INTO `0_sys_prefs` VALUES ('login_tout', 'setup.company', 'smallint', '6', '600');
 INSERT INTO `0_sys_prefs` VALUES ('past_due_days', 'glsetup.general', 'int', '11', '30');
-INSERT INTO `0_sys_prefs` VALUES ('profit_loss_year_act', 'glsetup.general', 'varchar', '11', '9990');
-INSERT INTO `0_sys_prefs` VALUES ('retained_earnings_act', 'glsetup.general', 'varchar', '11', '3590');
-INSERT INTO `0_sys_prefs` VALUES ('bank_charge_act', 'glsetup.general', 'varchar', '11', '5690');
-INSERT INTO `0_sys_prefs` VALUES ('exchange_diff_act', 'glsetup.general', 'varchar', '11', '4450');
+INSERT INTO `0_sys_prefs` VALUES ('profit_loss_year_act', 'glsetup.general', 'varchar', '15', '9990');
+INSERT INTO `0_sys_prefs` VALUES ('retained_earnings_act', 'glsetup.general', 'varchar', '15', '3590');
+INSERT INTO `0_sys_prefs` VALUES ('bank_charge_act', 'glsetup.general', 'varchar', '15', '5690');
+INSERT INTO `0_sys_prefs` VALUES ('exchange_diff_act', 'glsetup.general', 'varchar', '15', '4450');
 INSERT INTO `0_sys_prefs` VALUES ('default_credit_limit', 'glsetup.customer', 'int', '11', '1000');
 INSERT INTO `0_sys_prefs` VALUES ('accumulate_shipping', 'glsetup.customer', 'tinyint', '1', '0');
 INSERT INTO `0_sys_prefs` VALUES ('legal_text', 'glsetup.customer', 'tinytext', '0', NULL);
-INSERT INTO `0_sys_prefs` VALUES ('freight_act', 'glsetup.customer', 'varchar', '11', '4430');
-INSERT INTO `0_sys_prefs` VALUES ('debtors_act', 'glsetup.sales', 'varchar', '11', '1200');
-INSERT INTO `0_sys_prefs` VALUES ('default_sales_act', 'glsetup.sales', 'varchar', '11', '4010');
-INSERT INTO `0_sys_prefs` VALUES ('default_sales_discount_act', 'glsetup.sales', 'varchar', '11', '4510');
-INSERT INTO `0_sys_prefs` VALUES ('default_prompt_payment_act', 'glsetup.sales', 'varchar', '11', '4500');
+INSERT INTO `0_sys_prefs` VALUES ('freight_act', 'glsetup.customer', 'varchar', '15', '4430');
+INSERT INTO `0_sys_prefs` VALUES ('debtors_act', 'glsetup.sales', 'varchar', '15', '1200');
+INSERT INTO `0_sys_prefs` VALUES ('default_sales_act', 'glsetup.sales', 'varchar', '15', '4010');
+INSERT INTO `0_sys_prefs` VALUES ('default_sales_discount_act', 'glsetup.sales', 'varchar', '15', '4510');
+INSERT INTO `0_sys_prefs` VALUES ('default_prompt_payment_act', 'glsetup.sales', 'varchar', '15', '4500');
 INSERT INTO `0_sys_prefs` VALUES ('default_delivery_required', 'glsetup.sales', 'smallint', '6', '1');
 INSERT INTO `0_sys_prefs` VALUES ('default_dim_required', 'glsetup.dims', 'int', '11', '20');
-INSERT INTO `0_sys_prefs` VALUES ('pyt_discount_act', 'glsetup.purchase', 'varchar', '11', '5060');
-INSERT INTO `0_sys_prefs` VALUES ('creditors_act', 'glsetup.purchase', 'varchar', '11', '2100');
+INSERT INTO `0_sys_prefs` VALUES ('pyt_discount_act', 'glsetup.purchase', 'varchar', '15', '5060');
+INSERT INTO `0_sys_prefs` VALUES ('creditors_act', 'glsetup.purchase', 'varchar', '15', '2100');
 INSERT INTO `0_sys_prefs` VALUES ('po_over_receive', 'glsetup.purchase', 'int', '11', '10');
 INSERT INTO `0_sys_prefs` VALUES ('po_over_charge', 'glsetup.purchase', 'int', '11', '10');
 INSERT INTO `0_sys_prefs` VALUES ('allow_negative_stock', 'glsetup.inventory', 'tinyint', '1', '0');
-INSERT INTO `0_sys_prefs` VALUES ('default_inventory_act', 'glsetup.items', 'varchar', '11', '1510');
-INSERT INTO `0_sys_prefs` VALUES ('default_cogs_act', 'glsetup.items', 'varchar', '11', '5010');
-INSERT INTO `0_sys_prefs` VALUES ('default_adj_act', 'glsetup.items', 'varchar', '11', '5040');
-INSERT INTO `0_sys_prefs` VALUES ('default_inv_sales_act', 'glsetup.items', 'varchar', '11', '4010');
-INSERT INTO `0_sys_prefs` VALUES ('default_assembly_act', 'glsetup.items', 'varchar', '11', '1530');
+INSERT INTO `0_sys_prefs` VALUES ('default_inventory_act', 'glsetup.items', 'varchar', '15', '1510');
+INSERT INTO `0_sys_prefs` VALUES ('default_cogs_act', 'glsetup.items', 'varchar', '15', '5010');
+INSERT INTO `0_sys_prefs` VALUES ('default_adj_act', 'glsetup.items', 'varchar', '15', '5040');
+INSERT INTO `0_sys_prefs` VALUES ('default_inv_sales_act', 'glsetup.items', 'varchar', '15', '4010');
+INSERT INTO `0_sys_prefs` VALUES ('default_assembly_act', 'glsetup.items', 'varchar', '15', '1530');
 INSERT INTO `0_sys_prefs` VALUES ('default_workorder_required', 'glsetup.manuf', 'int', '11', '20');
 INSERT INTO `0_sys_prefs` VALUES ('version_id', 'system', 'varchar', '11', '2.3');
 
@@ -1695,8 +1695,8 @@ DROP TABLE IF EXISTS `0_tax_types`;
 CREATE TABLE `0_tax_types` (
   `id` int(11) NOT NULL auto_increment,
   `rate` double NOT NULL default '0',
-  `sales_gl_code` varchar(11) NOT NULL default '',
-  `purchasing_gl_code` varchar(11) NOT NULL default '',
+  `sales_gl_code` varchar(15) NOT NULL default '',
+  `purchasing_gl_code` varchar(15) NOT NULL default '',
   `name` varchar(60) NOT NULL default '',
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`)
@@ -1942,7 +1942,7 @@ CREATE TABLE `0_tags` (
 DROP TABLE IF EXISTS `0_tag_associations`;
 
 CREATE TABLE `0_tag_associations` (
-  `record_id` varchar(11) NOT NULL,
+  `record_id` varchar(15) NOT NULL,
   `tag_id` int(11) NOT NULL,
   UNIQUE KEY(`record_id`,`tag_id`)
 ) TYPE=MyISAM;