diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 2ace9e20590..12a907878fc 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -317,7 +317,7 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit') $var=!$var; print ''.$langs->trans("CompanyCurrency").''; - $form->select_currency($conf->global->MAIN_MONNAIE,"currency"); + $form->select_currency($conf->currency,"currency"); print ''."\n"; $var=!$var; @@ -680,8 +680,8 @@ else $var=!$var; print ''.$langs->trans("CompanyCurrency").''; - print currency_name($conf->global->MAIN_MONNAIE,1); - print ' ('.$conf->global->MAIN_MONNAIE.')'; + print currency_name($conf->currency,1); + print ' ('.$conf->currency.')'; print ''; $var=!$var; diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index bcdbbab2341..e26f13411b1 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -53,7 +53,7 @@ $langs->load("paybox"); $suffix=GETPOST("suffix",'alpha'); $amount=price2num(GETPOST("amount")); -if (! GETPOST("currency",'alpha')) $currency=$conf->global->MAIN_MONNAIE; +if (! GETPOST("currency",'alpha')) $currency=$conf->currency; else $currency=GETPOST("currency",'alpha'); if (! GETPOST("action")) diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index 8c7e7189a33..d4aa889d2e0 100755 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -55,7 +55,7 @@ $langs->load("paypal"); $suffix=GETPOST("suffix",'alpha'); $amount=price2num(GETPOST("amount")); -if (! GETPOST("currency",'alpha')) $currency=$conf->global->MAIN_MONNAIE; +if (! GETPOST("currency",'alpha')) $currency=$conf->currency; else $currency=GETPOST("currency",'alpha'); if (! GETPOST("action"))