2
0
forked from Wavyzz/dolibarr

Merge pull request #10104 from inoveaconseil/MassClose

FIX mass action closed proposal
This commit is contained in:
Juanjo Menent
2018-11-30 23:56:38 +01:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -2432,7 +2432,7 @@ class Propal extends CommonObject
* @param int $notrigger 1=Does not execute triggers, 0=Execute triggers
* @return int <0 if KO, >0 if OK
*/
function cloture($user, $statut, $note, $notrigger=0)
function cloture($user, $statut, $note="", $notrigger=0)
{
global $langs,$conf;

View File

@@ -466,7 +466,7 @@ if ($resql)
'builddoc'=>$langs->trans("PDFMerge"),
);
if ($user->rights->propal->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
if ($user->rights->propal->cloturer) $arrayofmassactions['closed']=$langs->trans("Closed");
if ($user->rights->propal->cloturer) $arrayofmassactions['closed']=$langs->trans("Close");
if (in_array($massaction, array('presend','predelete','closed'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);