From 74be2d4b0e5b9808d43bdb668cafc65a592f751a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 16 Sep 2006 00:27:54 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20Date=20r=E9al=20mal=20renseign=E9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/comm/action/fiche.php | 2 +- mysql/migration/2.0.0-2.1.0.sql | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 17230c475b5..d3adfa4d234 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -729,7 +729,7 @@ if ($_GET["id"]) // Note print ''.$langs->trans("Note").''; - print nl2br($act->note); + print nl2br(htmlentities($act->note)); print ''; print ''; diff --git a/mysql/migration/2.0.0-2.1.0.sql b/mysql/migration/2.0.0-2.1.0.sql index 376a9520a40..850b66338bc 100644 --- a/mysql/migration/2.0.0-2.1.0.sql +++ b/mysql/migration/2.0.0-2.1.0.sql @@ -101,7 +101,9 @@ alter table llx_actioncomm add column tms timestamp after datea; alter table llx_actioncomm add column fk_commande integer after propalrowid; update llx_actioncomm set datec = datea where datec is null; -update llx_actioncomm set datep = datea where datep is null; +update llx_actioncomm set datep = datea where datep is null AND percent < 100; +update llx_actioncomm set datep = datec where datea is null AND datep is null AND percent < 100; +update llx_actioncomm set datea = datec where datea is null AND datep is null AND percent = 100; update llx_actioncomm set fk_action = '8' where fk_action = '3' and label = 'Envoi commande par mail';