diff --git a/src/schedule-2.0/scripts/migration/migration.php b/src/schedule-2.0/scripts/migration/migration.php
index 91a2b94..17ae0d2 100644
--- a/src/schedule-2.0/scripts/migration/migration.php
+++ b/src/schedule-2.0/scripts/migration/migration.php
@@ -182,14 +182,25 @@ while($row=$queryold->fetch()) {
 
 writeligne("");
 writeligne("== Récupération Event");
-$q="SELECT * FROM schedule_event";
+$q="SELECT * FROM schedule_event, schedule_task WHERE event_task=task_id";
 $queryold=$bddold->prepare($q);
 $queryold->execute();
 while($row=$queryold->fetch()) {
+    // Event vacation ?
+    $isvacation=false;
+    if($row["task_id"]<=-70) $isvacation=true;
+    if($row["task_id"]==-85 || $row["task_id"]==-70) $isvacation=true;
+     
+    // Validation
+    $validate=$row["event_validate"];
+    $validateholiday=false;
+    if($isvacation) $validateholiday=$row["event_validate"];
+
+    // Génération de l'event
     writeligne($row["event_id"]);
     $q="INSERT IGNORE INTO event (id, description, start, end, allday, duration, validate, validateholiday, task_id, user_id ) VALUES (?,?,?,?,?,?,?,?,?,?)";
     $query=$bddnew->prepare($q);
-    $query->execute([$row["event_id"],$row["event_description"],$row["event_start"],$row["event_end"],$row["event_allday"],$row["event_duration"],$row["event_validate"],$row["event_validate"],$row["event_task"],$row["event_user"] ]);
+    $query->execute([$row["event_id"],$row["event_description"],$row["event_start"],$row["event_end"],$row["event_allday"],$row["event_duration"],$validate,$validateholiday,$row["event_task"],$row["event_user"] ]);
 }
 
 writeligne("");
diff --git a/src/schedule-2.0/src/Controller/EventController.php b/src/schedule-2.0/src/Controller/EventController.php
index 10f82f0..e255281 100755
--- a/src/schedule-2.0/src/Controller/EventController.php
+++ b/src/schedule-2.0/src/Controller/EventController.php
@@ -48,20 +48,17 @@ class EventController extends AbstractController
         if($iduser=="all")
             $events=$em->getRepository("App:Event")->findAll();
         else {
-            $selectedusers = $this->get("session")->get("selectedusers");
-            if (isset($selectedusers) && sizeof($selectedusers)>1){
-                $users= [];
-                foreach($selectedusers as $user) {
-                    array_push($users,$em->getRepository("App:User")->find($user));
-                }
-                $events=$em->getRepository("App:Event")->findBy(["user"=>$users]);
-            }else{
-                $user=$em->getRepository("App:User")->find($iduser);
-                $events=$em->getRepository("App:Event")->findBy(["user"=>$user]);
-            }
+            $user=$em->getRepository("App:User")->find($iduser);
+            $events=$em->getRepository("App:Event")->findBy(["user"=>$user]);
         }
-
         foreach($events as $event) {
+            $idproject=$event->getTask()->getProject()->getId();
+
+            // Filtre par project
+            if($this->get('session')->get('idproject')!="all") {
+                if($idproject!=$this->get('session')->get('idproject'))
+                    continue;
+            }
             $tmp=$this->formatEvent($event);
             array_push($tbevents,$tmp);
         }
diff --git a/src/schedule-2.0/src/Controller/HomeController.php b/src/schedule-2.0/src/Controller/HomeController.php
index 69b72af..01cfb4a 100755
--- a/src/schedule-2.0/src/Controller/HomeController.php
+++ b/src/schedule-2.0/src/Controller/HomeController.php
@@ -36,9 +36,7 @@ class HomeController extends AbstractController
     public function selectuser(Request $request)
     {
         $iduser = $request->request->get('iduser');
-        $selectedusers = $request->request->get('selectedusers');
         $this->get('session')->set('iduser',$iduser);
-        $this->get('session')->set('selectedusers',$selectedusers);
         $output=["return"=>"OK"];
         return new Response(json_encode($output));
     }    
diff --git a/src/schedule-2.0/src/Controller/ReportController.php b/src/schedule-2.0/src/Controller/ReportController.php
index 039fb5c..74e59e8 100755
--- a/src/schedule-2.0/src/Controller/ReportController.php
+++ b/src/schedule-2.0/src/Controller/ReportController.php
@@ -352,7 +352,7 @@ class ReportController extends AbstractController
         $end=new \Datetime('first day of this month');
         $end->add(new \DateInterval('P'.$nbmonth.'M'));
         $end->sub(new \DateInterval('P1D'));
-
+        
         foreach($users as $user) {
             $tbevents = $this->getEventuser($user,$start,$end,false);
 
@@ -955,7 +955,7 @@ class ReportController extends AbstractController
                     ];
                 }
 
