| '.$langs->trans("MAIN_MAIL_SMTPS_PW").' | ';
// SuperAdministrator access only
if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
{
diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index edb2735b354..fe09ee14378 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -19,14 +19,11 @@
/**
* \file admin/multicurrency.php
* \ingroup multicurrency
- * \brief This file is an example module setup page
- * Put some comments here
+ * \brief Page to setup multicurrency module
*/
+
// Dolibarr environment
-
require '../main.inc.php';
-
-// Libraries
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/multicurrency.lib.php';
require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
@@ -42,6 +39,8 @@ if (! $user->admin) {
// Parameters
$action = GETPOST('action', 'alpha');
+
+
/*
* Actions
*/
@@ -164,6 +163,8 @@ if ($resql)
* View
*/
+$form=new Form($db);
+
$page_name = "MultiCurrencySetup";
llxHeader('', $langs->trans($page_name));
@@ -176,21 +177,16 @@ print_fiche_titre($langs->trans($page_name), $linkback);
$head = multicurrencyAdminPrepareHead();
dol_fiche_head($head, 'settings', $langs->trans("ModuleSetup"), -1, "multicurrency");
-// Setup page goes here
-$form=new Form($db);
-$var=false;
print '';
print '';
print '| '.$langs->trans("Parameters").' | '."\n";
-print ' | ';
-print ''.$langs->trans("Value").' | '."\n";
-
+print ''.$langs->trans("Value").' | '."\n";
+print ' ';
print '';
print '| '.$langs->transnoentitiesnoconv("MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE").' | ';
-print ' | ';
-print '';
+print ' | ';
print '';
print ' | ';
-
print '';
print '| '.$langs->transnoentitiesnoconv("multicurrency_useOriginTx").' | ';
-print ' | ';
-print '';
+print ' | ';
print ' | ';
print '';
print '| '.$langs->transnoentitiesnoconv("multicurrency_buyPriceInCurrency").' | ';
-print ' | ';
-print '';
+print ' | ';
print ' | ';
print '';
print '| '.$langs->transnoentitiesnoconv("multicurrency_modifyRateApplication").' | ';
-print ' | ';
-print '';
+print ' | ';
print ' | ';
*/
print ' ';
+
print ' ';
if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION))
{
- $var=false;
+ print '';
print ' ';
+
print '';
print '| '.$form->textwithpicto($langs->trans("CurrencyLayerAccount"), $langs->trans("CurrencyLayerAccount_help_to_synchronize")).' | '."\n";
- print ' | ';
- print '';
+ print ' | ';
print ' | ';
-
print '';
print '| '.$langs->transnoentitiesnoconv("multicurrency_appId").' | ';
- print ' | ';
- print '';
+ print ' | ';
print ' | ';
+ print ' ';
print ' ';
}
+print '';
print ' ';
-
-
+print ' ';
print '
|