From 3a3384da0dcece74739deb8896db8724217b2869 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 15 Jul 2009 23:14:15 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20bug=20#26991=20:=20Action=20termin=E9e?= =?UTF-8?q?=20=E0=20la=20saisie=20sans=20le=20demander?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/actioncomm.class.php | 2 +- htdocs/comm/action/fiche.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/actioncomm.class.php b/htdocs/actioncomm.class.php index 1548264b309..ea1450651f3 100644 --- a/htdocs/actioncomm.class.php +++ b/htdocs/actioncomm.class.php @@ -98,7 +98,7 @@ class ActionComm // Clean parameters $this->label=trim($this->label); $this->location=trim($this->location); - $this->note=trim($this->note); + $this->note=dol_htmlcleanlastbr(trim($this->note)); if (! $this->percentage) $this->percentage = 0; if (! $this->priority) $this->priority = 0; if (! $this->punctual) $this->punctual = 0; diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 0e3e8b6c61e..2d6c4ecf551 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -161,7 +161,7 @@ if ($_POST["action"] == 'add_action') if ($actioncomm->type_code == 'AC_RDV') { // RDV - if ($actioncomm->datef) + if ($actioncomm->datef && $actioncomm->datef < dol_now('tzref')) { $actioncomm->percentage = 100; }