Browse Source

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

Laurent Destailleur 3 years ago
parent
commit
e47e3b9797
2 changed files with 2 additions and 2 deletions
  1. 2 1
      htdocs/contact/list.php
  2. 0 1
      htdocs/projet/activity/perweek.php

+ 2 - 1
htdocs/contact/list.php

@@ -95,7 +95,8 @@ $search_roles = GETPOST("search_roles", 'array');
 $search_level = GETPOST("search_level", "array");
 $search_stcomm = GETPOST('search_stcomm', 'int');
 
-if ($search_status == '') $search_status = 1; // always display active customer first
+if ($search_status === '') $search_status = 1; // always display active customer first
+if ($search_no_email === '') $search_no_email = -1;
 
 $optioncss = GETPOST('optioncss', 'alpha');
 

+ 0 - 1
htdocs/projet/activity/perweek.php

@@ -520,7 +520,6 @@ if (!empty($conf->global->MAIN_DEFAULT_WORKING_DAYS))
 for ($idw = 0; $idw < 7; $idw++)
 {
 	$dayinloopfromfirstdaytoshow = dol_time_plus_duree($firstdaytoshow, $idw, 'd'); // $firstdaytoshow is a date with hours = 0
-	$dayinloop = dol_time_plus_duree($startday, $idw, 'd');
 
 	// Useless because $dayinloopwithouthours should be same than $dayinloopfromfirstdaytoshow
 	//$tmparray = dol_getdate($dayinloop);