Merge remote-tracking branch 'upstream/develop' into actioncomm_category

htdocs/install/mysql/migration/10.0.0-11.0.0.sql

@@ -59,6 +59,10 @@ ALTER TABLE llx_emailcollector_emailcollectoraction ADD COLUMN position integer
 
 -- For v11
 
+UPDATE llx_holiday SET ref = rowid WHERE ref IS NULL;
+-- VMYSQL4.3 ALTER TABLE llx_holiday MODIFY COLUMN ref varchar(30) NOT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_holiday ALTER COLUMN ref SET NOT NULL;
+
 ALTER TABLE llx_c_email_senderprofile MODIFY COLUMN active tinyint DEFAULT 1 NOT NULL;
  
 insert into llx_c_type_container (code,label,module,active) values ('menu',     'Menu',     'system', 1);

htdocs/install/mysql/tables/llx_holiday.sql

@@ -19,7 +19,7 @@
 CREATE TABLE llx_holiday 
 (
 rowid          integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
-ref			   varchar(30) NULL,       -- number
+ref			   varchar(30) NOT NULL,
 ref_ext		   varchar(255),
 entity         integer DEFAULT 1 NOT NULL,		-- Multi company id
 fk_user        integer NOT NULL,