Merged changes up to 2.3.16 into unstable

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

diff --git a/sql/alter2.4.sql b/sql/alter2.4.sql
index 4d86ae3bee37b67e6c617ce1704c71614a3eeff2..ee77647ad9c810894324f46905152afe4e2552b6 100644 (file)
--- a/sql/alter2.4.sql
+++ b/sql/alter2.4.sql
@@ -19,7 +19,7 @@ CREATE TABLE `0_wo_costing` (
   `trans_no` int(11) NOT NULL default '0',
   `factor` double NOT NULL default '1',
   PRIMARY KEY  (`id`)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
 
 UPDATE `0_gl_trans` gl
                LEFT JOIN `0_cust_branch` br ON br.receivables_account=gl.account AND br.debtor_no=gl.person_id AND gl.person_type_id=2
@@ -76,3 +76,6 @@ UPDATE `0_security_roles` SET `sections`=CONCAT_WS(';', `sections`, '768'), `are
 
 UPDATE `0_security_roles` SET `areas`=CONCAT_WS(';', `areas`, '775')
        WHERE NOT `areas` REGEXP '[^0-9]?775[^0-9]?';
+
+ALTER TABLE `0_stock_master` ADD COLUMN `no_purchase` tinyint(1) NOT NULL default '0' AFTER `no_sale`;
+ALTER TABLE `0_stock_category` ADD COLUMN `dflt_no_purchase` tinyint(1) NOT NULL default '0' AFTER `dflt_no_sale`;