Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

htdocs/comm/propal/class/propal.class.php

@@ -2415,7 +2415,7 @@ class Propal extends CommonObject
             }
 
 	        $response = new WorkboardResponse();
-	        $response->warning_delay = $delay_warning;
+	        $response->warning_delay = $delay_warning/60/60/24;
 	        $response->label = $label;
 	        $response->url = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut;
 	        $response->img = img_object($langs->trans("Propals"),"propal");

htdocs/don/payment/card.php

@@ -202,7 +202,7 @@ $sql.= ' WHERE pd.fk_donation = d.rowid';
 $sql.= ' AND d.entity = '.$conf->entity;
 $sql.= ' AND pd.rowid = '.$id;
 
-dol_syslog("donations/payment/card.php", LOG_DEBUG);
+dol_syslog("don/payment/card.php", LOG_DEBUG);
 $resql=$db->query($sql);
 if ($resql)
 {