From 451144e261481419e15a97a4989d6b39fa64f7ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 8 Jul 2009 13:35:00 +0000
Subject: [PATCH] Fix: Correct corrupted data

---
 htdocs/comm/action/index.php         |  3 ++-
 htdocs/comm/action/rapport/index.php | 11 ++++++-----
 mysql/migration/2.6.0-2.7.0.sql      |  2 ++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index c43fad1b3ee..30be0144452 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -109,7 +109,7 @@ llxHeader('','','EN:AgendaEn|FR:Agenda|ES:AgendaES');
 $form=new Form($db);
 
 //print $langs->trans("FeatureNotYetAvailable");
-$now=gmmktime(0,0,0);
+$now=dol_now('tzref');
 
 $prev = dol_get_prev_month($month, $year);
 $prev_year  = $prev['year'];
@@ -248,6 +248,7 @@ if ($status == 'todo') { $sql.= " AND a.percent < 100"; }
 $sql.= ' ORDER BY datep';
 dol_syslog("comm/action/index.php sql=".$sql, LOG_DEBUG);
 
+//print $sql;
 $resql=$db->query($sql);
 if ($resql)
 {
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 7c27ef1e551..44eb15e8ace 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -20,11 +20,11 @@
  */
 
 /**
-	    \file       htdocs/comm/action/rapport/index.php
-        \ingroup    commercial
-		\brief      Page accueil des rapports des actions
-		\version    $Id$
-*/
+ *	    \file       htdocs/comm/action/rapport/index.php
+ *      \ingroup    commercial
+ *		\brief      Page accueil des rapports des actions
+ *		\version    $Id$
+ */
 
 require_once("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
@@ -79,6 +79,7 @@ $sql.= " GROUP BY date_format(a.datep, '%m/%Y') ";
 $sql.= " ORDER BY a.datep DESC";
 $sql.= $db->plimit($limit+1,$offset);
 
+//print $sql;
 $resql=$db->query($sql);
 if ($resql)
 {
diff --git a/mysql/migration/2.6.0-2.7.0.sql b/mysql/migration/2.6.0-2.7.0.sql
index ff34a31e94b..0a435ba7286 100644
--- a/mysql/migration/2.6.0-2.7.0.sql
+++ b/mysql/migration/2.6.0-2.7.0.sql
@@ -6,6 +6,8 @@
 -- when current version is 2.6.0 or higher. 
 --
 
+update llx_actioncomm set datep = datec where datep is null and datec is not null;
+
 -- Create new table for import module
 create table llx_import_model
 (