modif pour date en popup
This commit is contained in:
parent
73afd7c340
commit
5a0a1828b6
@ -1664,13 +1664,14 @@ class Form
|
|||||||
*/
|
*/
|
||||||
if ($conf->use_javascript && $conf->use_popup_date)
|
if ($conf->use_javascript && $conf->use_popup_date)
|
||||||
{
|
{
|
||||||
print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_calendar.js"></script>';
|
|
||||||
if ($langs->defaultlang != "")
|
if ($langs->defaultlang != "")
|
||||||
{
|
{
|
||||||
print '<script language="javascript">';
|
print '<script language="javascript">';
|
||||||
print 'selectedLanguage = "'.substr($langs->defaultlang,0,2).'"';
|
print 'selectedLanguage = "'.substr($langs->defaultlang,0,2).'"';
|
||||||
print '</script>';
|
print '</script>';
|
||||||
}
|
}
|
||||||
|
print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_calendar.js"></script>';
|
||||||
$timearray=getDate($set_time);
|
$timearray=getDate($set_time);
|
||||||
$formated_date=dolibarr_print_date($set_time,$conf->format_date_short);
|
$formated_date=dolibarr_print_date($set_time,$conf->format_date_short);
|
||||||
print '<input id="'.$prefix.'" type="text" name="'.$prefix.'" size="10" value="'.$formated_date.'"> ';
|
print '<input id="'.$prefix.'" type="text" name="'.$prefix.'" size="10" value="'.$formated_date.'"> ';
|
||||||
|
|||||||
@ -127,8 +127,8 @@ else {
|
|||||||
|
|
||||||
// GET CURRENTLY SELECTED LANGUAGE
|
// GET CURRENTLY SELECTED LANGUAGE
|
||||||
// selectedLanguage = navigator.language;
|
// selectedLanguage = navigator.language;
|
||||||
selectedLanguage = "en";
|
if(selectedLanguage == "")
|
||||||
|
selectedLanguage = navigator.language;
|
||||||
|
|
||||||
// PRE-BUILD PORTIONS OF THE CALENDAR WHEN THIS JS LIBRARY LOADS INTO THE BROWSER
|
// PRE-BUILD PORTIONS OF THE CALENDAR WHEN THIS JS LIBRARY LOADS INTO THE BROWSER
|
||||||
buildCalParts();
|
buildCalParts();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user