-                $tbevents[$idproject][$idday]["duration"]=($event->getAllday()?1:0.5);
+                $tbevents[$idproject][$idday]["duration"]+=($event->getAllday()?1:0.5);
 
 
                 $st->add(new \DateInterval('P1D'));
diff --git a/src/schedule-2.0/src/Service/sessionListener.php b/src/schedule-2.0/src/Service/sessionListener.php
index a872503..e99f79d 100644
--- a/src/schedule-2.0/src/Service/sessionListener.php
+++ b/src/schedule-2.0/src/Service/sessionListener.php
@@ -122,8 +122,6 @@ class sessionListener {
             }
             $session->set('services',$tbservices);      
             
-            $selectedusers=[];
-            $session->set('selectedusers',$selectedusers);      
         }
     }
 }
diff --git a/src/schedule-2.0/templates/Report/planning.html.twig b/src/schedule-2.0/templates/Report/planning.html.twig
index 9186e25..fa7ee6d 100644
--- a/src/schedule-2.0/templates/Report/planning.html.twig
+++ b/src/schedule-2.0/templates/Report/planning.html.twig
@@ -99,9 +99,10 @@
                     <h2>{{ project.displayname }}</h2>
                     <div class="synthese">
                         Estimé = {{ project.estimate }}<br>
+                        Commandé = {{ project.proposed }}
                         Validé = {{ project.validate }}<br>
                         Planifié  = {{ project.planified }}<br>
-                        <b>RESTE = {{ (project.estimate - project.validate - project.planified) }}</b>
+                        <b>RESTE = {{ ( project.proposed - project.validate - project.planified) }}</b>
                     </div>
                 </div>
 
diff --git a/src/schedule-2.0/templates/base.html.twig b/src/schedule-2.0/templates/base.html.twig
index 10a6199..301d36b 100644
--- a/src/schedule-2.0/templates/base.html.twig
+++ b/src/schedule-2.0/templates/base.html.twig
@@ -284,20 +284,13 @@
                             </label>
                             </a>
                             <div class="select-control">
-                                <select class="form-control select2entity" id="sideuser" name="sideuser" multiple>
-                                    <option value="all" {%if app.session.get('iduser')=="all" %}selected{% endif %}>Tout le monde</option>
+                            <select class="form-control select2entity" id="sideuser" name="sideuser">
+                                    <option value="all" selected>Tout le monde</option>
+
                                     {% for user in app.session.get('users') %}
                                         {% set selected="" %}
-                                        {% if app.session.get('selectedusers')|length > 1 %}
-                                            {% for suser in app.session.get('selectedusers') %}
-                                                 {%if user.id == suser %}
-                                                    {% set selected="selected" %}
-                                                {% endif %}
-                                            {% endfor %}
-                                        {% else %}
-                                            {%if user.id==app.session.get('iduser') %}
-                                                {% set selected="selected" %}
-                                            {% endif %}
+                                        {%if user.id==app.session.get('iduser') %}
+                                        {% set selected="selected" %}
                                         {% endif %}
                                         <option value="{{user.id}}" {{selected}}>{{user.displayname}}</option>
                                     {% endfor %}
@@ -520,13 +513,10 @@
 
             $('#sideuser').on('select2:select', function (e) {
                 var data = e.params.data;
-                var selectedusers = $('#sideuser').val();
-                console.log(selectedusers)
                 $.ajax({                                                            
                     type: "POST",
                     data: {
                         iduser: data.id,
-                        selectedusers: selectedusers,
                     },
                     url: "{{ path('app_home_selectuser') }}",
                     success: function (response) {
diff --git a/tmpl/schedule-env.local b/tmpl/schedule-env.local
index 7815fe1..49afc0f 100644
--- a/tmpl/schedule-env.local
+++ b/tmpl/schedule-env.local
@@ -35,4 +35,7 @@ DATABASE_HOST=%%adresse_ip_mysql
 # CAS = Redefine local
 CAS_HOST=%%eolesso_adresse
 CAS_PORT=%%eolesso_port
-CAS_PATH=%%eolesso_cas_folder
\ No newline at end of file
+CAS_PATH=%%eolesso_cas_folder
+
+OFFICE_HOUR_START=09:00
+OFFICE_HOUR_END=17:30
\ No newline at end of file