From a0f6fa1c26965f9491b02ef133303a1fe38a89bb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 18 Sep 2004 13:29:05 +0000 Subject: [PATCH] =?UTF-8?q?La=20table=20des=20civilit=E9s=20n'a=20pas=20a?= =?UTF-8?q?=20contenir=20le=20code=20pays=20mais=20juste=20le=20code=20lan?= =?UTF-8?q?gue.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mysql/migration/1.1.0-1.2.0-RC1.sql | 32 +++++++++++++---------------- 1 file changed, 14 insertions(+), 18 deletions(-) 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 efb2198b60e..04b2df3ab3d 100644 --- a/mysql/migration/1.1.0-1.2.0-RC1.sql +++ b/mysql/migration/1.1.0-1.2.0-RC1.sql @@ -635,7 +635,6 @@ create table llx_c_civilite rowid integer PRIMARY KEY, lang varchar(8) default 'all' not null, code varchar(6), - fk_pays integer default 0, civilite varchar(50), active tinyint default 1 )type=innodb; @@ -644,23 +643,23 @@ alter table llx_socpeople change civilite civilite varchar(6); delete from llx_c_civilite; -insert into llx_c_civilite (rowid, code, lang, fk_pays, civilite, active) values (1 , 'MME', 'fr_FR', 0, 'Madame', 1); -insert into llx_c_civilite (rowid, code, lang, fk_pays, civilite, active) values (3 , 'MR', 'fr_FR', 0, 'Monsieur', 1); -insert into llx_c_civilite (rowid, code, lang, fk_pays, civilite, active) values (5 , 'MLE', 'fr_FR', 0, 'Mademoiselle', 1); -insert into llx_c_civilite (rowid, code, lang, fk_pays, civilite, active) values (7 , 'MTRE','fr_FR', 0, 'Maître', 1); +insert into llx_c_civilite (rowid, code, lang, civilite, active) values (1 , 'MME', 'fr_FR', 'Madame', 1); +insert into llx_c_civilite (rowid, code, lang, civilite, active) values (3 , 'MR', 'fr_FR', 'Monsieur', 1); +insert into llx_c_civilite (rowid, code, lang, civilite, active) values (5 , 'MLE', 'fr_FR', 'Mademoiselle', 1); +insert into llx_c_civilite (rowid, code, lang, civilite, active) values (7 , 'MTRE','fr_FR', 'Maître', 1); -insert into llx_c_civilite (rowid, code, lang, fk_pays, civilite, active) values (21, 'MME', 'fr_BE', 0, 'Madame', 1); -insert into llx_c_civilite (rowid, code, lang, fk_pays, civilite, active) values (23, 'MR', 'fr_BE', 0, 'Monsieur', 1); -insert into llx_c_civilite (rowid, code, lang, fk_pays, civilite, active) values (25, 'MLE', 'fr_BE', 0, 'Mademoiselle', 1); -insert into llx_c_civilite (rowid, code, lang, fk_pays, civilite, active) values (27, 'MTRE','fr_BE', 0, 'Maître', 1); +insert into llx_c_civilite (rowid, code, lang, civilite, active) values (21, 'MME', 'fr_BE', 'Madame', 1); +insert into llx_c_civilite (rowid, code, lang, civilite, active) values (23, 'MR', 'fr_BE', 'Monsieur', 1); +insert into llx_c_civilite (rowid, code, lang, civilite, active) values (25, 'MLE', 'fr_BE', 'Mademoiselle', 1); +insert into llx_c_civilite (rowid, code, lang, civilite, active) values (27, 'MTRE','fr_BE', 'Maître', 1); -insert into llx_c_civilite (rowid, code, lang, fk_pays, civilite, active) values (32, 'MME', 'nl_BE', 0, 'Mevrouw', 1); -insert into llx_c_civilite (rowid, code, lang, fk_pays, civilite, active) values (34, 'MR', 'nl_BE', 0, 'Meneer', 1); -insert into llx_c_civilite (rowid, code, lang, fk_pays, civilite, active) values (36, 'MLE', 'nl_BE', 0, 'Juffrouw', 1); +insert into llx_c_civilite (rowid, code, lang, civilite, active) values (32, 'MME', 'nl_BE', 'Mevrouw', 1); +insert into llx_c_civilite (rowid, code, lang, civilite, active) values (34, 'MR', 'nl_BE', 'Meneer', 1); +insert into llx_c_civilite (rowid, code, lang, civilite, active) values (36, 'MLE', 'nl_BE', 'Juffrouw', 1); -insert into llx_c_civilite (rowid, code, lang, fk_pays, civilite, active) values (41, 'MME', 'en_US', 0, 'Madam', 1); -insert into llx_c_civilite (rowid, code, lang, fk_pays, civilite, active) values (43, 'MR', 'en_US', 0, 'Mister', 1); -insert into llx_c_civilite (rowid, code, lang, fk_pays, civilite, active) values (45, 'MLE', 'en_US', 0, 'Misses', 1); +insert into llx_c_civilite (rowid, code, lang, civilite, active) values (41, 'MME', 'en_US', 'Madam', 1); +insert into llx_c_civilite (rowid, code, lang, civilite, active) values (43, 'MR', 'en_US', 'Mister', 1); +insert into llx_c_civilite (rowid, code, lang, civilite, active) values (45, 'MLE', 'en_US', 'Misses', 1); -- -- @@ -804,6 +803,3 @@ create table llx_societe_rib )type=innodb; - - -alter table llx_c_civilite drop fk_pays;