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

FIX #5866

Browse Source
This commit is contained in:
Laurent Destailleur
2016-10-29 18:43:12 +02:00
parent 413796f1ee
commit 7c75d98f9a
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/facture/list.php
View File

@@ -229,6 +229,10 @@ if (empty($reshook))
$error++; $error++;
} }
if (! $error && $massaction == 'confirm_presend' && GETPOST('modelselected')) // If we change the template, we must not send email, but keep on send email form
{
$massaction='presend';
}
if (! $error && $massaction == 'confirm_presend') if (! $error && $massaction == 'confirm_presend')
{ {
$resaction = ''; $resaction = '';

2
htdocs/product/stock/productlot_list.php
View File

@@ -145,7 +145,7 @@ if (($id > 0 || ! empty($ref)) && $action != 'add')
*/ */
if (GETPOST('cancel')) { $action='list'; $massaction=''; } if (GETPOST('cancel')) { $action='list'; $massaction=''; }
if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; } if (! GETPOST('confirmmassaction') && $massaction != 'confirm_presend') { $massaction=''; }
$parameters=array(); $parameters=array();
$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks