Fix : increment listview only when modules entities AND basket are loaded

core/trunk/core/class/class_core_tools.php

@@ -961,7 +961,14 @@ class core_tools extends functions
                         elseif($app_services[$i]['whereamiused'][$k]['nature'] == "include" && $_SESSION['user']['services'][$app_services[$i]['id']] && ($servicenature == "all" || $servicenature == "include") && !in_array($app_services[$i]['id'],$executed_services))
                         {
                             array_push($executed_services, $app_services[$i]['id']);
-                            include('apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.$app_services[$i]['servicepage']);
+                            if(isset($_SESSION['custom_override_id']) && !empty($_SESSION['custom_override_id']) && file_exists($_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR.$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.$app_services[$i]['servicepage']))
+                            {
+                                include($_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR.$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.$app_services[$i]['servicepage']);
+                            }
+                            else
+                            {
+                                include('apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.$app_services[$i]['servicepage']);
+                            }
                         }
                     }
                 }

core/trunk/core/init.php

@@ -3,27 +3,27 @@ session_name('maarch_entreprise');
 session_start();
 if(isset($_SESSION['config']['default_timezone']) && !empty($_SESSION['config']['default_timezone']))
 {
-	ini_set('date.timezone', $_SESSION['config']['default_timezone']);
-	date_default_timezone_set($_SESSION['config']['default_timezone']);
+    ini_set('date.timezone', $_SESSION['config']['default_timezone']);
+    date_default_timezone_set($_SESSION['config']['default_timezone']);
 }
 else
 {
-	ini_set('date.timezone', 'Europe/Paris');
-	date_default_timezone_set('Europe/Paris');
+    ini_set('date.timezone', 'Europe/Paris');
+    date_default_timezone_set('Europe/Paris');
 }
 
 if(isset($_SESSION['config']['corepath']) && !empty($_SESSION['config']['corepath']))
 {
-	chdir($_SESSION['config']['corepath']);
+    chdir($_SESSION['config']['corepath']);
 }
 //ini_set('error_reporting', E_ALL);
 if (isset($_SESSION['custom_override_id']) && !empty($_SESSION['custom_override_id']) && isset($_SESSION['config']['corepath']) && !empty($_SESSION['config']['corepath']))
 {
-	$path = $_SESSION['config']['corepath']."custom".DIRECTORY_SEPARATOR.$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR;
-	//echo $path;
-	set_include_path( get_include_path() . PATH_SEPARATOR.$path.PATH_SEPARATOR.$_SESSION['config']['corepath']);
+    $path = $_SESSION['config']['corepath']."custom".DIRECTORY_SEPARATOR.$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR;
+    //echo $path;
+    set_include_path( get_include_path() . PATH_SEPARATOR.$path.PATH_SEPARATOR.$_SESSION['config']['corepath']);
 }
 elseif(isset($_SESSION['config']['corepath']) && !empty($_SESSION['config']['corepath']))
 {
-	set_include_path(get_include_path() . PATH_SEPARATOR.$_SESSION['config']['corepath']);	
+    set_include_path(get_include_path() . PATH_SEPARATOR.$_SESSION['config']['corepath']);
 }
\ No newline at end of file