From c63268eb8a18aa67941b685a0b29dd8ad036482e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 4 Dec 2009 10:14:51 +0000 Subject: [PATCH] Start 2.8.0 --- htdocs/install/check.php | 9 +++++---- htdocs/install/mysql/migration/2.6.0-2.7.0.sql | 3 --- htdocs/install/mysql/migration/2.7.0-2.8.0.sql | 11 +++++++++++ 3 files changed, 16 insertions(+), 7 deletions(-) create mode 100755 htdocs/install/mysql/migration/2.7.0-2.8.0.sql diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 8dcbd2e426c..80e5c19ab26 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -310,10 +310,10 @@ else print $langs->trans("InstallEasy")." "; print $langs->trans("ChooseYourSetupMode"); - + $foundrecommandedchoice=0; - - + + // Array of install choices print ''; @@ -356,7 +356,8 @@ else array('from'=>'2.2.0', 'to'=>'2.4.0'), array('from'=>'2.4.0', 'to'=>'2.5.0'), array('from'=>'2.5.0', 'to'=>'2.6.0'), - array('from'=>'2.6.0', 'to'=>'2.7.0') + array('from'=>'2.6.0', 'to'=>'2.7.0'), + array('from'=>'2.7.0', 'to'=>'2.8.0') ); $count=0; diff --git a/htdocs/install/mysql/migration/2.6.0-2.7.0.sql b/htdocs/install/mysql/migration/2.6.0-2.7.0.sql index a3ccb7012d2..00df2853388 100644 --- a/htdocs/install/mysql/migration/2.6.0-2.7.0.sql +++ b/htdocs/install/mysql/migration/2.6.0-2.7.0.sql @@ -499,6 +499,3 @@ ALTER TABLE llx_adherent DROP INDEX idx_adherent_fk_soc; ALTER TABLE llx_propaldet ADD INDEX idx_propaldet_fk_propal (fk_propal); -- V4.1 delete from llx_propaldet where fk_propal not in (select rowid from llx_propal); ALTER TABLE llx_propaldet ADD CONSTRAINT fk_propaldet_fk_propal FOREIGN KEY (fk_propal) REFERENCES llx_propal (rowid); - -ALTER TABLE llx_don ADD COLUMN ref varchar(30) DEFAULT NULL AFTER rowid; -ALTER TABLE llx_don ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref; diff --git a/htdocs/install/mysql/migration/2.7.0-2.8.0.sql b/htdocs/install/mysql/migration/2.7.0-2.8.0.sql new file mode 100755 index 00000000000..4a7aeb6079f --- /dev/null +++ b/htdocs/install/mysql/migration/2.7.0-2.8.0.sql @@ -0,0 +1,11 @@ +-- +-- $Id$ +-- +-- Be carefull to requests order. +-- This file must be loaded by calling /install/index.php page +-- when current version is 2.6.0 or higher. +-- + + +ALTER TABLE llx_don ADD COLUMN ref varchar(30) DEFAULT NULL AFTER rowid; +ALTER TABLE llx_don ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;