From 02a5c1b8d6a5a0fa334f62e7c5a439d5b81a3224 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Thu, 20 Feb 2020 22:40:43 +0100
Subject: [PATCH 1/3] Update card.php

---
 htdocs/commande/card.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index d4855e8933f..737a544eda8 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -112,6 +112,10 @@ $permissionnote = $usercancreate; 		// Used by the include of actions_setnotes.i
 $permissiondellink = $usercancreate; 	// Used by the include of actions_dellink.inc.php
 $permissiontoadd = $usercancreate; 		// Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 
+if (!empty($conf->expedition->enabled)){
+	if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $object->warehouse_id = $conf->global->MAIN_DEFAULT_WAREHOUSE;
+	if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) $object->warehouse_id = $user->fk_warehouse;
+}
 
 /*
  * Actions

From bbb108133f36989b356f7f0e94dc185769c6be39 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Thu, 20 Feb 2020 22:45:03 +0100
Subject: [PATCH 2/3] Update html.formproduct.class.php

---
 htdocs/product/class/html.formproduct.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index af78ab5b59d..6443b0d03a3 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -254,6 +254,9 @@ class FormProduct
 			$out.= $comboenhancement;
 		}
 
+		if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $selected = $conf->global->MAIN_DEFAULT_WAREHOUSE;
+		if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) $selected = $user->fk_warehouse;
+
 		$out.='<select class="flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled':'').' id="'.$htmlname.'" name="'.($htmlname.($disabled?'_disabled':'')).'">';
 		if ($empty) $out.='<option value="-1">'.($empty_label?$empty_label:'&nbsp;').'</option>';
 		foreach($this->cache_warehouses as $id => $arraytypes)

From 54b23a1e1cd91c89afdb89b970f9db49301dff55 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Fri, 21 Feb 2020 22:54:12 +0100
Subject: [PATCH 3/3] Update card.php

---
 htdocs/commande/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 737a544eda8..0d30e2dff7b 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -112,7 +112,7 @@ $permissionnote = $usercancreate; 		// Used by the include of actions_setnotes.i
 $permissiondellink = $usercancreate; 	// Used by the include of actions_dellink.inc.php
 $permissiontoadd = $usercancreate; 		// Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 
-if (!empty($conf->expedition->enabled)){
+if (!empty($conf->expedition->enabled) && $conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER = 1){
 	if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $object->warehouse_id = $conf->global->MAIN_DEFAULT_WAREHOUSE;
 	if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) $object->warehouse_id = $user->fk_warehouse;
 }