diff --git a/adm/tabs/AdminOrders.php b/adm/tabs/AdminOrders.php
index 5990c6f9..e2718087 100755
--- a/adm/tabs/AdminOrders.php
+++ b/adm/tabs/AdminOrders.php
@@ -72,13 +72,13 @@ class AdminOrders extends AdminTab
         foreach(Country::getCountries((int) $cookie->id_lang, TRUE) as $country) {
             $country_array[(int) $country['id_country']] = $country['name'];
         }
-        
+
         $deviceList = array(
             0 => 'Site',
             1 => 'Appli',
             2 => 'Mobile',
         );
-                
+
         foreach ($states AS $state){
             $statesArray[$state['id_order_state']] = $state['name'];
         }
@@ -94,7 +94,7 @@ class AdminOrders extends AdminTab
         foreach ($carriers as $row) {
             $carriersArray[(int)$row['id_carrier']] = $row['name'];
         }
-        
+
         $this->fieldsDisplay = array(
             'id_order' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
             'new' => array('title' => $this->l('New'), 'width' => 25, 'align' => 'center', 'type' => 'bool', 'filter_key' => 'new', 'tmpTableFilter' => true, 'icon' => array(0 => 'blank.gif', 1 => 'news-new.gif'), 'orderby' => false),
@@ -109,7 +109,7 @@ class AdminOrders extends AdminTab
             'id_country' => array('title' => $this->l('Pays'), 'callback' => 'printCountry', 'orderby' => false, 'type' => 'select', 'select' => $country_array, 'filter_key' => 'x!id_country', 'filter_type' => 'int', 'width' => 35,),
             'appli' => array('title' => $this->l('Device'), 'width' => 25, 'align' => 'center', 'type' => 'select', 'select' => $deviceList, 'filter_key' => 'a!appli', 'callback' => 'printDeviceIcons', 'orderby' => false),
         );
-        
+
         parent::__construct();
 
         if(!isset($_POST['submitFilter']) && !isset($_POST['orderFilter_a!date_add'])) {
@@ -1432,9 +1432,9 @@ class AdminOrders extends AdminTab
                                     </div>
                                     <div class="col-md-4">
                                         <h5 style="background:#504D8B;color:#fff;padding:5px; text-align:center;">
-                                            '.$order->printCarrier($order->id_carrier,array()).' Adresse Livraison
-                                            '.($cart->id_carrier==(int)Configuration::get('ANT_CARRIER_DOM') && in_array($cart->id_carrier,$carriers_socol)?'<a style="color:#fff;cursor:pointer;" class="pull-right" id="changeAddress" data-url="scaddressedit.php?id_cart='.(int)$order->id_cart.'"><i class="glyphicon glyphicon-edit"></i></a>':'').'
-                                            '.(in_array($cart->id_carrier,$carriers_mr)?'<a style="color:#fff;cursor:pointer" class="pull-right" id="changeAddress" data-url="mraddressedit.php?id_cart='.(int)$order->id_cart.'"><i class="glyphicon glyphicon-edit"></i></a>':'').'
+                                            ' . $order->printCarrier($order->id_carrier, array()) . ' Adresse Livraison
+                                            ' . ($cart->id_carrier == (int)Configuration::get('ANT_CARRIER_DOM') || in_array($cart->id_carrier, $carriers_socol) ? '<a style="color:#fff;cursor:pointer;" class="pull-right" id="changeAddress" data-url="scaddressedit.php?id_cart=' . (int)$order->id_cart . '"><i class="glyphicon glyphicon-edit"></i></a>' : '') . '
+                                            ' . (in_array($cart->id_carrier, $carriers_mr) ? '<a style="color:#fff;cursor:pointer" class="pull-right" id="changeAddress" data-url="mraddressedit.php?id_cart=' . (int)$order->id_cart . '"><i class="glyphicon glyphicon-edit"></i></a>' : '') . '
                                         </h5>
                                         <p style="padding:5px 20px;background:#efefef;">'.$data['order_address'].'</p>
                                     </div>
@@ -2958,7 +2958,7 @@ class AdminOrders extends AdminTab
                 AND (`pradress1`!= "" OR `pradress2`!= "" OR `pradress3`!= "" OR `pradress4`!= "")
             ');
             // If socol AND id_carrier is DOM
-            if($socol && (int)$cart->id_carrier == (int)Configuration::get('ANT_CARRIER_DOM')) {
+            if($socol) {
                 $order_address = nl2br(preg_replace("/(\r\n){2,}/", "\r\n", implode("\r\n", array(
                     $socol['cefirstname'].' '.$socol['cename'],
                     $socol['cecompanyname'],