From 2ad483413e729131ec46e3d7484d82599646e7cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Dec 2019 12:05:34 +0100
Subject: [PATCH] Better place to force the default warehouse

---
 htdocs/fourn/commande/dispatch.php | 28 +++++++++++++---------------
 htdocs/langs/en_US/stocks.lang     |  1 +
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 46b2f6a50ad..eb9093888af 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -569,20 +569,6 @@ if ($id > 0 || !empty($ref)) {
 			if ($num) {
 				$entrepot = new Entrepot($db);
 				$listwarehouses=$entrepot->list_array(1);
-				// entrepot par défaut
-				print $langs->trans("Warehouse").' : ';
-				if (count($listwarehouses)>1)
-				{
-					print $form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 1, 0, 0, '', 0, 0, $disabled);
-				}
-				elseif  (count($listwarehouses)==1)
-				{
-					print $form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 0, 0, 0, '', 0, 0, $disabled);
-				}
-				else
-				{
-					print $langs->trans("NoWarehouseDefined");
-				}
 
 				print '<tr class="liste_titre">';
 
@@ -613,7 +599,19 @@ if ($id > 0 || !empty($ref)) {
 					}
 				}
 
-				print '<td align="right">'.$langs->trans("Warehouse").'</td>';
+				print '<td align="right">'.$langs->trans("Warehouse");
+
+				// Select warehouse to force it everywhere
+				if (count($listwarehouses)>1)
+				{
+					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 1, 0, 0, '', 0, 0, $disabled);
+				}
+				elseif  (count($listwarehouses)==1)
+				{
+					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 0, 0, 0, '', 0, 0, $disabled);
+				}
+
+				print '</td>';
 
                 // Enable hooks to append additional columns
                 $parameters = array();
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index ecee37908ce..3e01db9fffb 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -215,3 +215,4 @@ StockDecrease=Stock decrease
 InventoryForASpecificWarehouse=Inventory for a specific warehouse
 InventoryForASpecificProduct=Inventory for a specific product
 StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
+ForceTo=Force to
\ No newline at end of file