diff --git a/adm/tabs/AdminOrders.php b/adm/tabs/AdminOrders.php
index 37d4233c..721a0137 100755
--- a/adm/tabs/AdminOrders.php
+++ b/adm/tabs/AdminOrders.php
@@ -1532,7 +1532,7 @@ class AdminOrders extends AdminTab
                                             <p class="col-md-12" style="font-size:11px; margin:0 0 10px 0;"><i>* Le chiffre de gauche correspond à la quantité remboursée pré-envoi et celui de droite post-envoi</i></p>';
 
                                             $html .= '
-                                            <div class="col-md-offset-9 col-md-3">';
+                                            <div class="col-md-offset-9 col-md-3" style="padding-left:5px;">';
                                             if ($order->hasBeenDelivered() AND Configuration::get('PS_ORDER_RETURN')){
                                                 $html .= '<input type="checkbox" id="reinjectQuantities" name="reinjectQuantities" class="button" />&nbsp;<label for="reinjectQuantities" style="float:none; font-weight:normal;">'.$this->l('Re-stock products').'</label><br />';
                                             }
@@ -1983,6 +1983,11 @@ class AdminOrders extends AdminTab
 
     public function viewDetails()
     {
+        $authorized_ip = array(
+          '88.163.22.99',
+          '90.63.178.63',
+        );
+
         if((int)Configuration::get('ANT_BOOTSTRAP_TPL') == 1){
             return $this->_viewDetails();
         }
diff --git a/modules/paypal/paypal.php b/modules/paypal/paypal.php
index bd72da81..39d7b279 100755
--- a/modules/paypal/paypal.php
+++ b/modules/paypal/paypal.php
@@ -673,7 +673,6 @@ class PayPal extends PaymentModule
 	public function hookAdminOrderNew($params)
 	{
 		if (Tools::isSubmit('submitPayPalRefund')){
-			echo '<pre>';var_dump('test');echo '</pre>';die();
 			$this->_doTotalRefund($params['id_order']);
 		}
 	}
diff --git a/modules/privatesales/Sale.php b/modules/privatesales/Sale.php
index 5b17d68d..3fd22d83 100755
--- a/modules/privatesales/Sale.php
+++ b/modules/privatesales/Sale.php
@@ -2202,6 +2202,7 @@ class Sale {
                 (int)$current_sale['delivery_delay'] != (int)$adding_sale['delivery_delay']
                 || (
                     (int)$current_sale['delivery_delay'] == (int)$adding_sale['delivery_delay']
+                    && ((int)$current_sale['shipping'] == 1 || (int)$adding_sale['shipping'] == 1)
                     && (int)$current_sale['shipping'] != (int)$adding_sale['shipping']
                 )
             )
diff --git a/modules/privatesales_logistique/exportOrderForm.php b/modules/privatesales_logistique/exportOrderForm.php
index 96c733ec..cdee4b08 100755
--- a/modules/privatesales_logistique/exportOrderForm.php
+++ b/modules/privatesales_logistique/exportOrderForm.php
@@ -6,8 +6,8 @@ require_once(dirname(__FILE__).'/../../init.php');
 require_once(_PS_MODULE_DIR_.'privatesales/Sale.php');
 require_once('AdminPrivateSalesLogistique.php');
 require_once dirname(__FILE__).'/classes/SaleStats.php';
-ini_set('memory_limit', '4096M');
-ini_set('max_execution_time', 0);
+ini_set('memory_limit', '5G');
+ini_set('max_execution_time', -1);
 set_include_path(get_include_path() . PATH_SEPARATOR . _PS_MODULE_DIR_.'privatesales_logistique/classes/');
 
 include_once('PHPExcel.php');
@@ -246,7 +246,8 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
 
     // $authorized_ip = array(
     //  '80.13.158.176',
-    //  '88.120.248.124'
+    //  '88.120.248.124',
+    //  '88.163.22.99'
     // );
     // if(in_array($_SERVER['REMOTE_ADDR'], $authorized_ip))
     // {
@@ -1352,4 +1353,4 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
     }
     exit;
 
-}
\ No newline at end of file
+}
diff --git a/themes/site/delay.tpl b/themes/site/delay.tpl
index 345f559e..e951f120 100644
--- a/themes/site/delay.tpl
+++ b/themes/site/delay.tpl
@@ -24,7 +24,7 @@
 	</div>
 {elseif $delivery_delay == 8}
 	<div class="delivery_delay">
-		<img src="{$img_ps_dir}delay/48h_noel_{$cookie->id_lang}.png" alt="72h">
+		<img src="{$img_ps_dir}delay/48h_noel_{$cookie->id_lang}.png" alt="48h">
 	</div>
 {elseif $delivery_delay == 10}
 	<div class="delivery_delay">