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

Merge pull request #896 from marcosgdf/bug-856

Browse Source 
Fix: [bug #856] Mail error if destination user doesn't have an email
This commit is contained in:
Laurent Destailleur 2013-04-27 17:59:37 -07:00
commit 89eec9bfbd
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -26,6 +26,7 @@ English Dolibarr ChangeLog
- Fix: [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary
- Fix: [ bug #828 ] Error when code_region is not a number in llx_c_regions (with postgres)
- Fix: [ bug #857 ] Invoice created from shipment does not have the order discount
- Fix: [ bug #856 ] (Holidays module) Mail error if destination user doesn't have an email
***** ChangeLog for 3.3.1 compared to 3.3 *****

24
htdocs/holiday/fiche.php
View File

@ -276,6 +276,12 @@ if ($action == 'confirm_send')
$destinataire->fetch($cp->fk_validator);
$emailTo = $destinataire->email;
if (!$emailTo)
{
header('Location: fiche.php?id='.$_GET['id']);
exit;
}
// From
$expediteur = new User($db);
$expediteur->fetch($cp->fk_user);
@ -385,6 +391,12 @@ if($action == 'confirm_valid')
$destinataire->fetch($cp->fk_user);
$emailTo = $destinataire->email;
if (!$emailTo)
{
header('Location: fiche.php?id='.$_GET['id']);
exit;
}
// From
$expediteur = new User($db);
$expediteur->fetch($cp->fk_validator);
@ -453,6 +465,12 @@ if ($action == 'confirm_refuse')
$destinataire->fetch($cp->fk_user);
$emailTo = $destinataire->email;
if (!$emailTo)
{
header('Location: fiche.php?id='.$_GET['id']);
exit;
}
// From
$expediteur = new User($db);
$expediteur->fetch($cp->fk_validator);
@ -524,6 +542,12 @@ if ($action == 'confirm_cancel' && $_GET['confirm'] == 'yes')
$destinataire->fetch($cp->fk_user);
$emailTo = $destinataire->email;
if (!$emailTo)
{
header('Location: fiche.php?id='.$_GET['id']);
exit;
}
// From
$expediteur = new User($db);
$expediteur->fetch($cp->fk_validator);