diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 268d24ae2fd..33fbbb91508 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -1646,11 +1646,12 @@ class Form
             $smin = '';
         }
 
-        $conf->use_popup_date=0;    // Mettre 1 pour avoir date en popup (experimental)
+        $conf->use_popup_date=1;    // Mettre 1 pour avoir date en popup (experimental)
 
-        /*
+        /* Commenté par André
          * Affiche date en popup
          */
+		 /*
         if ($conf->use_javascript && $conf->use_popup_date)
         {
             $timearray=getDate($set_time);
@@ -1660,7 +1661,24 @@ class Form
             print '<input type="hidden" name="'.$prefix.'month" value="'.$timearray['mon'].'">'."\n";
             print '<input type="hidden" name="'.$prefix.'year" value="'.$timearray['year'].'">'."\n";
         }
-
+	*/
+		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 != "")
+		 	{
+				print '<script language="javascript">';
+				print 'selectedLanguage = "'.substr($langs->defaultlang,0,2).'"';
+				print '</script>';
+			}
+			$timearray=getDate($set_time);
+            $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 type="hidden" name="'.$prefix.'day" value="'.$timearray['mday'].'">'."\n";
+            print '<input type="hidden" name="'.$prefix.'month" value="'.$timearray['mon'].'">'."\n";
+            print '<input type="hidden" name="'.$prefix.'year" value="'.$timearray['year'].'">'."\n";
+			print '<A HREF="javascript:showCalendar(document.forms[3].'.$prefix.')">'.img_cal().'</a>';
+        }
         /*
          * Affiche date en select
          */
diff --git a/htdocs/theme/dev/img/calendar.png b/htdocs/theme/dev/img/calendar.png
new file mode 100644
index 00000000000..90829a353c3
Binary files /dev/null and b/htdocs/theme/dev/img/calendar.png differ
diff --git a/htdocs/theme/dolibarr/img/calendar.png b/htdocs/theme/dolibarr/img/calendar.png
new file mode 100644
index 00000000000..90829a353c3
Binary files /dev/null and b/htdocs/theme/dolibarr/img/calendar.png differ
diff --git a/htdocs/theme/eldy/img/calendar.png b/htdocs/theme/eldy/img/calendar.png
new file mode 100644
index 00000000000..90829a353c3
Binary files /dev/null and b/htdocs/theme/eldy/img/calendar.png differ
diff --git a/htdocs/theme/freelug/img/calendar.png b/htdocs/theme/freelug/img/calendar.png
new file mode 100644
index 00000000000..90829a353c3
Binary files /dev/null and b/htdocs/theme/freelug/img/calendar.png differ
diff --git a/htdocs/theme/yellow/img/calendar.png b/htdocs/theme/yellow/img/calendar.png
new file mode 100644
index 00000000000..90829a353c3
Binary files /dev/null and b/htdocs/theme/yellow/img/calendar.png differ