From 21178ef2f3bb121c11d5fb8f66c6a54623cdcdfd Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 4 May 2010 06:15:05 +0000 Subject: [PATCH] Works on Milestone module --- dev/initdata/initdemo.sql | 34 ------------------- .../install/mysql/migration/2.7.0-2.8.0.sql | 1 - .../install/mysql/migration/2.8.0-2.9.0.sql | 1 + .../install/mysql/tables/llx_projet_task.sql | 1 - 4 files changed, 1 insertion(+), 36 deletions(-) diff --git a/dev/initdata/initdemo.sql b/dev/initdata/initdemo.sql index 2b7c16e7f77..d04ce23b48e 100644 --- a/dev/initdata/initdemo.sql +++ b/dev/initdata/initdemo.sql @@ -3759,39 +3759,6 @@ INSERT INTO `llx_projet` VALUES (1,NULL,'2010-02-06','2010-02-08 14:59:12','2010 /*!40000 ALTER TABLE `llx_projet` ENABLE KEYS */; UNLOCK TABLES; --- --- Table structure for table `llx_projet_milestone` --- - -DROP TABLE IF EXISTS `llx_projet_milestone`; -CREATE TABLE `llx_projet_milestone` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `fk_projet` int(11) NOT NULL, - `label` varchar(255) NOT NULL, - `description` text, - `datec` datetime DEFAULT NULL, - `tms` timestamp NOT NULL, - `dateo` datetime DEFAULT NULL, - `datee` datetime DEFAULT NULL, - `priority` int(11) DEFAULT '0', - `fk_user_creat` int(11) DEFAULT NULL, - `rang` int(11) DEFAULT '0', - PRIMARY KEY (`rowid`), - KEY `idx_projet_milestone_fk_projet` (`fk_projet`), - KEY `idx_projet_milestone_fk_user_creat` (`fk_user_creat`), - CONSTRAINT `fk_projet_milestone_fk_projet` FOREIGN KEY (`fk_projet`) REFERENCES `llx_projet` (`rowid`), - CONSTRAINT `fk_projet_milestone_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`) -) TYPE=InnoDB; - --- --- Dumping data for table `llx_projet_milestone` --- - -LOCK TABLES `llx_projet_milestone` WRITE; -/*!40000 ALTER TABLE `llx_projet_milestone` DISABLE KEYS */; -/*!40000 ALTER TABLE `llx_projet_milestone` ENABLE KEYS */; -UNLOCK TABLES; - -- -- Table structure for table `llx_projet_task` -- @@ -3811,7 +3778,6 @@ CREATE TABLE `llx_projet_task` ( `duration_effective` double NOT NULL DEFAULT '0', `progress` int(11) DEFAULT '0', `priority` int(11) DEFAULT '0', - `fk_milestone` int(11) DEFAULT '0', `fk_user_creat` int(11) DEFAULT NULL, `fk_user_modif` int(11) DEFAULT NULL, `fk_user_valid` int(11) DEFAULT NULL, 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 index 9514087b7cf..ead8699f833 100755 --- a/htdocs/install/mysql/migration/2.7.0-2.8.0.sql +++ b/htdocs/install/mysql/migration/2.7.0-2.8.0.sql @@ -124,7 +124,6 @@ ALTER TABLE llx_projet_task MODIFY description text; ALTER TABLE llx_projet_task MODIFY duration_effective real DEFAULT 0 NOT NULL; ALTER TABLE llx_projet_task ADD COLUMN progress integer DEFAULT 0 AFTER duration_effective; ALTER TABLE llx_projet_task ADD COLUMN priority integer DEFAULT 0 AFTER progress; -ALTER TABLE llx_projet_task ADD COLUMN fk_milestone integer DEFAULT 0 AFTER priority; ALTER TABLE llx_projet_task ADD COLUMN fk_user_modif integer AFTER fk_user_creat; ALTER TABLE llx_projet_task ADD COLUMN fk_user_valid integer AFTER fk_user_modif; UPDATE llx_projet_task SET statut='1' WHERE statut='open'; diff --git a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql index 5ae420a9f81..811bec38c3b 100755 --- a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql +++ b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql @@ -166,6 +166,7 @@ ALTER table llx_adherent MODIFY pays integer; -- add milestone module DROP TABLE llx_projet_milestone; +ALTER TABLE llx_projet drop column fk_milestone; create table llx_milestone ( rowid integer AUTO_INCREMENT PRIMARY KEY, diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index 50e0b5729df..ca28fcb5a6d 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -34,7 +34,6 @@ create table llx_projet_task duration_effective real DEFAULT 0 NOT NULL, progress integer DEFAULT 0, -- percentage increase priority integer DEFAULT 0, -- priority - fk_milestone integer DEFAULT 0, -- milestone fk_user_creat integer, -- user who created the task fk_user_valid integer, -- user who validated the task fk_statut smallint DEFAULT 0 NOT NULL,