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

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

Browse Source 
Conflicts:
	htdocs/admin/dict.php
This commit is contained in:
Laurent Destailleur 2022-03-16 22:02:40 +01:00
commit 983bfc4ca9
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/reception/card.php
View File

@ -690,7 +690,7 @@ if (empty($reshook)) {
$triggersendname = 'RECEPTION_SENTBYMAIL'; $triggersendname = 'RECEPTION_SENTBYMAIL';
$paramname = 'id'; $paramname = 'id';
$mode = 'emailfromreception'; $mode = 'emailfromreception';
$trackid = 'shi'.$object->id; $trackid = 'rec'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php'; include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
} }