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

Merge pull request #6425 from GPCsolutions/5.0-multicurrency-error

Browse Source 
Fix: [Multicurrency] properly display API error
This commit is contained in:
Laurent Destailleur 2017-02-17 10:45:45 +01:00 committed by GitHub
commit bde6815e5d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/multicurrency.php
View File

@ -131,7 +131,7 @@ elseif ($action == 'synchronize')
} }
else else
{ {
setEventMessages($langs->trans('multicurrency_syncronize_error', $reponse->error->info), null, 'errors'); setEventMessages($langs->trans('multicurrency_syncronize_error', $response->error->info), null, 'errors');
} }
} }
@ -377,4 +377,4 @@ print '
llxFooter(); llxFooter();
$db->close(); $db->close();

4
htdocs/langs/en_US/multicurrency.lang
View File

@ -3,7 +3,7 @@ MultiCurrency=Multi currency
ErrorAddRateFail=Error in added rate ErrorAddRateFail=Error in added rate
ErrorAddCurrencyFail=Error in added currency ErrorAddCurrencyFail=Error in added currency
ErrorDeleteCurrencyFail=Error delete fail ErrorDeleteCurrencyFail=Error delete fail
multicurrency_syncronize_error=Error in synchronization multicurrency_syncronize_error=Synchronisation error: %s
multicurrency_useOriginTx=When an object is created from another, keep the original rate of source object (otherwise use the new known rate) multicurrency_useOriginTx=When an object is created from another, keep the original rate of source object (otherwise use the new known rate)
CurrencyLayerAccount=CurrencyLayer API CurrencyLayerAccount=CurrencyLayer API
CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality<br />Get your <b>API key</b><br />If you use a free account you can't change the <b>currency source</b> (USD by default)<br />But if your main currency isn't USD you can use the <b>alternate currency source</b> to force you main currency<br /><br />You are limited at 1000 synchronizations per month CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality<br />Get your <b>API key</b><br />If you use a free account you can't change the <b>currency source</b> (USD by default)<br />But if your main currency isn't USD you can use the <b>alternate currency source</b> to force you main currency<br /><br />You are limited at 1000 synchronizations per month
@ -15,4 +15,4 @@ CurrenciesUsed_help_to_add=Add the differents currencies and rates you need to u
rate=rate rate=rate
MulticurrencyReceived=Received, original currency MulticurrencyReceived=Received, original currency
MulticurrencyRemainderToTake=Remaining amout, original currency MulticurrencyRemainderToTake=Remaining amout, original currency
MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyPaymentAmount=Payment amount, original currency