From ce137e3987ae7540612227d8c29bc6b70ecf6b11 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 10 Sep 2016 17:58:13 +0200 Subject: [PATCH] Fix migration when field was added without null flag. --- htdocs/install/mysql/migration/4.0.0-5.0.0.sql | 3 ++- htdocs/langs/en_US/main.lang | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql index 566e51ff757..b236ba702af 100644 --- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql +++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql @@ -28,7 +28,8 @@ ALTER TABLE llx_user DROP COLUMN phenix_pass; ALTER TABLE llx_societe ADD COLUMN fk_account integer; -ALTER TABLE llx_commandedet ADD COLUMN fk_commandefourndet integer DEFAULT NULL after import_key; -- link to detail line of commande fourn (resplenish) +ALTER TABLE llx_commandedet ADD COLUMN fk_commandefourndet integer DEFAULT NULL after import_key; -- link to detail line of commande fourn (resplenish) +ALTER TABLE llx_commandedet MODIFY COLUMN fk_commandefourndet integer DEFAULT NULL; ALTER TABLE llx_website ADD COLUMN virtualhost varchar(255) after fk_default_home; diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 4fd073ee57f..ad5539d502f 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -583,6 +583,7 @@ NotEnoughPermissions=You don't have permission for this action SessionName=Session name Method=Method Receive=Receive +CompleteOrNoMoreReceptionExpected=Complete or nothing more expected PartialWoman=Partial TotalWoman=Total NeverReceived=Never received