Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur
2024-10-03 17:25:10 +02:00
parent 88b488cfbb a272d929a5
commit 6f6a87cd78
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/functions.lib.php
View File

@@ -12309,9 +12309,9 @@ function dolGetButtonAction($label, $text = '', $actionType = 'default', $url =
$text = $button['text'] ?? ''; $text = $button['text'] ?? '';
$actionType = $button['actionType'] ?? ''; $actionType = $button['actionType'] ?? '';
$tmpUrl = DOL_URL_ROOT.$button['url'].(empty($params['backtopage']) ? '' : '&backtopage='.urlencode($params['backtopage'])); $tmpUrl = DOL_URL_ROOT.$button['url'].(empty($params['backtopage']) ? '' : '&backtopage='.urlencode($params['backtopage']));
$id = $button['$id'] ?? ''; $id = $button['id'] ?? '';
$userRight = $button['perm'] ?? 1; $userRight = $button['perm'] ?? 1;
$params = $button['$params'] ?? []; $params = $button['params'] ?? [];
$out .= dolGetButtonAction($label, $text, $actionType, $tmpUrl, $id, $userRight, $params); $out .= dolGetButtonAction($label, $text, $actionType, $tmpUrl, $id, $userRight, $params);
} }

2
htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
View File

@@ -191,7 +191,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
} }
// Send email to customer // Send email to customer
if (!getDolGlobalString('TICKET_DISABLE_CUSTOMER_MAILS') && empty($object->context['disableticketemail']) && $object->notify_tiers_at_create) { if (!getDolGlobalInt('TICKET_DISABLE_CUSTOMER_MAILS') && empty($object->context['disableticketemail']) && $object->notify_tiers_at_create) {
$sendto = ''; $sendto = '';
// if contact selected send to email's contact else send to email's thirdparty // if contact selected send to email's contact else send to email's thirdparty