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

Fix: Bad value of selected year

Browse Source
This commit is contained in:
Laurent Destailleur 2011-02-06 02:02:50 +00:00
parent 70ec9f70b7
commit f4d1d35017
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3074,11 +3074,11 @@ class Form
/** /**
* \brief Return HTML combo list of years * \brief Return HTML combo list of years
* \param selected Preselected value * \param selected Preselected value (''=current year, -1=none, year otherwise)
* \param htmlname Name of HTML select object * \param htmlname Name of HTML select object
* \param useempty Affiche valeur vide dans liste * \param useempty Affiche valeur vide dans liste
* \param $min_year Valeur minimum de l'annee dans la liste (par defaut annee courante -10) * \param $min_year Offset of minimum year into list (by default current year -10)
* \param $max_year Valeur maximum de l'annee dans la liste (par defaut annee courante + 5) * \param $max_year Offset of maximum year into list (by default current year + 5)
* TODO Move into html.formother * TODO Move into html.formother
*/ */
function select_year($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5) function select_year($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5)
@ -3091,19 +3091,14 @@ class Form
print '<select class="flat" name="' . $htmlname . '">'; print '<select class="flat" name="' . $htmlname . '">';
if($useempty) if($useempty)
{ {
if($selected == '') if ($selected == '') $selected_html = ' selected="selected"';
$selected_html = 'selected="selected"'; print '<option value=""' . $selected_html . '>&nbsp;</option>';
print '<option value="" ' . $selected_html . ' >&nbsp;</option>';
} }
for ($y = $max_year; $y >= $min_year; $y--) for ($y = $max_year; $y >= $min_year; $y--)
{ {
$selected_html=''; $selected_html='';
if ($y == $selected) if ($selected > 0 && $y == $selected) $selected_html = ' selected="selected"';
{ print '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
$selected_html = 'selected="selected"';
}
print "<option value=\"$y\" $selected_html >$y";
print "</option>";
} }
print "</select>\n"; print "</select>\n";
} }

3
htdocs/fourn/facture/index.php
View File

@ -204,10 +204,9 @@ if ($resql)
print '<td class="liste_titre" colspan="1" align="center">'; print '<td class="liste_titre" colspan="1" align="center">';
print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">'; print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
//print '&nbsp;'.$langs->trans('Year').': '; //print '&nbsp;'.$langs->trans('Year').': ';
$max_year = date("Y");
$syear = $year; $syear = $year;
//if ($syear == '') $syear = date("Y"); //if ($syear == '') $syear = date("Y");
$html->select_year($syear,'year',1, '', $max_year); $html->select_year($syear?$syear:-1,'year',1, 10, 10);
print '</td>'; print '</td>';
print '<td class="liste_titre">&nbsp;</td>'; print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre" align="left">'; print '<td class="liste_titre" align="left">';