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

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2017-09-14 12:20:26 +02:00
commit ed9c401ca6
3 changed files with 51 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/card.php
View File

@ -331,6 +331,8 @@ if ($id > 0)
print "</td>"; print "</td>";
print '</tr>'; print '</tr>';
if (! empty($conf->banque->enabled))
{
// Compte bancaire par défaut // Compte bancaire par défaut
print '<tr><td class="nowrap">'; print '<tr><td class="nowrap">';
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">'; print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
@ -349,7 +351,7 @@ if ($id > 0)
} }
print "</td>"; print "</td>";
print '</tr>'; print '</tr>';
}
// Relative discounts (Discounts-Drawbacks-Rebates) // Relative discounts (Discounts-Drawbacks-Rebates)
print '<tr><td class="nowrap">'; print '<tr><td class="nowrap">';

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

@ -4297,7 +4297,7 @@ class Form
*/ */
function select_currency($selected='',$htmlname='currency_id') function select_currency($selected='',$htmlname='currency_id')
{ {
print $this->selectcurrency($selected,$htmlname); print $this->selectCurrency($selected,$htmlname);
} }
/** /**
@ -4317,7 +4317,7 @@ class Form
if ($selected=='euro' || $selected=='euros') $selected='EUR'; // Pour compatibilite if ($selected=='euro' || $selected=='euros') $selected='EUR'; // Pour compatibilite
$out.= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">'; $out.= '<select class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'" id="'.$htmlname.'">';
foreach ($langs->cache_currencies as $code_iso => $currency) foreach ($langs->cache_currencies as $code_iso => $currency)
{ {
if ($selected && $selected == $code_iso) if ($selected && $selected == $code_iso)
@ -4334,6 +4334,11 @@ class Form
} }
$out.= '</select>'; $out.= '</select>';
if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
// Make select dynamic
include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
$out .= ajax_combobox($htmlname);
return $out; return $out;
} }

1
htdocs/langs/en_US/admin.lang
View File

@ -1,6 +1,7 @@
# Dolibarr language file - Source file is en_US - admin # Dolibarr language file - Source file is en_US - admin
Foundation=Foundation Foundation=Foundation
Version=Version Version=Version
Publisher=Publisher
VersionProgram=Version program VersionProgram=Version program
VersionLastInstall=Initial install version VersionLastInstall=Initial install version
VersionLastUpgrade=Latest version upgrade VersionLastUpgrade=Latest version upgrade