diff --git a/mysql/tables/llx_c_regions.key.sql b/mysql/tables/llx_c_regions.key.sql
index d0b279718bc..ceba9c65b8d 100644
--- a/mysql/tables/llx_c_regions.key.sql
+++ b/mysql/tables/llx_c_regions.key.sql
@@ -21,4 +21,5 @@
 -- ========================================================================
 
 
-ALTER TABLE llx_c_regions        ADD CONSTRAINT c_regions_fk_pays		FOREIGN KEY (fk_pays)     REFERENCES llx_c_pays (rowid);
+ALTER TABLE llx_c_regions ADD INDEX idx_c_regions_fk_pays (fk_pays);
+ALTER TABLE llx_c_regions ADD CONSTRAINT c_regions_fk_pays	FOREIGN KEY (fk_pays)     REFERENCES llx_c_pays (rowid);
diff --git a/mysql/tables/llx_facture.key.sql b/mysql/tables/llx_facture.key.sql
index f2cfc9d9812..3b97d39406b 100644
--- a/mysql/tables/llx_facture.key.sql
+++ b/mysql/tables/llx_facture.key.sql
@@ -21,12 +21,11 @@
 --
 -- ============================================================================
 
-ALTER TABLE llx_facture ADD INDEX (fk_soc);
 
-ALTER TABLE llx_facture ADD INDEX (fk_user_author);
-ALTER TABLE llx_facture ADD INDEX (fk_user_valid);
+ALTER TABLE llx_facture ADD INDEX idx_facture_fk_soc (fk_soc);
+ALTER TABLE llx_facture ADD INDEX idx_facture_fk_user_author (fk_user_author);
+ALTER TABLE llx_facture ADD INDEX idx_facture_fk_user_valid (fk_user_valid);
 
 ALTER TABLE llx_facture ADD FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp);
-
 ALTER TABLE llx_facture ADD FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid);
 ALTER TABLE llx_facture ADD FOREIGN KEY (fk_user_valid) REFERENCES llx_user (rowid);
diff --git a/mysql/tables/llx_facture_tva_sum.key.sql b/mysql/tables/llx_facture_tva_sum.key.sql
index 4573bc42f0e..85296b7dbe9 100644
--- a/mysql/tables/llx_facture_tva_sum.key.sql
+++ b/mysql/tables/llx_facture_tva_sum.key.sql
@@ -20,10 +20,8 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_facture_tva_sum ADD INDEX idx_fk_facture (fk_facture);
-
-
 -- Supprimme orhpelins pour permettre montée de la clé
 DELETE llx_facture_tva_sum FROM llx_facture_tva_sum LEFT JOIN llx_facture ON llx_facture_tva_sum.fk_facture = llx_facture.rowid WHERE llx_facture.rowid IS NULL;
 
-ALTER TABLE llx_facture_tva_sum  ADD CONSTRAINT facture_tva_sum_fk_facture_rowid FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid);
+ALTER TABLE llx_facture_tva_sum ADD INDEX idx_facture_tva_sum_fk_facture (fk_facture);
+ALTER TABLE llx_facture_tva_sum ADD CONSTRAINT facture_tva_sum_fk_facture_rowid FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid);
diff --git a/mysql/tables/llx_facturedet.key.sql b/mysql/tables/llx_facturedet.key.sql
index 60ba36e82e0..05b84095ae3 100644
--- a/mysql/tables/llx_facturedet.key.sql
+++ b/mysql/tables/llx_facturedet.key.sql
@@ -19,7 +19,9 @@
 -- $Source$
 -- ===================================================================
 
+
 -- Supprimme orhpelins pour permettre montée de la clé
 DELETE llx_facturedet FROM llx_facturedet LEFT JOIN llx_facture ON llx_facturedet.fk_facture = llx_facture.rowid WHERE llx_facture.rowid IS NULL;
 
-ALTER TABLE llx_facturedet       ADD CONSTRAINT facturedet_fk_facture_rowid	FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid);
+ALTER TABLE llx_facturedet ADD INDEX idx_facturedet_fk_facture (fk_facture);
+ALTER TABLE llx_facturedet ADD CONSTRAINT facturedet_fk_facture_rowid	FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid);
diff --git a/mysql/tables/llx_fichinter.key.sql b/mysql/tables/llx_fichinter.key.sql
index 70152fea4ed..7e17c62ba1d 100644
--- a/mysql/tables/llx_fichinter.key.sql
+++ b/mysql/tables/llx_fichinter.key.sql
@@ -20,4 +20,6 @@
 --
 -- ===================================================================
 
