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

fix reminder offsetunit and display problems

Browse Source
This commit is contained in:
atm-greg 2020-09-24 15:20:30 +02:00
parent 101405b052
commit e6eff6511e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -397,7 +397,7 @@ if (empty($reshook) && $action == 'add')
if ($addreminder == 'on'){
$actionCommReminder = new ActionCommReminder($db);
$dateremind = dol_time_plus_duree($datep, -$offsetvalue, 'i');
$dateremind = dol_time_plus_duree($datep, -$offsetvalue, $offsetunit);
$actionCommReminder->dateremind = $dateremind;
$actionCommReminder->typeremind = $remindertype;
@ -1697,6 +1697,7 @@ if ($id > 0)
print $langs->trans("Done");
print ' </span>';
}
print '<br />';
}
}
}
@ -1985,7 +1986,7 @@ if ($id > 0)
{
$filtreuserid = $user->id;
if ($user->rights->agenda->allactions->read) $filtreuserid = 0;
$object->loadReminders('', $filteruserid);
$object->loadReminders('', $filteruserid, false);
print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("Reminders").'</td><td>';
@ -1996,7 +1997,7 @@ if ($id > 0)
print $TRemindTypes[$actioncommreminder->typeremind];
if ($actioncommreminder->fk_user > 0) {
$tmpuserstatic->fetch($actioncommreminder->fk_user);
print ' ('.$tmpuser->getNomUrl(0, '', 0, 0, 16).')';
print ' ('.$tmpuserstatic->getNomUrl(0, '', 0, 0, 16).')';
}
print ' - '.$actioncommreminder->offsetvalue.' '.$TDurationTypes[$actioncommreminder->offsetunit];
if ($actioncommreminder->status == $actioncommreminder::STATUS_TODO) {
@ -2008,6 +2009,7 @@ if ($id > 0)
print $langs->trans("Done");
print ' </span>';
}
print '<br />';
}
}

1
htdocs/install/mysql/migration/12.0.0-13.0.0.sql
View File

@ -306,7 +306,6 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
ALTER TABLE llx_actioncomm_reminder ADD COLUMN entity integer NOT NULL DEFAULT 1;
ALTER TABLE llx_actioncomm_reminder ADD COLUMN fk_actioncomm integer NOT NULL;
ALTER TABLE llx_actioncomm_reminder ADD COLUMN fk_email_template integer;
ALTER TABLE llx_actioncomm_reminder CHANGE offsetunit offsetunit VARCHAR(10);
ALTER TABLE llx_actioncomm_reminder DROP INDEX uk_actioncomm_reminder_unique;
ALTER TABLE llx_actioncomm_reminder ADD UNIQUE uk_actioncomm_reminder_unique (fk_user, typeremind, offsetvalue, offsetunit, fk_actioncomm);