From 300ff9f9e73a97a9e111f5ef938efdb9a38ad6cb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 30 Oct 2006 23:37:38 +0000
Subject: [PATCH] Fix: Corrige bug affiche selecteur date si en mode non
 calendrier

---
 htdocs/comm/action/fiche.php | 10 ++++++++++
 htdocs/html.form.class.php   | 17 ++++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 9c959d47d6f..1c8e9ba8d26 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -621,6 +621,11 @@ if ($_GET["id"])
         $html->select_array("contactid",  $act->societe->contact_array(), $act->contact->id, 1);
         print '</td></tr>';
 
+		// Priorite
+		print '<tr><td nowrap>'.$langs->trans("Priority").'</td><td colspan="3">';
+		print $langs->trans("FeatureNotYetSupported");
+		print '</td></tr>';
+
 		// Affecte a
 		print '<tr><td nowrap>'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
 		print $langs->trans("FeatureNotYetSupported");
@@ -704,6 +709,11 @@ if ($_GET["id"])
 
         print '</td></tr>';
 
+		// Priorite
+		print '<tr><td nowrap>'.$langs->trans("Priority").'</td><td colspan="3">';
+		print $langs->trans("FeatureNotYetSupported");
+		print '</td></tr>';
+
 		// Affecte a
 		print '<tr><td nowrap>'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
 		print $langs->trans("FeatureNotYetSupported");
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 41fdd2799d6..87fdc754785 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -2093,21 +2093,24 @@ class Form
          */
         if (! $conf->use_javascript || ! $conf->use_popup_calendar)
         {
-
-            // Jour
-            print '<select class="flat" name="'.$prefix.'day">';
-        
-            if ($empty || $set_time == -1)
+/*          
+			if ($set_time == -1)
             {
                 $sday = 0;
                 $smonth = 0;
                 $syear = 0;
                 $shour = 0;
                 $smin = 0;
+			}
+*/
+            // Jour
+            print '<select class="flat" name="'.$prefix.'day">';
         
+            if ($empty || $set_time == -1)
+            {
                 print '<option value="0" selected="true">&nbsp;</option>';
             }
-        
+
             for ($day = 1 ; $day <= 31; $day++)
             {
                 if ($day == $sday)
@@ -2141,7 +2144,7 @@ class Form
             // Année
             if ($empty || $set_time == -1)
             {
-                print '<input class="flat" type="text" size="3" maxlength="4" name="'.$prefix.'year">';
+                print '<input class="flat" type="text" size="3" maxlength="4" name="'.$prefix.'year" value="'.$syear.'">';
             }
             else
             {