lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2023-05-04 21:43:37 +02:00
commit c4ea0c7d35
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/fichinter/card.php
View File

@ -583,7 +583,7 @@ if (empty($reshook)) {
} else {
$mesg = $object->error;
}
} elseif ($action == 'updateline' && $user->hasRight('ficheinter', 'creer') && GETPOST('save', 'alpha') == $langs->trans("Save")) {
} elseif ($action == 'updateline' && $user->hasRight('ficheinter', 'creer') && GETPOST('save', 'alpha')) {
// Mise a jour d'une ligne d'intervention
$objectline = new FichinterLigne($db);
if ($objectline->fetch($lineid) <= 0) {
@ -601,7 +601,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;

1
htdocs/public/eventorganization/attendee_new.php
View File

@ -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) {