Fixed 2.4 upgrade routines (column drop moved to post-upgrade cleanup).

[fa-stable.git] / sql / alter2.4.sql

diff --git a/sql/alter2.4.sql b/sql/alter2.4.sql
index d84441ac7577469e24ff7b975ea1fd082b94dfba..73bbcef51e2df4f2767267c8980358257808ed30 100644 (file)
--- a/sql/alter2.4.sql
+++ b/sql/alter2.4.sql
@@ -27,3 +27,14 @@ UPDATE `0_gl_trans` gl
  SET `person_id` = IF(br.receivables_account, br.debtor_no, IF(sup.payable_account, sup.supplier_id, NULL)), 
        `person_type_id` = IF(br.receivables_account, 2, IF(sup.payable_account, 3, NULL));
 
+ALTER TABLE `0_tax_group_items` ADD COLUMN `tax_shipping` tinyint(1) NOT NULL default '0' AFTER `rate`;
+UPDATE `0_tax_group_items` tgi
+       SET tgi.tax_shipping=1
+       WHERE tgi.rate=(SELECT 0_tax_types.rate FROM 0_tax_types, 0_tax_groups 
+               WHERE tax_shipping=1 AND tgi.tax_group_id=0_tax_groups.id AND tgi.tax_type_id=0_tax_types.id);
+ALTER TABLE `0_tax_groups` DROP COLUMN `tax_shipping`;
+
+ALTER TABLE `0_sales_order_details` ADD KEY `stkcode` (`stk_code`);
+ALTER TABLE `0_purch_order_details` ADD KEY `itemcode` (`item_code`);
+ALTER TABLE `0_sys_prefs` CHANGE `value` `value` TEXT NOT NULL DEFAULT '';
+ALTER TABLE `0_cust_branch` ADD COLUMN `bank_account` varchar(60) DEFAULT NULL AFTER `notes`;