From 74ef3b076d84920ca91aaa840a6857fdd2dbb9e4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 May 2023 19:17:57 +0200 Subject: [PATCH 1/2] FIX Count only attendee draft of validated. --- htdocs/public/eventorganization/attendee_new.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php index 043e52f5808..d0a3bb81d74 100644 --- a/htdocs/public/eventorganization/attendee_new.php +++ b/htdocs/public/eventorganization/attendee_new.php @@ -106,6 +106,7 @@ if ($type == 'global') { } else { $sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."eventorganization_conferenceorboothattendee"; $sql .= " WHERE fk_project = ".((int) $project->id); + $sql .= " AND status IN (0, 1)"; $resql = $db->query($sql); if ($resql) { From 077c3312cea9f58396e9000f266608ac83c53fb7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 May 2023 20:15:10 +0200 Subject: [PATCH 2/2] FIX Update hour of intervention line --- htdocs/fichinter/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index accf1bb3cb5..b7f412cc765 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -578,7 +578,7 @@ if (empty($reshook)) { } else { $mesg = $object->error; } - } elseif ($action == 'updateline' && $user->rights->ficheinter->creer && GETPOST('save', 'alpha') == $langs->trans("Save")) { + } elseif ($action == 'updateline' && $user->rights->ficheinter->creer && GETPOST('save', 'alpha')) { // Mise a jour d'une ligne d'intervention $objectline = new FichinterLigne($db); if ($objectline->fetch($lineid) <= 0) { @@ -596,7 +596,7 @@ if (empty($reshook)) { $date_inter = dol_mktime(GETPOST('dihour', 'int'), GETPOST('dimin', 'int'), 0, GETPOST('dimonth', 'int'), GETPOST('diday', 'int'), GETPOST('diyear', 'int')); $duration = convertTime2Seconds(GETPOST('durationhour', 'int'), GETPOST('durationmin', 'int')); - $objectline->datei = $date_inter; + $objectline->date = $date_inter; $objectline->desc = $desc; $objectline->duration = $duration;