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

Fix: When validation and approval where done in same step, label of

Browse Source 
action used always label for validation.
This commit is contained in:
Laurent Destailleur 2015-08-15 02:34:15 +02:00
parent 3bdd342df1
commit d9b3069813
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
View File

@ -678,10 +678,10 @@ class InterfaceActionsAuto extends DolibarrTriggers
// Add entry in event table // Add entry in event table
$now=dol_now(); $now=dol_now();
if(isset($_SESSION['listofnames'])) if (isset($_SESSION['listofnames']))
{ {
$attachs=$_SESSION['listofnames']; $attachs=$_SESSION['listofnames'];
if($attachs && strpos($action,'SENTBYMAIL')) if ($attachs && strpos($action,'SENTBYMAIL'))
{ {
$object->actionmsg.="\n".$langs->transnoentities("AttachedFiles").': '.$attachs; $object->actionmsg.="\n".$langs->transnoentities("AttachedFiles").': '.$attachs;
} }
@ -719,6 +719,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
$actioncomm->elementtype = $object->element; $actioncomm->elementtype = $object->element;
$ret=$actioncomm->add($user); // User qui saisit l'action $ret=$actioncomm->add($user); // User qui saisit l'action
unset($object->actionmsg); unset($object->actionmsg2); unset($object->actiontypecode); // When several action are called on same object, we must be sure to not reuse vallue of first action.
if ($ret > 0) if ($ret > 0)
{ {
$_SESSION['LAST_ACTION_CREATED'] = $ret; $_SESSION['LAST_ACTION_CREATED'] = $ret;