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

Fix : stickler-ci

Browse Source
This commit is contained in:
jpb 2020-10-23 13:55:55 +02:00
parent 63c82b47fe
commit 47351c3cb3
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/html.form.class.php
View File

@ -5053,7 +5053,7 @@ class Form
* @param bool $excludeConfCurrency false = If company current currency not in table, we add it into list. Should always be available. true = we are in currency_rate update , we don't want to see conf->currency in select * @param bool $excludeConfCurrency false = If company current currency not in table, we add it into list. Should always be available. true = we are in currency_rate update , we don't want to see conf->currency in select
* @return string * @return string
*/ */
public function selectMultiCurrency($selected = '', $htmlname = 'multicurrency_code', $useempty = 0, $filter= '',$excludeConfCurrency = false) public function selectMultiCurrency($selected = '', $htmlname = 'multicurrency_code', $useempty = 0, $filter = '', $excludeConfCurrency = false)
{ {
global $db, $conf, $langs, $user; global $db, $conf, $langs, $user;

25
htdocs/multicurrency/multicurrency_rate.php
View File

@ -116,7 +116,7 @@ if ($action == "create"){
dol_syslog("currencyRate:createRate", LOG_WARNING); dol_syslog("currencyRate:createRate", LOG_WARNING);
setEventMessage($langs->trans('successRateCreate')); setEventMessage($langs->trans('successRateCreate'));
} }
}else{ } else {
setEventMessage($langs->trans('NoEmptyRate'), "errors"); setEventMessage($langs->trans('NoEmptyRate'), "errors");
} }
} }
@ -133,10 +133,10 @@ if ($action == 'update'){
$res = $currencyRate->update(); $res = $currencyRate->update();
if ($res){ if ($res){
setEventMessage($langs->trans('successUpdateRate')); setEventMessage($langs->trans('successUpdateRate'));
}else{ }else {
setEventMessage($langs->trans('errorUpdateRate'), "errors"); setEventMessage($langs->trans('errorUpdateRate'), "errors");
} }
}else{ }else {
setEventMessage($langs->trans(''), "warnings"); setEventMessage($langs->trans(''), "warnings");
} }
} }
@ -158,10 +158,10 @@ if ($action == "deleteRate"){
0, 0,
1 1
); );
}else{ }else {
dol_syslog("Multicurrency::fetch", LOG_WARNING); dol_syslog("Multicurrency::fetch", LOG_WARNING);
} }
}else{ }else {
setEventMessage($langs->trans('NoCurrencyRateSelected'), "warnings"); setEventMessage($langs->trans('NoCurrencyRateSelected'), "warnings");
} }
} }
@ -173,10 +173,10 @@ if ($action == "confirm_delete"){
$result = $current_rate->delete(); $result = $current_rate->delete();
if ($result){ if ($result){
setEventMessage($langs->trans('successRateDelete')); setEventMessage($langs->trans('successRateDelete'));
}else{ }else {
setEventMessage($langs->trans('errorRateDelete')); setEventMessage($langs->trans('errorRateDelete'));
} }
}else{ }else {
setEventMessage($langs->trans('NoCurrencyRateSelected'), "warnings"); setEventMessage($langs->trans('NoCurrencyRateSelected'), "warnings");
dol_syslog($langs->trans('NoCurrencyRateSelected'), LOG_WARNING); dol_syslog($langs->trans('NoCurrencyRateSelected'), LOG_WARNING);
} }
@ -270,7 +270,7 @@ if ($action == "updateRate"){
if ($resultcurrentCurrency){ if ($resultcurrentCurrency){
$currency_code = $curr->code; $currency_code = $curr->code;
}else{ }else {
$currency_code = ''; $currency_code = '';
} }
@ -300,7 +300,7 @@ if ($action == "updateRate"){
print '</td>'; print '</td>';
print '</tr></table>'; print '</tr></table>';
print '</form>'; print '</form>';
}else{ }else {
dol_syslog("currency_rate:list:update", LOG_WARNING); dol_syslog("currency_rate:list:update", LOG_WARNING);
} }
} }
@ -350,7 +350,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
$page = 0; $page = 0;
$offset = 0; $offset = 0;
} }
}else{ }else {
setEventMessage($langs->trans('No_record_on_multicurrency_rate'), 'warnings'); setEventMessage($langs->trans('No_record_on_multicurrency_rate'), 'warnings');
} }
} }
@ -396,7 +396,7 @@ if ($resql)
if ($sall) if ($sall)
{ {
foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ', $fieldstosearchall).'</div>'; print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ', $fieldstosearchall).'</div>';
} }
@ -538,8 +538,7 @@ if ($resql)
print '</form>'; print '</form>';
} }
else else {
{
dol_print_error($db); dol_print_error($db);
} }