From 40af984c5e5a74c0a51a7e4a9950e6c499f908d7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 8 Aug 2004 13:35:44 +0000 Subject: [PATCH] =?UTF-8?q?Sur=20la=20table=20des=20actions,=20ajout=20du?= =?UTF-8?q?=20champ=20lang=20afin=20de=20pouvoir=20y=20mettre=20les=20dif?= =?UTF-8?q?=E9rentes=20d=E9clinaisons=20par=20langue=20et=20ajout=20du=20c?= =?UTF-8?q?hamp=20type=20afin=20d'identifier=20les=20actions=20qui=20ne=20?= =?UTF-8?q?doivent=20pas=20etre=20supprim=E9e=20du=20dictionnaire=20de=20d?= =?UTF-8?q?onn=E9es=20leur=20id=20=E9tant=20utilis=E9=20en=20dur=20dans=20?= =?UTF-8?q?le=20code=20(Exemple:=20rendez-vous,=20envoi=20mail).=20Ce=20ch?= =?UTF-8?q?amp=20est=20mis=20dans=20ce=20cas=20a=20la=20valeur=20'system'.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mysql/data/data.sql | 18 +++++++++--------- mysql/migration/1.1.0-1.2.0-RC1.sql | 6 +++++- mysql/tables/llx_c_actioncomm.sql | 5 ++++- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/mysql/data/data.sql b/mysql/data/data.sql index b560a56fe97..18c630b9ba8 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -185,15 +185,15 @@ insert into llx_c_chargesociales (id,libelle,deductible) values ( 3, 'GSG/CRDS N -- Types action -- delete from llx_c_actioncomm; -insert into llx_c_actioncomm (id,libelle) values ( 0, '-'); -insert into llx_c_actioncomm (id,libelle) values ( 1, 'Appel Téléphonique'); -insert into llx_c_actioncomm (id,libelle) values ( 2, 'Envoi Fax'); -insert into llx_c_actioncomm (id,libelle) values ( 3, 'Envoi Proposition'); -insert into llx_c_actioncomm (id,libelle) values ( 4, 'Envoi Email'); -insert into llx_c_actioncomm (id,libelle) values ( 5, 'Prendre rendez-vous'); -insert into llx_c_actioncomm (id,libelle) values ( 9, 'Envoi Facture'); -insert into llx_c_actioncomm (id,libelle) values (10, 'Relance effectuée'); -insert into llx_c_actioncomm (id,libelle) values (11, 'Clôture'); +insert into llx_c_actioncomm (id,libelle) values ( 0, 'system', 'all', '-'); +insert into llx_c_actioncomm (id,libelle) values ( 1, 'system', 'fr_FR', 'Appel Téléphonique'); +insert into llx_c_actioncomm (id,libelle) values ( 2, 'system', 'fr_FR', 'Envoi Fax'); +insert into llx_c_actioncomm (id,libelle) values ( 3, 'system', 'fr_FR', 'Envoi Proposition'); +insert into llx_c_actioncomm (id,libelle) values ( 4, 'system', 'fr_FR', 'Envoi Email'); +insert into llx_c_actioncomm (id,libelle) values ( 5, 'system', 'fr_FR', 'Prendre rendez-vous'); +insert into llx_c_actioncomm (id,libelle) values ( 9, 'system', 'fr_FR', 'Envoi Facture'); +insert into llx_c_actioncomm (id,libelle) values (10, 'system', 'fr_FR', 'Relance effectuée'); +insert into llx_c_actioncomm (id,libelle) values (11, 'system', 'fr_FR', 'Clôture'); -- -- Types action diff --git a/mysql/migration/1.1.0-1.2.0-RC1.sql b/mysql/migration/1.1.0-1.2.0-RC1.sql index 12884e96bc4..7a0d8a16751 100644 --- a/mysql/migration/1.1.0-1.2.0-RC1.sql +++ b/mysql/migration/1.1.0-1.2.0-RC1.sql @@ -1,7 +1,7 @@ -- -- -- --- Attention à l'ordre des requetes +-- Attention à l ordre des requetes -- ce fichier doit être chargé sur une version 1.1.0 -- sans AUCUNE erreur ni warning -- @@ -74,6 +74,10 @@ alter table c_pays rename llx_c_pays ; alter table c_stcomm rename llx_c_stcomm ; alter table c_typent rename llx_c_typent ; +alter table llx_c_actioncomm add type varchar(10) not null default 'system' after id; +alter table llx_c_actioncomm add lang varchar(8) not null default 'all' after type; +update llx_c_actioncomm set lang='fr_FR' where id > 0; + alter table llx_c_paiement add code varchar(6) after id; delete from llx_c_paiement; diff --git a/mysql/tables/llx_c_actioncomm.sql b/mysql/tables/llx_c_actioncomm.sql index 51000558556..e01ac1c6651 100644 --- a/mysql/tables/llx_c_actioncomm.sql +++ b/mysql/tables/llx_c_actioncomm.sql @@ -1,5 +1,6 @@ -- ======================================================================== -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville +-- Copyright (C) 2004 Laurent Destailleur -- -- $Id$ -- $Source$ @@ -23,6 +24,8 @@ create table llx_c_actioncomm ( id integer PRIMARY KEY, - libelle varchar(30), + type varchar(10) default 'system' not null, + lang varchar(8) default 'all' not null, + libelle varchar(30) not null, todo tinyint )type=innodb;