diff --git a/importE5EDISales.php b/importE5EDISales.php
index f8582102..3988d9f6 100644
--- a/importE5EDISales.php
+++ b/importE5EDISales.php
@@ -61,8 +61,8 @@ function checkEDISales()
 		$s->number = $number;
 		$s->document_no = $s->formatNumber($number);
 		$s->edi_file = $order;
-		$s->type = 'sales_order';
-		$s->status = 's60';
+        $s->type = 'abf8f342-13de-bb9f-7848-687897a3b953';
+        $s->status = 's30';
 		$s->ecmlanguage = 'pl_pl';
 		$a = new Account();
 		$a->retrieve($s->parent_id);
@@ -77,7 +77,7 @@ function checkEDISales()
 		}
 		$s->total_netto = $sum_netto;
 
-		if ($s->parent_id == 134 || $s->parent_id == '134') {
+		if ($s->parent_id == 134 || $s->parent_id == '134') { // carrefour
 			$s->shop_number = null;
 		}
 
diff --git a/modules/EcmSales/readXML.php b/modules/EcmSales/readXML.php
index 83fa0b76..6fa1f7b7 100644
--- a/modules/EcmSales/readXML.php
+++ b/modules/EcmSales/readXML.php
@@ -131,7 +131,17 @@ class readXML {
 		}
 		$this->register_date = date ( "d.m.Y", strtotime ( $this->nodes->{'Order-Header'}->OrderDate ) );
 		$this->delivery_date = date ( "d.m.Y", strtotime ( $this->nodes->{'Order-Header'}->ExpectedDeliveryDate ) );
-		$this->assigned_user_id = $_SESSION ['authenticated_user_id'];
+
+        $delivery_timestamp = strtotime($this->nodes->{'Order-Header'}->ExpectedDeliveryDate);
+        $delivery_day_of_week = date('N', $delivery_timestamp); // 1 = Monday, 7 = Sunday
+        if ($delivery_day_of_week == 1) { // Monday -> send on Friday
+            $send_timestamp = strtotime('-3 days', $delivery_timestamp);
+        } else { // send one day before
+            $send_timestamp = strtotime('-1 day', $delivery_timestamp);
+        }
+        $this->send_date = date("d.m.Y", $send_timestamp);
+
+        $this->assigned_user_id = $_SESSION ['authenticated_user_id'];
 		$this->position_list = array ();
 	}