diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 36b6df7d05a..f0f1a784763 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -9694,8 +9694,8 @@ class Form $htmltoenteralink .= ''; //print '' . $langs->trans("Ref") . ''; $htmltoenteralink .= ' '; - $htmltoenteralink .= ' '; - $htmltoenteralink .= ''; + $htmltoenteralink .= ' '; + $htmltoenteralink .= ''; $htmltoenteralink .= ''; $htmltoenteralink .= ''; $htmltoenteralink .= ''; @@ -9749,12 +9749,12 @@ class Form $htmltoenteralink .= ''; $htmltoenteralink .= '
'; if ($num) { - $htmltoenteralink .= ''; + $htmltoenteralink .= ''; } if (empty($conf->use_javascript_ajax)) { - $htmltoenteralink .= '
'; + $htmltoenteralink .= ''; } else { - $htmltoenteralink .= ''; + $htmltoenteralink .= ''; } $htmltoenteralink .= ''; } diff --git a/htdocs/core/tpl/object_currency_amount.tpl.php b/htdocs/core/tpl/object_currency_amount.tpl.php index 21da43235b2..5d7f0f2ed64 100644 --- a/htdocs/core/tpl/object_currency_amount.tpl.php +++ b/htdocs/core/tpl/object_currency_amount.tpl.php @@ -78,7 +78,7 @@ if (isModEnabled('multicurrency')) { print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0); print ''; if ($usercancreate && $action != 'editmulticurrencyrate' && $currencyIsEditable && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) { - print 'id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).''; + print 'id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyRate'), 1).''; } print ''; print ''; diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index df2bf4bc2c1..cad3a86d4f2 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -967,10 +967,11 @@ PrivateDownloadLinkDesc=You need to be logged and you need permissions to view o Download=Download DownloadDocument=Download document DownloadSignedDocument=Download signed document -ActualizeCurrency=Use last known rate +ActualizeCurrency=Use the last known rate of the currency Fiscalyear=Fiscal year ModuleBuilder=Module and Application Builder SetMultiCurrencyCode=Set currency +SetMultiCurrencyRate=Set currency rate BulkActions=Bulk actions ClickToShowHelp=Click to show tooltip help WebSite=Website