From 75a5ce66108061a63a82653d970bc82f9ebaadba Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Oct 2006 22:25:11 +0000 Subject: [PATCH] =?UTF-8?q?Modification=20pour=20g=E9rer=20les=20taches=20?= =?UTF-8?q?et=20les=20actions=20sur=20le=20meme=20principe.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mysql/migration/2.0.0-2.1.0.sql | 9 ++++++++- mysql/tables/llx_actioncomm.sql | 20 +++++++++++++++----- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/mysql/migration/2.0.0-2.1.0.sql b/mysql/migration/2.0.0-2.1.0.sql index 06e83d5ca07..5c6f6f72ef9 100644 --- a/mysql/migration/2.0.0-2.1.0.sql +++ b/mysql/migration/2.0.0-2.1.0.sql @@ -97,8 +97,15 @@ insert into llx_c_actioncomm (id, code, type, libelle, module) values (50, 'AC_O alter table llx_actioncomm modify datea datetime; alter table llx_actioncomm add column datec datetime after id; alter table llx_actioncomm add column datep datetime after datec; -alter table llx_actioncomm add column tms timestamp after datea; +alter table llx_actioncomm add column datep2 datetime after datep; +alter table llx_actioncomm add column datea2 datetime after datea; +alter table llx_actioncomm add column tms timestamp after datea2; alter table llx_actioncomm add column fk_commande integer after propalrowid; +alter table llx_actioncomm add column fk_parent integer NOT NULL default 0 after fk_contact; +alter table llx_actioncomm add column durationp real after percent; +alter table llx_actioncomm add column durationa real after durationp; +alter table llx_actioncomm add column fk_projet integer after label; + update llx_actioncomm set datec = datea where datec is null; update llx_actioncomm set datep = datea where datep is null AND percent < 100; diff --git a/mysql/tables/llx_actioncomm.sql b/mysql/tables/llx_actioncomm.sql index 17b811440ad..1fbc82589c2 100644 --- a/mysql/tables/llx_actioncomm.sql +++ b/mysql/tables/llx_actioncomm.sql @@ -27,21 +27,31 @@ create table llx_actioncomm ( id integer AUTO_INCREMENT PRIMARY KEY, datec datetime, -- date creation - datep datetime, -- date 0% - datea datetime, -- date 100% + datep datetime, -- date debut planifiee + datep2 datetime, -- date fin planifiee si action non ponctuelle + datea datetime, -- date debut realisation + datea2 datetime, -- date fin realisation si action non ponctuelle tms timestamp, -- date modif - fk_action integer, + fk_action integer, -- type de l'action label varchar(50) NOT NULL, -- libelle de l'action + + fk_project integer, fk_soc integer, - fk_contact integer default 0, + fk_contact integer, + fk_parent integer NOT NULL default 0, + fk_user_action integer, -- id de la personne qui doit effectuer l'action - fk_user_author integer, + fk_user_author integer, -- id de la personne qui a effectuer l'action priority smallint, percent smallint NOT NULL default 0, + durationp real, -- duree planifiee + durationa real, -- duree reellement passee note text, + propalrowid integer, fk_commande integer, fk_facture integer + )type=innodb;