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

FIX permission to close a proposal when using advanced permissions

Browse Source
This commit is contained in:
Laurent Destailleur 2021-07-01 03:06:40 +02:00
parent 51456741d9
commit 5b34ea6c22
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/comm/propal/card.php
View File

@ -2520,9 +2520,14 @@ if ($action == 'create')
} }
// Close as accepted/refused // Close as accepted/refused
if ($object->statut == Propal::STATUS_VALIDATED && $usercanclose) { if ($object->statut == Propal::STATUS_VALIDATED) {
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=closeas'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"'; if ($usercanclose) {
print '>'.$langs->trans('SetAcceptedRefused').'</a>'; print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=closeas'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
print '>'.$langs->trans('SetAcceptedRefused').'</a>';
} else {
print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'"';
print '>'.$langs->trans('SetAcceptedRefused').'</a>';
}
} }
// Clone // Clone

6
htdocs/comm/propal/list.php
View File

@ -114,7 +114,11 @@ if (!$sortorder) $sortorder = 'DESC';
$permissiontoread = $user->rights->propal->lire; $permissiontoread = $user->rights->propal->lire;
$permissiontoadd = $user->rights->propal->write; $permissiontoadd = $user->rights->propal->write;
$permissiontodelete = $user->rights->propal->supprimer; $permissiontodelete = $user->rights->propal->supprimer;
$permissiontoclose = $user->rights->propal->cloturer; if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
$permissiontoclose = $user->rights->propale->propal_advance->close;
} else {
$permissiontoclose = $user->rights->propal->creer;
}
// Security check // Security check
$module = 'propal'; $module = 'propal';

3
htdocs/core/modules/modPropale.class.php
View File

@ -157,7 +157,8 @@ class modPropale extends DolibarrModules
$this->rights[$r][1] = 'Close commercial proposals'; // libelle de la permission $this->rights[$r][1] = 'Close commercial proposals'; // libelle de la permission
$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour) $this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
$this->rights[$r][4] = 'cloturer'; $this->rights[$r][4] = 'propal_advance';
$this->rights[$r][5] = 'close';
$r++; $r++;
$this->rights[$r][0] = 27; // id de la permission $this->rights[$r][0] = 27; // id de la permission