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

wip on adding a filter for the ics file + fix on class name

Browse Source
This commit is contained in:
Dorian Vabre 2021-05-10 16:57:48 +02:00
parent 48bbb500d3
commit c85b75924f
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/comm/action/class/actioncomm.class.php
View File

@ -1901,6 +1901,9 @@ class ActionComm extends CommonObject
$sql .= " AND ar.fk_element = 0";
}
}
if ($key == 'author') {
$sql .= " AND c.type = '".$this->db->escape($value)."'";
}
}
$sql .= " AND a.datep IS NOT NULL"; // To exclude corrupted events and avoid errors in lightning/sunbird import

3
htdocs/public/agenda/agendaexport.php
View File

@ -135,6 +135,9 @@ if (GETPOST("notolderthan", 'int')) {
} else {
$filters['notolderthan'] = $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY;
}
if (GETPOST("author", 'apha')) {
$filters['author'] = GETPOST("author", 'apha');
}
// Check config
if (empty($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY)) {

2
htdocs/public/project/suggestbooth.php
View File

@ -439,7 +439,7 @@ if (empty($reshook) && $action == 'add') {
}
} else {
// If no price has been set for the booth, we confirm it as suggested and we update
$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
$conforbooth->status = ConferenceOrBooth::STATUS_SUGGESTED;
$conforbooth->update($user);
// Sending mail
require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';

2
htdocs/public/project/suggestconference.php
View File

@ -373,7 +373,7 @@ if (empty($reshook) && $action == 'add') {
$error++;
$errmsg .= $conforbooth->error;
} else {
$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
$conforbooth->status = ConferenceOrBooth::STATUS_SUGGESTED;
$conforbooth->update($user);
// Sending mail