diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 1c3365da7d7..b7b12ff7556 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -93,8 +93,8 @@ if ($_POST['action'] == 'classin' && $user->rights->commande->creer) if ($_POST['action'] == 'add' && $user->rights->commande->creer) { $datecommande=''; - $datecommande = @mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); - $datelivraison = @mktime(12, 0, 0, $_POST['liv_month'],$_POST['liv_day'],$_POST['liv_year']); + $datecommande = dolibarr_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); + $datelivraison = dolibarr_mktime(12, 0, 0, $_POST['liv_month'],$_POST['liv_day'],$_POST['liv_year']); $commande = new Commande($db); $commande->socid=$_POST['socid']; @@ -202,7 +202,7 @@ if ($_POST['action'] == "setabsolutediscount" && $user->rights->propale->creer) if ($_POST['action'] == 'setdate_livraison' && $user->rights->commande->creer) { - $datelivraison=@mktime(0, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']); + $datelivraison=dolibarr_mktime(0, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']); $commande = new Commande($db); $commande->fetch($_GET['id']); $result=$commande->set_date_livraison($user,$datelivraison); diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index fb243d2cab5..b894b4f6c13 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -2401,11 +2401,11 @@ class Form * Affiche date en popup */ if ($conf->use_javascript && $conf->use_popup_calendar) - { - //print "e".$set_time." t ".$conf->format_date_short; - if ($set_time > 0) - { - $formated_date=dolibarr_print_date($set_time,$conf->format_date_short); + { + //print "e".$set_time." t ".$conf->format_date_short; + if ($set_time > 0) + { + $formated_date=dolibarr_print_date($set_time,$conf->format_date_short); } // Calendrier popup version eldy diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index a7ffb549209..f3de0678119 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -379,3 +379,18 @@ CurrencyCHF=Swiss Francs CurrencyEUR=Euros CurrencyGBP=GB Pounds CurrencyUSD=Dollar US +# Week day +Monday=Monday +Tuesday=Tuesday +Wednesday=Wednesday +Thursday=Thursday +Friday=Friday +Saturday=Saturday +Sunday=Sunday +ShortMonday=M +ShortTuesday=T +ShortWednesday=W +ShortThursday=T +ShortFriday=F +ShortSaturday=S +ShortSunday=S \ No newline at end of file diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 7a0cac6543b..0fe32862658 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -383,3 +383,18 @@ CurrencyCHF=Francs suisses CurrencyEUR=Euros CurrencyGBP=Livre sterling CurrencyUSD=Dollar US +# Week day +Monday=Lundi +Tuesday=Mardi +Wednesday=Mercredi +Thursday=Jeudi +Friday=Vendredi +Saturday=Samedi +Sunday=Dimanche +ShortMonday=L +ShortTuesday=M +ShortWednesday=M +ShortThursday=J +ShortFriday=V +ShortSaturday=S +ShortSunday=D \ No newline at end of file diff --git a/htdocs/lib/datepicker.php b/htdocs/lib/datepicker.php index 07b1f9094b8..c14675438a6 100644 --- a/htdocs/lib/datepicker.php +++ b/htdocs/lib/datepicker.php @@ -72,7 +72,13 @@ function displayBox($selectedDate,$month,$year){ ?> - + @@ -83,13 +89,13 @@ function displayBox($selectedDate,$month,$year){ - - - - - - - + + + + + + + =$mydate["wday"];$i--) echo ""; - echo ""; } ?>
+ trans($selectMonth).", ".$selectYear; + ?> +
>>
SMTWRFStrans("ShortSunday") ?>trans("ShortMonday") ?>trans("ShortTuesday") ?>trans("ShortWednesday") ?>trans("ShortThursday") ?>trans("ShortFriday") ?>trans("ShortSaturday") ?>
 
trans($tempDate["month"])." "; print sprintf("%02s",$tempDate["mday"]); print ", ".$tempDate["year"]; } diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index b08c12d0eaa..0fefd3a695a 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -556,15 +556,15 @@ function dolibarr_stringtotime($string) /** \brief Retourne une date fabriquée depuis infos. Remplace la fonction mktime non implémentée sous Windows si année < 1970 - \param x X - \param y Y - \param z Z + \param hour Heure + \param minute Minute + \param second Seconde \param month Mois \param day Jour \param year Année \return date Date */ -function dolibarr_mktime($x,$y,$z,$month,$day,$year) +function dolibarr_mktime($hour,$minute,$second,$month,$day,$year) { $montharray=array(1=>'january',2=>'february',3=>'march',4=>'april',5=>'may',6=>'june', 7=>'july',8=>'august',9=>'september',10=>'october',11=>'november',12=>'december'); @@ -581,7 +581,7 @@ function dolibarr_mktime($x,$y,$z,$month,$day,$year) } else { - return mktime($x,$y,$z,$month,$day,$year); + return mktime($hour,$minute,$second,$month,$day,$year); } } diff --git a/htdocs/lib/lib_head.js b/htdocs/lib/lib_head.js index 90f2d91eb98..2b727c528c1 100644 --- a/htdocs/lib/lib_head.js +++ b/htdocs/lib/lib_head.js @@ -206,7 +206,19 @@ function dpClickDay(year,month,day,format) function dpHighlightDay(year,month,day){ var displayinfo=getObjectFromID("dpExp"); - var months=Array("January","February","March","April","May","June","July","August","September","October","November","December"); + var months=Array("January", + "February", + "March", + "April", + "May", + "June", + "July", + "August", + "September", + "October", + "November", + "December" + ); displayinfo.innerHTML=months[month-1]+" "+day+", "+year; }