From d76e0c6dfd396d85a1081340cf06d5d14d30807a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 2 May 2007 09:26:26 +0000
Subject: [PATCH] Mere modif de la branche 2.1

---
 htdocs/expedition/commande.php         |  1 +
 mysql/migration/2.0.0-2.1.0.sql        |  3 +++
 mysql/tables/llx_adherent_type.key.sql | 24 ++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 mysql/tables/llx_adherent_type.key.sql

diff --git a/htdocs/expedition/commande.php b/htdocs/expedition/commande.php
index b28ec69c3c8..9f8b4f1b5f2 100644
--- a/htdocs/expedition/commande.php
+++ b/htdocs/expedition/commande.php
@@ -18,6 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id$
+ * $Id$
  * $Source$
  */
 
diff --git a/mysql/migration/2.0.0-2.1.0.sql b/mysql/migration/2.0.0-2.1.0.sql
index 806b605b076..757c3c677b2 100644
--- a/mysql/migration/2.0.0-2.1.0.sql
+++ b/mysql/migration/2.0.0-2.1.0.sql
@@ -810,6 +810,9 @@ alter table llx_adherent add column phone            varchar(30) after email;
 alter table llx_adherent add column phone_perso      varchar(30) after phone;
 alter table llx_adherent add column phone_mobile     varchar(30) after phone_perso;
 
+delete from llx_adherent_type where libelle IS NULL;
+alter table llx_adherent_type modify libelle          varchar(50) NOT NULL;
+
 update llx_facture set fk_facture_source=null where fk_facture_source is not null and type = 0;
 update llx_facture set fk_statut=2 where paye=1;
 update llx_facture set fk_statut=2 where close_code is not null and close_code != '' and close_code != 'replaced';
diff --git a/mysql/tables/llx_adherent_type.key.sql b/mysql/tables/llx_adherent_type.key.sql
new file mode 100644
index 00000000000..a8047b032c5
--- /dev/null
+++ b/mysql/tables/llx_adherent_type.key.sql
@@ -0,0 +1,24 @@
+-- ============================================================================
+-- Copyright (C) 2007 Laurent Destailleur <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- $Id$
+-- $Source$
+--
+-- ============================================================================
+
+
+ALTER TABLE llx_adherent_type ADD UNIQUE uk_adherent_type_libelle(libelle);