From bf93e9ed00099ea98f5a0bf8b768e689203461d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 18 Mar 2006 23:18:23 +0000
Subject: [PATCH] New: Gestion des dates de debut et fin sur les actions

---
 htdocs/comm/action/document.php | 11 ++++++-----
 htdocs/comm/action/fiche.php    | 21 +++++++++++++++------
 mysql/migration/2.0.0-2.1.0.sql |  3 +++
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index b01c6c2b8e0..dbff9a6b210 100755
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2004 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2005 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2006 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005      Regis Houssin         <regis.houssin@cap-networks.com>
  * Copyright (C) 2005      Simon TOSSER         <simon@kornog-computing.com>
@@ -120,7 +120,11 @@ if ($_GET["id"] > 0)
 	$hselected=$h;
 	$h++;
 
-	dolibarr_fiche_head($head, $hselected, $langs->trans("Ref")." ".$act->id);
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/info.php?id='.$_GET["id"];
+	$head[$h][1] = $langs->trans('Info');
+	$h++;
+	
+	dolibarr_fiche_head($head, $hselected, $langs->trans("Action"));
 
     // Affichage fiche action en mode visu
     print '<table class="border" width="100%"';
@@ -140,9 +144,6 @@ if ($_GET["id"] > 0)
     print '<tr><td>'.$langs->trans("Author").'</td>';
     print '<td colspan="3"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$act->author->id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$act->author->fullname.'</a></td></tr>';
 
-    // Date
-    print '<tr><td>'.$langs->trans("Date").'</td><td colspan="3">'.dolibarr_print_date($act->date,'%d %B %Y %H:%M').'</td></tr>';
-    
     // Construit liste des fichiers
     clearstatcache();
 
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index b53374e14b5..a02be95b4cd 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -414,10 +414,13 @@ if ($_GET["id"])
 
     $head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$_GET["id"];
     $head[$h][1] = $langs->trans('Documents');
-    //$hselected=$h;
     $h++;
 
-    dolibarr_fiche_head($head, $hselected, $langs->trans("Ref")." ".$act->id);
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/info.php?id='.$_GET["id"];
+	$head[$h][1] = $langs->trans('Info');
+	$h++;
+	
+    dolibarr_fiche_head($head, $hselected, $langs->trans("Action"));
 
 
     // Confirmation suppression action
@@ -450,8 +453,11 @@ if ($_GET["id"])
         print '<tr><td>'.$langs->trans("Author").'</td>';
         print '<td colspan="3"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$act->author->id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$act->author->fullname.'</a></td></tr>';
 
-        // Date
-        print '<tr><td>'.$langs->trans("Date").'</td><td colspan="3">'.dolibarr_print_date($act->date,'%d %B %Y %H:%M').'</td></tr>';
+        // Date debut
+        print '<tr><td>'.$langs->trans("DateStart").'</td><td colspan="3">'.dolibarr_print_date($act->datep,'%d %B %Y %H:%M').'</td></tr>';
+
+        // Date fin real
+        print '<tr><td>'.$langs->trans("DateEnd").'</td><td colspan="3">'.dolibarr_print_date($act->date,'%d %B %Y %H:%M').'</td></tr>';
 
         print '<tr><td nowrap>'.$langs->trans("PercentDone").'</td><td colspan="3"><input name="percent" value="'.$act->percent.'" size="4">%</td></tr>';
         if ($act->objet_url)
@@ -490,8 +496,11 @@ if ($_GET["id"])
         print '<tr><td>'.$langs->trans("Author").'</td>';
         print '<td colspan="3"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$act->author->id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$act->author->fullname.'</a></td></tr>';
 
-        // Date
-        print '<tr><td>'.$langs->trans("Date").'</td><td colspan="3">'.dolibarr_print_date($act->date,'%d %B %Y %H:%M').'</td></tr>';
+        // Date debut
+		print '<tr><td>'.$langs->trans("DateActionPlanned").'</td><td colspan="3">'.dolibarr_print_date($act->datep,'%d %B %Y %H:%M').'</td></tr>';
+        
+        // Date fin real
+        print '<tr><td>'.$langs->trans("DateActionDone").'</td><td colspan="3">'.dolibarr_print_date($act->date,'%d %B %Y %H:%M').'</td></tr>';
 
         print '<tr><td nowrap>'.$langs->trans("PercentDone").'</td><td colspan="3">'.$act->percent.' %</td></tr>';
         if ($act->objet_url)
diff --git a/mysql/migration/2.0.0-2.1.0.sql b/mysql/migration/2.0.0-2.1.0.sql
index d251eedeb73..e9514859cd2 100644
--- a/mysql/migration/2.0.0-2.1.0.sql
+++ b/mysql/migration/2.0.0-2.1.0.sql
@@ -60,6 +60,9 @@ alter table llx_actioncomm modify datea datetime;
 alter table llx_actioncomm add column datec datetime after id;
 alter table llx_actioncomm add column datep datetime after datec;
 alter table llx_actioncomm add column tms timestamp after datea;
+update llx_actioncomm set datec = datea where datec is null;
+update llx_actioncomm set datep = datea where datep is null;
+
 
 create table llx_expedition_model_pdf
 (