lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix more consistent setup

Browse Source
This commit is contained in:
Laurent Destailleur 2019-09-06 02:39:08 +02:00
parent 626e3fd90e
commit 2e8c915b88
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/admin/supplier_order.php
View File

@ -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'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("admin", "other", "orders")); $langs->loadLangs(array("admin", "other", "orders", "stocks"));
if (!$user->admin) if (!$user->admin)
accessforbidden(); accessforbidden();
@ -561,16 +561,22 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'
print "</td></tr>\n"; print "</td></tr>\n";
// Option to add a quality/validation step, on products, after reception. // Option to add a quality/validation step, on products, after reception.
$langs->load("stocks");
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td>'.$langs->trans("UseDispatchStatus").'</td>'; print '<td>'.$langs->trans("UseDispatchStatus").'</td>';
print '<td></td>'; print '<td></td>';
print '<td class="center">'; print '<td class="center">';
if ($conf->use_javascript_ajax) { if ($conf->reception->enabled)
print ajax_constantonoff('SUPPLIER_ORDER_USE_DISPATCH_STATUS'); {
} else { print '<span class="opacitymedium">'.$langs->trans("FeatureNotAvailableWithReceptionModule").'</span>';
$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); 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"; print "</td>\n</tr>\n";

1
htdocs/langs/en_US/admin.lang
View File

@ -1919,3 +1919,4 @@ DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector? ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled