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

FIX Missing ref into popup

Browse Source
This commit is contained in:
Laurent Destailleur 2020-05-30 23:51:02 +02:00
parent e8016a5e7e
commit ddebe1bbba
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/comm/action/index.php
View File

@ -608,7 +608,9 @@ if ($resql)
// Create a new object action // Create a new object action
$event = new ActionComm($db); $event = new ActionComm($db);
$event->id = $obj->id; $event->id = $obj->id;
$event->ref = $event->id;
$event->datep = $db->jdate($obj->datep); // datep and datef are GMT date. Example: 1970-01-01 01:00:00, jdate will return 0 if TZ of PHP server is Europe/Berlin $event->datep = $db->jdate($obj->datep); // datep and datef are GMT date. Example: 1970-01-01 01:00:00, jdate will return 0 if TZ of PHP server is Europe/Berlin
$event->datef = $db->jdate($obj->datep2); $event->datef = $db->jdate($obj->datep2);
@ -718,7 +720,10 @@ if ($showbirthday)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$event = new ActionComm($db); $event = new ActionComm($db);
$event->id = $obj->rowid; // We put contact id in action id for birthdays events $event->id = $obj->rowid; // We put contact id in action id for birthdays events
$event->ref = $event->id;
$datebirth = dol_stringtotime($obj->birthday, 1); $datebirth = dol_stringtotime($obj->birthday, 1);
//print 'ee'.$obj->birthday.'-'.$datebirth; //print 'ee'.$obj->birthday.'-'.$datebirth;
$datearray = dol_getdate($datebirth, true); $datearray = dol_getdate($datebirth, true);
@ -796,6 +801,7 @@ if ($conf->global->AGENDA_SHOW_HOLIDAYS)
// Need the id of the leave object for link to it // Need the id of the leave object for link to it
$event->id = $obj->rowid; $event->id = $obj->rowid;
$event->ref = $event->id;
$event->type_code = 'HOLIDAY'; $event->type_code = 'HOLIDAY';
$event->datep = dol_mktime(0, 0, 0, $dateStartArray['mon'], $dateStartArray['mday'], $dateStartArray['year'], true); $event->datep = dol_mktime(0, 0, 0, $dateStartArray['mon'], $dateStartArray['mday'], $dateStartArray['year'], true);
@ -1036,6 +1042,8 @@ if (count($listofextcals))
if ($addevent) if ($addevent)
{ {
$event->id = $icalevent['UID']; $event->id = $icalevent['UID'];
$event->ref = $event->id;
$event->icalname = $namecal; $event->icalname = $namecal;
$event->icalcolor = $colorcal; $event->icalcolor = $colorcal;
$usertime = 0; // We dont modify date because we want to have date into memory datep and datef stored as GMT date. Compensation will be done during output. $usertime = 0; // We dont modify date because we want to have date into memory datep and datef stored as GMT date. Compensation will be done during output.