Merge pull request #22252 from hregis/fix_some_upgrade_sql_errors

FIX some upgrade sql errors

htdocs/install/mysql/migration/15.0.0-16.0.0.sql

@@ -689,3 +689,6 @@ ALTER TABLE llx_cronjob ADD UNIQUE INDEX uk_cronjob (label, entity);
 ALTER TABLE llx_expedition ADD COLUMN billed smallint    DEFAULT 0;
 
 ALTER TABLE llx_loan_schedule ADD UNIQUE INDEX uk_loan_schedule_ref (fk_loan, datep);
+
+-- We need when upgrade 15 to 16 with Dolibarr v17+ for upgrade2 function migrate_user_photospath2()
+ALTER TABLE llx_user CHANGE COLUMN note note_private text;

htdocs/install/mysql/migration/16.0.0-17.0.0.sql

@@ -175,5 +175,5 @@ create table llx_element_categorie
 
 ALTER TABLE llx_element_categorie ADD UNIQUE INDEX idx_element_categorie_idx (fk_element, fk_categorie);
 
-ALTER TABLE llx_element_categorie ADD CONSTRAINT fk_element_categorie_fk_categorie FOREIGN KEY (fk_categorie)     REFERENCES llx_fk_categorie(rowid);
+ALTER TABLE llx_element_categorie ADD CONSTRAINT fk_element_categorie_fk_categorie FOREIGN KEY (fk_categorie) REFERENCES llx_categorie(rowid);
 

htdocs/install/mysql/tables/llx_element_categorie.key.sql

@@ -19,4 +19,4 @@
 
 ALTER TABLE llx_element_categorie ADD UNIQUE INDEX idx_element_categorie_idx (fk_element, fk_categorie);
 
-ALTER TABLE llx_element_categorie ADD CONSTRAINT fk_element_categorie_fk_categorie FOREIGN KEY (fk_categorie)     REFERENCES llx_fk_categorie(rowid);
+ALTER TABLE llx_element_categorie ADD CONSTRAINT fk_element_categorie_fk_categorie FOREIGN KEY (fk_categorie) REFERENCES llx_categorie(rowid);

htdocs/install/mysql/tables/llx_user.sql

@@ -75,8 +75,8 @@ create table llx_user
   idpers2			   varchar(128),
   idpers3			   varchar(128),
   
-  note_public		          text,
-  note_private                    text          DEFAULT NULL,
+  note_public		      text,
+  note_private            text          DEFAULT NULL,
   model_pdf               varchar(255)  DEFAULT NULL,
   datelastlogin           datetime,
   datepreviouslogin       datetime,