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

htdocs/accountancy/class/accountingaccount.class.php

@@ -462,7 +462,7 @@ class AccountingAccount extends CommonObject
 	}
 
 	/**
-	 * Account desactivate
+	 * Account deactivated
 	 *
 	 * @param  int  $id         Id
 	 * @return int              <0 if KO, >0 if OK
@@ -494,7 +494,7 @@ class AccountingAccount extends CommonObject
 	}
 
 	/**
-	 * Account activate
+	 * Account activated
 	 *
 	 * @param  int  $id         Id
 	 * @return int              <0 if KO, >0 if OK

htdocs/compta/bank/various_payment/card.php

@@ -437,7 +437,7 @@ if ($id)
 	if (! empty($conf->accounting->enabled))
 	{
 		$accountingaccount = new AccountingAccount($db);
-		$accountingaccount->fetch('',$object->accountancy_code);
+		$accountingaccount->fetch('',$object->accountancy_code, 1);
 
 		print $accountingaccount->getNomUrl(0,1,1,'',1);
 	} else {

htdocs/compta/bank/various_payment/index.php

@@ -257,7 +257,7 @@ if ($result)
 		// Accounting account
 		if (! empty($conf->accounting->enabled)) {
 			$accountingaccount = new AccountingAccount($db);
-			$accountingaccount->fetch('',$obj->accountancy_code);
+			$accountingaccount->fetch('', $obj->accountancy_code, 1);
 
 			print '<td>'.$accountingaccount->getNomUrl(0,1,1,'',1).'</td>';
 		}

htdocs/core/actions_massactions.inc.php

@@ -728,13 +728,14 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
 	}
 
 	$arrayofinclusion=array();
-	foreach($listofobjectref as $tmppdf) $arrayofinclusion[]='^'.preg_quote($tmppdf.'.pdf','/').'$';
+	foreach($listofobjectref as $tmppdf) $arrayofinclusion[]='^'.preg_quote(dol_sanitizeFileName($tmppdf).'.pdf','/').'$';
 	$listoffiles = dol_dir_list($uploaddir,'all',1,implode('|',$arrayofinclusion),'\.meta$|\.png','date',SORT_DESC,0,true);
 
 	// build list of files with full path
 	$files = array();
 	foreach($listofobjectref as $basename)
 	{
+		$basename = dol_sanitizeFileName($basename);
 		foreach($listoffiles as $filefound)
 		{
 			if (strstr($filefound["name"],$basename))

htdocs/core/lib/date.lib.php

@@ -707,6 +707,93 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR', $
 			//Samedi (6) et dimanche (0)
 		}
 		
+		if ($countrycode == 'AT')
+		{
+		    $countryfound=1;
+		    
+		    // Definition des dates feriees fixes
+		    if($jour == 1 && $mois == 1)   $ferie=true; // Neujahr
+		    if($jour == 6 && $mois == 1)   $ferie=true; // Hl. 3 Koenige
+		    if($jour == 1 && $mois == 5)   $ferie=true; // 1. Mai
+		    if($jour == 15 && $mois == 8)  $ferie=true; // Mariae Himmelfahrt
+		    if($jour == 26 && $mois == 10) $ferie=true; // 26. Oktober
+		    if($jour == 1 && $mois == 11)  $ferie=true; // Allerheiligen
+		    if($jour == 8 && $mois == 12)  $ferie=true; // Mariae Empfaengnis
+		    if($jour == 24 && $mois == 12) $ferie=true; // Heilig abend
+		    if($jour == 25 && $mois == 12) $ferie=true; // Christtag
+		    if($jour == 26 && $mois == 12) $ferie=true; // Stefanietag
+		    if($jour == 31 && $mois == 12) $ferie=true; // Silvester
+		    
+		    // Easter calculation
+		    $date_paques = easter_date($annee);
+		    $jour_paques = date("d", $date_paques);
+		    $mois_paques = date("m", $date_paques);
+		    if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+		    // Easter sunday
+		    
+		    // Monday after easter
+		    $date_eastermonday = mktime(
+		        date("H", $date_paques),
+		        date("i", $date_paques),
+		        date("s", $date_paques),
+		        date("m", $date_paques),
+		        date("d", $date_paques) + 1,
+		        date("Y", $date_paques)
+		        );
+		    $jour_eastermonday = date("d", $date_eastermonday);
+		    $mois_eastermonday = date("m", $date_eastermonday);
+		    if($jour_eastermonday == $jour && $mois_eastermonday == $mois) $ferie=true;
+		    // Easter monday
+		    
+		    // Christi Himmelfahrt (39 days after easter sunday)
+		    $date_ch = mktime(
+		        date("H", $date_paques),
+		        date("i", $date_paques),
+		        date("s", $date_paques),
+		        date("m", $date_paques),
+		        date("d", $date_paques) + 39,
+		        date("Y", $date_paques)
+		        );
+		    $jour_ch = date("d", $date_ch);
+		    $mois_ch = date("m", $date_ch);
+		    if($jour_ch == $jour && $mois_ch == $mois) $ferie=true;
+		    // Christi Himmelfahrt
+		    
+		    // Pfingsten (50 days after easter sunday)
+		    $date_pentecote = mktime(
+		        date("H", $date_paques),
+		        date("i", $date_paques),
+		        date("s", $date_paques),
+		        date("m", $date_paques),
+		        date("d", $date_paques) + 50,
+		        date("Y", $date_paques)
+		        );
+		    $jour_pentecote = date("d", $date_pentecote);
+		    $mois_pentecote = date("m", $date_pentecote);
+		    if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
+		    // Pfingsten
+		    
+		    // Fronleichnam (60 days after easter sunday)
+		    $date_fronleichnam = mktime(
+		        date("H", $date_paques),
+		        date("i", $date_paques),
+		        date("s", $date_paques),
+		        date("m", $date_paques),
+		        date("d", $date_paques) + 60,
+		        date("Y", $date_paques)
+		        );
+		    $jour_fronleichnam = date("d", $date_fronleichnam);
+		    $mois_fronleichnam = date("m", $date_fronleichnam);
+		    if($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie=true;
+		    // Fronleichnam
+
+		    // Calul des samedis et dimanches
+		    $jour_julien = unixtojd($timestampStart);
+		    $jour_semaine = jddayofweek($jour_julien, 0);
+		    if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
+		    //Samedi (6) et dimanche (0)
+		}
+
 		// Cas pays non defini
 		if (! $countryfound)
 		{