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

Fix: use new default variable

Browse Source
This commit is contained in:
Regis Houssin 2012-03-08 14:17:08 +01:00
parent 081f321a95
commit 727a18fde5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/company.php
View File

@ -317,7 +317,7 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyCurrency").'</td><td>';
$form->select_currency($conf->global->MAIN_MONNAIE,"currency");
$form->select_currency($conf->currency,"currency");
print '</td></tr>'."\n";
$var=!$var;
@ -680,8 +680,8 @@ else
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("CompanyCurrency").'</td><td>';
print currency_name($conf->global->MAIN_MONNAIE,1);
print ' ('.$conf->global->MAIN_MONNAIE.')';
print currency_name($conf->currency,1);
print ' ('.$conf->currency.')';
print '</td></tr>';
$var=!$var;

2
htdocs/public/paybox/newpayment.php
View File

@ -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"))

2
htdocs/public/paypal/newpayment.php
View File

@ -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"))