diff --git a/pgsql/tables/llx_facture.key.sql b/pgsql/tables/llx_facture.key.sql
index ecbfc01da618cb1887fdc41f1aa59a22c2491b43..3b89783ac453138cbc80a7d222ee7d91b98d594f 100644
--- a/pgsql/tables/llx_facture.key.sql
+++ b/pgsql/tables/llx_facture.key.sql
@@ -25,12 +25,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/pgsql/tables/llx_facture_tva_sum.key.sql b/pgsql/tables/llx_facture_tva_sum.key.sql
index c3311e59401712ade350a0573aa8a70b14c6b0cc..0bdc7f24e42d9fae14ddf71a56a292191cc0a2a3 100644
--- a/pgsql/tables/llx_facture_tva_sum.key.sql
+++ b/pgsql/tables/llx_facture_tva_sum.key.sql
@@ -24,10 +24,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/pgsql/tables/llx_facturedet.key.sql b/pgsql/tables/llx_facturedet.key.sql
index 96094441997777dcfe84d9b62813bbead8dd3be4..3ac0536473e7e72aa72b6d091e6f978e27c30795 100644
--- a/pgsql/tables/llx_facturedet.key.sql
+++ b/pgsql/tables/llx_facturedet.key.sql
@@ -23,7 +23,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/pgsql/tables/llx_fichinter.key.sql b/pgsql/tables/llx_fichinter.key.sql
index 2d876ace9d3c68bf76dd38955d2c70085c6e44a2..dde44bb14f5fe051bffe4b7ef17300ffe63e5427 100644
--- a/pgsql/tables/llx_fichinter.key.sql
+++ b/pgsql/tables/llx_fichinter.key.sql
@@ -24,4 +24,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/pgsql/tables/llx_paiement_facture.key.sql b/pgsql/tables/llx_paiement_facture.key.sql
index bd51d1a6bd92780ce436e025ceb91644c69f722d..00defbeea91f85622e32fc9f37a9f2f6d41f7a76 100644
--- a/pgsql/tables/llx_paiement_facture.key.sql
+++ b/pgsql/tables/llx_paiement_facture.key.sql
@@ -28,5 +28,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/pgsql/tables/llx_paiement_facture.sql b/pgsql/tables/llx_paiement_facture.sql
index dfbe0bb8486fb20c1226984969e979f055afd2ee..74a0888713bb9dfabca07e726b3a04a6384c1114 100644
--- a/pgsql/tables/llx_paiement_facture.sql
+++ b/pgsql/tables/llx_paiement_facture.sql
@@ -23,15 +23,10 @@
 -- $Source$
 -- ===================================================================
 
-
 create table llx_paiement_facture
 (
   rowid SERIAL PRIMARY KEY,
   "fk_paiement"     integer,
   "fk_facture"      integer,
   "amount"          real     DEFAULT 0
-  
 );
-
-CREATE INDEX idx_llx_paiement_facture_fk_paiement ON llx_paiement_facture (fk_paiement);
-CREATE INDEX idx_llx_paiement_facture_fk_facture ON llx_paiement_facture (fk_facture);
diff --git a/pgsql/tables/llx_propal.key.sql b/pgsql/tables/llx_propal.key.sql
index 9800e2e2bdf8fe9bd137a97e64feead5e5eb652b..799588bc0749095e8188e0a081edc19af4549523 100644
--- a/pgsql/tables/llx_propal.key.sql
+++ b/pgsql/tables/llx_propal.key.sql
@@ -25,7 +25,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/pgsql/tables/llx_socpeople.key.sql b/pgsql/tables/llx_socpeople.key.sql
index 2db579ea4a0aabafe162b306d1f1ff3b037f1037..4436b3548e38b2bf67cd3a87a8c4adbb240b4523 100644
--- a/pgsql/tables/llx_socpeople.key.sql
+++ b/pgsql/tables/llx_socpeople.key.sql
@@ -25,4 +25,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);