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 @@ - * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2004-2006 Laurent Destailleur * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005 Regis Houssin * Copyright (C) 2005 Simon TOSSER @@ -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 ' 0) print ''; print ''; - // Date - print ''; - // 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 ''; print ''; - // Date - print ''; + // Date debut + print ''; + + // Date fin real + print ''; print ''; if ($act->objet_url) @@ -490,8 +496,11 @@ if ($_GET["id"]) print ''; print ''; - // Date - print ''; + // Date debut + print ''; + + // Date fin real + print ''; print ''; 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 (
'.$langs->trans("Author").''.img_object($langs->trans("ShowUser"),'user').' '.$act->author->fullname.'
'.$langs->trans("Date").''.dolibarr_print_date($act->date,'%d %B %Y %H:%M').'
'.$langs->trans("Author").''.img_object($langs->trans("ShowUser"),'user').' '.$act->author->fullname.'
'.$langs->trans("Date").''.dolibarr_print_date($act->date,'%d %B %Y %H:%M').'
'.$langs->trans("DateStart").''.dolibarr_print_date($act->datep,'%d %B %Y %H:%M').'
'.$langs->trans("DateEnd").''.dolibarr_print_date($act->date,'%d %B %Y %H:%M').'
'.$langs->trans("PercentDone").'%
'.$langs->trans("Author").''.img_object($langs->trans("ShowUser"),'user').' '.$act->author->fullname.'
'.$langs->trans("Date").''.dolibarr_print_date($act->date,'%d %B %Y %H:%M').'
'.$langs->trans("DateActionPlanned").''.dolibarr_print_date($act->datep,'%d %B %Y %H:%M').'
'.$langs->trans("DateActionDone").''.dolibarr_print_date($act->date,'%d %B %Y %H:%M').'
'.$langs->trans("PercentDone").''.$act->percent.' %