Fix deletion when draft.
This commit is contained in:
parent
302ab362d5
commit
e9e5a39b79
1 changed files with 5 additions and 4 deletions
|
|
@ -132,7 +132,7 @@ $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture',
|
|||
// Common permissions
|
||||
$usercanread = ($user->hasRight("fournisseur", "facture", "lire") || $user->hasRight("supplier_invoice", "lire"));
|
||||
$usercancreate = ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"));
|
||||
$usercandelete = ($user->hasRight("fournisseur", "facture", "supprimer") || $user->hasRight("supplier_invoice", "supprimer"));
|
||||
$usercandelete = (($user->hasRight("fournisseur", "facture", "supprimer") || $user->hasRight("supplier_invoice", "supprimer")) || ($usercancreate && $object->is_erasable() == 1));
|
||||
$usercancreatecontract = $user->hasRight("contrat", "creer");
|
||||
|
||||
// Advanced permissions
|
||||
|
|
@ -279,7 +279,7 @@ if (empty($reshook)) {
|
|||
|
||||
$isErasable = $object->is_erasable();
|
||||
|
||||
if (($usercandelete && $isErasable > 0) || ($usercancreate && $isErasable == 1)) {
|
||||
if ($usercandelete && $isErasable > 0) {
|
||||
$revertstock = GETPOST('revertstock');
|
||||
|
||||
if ($revertstock) {
|
||||
|
|
@ -4172,8 +4172,9 @@ if ($action == 'create') {
|
|||
}
|
||||
|
||||
// Delete
|
||||
$isErasable = $object->is_erasable();
|
||||
if ($action != 'confirm_edit' && ($usercandelete || ($usercancreate && $isErasable == 1))) { // isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
|
||||
if ($action != 'confirm_edit' && $usercandelete) {
|
||||
$isErasable = $object->is_erasable();
|
||||
|
||||
$enableDelete = false;
|
||||
$htmltooltip = '';
|
||||
$params = (empty($conf->use_javascript_ajax) ? array() : array('attr' => array('class' => 'reposition')));
|
||||
|
|
|
|||
Loading…
Reference in a new issue