diff --git a/htdocs/fourn/fournisseur.class.php b/htdocs/fourn/fournisseur.class.php
index 6135125f0c2..fb4277dffa6 100644
--- a/htdocs/fourn/fournisseur.class.php
+++ b/htdocs/fourn/fournisseur.class.php
@@ -15,16 +15,13 @@
  * 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$
  */
 
 /**
    \file       htdocs/fourn/fournisseur.class.php
    \ingroup    fournisseur,societe
    \brief      Fichier de la classe des fournisseurs
-   \version    $Revision$
+   \version    $Id$
 */
 
 require_once(DOL_DOCUMENT_ROOT."/societe.class.php");
diff --git a/mysql/migration/2.0.0-2.1.0.sql b/mysql/migration/2.0.0-2.1.0.sql
index c7003c81f84..d82c8dc7f24 100644
--- a/mysql/migration/2.0.0-2.1.0.sql
+++ b/mysql/migration/2.0.0-2.1.0.sql
@@ -82,17 +82,6 @@ alter table llx_cond_reglement add (decalage smallint(6) default 0);
 alter table llx_commande add fk_cond_reglement int(11) DEFAULT NULL;
 alter table llx_commande add fk_mode_reglement int(11) DEFAULT NULL;
 
-create table llx_comfourn_facfourn
-(
-  rowid       integer AUTO_INCREMENT PRIMARY KEY,
-  fk_commande integer NOT NULL,
-  fk_facture  integer NOT NULL,
-
-  key(fk_commande),
-  key(fk_facture)
-)type=innodb;
-
-
 
 alter table llx_categorie drop column fk_statut;
 alter table llx_categorie add visible tinyint DEFAULT 1 NOT NULL;
diff --git a/mysql/migration/2.2.0-2.4.0.sql b/mysql/migration/2.2.0-2.4.0.sql
index 46557e0cb01..ce5d856f388 100644
--- a/mysql/migration/2.2.0-2.4.0.sql
+++ b/mysql/migration/2.2.0-2.4.0.sql
@@ -330,3 +330,6 @@ insert into llx_c_type_fees (code,libelle,active) values ('TF_TRIP',     'Trip',
 insert into llx_c_type_fees (code,libelle,active) values ('TF_LUNCH',    'Lunch',  1);
 
 drop table llx_comfourn_facfourn;
+
+alter table llx_element_element modify sourcetype		varchar(16) NOT NULL;
+alter table llx_element_element modify targettype		varchar(16) NOT NULL;
diff --git a/mysql/tables/llx_comfourn_facfourn.sql b/mysql/tables/llx_comfourn_facfourn.sql
deleted file mode 100644
index b09ca8b2ce8..00000000000
--- a/mysql/tables/llx_comfourn_facfourn.sql
+++ /dev/null
@@ -1,30 +0,0 @@
--- ===================================================================
--- Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
---
--- 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$
--- ===================================================================
-
-create table llx_comfourn_facfourn
-(
-  rowid       integer AUTO_INCREMENT PRIMARY KEY,
-  fk_commande integer NOT NULL,
-  fk_facture  integer NOT NULL,
-
-  key(fk_commande),
-  key(fk_facture)
-)type=innodb;
diff --git a/mysql/tables/llx_element_element.sql b/mysql/tables/llx_element_element.sql
index dd39b627d5e..53823a62793 100644
--- a/mysql/tables/llx_element_element.sql
+++ b/mysql/tables/llx_element_element.sql
@@ -25,8 +25,8 @@ create table llx_element_element
 (
   rowid           	integer AUTO_INCREMENT PRIMARY KEY,  
   sourceid			integer NOT NULL,
-  sourcetype		varchar(12) NOT NULL,
+  sourcetype		varchar(16) NOT NULL,
   targetid			integer NOT NULL,
-  targettype		varchar(12) NOT NULL
+  targettype		varchar(16) NOT NULL
 ) type=innodb;
 
diff --git a/pgsql/tables/llx_comfourn_facfourn.sql b/pgsql/tables/llx_comfourn_facfourn.sql
deleted file mode 100644
index 30ccc2da113..00000000000
--- a/pgsql/tables/llx_comfourn_facfourn.sql
+++ /dev/null
@@ -1,35 +0,0 @@
--- Generated by dolibarr_mysql2pgsql
--- (c) 2004, PostgreSQL Inc.
--- (c) 2005, Laurent Destailleur.
-
--- ===================================================================
--- Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
---
--- 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: llx_comfourn_facfourn.sql,v 1.3 2007/12/02 22:03:23 eldy Exp 
--- ===================================================================
-
-
-create table llx_comfourn_facfourn
-(
-  rowid SERIAL PRIMARY KEY,
-  "fk_commande" integer NOT NULL,
-  "fk_facture"  integer NOT NULL
-);
-
-CREATE INDEX idx_llx_comfourn_facfourn_fk_commande ON llx_comfourn_facfourn (fk_commande);
-CREATE INDEX idx_llx_comfourn_facfourn_fk_facture ON llx_comfourn_facfourn (fk_facture);