Merge remote-tracking branch 'origin/3.6' into develop

Conflicts:
	htdocs/holiday/class/holiday.class.php

ChangeLog

@@ -188,6 +188,7 @@ removed. You must now use the 6 parameters way. See file modMyModule.class.php f
 
 
 ***** ChangeLog for 3.5.5 compared to 3.5.4 *****
+Fix: Holiday module was broken. Initializaion of amount of holidays failed.
 Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas.
 Fix: Fusion PDF button on unpaid invoice is no more displayed 
 Fix: Unpaid invoice launch fusion PDF action even if it is only search (with enter keyboard input instead of lens click)

htdocs/holiday/class/holiday.class.php

@@ -1307,6 +1307,7 @@ class Holiday extends CommonObject
             } else {
                 // Erreur SQL
                 $this->error="Error ".$this->db->lasterror();
+                dol_syslog(get_class($this)."::verifNbUsers ".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -1;
             }
@@ -1347,6 +1348,7 @@ class Holiday extends CommonObject
             } else {
                 // Erreur SQL
                 $this->error="Error ".$this->db->lasterror();
+                dol_syslog(get_class($this)."::verifNbUsers ".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -1;
             }