diff --git a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql
index 0b4a6efe7a5..a1df835697d 100755
--- a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql
+++ b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql
@@ -133,12 +133,16 @@ alter table llx_product add column   accountancy_code_buy        varchar(15) aft
 ALTER TABLE llx_product drop column stock_loc;
 ALTER TABLE llx_product_stock add column location        varchar(32);
 
+ALTER TABLE llx_expedition DROP FOREIGN KEY fk_expedition_fk_adresse_livraison;
+ALTER TABLE llx_expedition DROP INDEX idx_expedition_fk_adresse_livraison;
 ALTER TABLE llx_expedition ADD COLUMN ref_customer varchar(30) AFTER entity;
 ALTER TABLE llx_expedition ADD COLUMN date_delivery date DEFAULT NULL AFTER date_expedition;
 ALTER TABLE llx_expedition CHANGE COLUMN fk_adresse_livraison fk_address integer DEFAULT NULL;
 
-ALTER TABLE llx_livraison CHANGE COLUMN ref_client ref_customer varchar(30);
-ALTER TABLE llx_livraison CHANGE COLUMN date_livraison date_delivery date		DEFAULT NULL;
+ALTER TABLE llx_livraison DROP FOREIGN KEY fk_livraison_fk_adresse_livraison;
+ALTER TABLE llx_livraison DROP INDEX idx_livraison_fk_adresse_livraison;
+ALTER TABLE llx_livraison change ref_client ref_customer varchar(30);
+ALTER TABLE llx_livraison change date_livraison date_delivery date		DEFAULT NULL;
 ALTER TABLE llx_livraison CHANGE COLUMN fk_adresse_livraison fk_address integer DEFAULT NULL;
 
 ALTER TABLE llx_c_actioncomm MODIFY libelle    varchar(48) NOT NULL;
@@ -249,10 +253,6 @@ insert into llx_c_actioncomm (id, code, type, libelle, module) values (30, 'AC_S
 insert into llx_c_actioncomm (id, code, type, libelle, module) values (31, 'AC_SUP_INV',  'system', 'Send supplier invoice by email'      ,'supplier_invoice');
 
 -- Rename llx_societe_adresse_livraison
-ALTER TABLE llx_expedition DROP FOREIGN KEY fk_expedition_fk_adresse_livraison;
-ALTER TABLE llx_expedition DROP INDEX idx_expedition_fk_adresse_livraison;
-ALTER TABLE llx_livraison DROP FOREIGN KEY fk_livraison_fk_adresse_livraison;
-ALTER TABLE llx_livraison DROP INDEX idx_livraison_fk_adresse_livraison;
 ALTER TABLE llx_societe_adresse_livraison RENAME TO llx_societe_address;
 ALTER TABLE llx_societe_address CHANGE COLUMN nom name varchar(60);
 ALTER TABLE llx_societe_address CHANGE COLUMN fk_societe fk_soc integer DEFAULT 0;
diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql
index de99fd52fea..68e21d26061 100644
--- a/htdocs/install/mysql/tables/llx_expedition.key.sql
+++ b/htdocs/install/mysql/tables/llx_expedition.key.sql
@@ -25,11 +25,9 @@ ALTER TABLE llx_expedition ADD UNIQUE INDEX idx_expedition_uk_ref (ref, entity);
 ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_soc (fk_soc);
 ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_user_author (fk_user_author);
 ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_user_valid (fk_user_valid);
--- obsolete ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_adresse_livraison (fk_adresse_livraison);
 ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_expedition_methode (fk_expedition_methode);
 
 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_soc					FOREIGN KEY (fk_soc)				REFERENCES llx_societe (rowid);
 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_user_author			FOREIGN KEY (fk_user_author)		REFERENCES llx_user (rowid);
 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_user_valid 			FOREIGN KEY (fk_user_valid)			REFERENCES llx_user (rowid);
-ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_expedition_methode 	FOREIGN KEY (fk_expedition_methode) REFERENCES llx_c_shipment_mode (rowid);
--- obsolete ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_adresse_livraison	FOREIGN KEY (fk_adresse_livraison)	REFERENCES llx_societe_address (rowid);
\ No newline at end of file
+ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_expedition_methode 	FOREIGN KEY (fk_expedition_methode) REFERENCES llx_c_shipment_mode (rowid);
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql
index c8974936d52..d573c90eb18 100644
--- a/htdocs/install/mysql/tables/llx_livraison.key.sql
+++ b/htdocs/install/mysql/tables/llx_livraison.key.sql
@@ -25,9 +25,7 @@ ALTER TABLE llx_livraison ADD UNIQUE INDEX idx_livraison_uk_ref (ref, entity);
 ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_soc (fk_soc);
 ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_user_author (fk_user_author);
 ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_user_valid (fk_user_valid);
--- obsolete ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_adresse_livraison (fk_adresse_livraison);
 
 ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_soc			FOREIGN KEY (fk_soc)			REFERENCES llx_societe (rowid);
 ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_user_author	FOREIGN KEY (fk_user_author)	REFERENCES llx_user (rowid);
 ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_user_valid		FOREIGN KEY (fk_user_valid)		REFERENCES llx_user (rowid);
--- obsolete ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_adresse_livraison	FOREIGN KEY (fk_adresse_livraison)	REFERENCES llx_societe_address (rowid);