-ALTER TABLE llx_fichinter        ADD CONSTRAINT fichinter_fk_soc_idp		FOREIGN KEY (fk_soc)     REFERENCES llx_societe (idp);
+
+ALTER TABLE llx_fichinter ADD INDEX idx_fichinter_fk_soc (fk_soc);
+ALTER TABLE llx_fichinter ADD CONSTRAINT fichinter_fk_soc_idp		FOREIGN KEY (fk_soc)     REFERENCES llx_societe (idp);
diff --git a/mysql/tables/llx_paiement_facture.key.sql b/mysql/tables/llx_paiement_facture.key.sql
index 2aeb16bf352..db1e1489d4b 100644
--- a/mysql/tables/llx_paiement_facture.key.sql
+++ b/mysql/tables/llx_paiement_facture.key.sql
@@ -24,5 +24,8 @@
 DELETE llx_paiement_facture FROM llx_paiement_facture LEFT JOIN llx_facture ON llx_paiement_facture.fk_facture = llx_facture.rowid WHERE llx_facture.rowid IS NULL;
 DELETE llx_paiement_facture FROM llx_paiement_facture LEFT JOIn llx_paiement ON llx_paiement_facture.fk_facture = llx_paiement.rowid WHERE llx_paiement.rowid IS NULL;
 
-ALTER TABLE llx_paiement_facture  ADD CONSTRAINT paiement_facture_fk_facture	FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid);
-ALTER TABLE llx_paiement_facture  ADD CONSTRAINT paiement_facture_fk_paiement	FOREIGN KEY (fk_paiement) REFERENCES llx_paiement (rowid);
+ALTER TABLE llx_paiement_facture ADD INDEX idx_paiement_facture_fk_facture (fk_facture);
+ALTER TABLE llx_paiement_facture ADD CONSTRAINT paiement_facture_fk_facture FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid);
+
+ALTER TABLE llx_paiement_facture ADD INDEX idx_paiement_facture_fk_paiement (fk_paiement);
+ALTER TABLE llx_paiement_facture ADD CONSTRAINT paiement_facture_fk_paiement FOREIGN KEY (fk_paiement) REFERENCES llx_paiement (rowid);
diff --git a/mysql/tables/llx_paiement_facture.sql b/mysql/tables/llx_paiement_facture.sql
index 6b32927bbf6..f3affe1a272 100644
--- a/mysql/tables/llx_paiement_facture.sql
+++ b/mysql/tables/llx_paiement_facture.sql
@@ -24,9 +24,5 @@ create table llx_paiement_facture
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   fk_paiement     integer,
   fk_facture      integer,
-  amount          real     DEFAULT 0,
-  
-  key (fk_paiement),
-  key (fk_facture)
-
+  amount          real     DEFAULT 0
 )type=innodb;
diff --git a/mysql/tables/llx_propal.key.sql b/mysql/tables/llx_propal.key.sql
index bc11a38eece..b4ad6882c63 100644
--- a/mysql/tables/llx_propal.key.sql
+++ b/mysql/tables/llx_propal.key.sql
@@ -21,7 +21,7 @@
 --
 -- ============================================================================
 
-ALTER TABLE llx_propal ADD INDEX (fk_soc);
 
+ALTER TABLE llx_propal ADD INDEX idx_propal_fk_soc (fk_soc);
 ALTER TABLE llx_propal ADD FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp);
 
diff --git a/mysql/tables/llx_socpeople.key.sql b/mysql/tables/llx_socpeople.key.sql
index 35416782bb5..2b6c4ecaed5 100644
--- a/mysql/tables/llx_socpeople.key.sql
+++ b/mysql/tables/llx_socpeople.key.sql
@@ -21,4 +21,5 @@
 -- ============================================================================
 
 
-ALTER TABLE llx_socpeople        ADD CONSTRAINT socpeople_fk_soc_idp		FOREIGN KEY (fk_soc)     REFERENCES llx_societe (idp);
+ALTER TABLE llx_socpeople ADD INDEX idx_socpeople_fk_soc (fk_soc);
+ALTER TABLE llx_socpeople ADD CONSTRAINT socpeople_fk_soc_idp		FOREIGN KEY (fk_soc)     REFERENCES llx_societe (idp);