';
- if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF == "$name") {
+ if (getDolGlobalString("INVOICE_SUPPLIER_ADDON_PDF") == "$name") {
//print img_picto($langs->trans("Default"),'on');
// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
print 'scandir.'&label='.urlencode($module->name).'&type=invoice_supplier"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 0204f184de7..905721128ad 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -1,63 +1,63 @@
- * Copyright (C) 2004-2011 Laurent Destailleur
- * Copyright (C) 2005-2011 Regis Houssin
- * Copyright (C) 2004 Sebastien Di Cintio
- * Copyright (C) 2004 Benoit Mortier
- * Copyright (C) 2010-2013 Juanjo Menent
- * Copyright (C) 2011-2018 Philippe Grand
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
+ /* Copyright (C) 2003-2007 Rodolphe Quiedeville
+ * Copyright (C) 2004-2011 Laurent Destailleur
+ * Copyright (C) 2005-2011 Regis Houssin
+ * Copyright (C) 2004 Sebastien Di Cintio
+ * Copyright (C) 2004 Benoit Mortier
+ * Copyright (C) 2010-2013 Juanjo Menent
+ * Copyright (C) 2011-2018 Philippe Grand
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
-/**
- * \file htdocs/admin/supplier_order.php
- * \ingroup fournisseur
- * \brief Page d'administration-configuration du module Fournisseur
- */
+ /**
+ * \file htdocs/admin/supplier_order.php
+ * \ingroup fournisseur
+ * \brief Page d'administration-configuration du module Fournisseur
+ */
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+ require '../main.inc.php';
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
+ 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", "stocks"));
+ // Load translation files required by the page
+ $langs->loadLangs(array("admin", "other", "orders", "stocks"));
if (!$user->admin) {
accessforbidden();
}
-$type = GETPOST('type', 'alpha');
-$value = GETPOST('value', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
+ $type = GETPOST('type', 'alpha');
+ $value = GETPOST('value', 'alpha');
+ $modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
-$label = GETPOST('label', 'alpha');
-$action = GETPOST('action', 'aZ09');
-$scandir = GETPOST('scan_dir', 'alpha');
+ $label = GETPOST('label', 'alpha');
+ $action = GETPOST('action', 'aZ09');
+ $scandir = GETPOST('scan_dir', 'alpha');
-$specimenthirdparty = new Societe($db);
-$specimenthirdparty->initAsSpecimen();
+ $specimenthirdparty = new Societe($db);
+ $specimenthirdparty->initAsSpecimen();
-/*
- * Actions
- */
+ /*
+ * Actions
+ */
-include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'updateMask') {
$maskconstorder = GETPOST('maskconstorder', 'alpha');
@@ -193,40 +193,40 @@ if ($action == 'updateMask') {
}
-/*
- * View
- */
+ /*
+ * View
+ */
-$form = new Form($db);
+ $form = new Form($db);
-$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-llxHeader("", "");
+ llxHeader("", "");
-$linkback = ''.$langs->trans("BackToModuleList").'';
-print load_fiche_titre($langs->trans("SuppliersSetup"), $linkback, 'title_setup');
+ $linkback = ''.$langs->trans("BackToModuleList").'';
+ print load_fiche_titre($langs->trans("SuppliersSetup"), $linkback, 'title_setup');
-print " ";
+ print " ";
-$head = supplierorder_admin_prepare_head();
+ $head = supplierorder_admin_prepare_head();
-print dol_get_fiche_head($head, 'order', $langs->trans("Suppliers"), -1, 'company');
+ print dol_get_fiche_head($head, 'order', $langs->trans("Suppliers"), -1, 'company');
-// Supplier order numbering module
+ // Supplier order numbering module
-print load_fiche_titre($langs->trans("OrdersNumberingModules"), '', '');
+ print load_fiche_titre($langs->trans("OrdersNumberingModules"), '', '');
-print '
';
print $form->textwithpicto('', $htmltooltip, 1, 0);
- if ($conf->global->PAYMENT_ADDON.'.php' == $file) { // If module is the one used, we show existing errors
+ if (getDolGlobalString("PAYMENT_ADDON").'.php' == $file) { // If module is the one used, we show existing errors
if (!empty($module->error)) {
dol_htmloutput_mesg($module->error, '', 'error', 1);
}
@@ -350,7 +350,7 @@ foreach ($dirmodels as $reldir) {
print "
\n";
print "
\n";
require_once $dir.'/'.$file;
- $module = new $classname($db, $specimenthirdparty);
+ $module = new $classname($db, new Societe($db));
if (method_exists($module, 'info')) {
print $module->info($langs);
} else {
@@ -382,7 +382,7 @@ foreach ($dirmodels as $reldir) {
// Default
print '
';
// Text to help to enter a ticket
- $public_text_help_message = $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE ? $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE : $langs->trans('TicketPublicPleaseBeAccuratelyDescribe');
+ $public_text_help_message = getDolGlobalString("TICKET_PUBLIC_TEXT_HELP_MESSAGE", $langs->trans('TicketPublicPleaseBeAccuratelyDescribe'));
print '
';
// Text of email after creatio of a ticket
- $mail_mesg_new = $conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->trans('TicketNewEmailBody');
+ $mail_mesg_new = getDolGlobalString("TICKET_MESSAGE_MAIL_NEW", $langs->trans('TicketNewEmailBody'));
print '