Skip to content
Snippets Groups Projects
Commit cd6ceaf3 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge remote-tracking branch 'origin/3.3' into develop 

Conflicts:
	htdocs/holiday/fiche.php
parents 52b9a3ad fd857554
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
htdocs/holiday/fiche.php
+ 33
− 2
View file @ cd6ceaf3
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
/* Copyright (C) 2011 Dimitri Mouillard <dmouillard@teclib.com> /* Copyright (C) 2011 Dimitri Mouillard <dmouillard@teclib.com>
* Copyright (C) 2012 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -276,6 +277,12 @@ if ($action == 'confirm_send') ...@@ -276,6 +277,12 @@ if ($action == 'confirm_send')
$destinataire->fetch($cp->fk_validator); $destinataire->fetch($cp->fk_validator);
$emailTo = $destinataire->email; $emailTo = $destinataire->email;
if (!$emailTo)
{
header('Location: fiche.php?id='.$_GET['id']);
exit;
}
// From // From
$expediteur = new User($db); $expediteur = new User($db);
$expediteur->fetch($cp->fk_user); $expediteur->fetch($cp->fk_user);
...@@ -383,6 +390,12 @@ if($action == 'confirm_valid') ...@@ -383,6 +390,12 @@ if($action == 'confirm_valid')
$destinataire->fetch($cp->fk_user); $destinataire->fetch($cp->fk_user);
$emailTo = $destinataire->email; $emailTo = $destinataire->email;
if (!$emailTo)
{
header('Location: fiche.php?id='.$_GET['id']);
exit;
}
// From // From
$expediteur = new User($db); $expediteur = new User($db);
$expediteur->fetch($cp->fk_validator); $expediteur->fetch($cp->fk_validator);
...@@ -398,7 +411,9 @@ if($action == 'confirm_valid') ...@@ -398,7 +411,9 @@ if($action == 'confirm_valid')
$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n"; $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
$message.= "\n"; $message.= "\n";
$message.= $langs->transnoentities("HolidaysValidatedBody", dol_print_date($cp->date_debut,'day'),dol_print_date($cp->date_fin,'day'))."\n"; $message.= $langs->transnoentities("HolidaysValidatedBody", dol_print_date($cp->date_debut,'day'),dol_print_date($cp->date_fin,'day'))."\n";
$message.= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n"; $message.= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
$message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/fiche.php?id=".$cp->rowid."\n\n"; $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/fiche.php?id=".$cp->rowid."\n\n";
$message.= "\n"; $message.= "\n";
...@@ -449,6 +464,12 @@ if ($action == 'confirm_refuse') ...@@ -449,6 +464,12 @@ if ($action == 'confirm_refuse')
$destinataire->fetch($cp->fk_user); $destinataire->fetch($cp->fk_user);
$emailTo = $destinataire->email; $emailTo = $destinataire->email;
if (!$emailTo)
{
header('Location: fiche.php?id='.$_GET['id']);
exit;
}
// From // From
$expediteur = new User($db); $expediteur = new User($db);
$expediteur->fetch($cp->fk_validator); $expediteur->fetch($cp->fk_validator);
...@@ -465,7 +486,9 @@ if ($action == 'confirm_refuse') ...@@ -465,7 +486,9 @@ if ($action == 'confirm_refuse')
$message.= "\n"; $message.= "\n";
$message.= $langs->transnoentities("HolidaysRefusedBody", dol_print_date($cp->date_debut,'day'), dol_print_date($cp->date_fin,'day'))."\n"; $message.= $langs->transnoentities("HolidaysRefusedBody", dol_print_date($cp->date_debut,'day'), dol_print_date($cp->date_fin,'day'))."\n";
$message.= GETPOST('detail_refuse','alpha')."\n\n"; $message.= GETPOST('detail_refuse','alpha')."\n\n";
$message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n"; $message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
$message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/fiche.php?id=".$cp->rowid."\n\n"; $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/fiche.php?id=".$cp->rowid."\n\n";
$message.= "\n"; $message.= "\n";
...@@ -518,6 +541,12 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes') ...@@ -518,6 +541,12 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes')
$destinataire->fetch($cp->fk_user); $destinataire->fetch($cp->fk_user);
$emailTo = $destinataire->email; $emailTo = $destinataire->email;
if (!$emailTo)
{
header('Location: fiche.php?id='.$_GET['id']);
exit;
}
// From // From
$expediteur = new User($db); $expediteur = new User($db);
$expediteur->fetch($cp->fk_validator); $expediteur->fetch($cp->fk_validator);
...@@ -532,8 +561,10 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes') ...@@ -532,8 +561,10 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes')
// Content // Content
$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n"; $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
$message.= "\n"; $message.= "\n";
$message.= $langs->transnoentities("HolidaysCanceledBody", dol_print_date($cp->date_debut,'day'), dol_print_date($cp->date_fin,'day'))."\n"; $message.= $langs->transnoentities("HolidaysCanceledBody", dol_print_date($cp->date_debut,'day'), dol_print_date($cp->date_fin,'day'))."\n";
$message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n"; $message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
$message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/fiche.php?id=".$cp->rowid."\n\n"; $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/fiche.php?id=".$cp->rowid."\n\n";
$message.= "\n"; $message.= "\n";
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment