diff --git a/backend/app/plugins/wiaas/includes/admin/delivery-process/class-wiaas-admin-delivery-process-flow.php b/backend/app/plugins/wiaas/includes/admin/delivery-process/class-wiaas-admin-delivery-process-flow.php
index 0ab60e8..1598770 100644
--- a/backend/app/plugins/wiaas/includes/admin/delivery-process/class-wiaas-admin-delivery-process-flow.php
+++ b/backend/app/plugins/wiaas/includes/admin/delivery-process/class-wiaas-admin-delivery-process-flow.php
@@ -63,25 +63,6 @@ class Wiaas_Admin_Order_Process_Flow {
 		$final_confirmed_date = Wiaas_Order::get_final_confirmed_date($order_id);
 		$earliest_installation_date = Wiaas_Order::get_earliest_installation_date($order_id);
 
-		
-		if ($final_estimated_date === 0){
-			$final_estimated_date = '-';
-		}else{
-			$final_estimated_date = date('Y-m-d', $final_estimated_date);
-		}
-		
-		if ($final_confirmed_date === 0){
-			$final_confirmed_date = '-';
-		}else{
-			$final_confirmed_date = date('Y-m-d', $final_confirmed_date);
-		}
-
-		if ($earliest_installation_date === 0){
-			$earliest_installation_date = '-';
-		}else{
-			$earliest_installation_date = date('Y-m-d', $earliest_installation_date);
-		}
-
 		require 'views/html-order-delivery-dates.php';
 		
 	}
diff --git a/backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-order-delivery-dates.php b/backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-order-delivery-dates.php
index 574903a..90b6429 100644
--- a/backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-order-delivery-dates.php
+++ b/backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-order-delivery-dates.php
@@ -68,15 +68,15 @@ if ( ! defined( 'ABSPATH' ) ) {
 
     <tr>
         <td><h3>Final dates : </h3></td>
-        <td><h4><?php echo $final_estimated_date ?></h4></td>
-        <td><h4><?php echo $final_confirmed_date ?></h4></td>
+        <td><h4><?php echo $final_estimated_date ? date('Y-m-d', $final_estimated_date) : '-' ?></h4></td>
+        <td><h4><?php echo $final_confirmed_date ? date('Y-m-d', $final_confirmed_date) : '-' ?></h4></td>
     </tr>
     <tr>
         <td colspan="5"><hr></td>
     </tr>
     <tr>
         <td><h3>Earliest installation date : </h3></td>
-        <td><h4><?php echo $earliest_installation_date ?></h4></td>
+        <td><h4><?php echo $earliest_installation_date ? date('Y-m-d', $earliest_installation_date) : '-' ?></h4></td>
     </tr>
 
     </table>