From 2e8c915b887d4cf645dcd7eb91dad3079d0689cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Sep 2019 02:39:08 +0200
Subject: [PATCH] Fix more consistent setup

---
 htdocs/admin/supplier_order.php | 20 +++++++++++++-------
 htdocs/langs/en_US/admin.lang   |  1 +
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index f1fbbd4b286..2fef63ffdd8 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("admin", "other", "orders"));
+$langs->loadLangs(array("admin", "other", "orders", "stocks"));
 
 if (!$user->admin)
 accessforbidden();
@@ -561,16 +561,22 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'
 print "</td></tr>\n";
 
 // Option to add a quality/validation step, on products, after reception.
-$langs->load("stocks");
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("UseDispatchStatus").'</td>';
 print '<td></td>';
 print '<td class="center">';
-if ($conf->use_javascript_ajax) {
-	print ajax_constantonoff('SUPPLIER_ORDER_USE_DISPATCH_STATUS');
-} else {
-	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-	print $form->selectarray("SUPPLIER_ORDER_USE_DISPATCH_STATUS", $arrval, $conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS);
+if ($conf->reception->enabled)
+{
+	print '<span class="opacitymedium">'.$langs->trans("FeatureNotAvailableWithReceptionModule").'</span>';
+}
+else
+{
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('SUPPLIER_ORDER_USE_DISPATCH_STATUS');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("SUPPLIER_ORDER_USE_DISPATCH_STATUS", $arrval, $conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS);
+	}
 }
 print "</td>\n</tr>\n";
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 5f1d04f8bb0..bc9981faf3f 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1919,3 +1919,4 @@ DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
\ No newline at end of file