From 94bd0f71d96821762d23143fb3c76d8dcf3a50fe Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 5 Nov 2019 19:41:30 +0100 Subject: [PATCH] Fix pb with permission --- htdocs/adherents/card.php | 2 +- htdocs/admin/emailcollector_card.php | 5 ++--- htdocs/asset/card.php | 3 +-- htdocs/bom/bom_card.php | 3 +-- htdocs/comm/action/card.php | 2 +- htdocs/comm/propal/card.php | 2 +- htdocs/commande/card.php | 4 ++-- htdocs/compta/facture/card.php | 2 +- htdocs/contrat/card.php | 2 +- htdocs/core/actions_addupdatedelete.inc.php | 10 ++++++---- htdocs/core/actions_builddoc.inc.php | 7 ++++--- htdocs/core/actions_massactions.inc.php | 2 +- htdocs/don/card.php | 2 +- htdocs/expedition/card.php | 2 +- htdocs/expensereport/card.php | 4 ++-- htdocs/fichinter/card.php | 2 +- htdocs/fourn/commande/card.php | 2 +- htdocs/fourn/commande/list.php | 2 +- htdocs/fourn/facture/card.php | 5 ++--- htdocs/fourn/paiement/card.php | 2 +- htdocs/holiday/card.php | 2 +- htdocs/livraison/card.php | 2 +- htdocs/modulebuilder/template/myobject_card.php | 6 +++--- htdocs/mrp/mo_card.php | 3 +-- htdocs/mrp/mo_production.php | 3 +-- htdocs/product/card.php | 2 +- htdocs/product/stock/card.php | 2 +- htdocs/product/stock/movement_card.php | 2 +- htdocs/product/stock/productlot_card.php | 4 ++-- htdocs/reception/list.php | 2 +- htdocs/societe/card.php | 2 +- htdocs/societe/paymentmodes.php | 2 +- htdocs/supplier_proposal/card.php | 2 +- htdocs/ticket/card.php | 2 +- htdocs/user/card.php | 2 +- htdocs/user/group/card.php | 2 +- htdocs/website/websiteaccount_card.php | 3 +-- 37 files changed, 52 insertions(+), 56 deletions(-) diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index add7d7b643b..ee89f6b9de3 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -818,7 +818,7 @@ if (empty($reshook)) // Actions to build doc $upload_dir = $conf->adherent->dir_output; - $permissioncreate=$user->rights->adherent->creer; + $permissiontoadd=$user->rights->adherent->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; // Actions to send emails diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php index 04accc01bbf..f3985bc70a4 100644 --- a/htdocs/admin/emailcollector_card.php +++ b/htdocs/admin/emailcollector_card.php @@ -80,10 +80,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be inclu //$isdraft = (($object->statut == MyObject::STATUS_DRAFT) ? 1 : 0); //$result = restrictedArea($user, 'mymodule', $object->id, '', '', 'fk_soc', 'rowid', $isdraft); -$permissionnote=$user->rights->emailcollector->write; // Used by the include of actions_setnotes.inc.php +$permissionnote=$user->rights->emailcollector->write; // Used by the include of actions_setnotes.inc.php $permissiondellink=$user->rights->emailcollector->write; // Used by the include of actions_dellink.inc.php -$permissionedit=$user->rights->emailcollector->write; // Used by the include of actions_lineupdown.inc.php -$permissiontoadd=$user->rights->emailcollector->write; // Used by the include of actions_addupdatedelete.inc.php +$permissiontoadd=$user->rights->emailcollector->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php $debuginfo=''; diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php index 7d49d253755..ddde75ee463 100644 --- a/htdocs/asset/card.php +++ b/htdocs/asset/card.php @@ -69,8 +69,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be inclu $permissionnote=$user->rights->asset->write; // Used by the include of actions_setnotes.inc.php $permissiondellink=$user->rights->asset->write; // Used by the include of actions_dellink.inc.php -$permissionedit=$user->rights->asset->write; // Used by the include of actions_lineupdown.inc.php -$permissiontoadd=$user->rights->asset->write; // Used by the include of actions_addupdatedelete.inc.php +$permissiontoadd=$user->rights->asset->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php /* diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php index f4124b2b9db..1fbce9d2824 100644 --- a/htdocs/bom/bom_card.php +++ b/htdocs/bom/bom_card.php @@ -77,8 +77,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be inclu $permissionnote=$user->rights->bom->write; // Used by the include of actions_setnotes.inc.php $permissiondellink=$user->rights->bom->write; // Used by the include of actions_dellink.inc.php -$permissionedit=$user->rights->bom->write; // Used by the include of actions_lineupdown.inc.php -$permissiontoadd=$user->rights->bom->write; // Used by the include of actions_addupdatedelete.inc.php +$permissiontoadd=$user->rights->bom->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php $permissiontodelete = $user->rights->bom->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT); diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 6b75f5b4a50..09c8e344794 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -756,7 +756,7 @@ if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate') // Actions to delete doc $upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($object->ref); -$permissioncreate = ($user->rights->agenda->allactions->create || (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->read)); +$permissiontoadd = ($user->rights->agenda->allactions->create || (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->read)); if (empty($reshook)) { include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; } diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 8f28a65473c..85a3b059164 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -1438,7 +1438,7 @@ if (empty($reshook)) // Actions to build doc $upload_dir = $conf->propal->multidir_output[$object->entity]; - $permissioncreate=$usercancreate; + $permissiontoadd=$usercancreate; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; } diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index a6427dbd045..57dbbabcf1d 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -110,7 +110,7 @@ $usercancreatepurchaseorder = $user->rights->fournisseur->commande->creer; $permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php $permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php -$permissionedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php +$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php /* @@ -1411,7 +1411,7 @@ if (empty($reshook)) // Actions to build doc $upload_dir = $conf->commande->multidir_output[$object->entity]; - $permissioncreate = $usercancreate; + $permissiontoadd = $usercancreate; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; // Actions to send emails diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index c9a536cc549..d462d3cc444 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -2489,7 +2489,7 @@ if (empty($reshook)) // Actions to build doc $upload_dir = $conf->facture->multidir_output[$object->entity]; - $permissioncreate=$usercancreate; + $permissiontoadd=$usercancreate; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 4e0226d4cae..9c30ff802a5 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -998,7 +998,7 @@ if (empty($reshook)) // Actions to build doc $upload_dir = $conf->contrat->dir_output; - $permissioncreate = $user->rights->contrat->creer; + $permissiontoadd = $user->rights->contrat->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; // Actions to send emails diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php index dcb8f75c637..ae096f55633 100644 --- a/htdocs/core/actions_addupdatedelete.inc.php +++ b/htdocs/core/actions_addupdatedelete.inc.php @@ -30,6 +30,8 @@ // $backtopage may be defined // $triggermodname may be defined +if (! empty($permissionedit) && empty($permissiontoadd)) $permissiontoadd = $permissionedit; // For backward compatibility + if ($cancel) { /*var_dump($cancel); @@ -234,7 +236,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && ! empty($permissiont } // Action validate object -if ($action == 'confirm_validate' && $confirm == 'yes' && $permissionedit) +if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd) { $result = $object->validate($user); if ($result >= 0) @@ -263,7 +265,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $permissionedit) } // Action close object -if ($action == 'confirm_close' && $confirm == 'yes' && $permissionedit) +if ($action == 'confirm_close' && $confirm == 'yes' && $permissiontoadd) { $result = $object->cancel($user); if ($result >= 0) @@ -292,7 +294,7 @@ if ($action == 'confirm_close' && $confirm == 'yes' && $permissionedit) } // Action setdraft object -if ($action == 'confirm_setdraft' && $confirm == 'yes' && $permissionedit) +if ($action == 'confirm_setdraft' && $confirm == 'yes' && $permissiontoadd) { $result = $object->setDraft($user); if ($result >= 0) @@ -306,7 +308,7 @@ if ($action == 'confirm_setdraft' && $confirm == 'yes' && $permissionedit) } // Action reopen object -if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissionedit) +if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd) { $result = $object->reopen($user); if ($result >= 0) diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php index 92bc2ff18f6..9b3b24eb41f 100644 --- a/htdocs/core/actions_builddoc.inc.php +++ b/htdocs/core/actions_builddoc.inc.php @@ -25,13 +25,14 @@ // $action must be defined // $id must be defined // $object must be defined and must have a method generateDocument(). -// $permissioncreate must be defined +// $permissiontoadd must be defined // $upload_dir must be defined (example $conf->projet->dir_output . "/";) // $hidedetails, $hidedesc, $hideref and $moreparams may have been set or not. +if (!empty($permissioncreate) && empty($permissiontoadd)) $permissiontoadd = $permissioncreate; // For backward compatibility // Build doc -if ($action == 'builddoc' && $permissioncreate) +if ($action == 'builddoc' && $permissiontoadd) { if (is_numeric(GETPOST('model', 'alpha'))) { @@ -107,7 +108,7 @@ if ($action == 'builddoc' && $permissioncreate) } // Delete file in doc form -if ($action == 'remove_file' && $permissioncreate) +if ($action == 'remove_file' && $permissiontoadd) { require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php index 07f294479b3..d40ed042350 100644 --- a/htdocs/core/actions_massactions.inc.php +++ b/htdocs/core/actions_massactions.inc.php @@ -824,7 +824,7 @@ if ($massaction == 'confirm_createbills') // Create bills from orders // Builddoc $donotredirect = 1; $upload_dir = $conf->facture->dir_output; - $permissioncreate=$user->rights->facture->creer; + $permissiontoadd=$user->rights->facture->creer; // Call action to build doc $savobject = $object; diff --git a/htdocs/don/card.php b/htdocs/don/card.php index 51244206516..2ebdc2c18c2 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -248,7 +248,7 @@ elseif ($action == 'classin' && $user->rights->don->creer) // Actions to build doc $upload_dir = $conf->don->dir_output; -$permissioncreate = $user->rights->don->creer; +$permissiontoadd = $user->rights->don->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 0c5874a5563..21aaae1b755 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -124,7 +124,7 @@ if (empty($reshook)) // Actions to build doc $upload_dir = $conf->expedition->dir_output.'/sending'; - $permissioncreate = $user->rights->expedition->creer; + $permissiontoadd = $user->rights->expedition->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; // Reopen diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index ecf1803cb50..28470bccc6c 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -107,7 +107,7 @@ $hookmanager->initHooks(array('expensereportcard','globalcard')); $permissionnote = $user->rights->expensereport->creer; // Used by the include of actions_setnotes.inc.php $permissiondellink = $user->rights->expensereport->creer; // Used by the include of actions_dellink.inc.php -$permissionedit = $user->rights->expensereport->creer; // Used by the include of actions_lineupdown.inc.php +$permissiontoadd = $user->rights->expensereport->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php $upload_dir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($object->ref); @@ -1418,7 +1418,7 @@ if (empty($reshook)) // Actions to build doc $upload_dir = $conf->expensereport->dir_output; - $permissioncreate = $user->rights->expensereport->creer; + $permissiontoadd = $user->rights->expensereport->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; } diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 8bb064ca803..684d67346ab 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -728,7 +728,7 @@ if (empty($reshook)) // Actions to build doc $upload_dir = $conf->ficheinter->dir_output; - $permissioncreate = $user->rights->ficheinter->creer; + $permissiontoadd = $user->rights->ficheinter->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; if ($action == 'update_extras') diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index aa3bc8fcbea..4c6e98eda78 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1035,7 +1035,7 @@ if (empty($reshook)) // Actions to build doc $upload_dir = $conf->fournisseur->commande->dir_output; - $permissioncreate = $user->rights->fournisseur->commande->creer; + $permissiontoadd = $user->rights->fournisseur->commande->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index 523543eb8e8..197d4562114 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -421,7 +421,7 @@ if (empty($reshook)) // Fac builddoc $donotredirect = 1; $upload_dir = $conf->facture->dir_output; - $permissioncreate=$user->rights->facture->creer; + $permissiontoadd=$user->rights->facture->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; } diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 70b9130c434..6935e978c67 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -101,8 +101,7 @@ $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture', $permissionnote=$user->rights->fournisseur->facture->creer; // Used by the include of actions_setnotes.inc.php $permissiondellink=$user->rights->fournisseur->facture->creer; // Used by the include of actions_dellink.inc.php -$permissionedit=$user->rights->fournisseur->facture->creer; // Used by the include of actions_lineupdown.inc.php -$permissiontoadd=$user->rights->fournisseur->facture->creer; // Used by the include of actions_addupdatedelete.inc.php +$permissiontoadd=$user->rights->fournisseur->facture->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php /* @@ -1506,7 +1505,7 @@ if (empty($reshook)) // Actions to build doc $upload_dir = $conf->fournisseur->facture->dir_output; - $permissioncreate = $user->rights->fournisseur->facture->creer; + $permissiontoadd = $user->rights->fournisseur->facture->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; // Make calculation according to calculationrule diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php index 3977c6ad4be..2b6404e7ff8 100644 --- a/htdocs/fourn/paiement/card.php +++ b/htdocs/fourn/paiement/card.php @@ -139,7 +139,7 @@ if ($action == 'setdatep' && ! empty($_POST['datepday'])) // Build document $upload_dir = $conf->fournisseur->payment->dir_output; // TODO: get the appropriate permisson -$permissioncreate = true; +$permissiontoadd = true; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index 1fedae6a61e..0b8ef393670 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -879,7 +879,7 @@ if (empty($reshook)) // Actions to build doc $upload_dir = $conf->holiday->dir_output; - $permissioncreate = $user->rights->holiday->creer; + $permissiontoadd = $user->rights->holiday->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; */ } diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php index 3f6c6b493b1..8ac7494b8ab 100644 --- a/htdocs/livraison/card.php +++ b/htdocs/livraison/card.php @@ -244,7 +244,7 @@ if ($action == 'update_extras_line') // Actions to build doc $upload_dir = $conf->expedition->dir_output.'/receipt'; -$permissioncreate = $user->rights->expedition->creer; +$permissiontoadd = $user->rights->expedition->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php index 5179dbcf37c..9c61d4901ce 100644 --- a/htdocs/modulebuilder/template/myobject_card.php +++ b/htdocs/modulebuilder/template/myobject_card.php @@ -105,11 +105,11 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be inclu //$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0); //$result = restrictedArea($user, 'mymodule', $object->id, '', '', 'fk_soc', 'rowid', $isdraft); +$permissiontoread = $user->rights->mymodule->myobject->read; +$permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php +$permissiontodelete = $user->rights->mymodule->myobject->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT); $permissionnote = $user->rights->mymodule->myobject->write; // Used by the include of actions_setnotes.inc.php $permissiondellink = $user->rights->mymodule->myobject->write; // Used by the include of actions_dellink.inc.php -$permissionedit = $user->rights->mymodule->myobject->write; // Used by the include of actions_lineupdown.inc.php -$permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php -$permissiontodelete = $user->rights->mymodule->myobject->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT); diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php index 43759bf0d70..bbf4340196b 100644 --- a/htdocs/mrp/mo_card.php +++ b/htdocs/mrp/mo_card.php @@ -95,8 +95,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be inclu $permissionnote=$user->rights->mrp->write; // Used by the include of actions_setnotes.inc.php $permissiondellink=$user->rights->mrp->write; // Used by the include of actions_dellink.inc.php -$permissionedit=$user->rights->mrp->write; // Used by the include of actions_lineupdown.inc.php -$permissiontoadd=$user->rights->mrp->write; // Used by the include of actions_addupdatedelete.inc.php +$permissiontoadd=$user->rights->mrp->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php $permissiontodelete = $user->rights->mrp->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT); diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php index 345bfe3f8dd..8dc7ee4c625 100644 --- a/htdocs/mrp/mo_production.php +++ b/htdocs/mrp/mo_production.php @@ -95,8 +95,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be inclu $permissionnote=$user->rights->mrp->write; // Used by the include of actions_setnotes.inc.php $permissiondellink=$user->rights->mrp->write; // Used by the include of actions_dellink.inc.php -$permissionedit=$user->rights->mrp->write; // Used by the include of actions_lineupdown.inc.php -$permissiontoadd=$user->rights->mrp->write; // Used by the include of actions_addupdatedelete.inc.php +$permissiontoadd=$user->rights->mrp->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php $permissiontodelete = $user->rights->mrp->delete || ($permissiontoadd && $object->status == 0); diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 79511df9640..cc8d4e6bc89 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -151,7 +151,7 @@ if (empty($reshook)) // Actions to build doc $upload_dir = $conf->product->dir_output; - $permissioncreate = $usercancreate; + $permissiontoadd = $usercancreate; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php'; diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 22f7cc03b63..6ccc5d891a1 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -223,7 +223,7 @@ if (empty($reshook)) // Actions to build doc $upload_dir = $conf->stock->dir_output; - $permissioncreate = $user->rights->stock->creer; + $permissiontoadd = $user->rights->stock->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; } diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php index ecffe32483e..e640c346eec 100644 --- a/htdocs/product/stock/movement_card.php +++ b/htdocs/product/stock/movement_card.php @@ -413,7 +413,7 @@ if ($action == "transfert_stock" && ! $cancel) // The builddoc action for object of a movement must be on the movement card // Actions to build doc $upload_dir = $conf->stock->dir_output . "movement/"; -$permissioncreate = $user->rights->stock->creer; +$permissiontoadd = $user->rights->stock->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php index c7f9a5ae8fa..d65f311acbb 100644 --- a/htdocs/product/stock/productlot_card.php +++ b/htdocs/product/stock/productlot_card.php @@ -87,7 +87,7 @@ $hookmanager->initHooks(array('productlotcard','globalcard')); $permissionnote = $user->rights->stock->creer; // Used by the include of actions_setnotes.inc.php $permissiondellink = $user->rights->stock->creer; // Used by the include of actions_dellink.inc.php -$permissionedit = $user->rights->stock->creer; // Used by the include of actions_lineupdown.inc.php +$permissiontoadd = $user->rights->stock->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php $usercanread = $user->rights->produit->lire; $usercancreate = $user->rights->produit->creer; @@ -252,7 +252,7 @@ if (empty($reshook)) // Actions to build doc $upload_dir = $conf->productbatch->multidir_output[$conf->entity]; - $permissioncreate = $usercancreate; + $permissiontoadd = $usercancreate; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; } diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php index a2d2f494fc3..a01ee64f30d 100644 --- a/htdocs/reception/list.php +++ b/htdocs/reception/list.php @@ -379,7 +379,7 @@ if (empty($reshook)) // Fac builddoc $donotredirect = 1; $upload_dir = $conf->fournisseur->facture->dir_output; - $permissioncreate=$user->rights->fournisseur->facture->creer; + $permissiontoadd=$user->rights->fournisseur->facture->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; } diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index 5ba0b3b6cc9..b0503c7c163 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -871,7 +871,7 @@ if (empty($reshook)) // Actions to build doc $id = $socid; $upload_dir = $conf->societe->dir_output; - $permissioncreate=$user->rights->societe->creer; + $permissiontoadd=$user->rights->societe->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; } diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php index 5ed2b9a148f..1f333a7cdfd 100644 --- a/htdocs/societe/paymentmodes.php +++ b/htdocs/societe/paymentmodes.php @@ -489,7 +489,7 @@ if (empty($reshook)) $id = $socid; $upload_dir = $conf->societe->multidir_output[$object->entity]; - $permissioncreate=$user->rights->societe->creer; + $permissiontoadd=$user->rights->societe->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; $id = $savid; diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index 340a959d1a2..67bf6d02a0d 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -498,7 +498,7 @@ if (empty($reshook)) // Actions to build doc $upload_dir = $conf->supplier_proposal->dir_output; - $permissioncreate = $user->rights->supplier_proposal->creer; + $permissiontoadd = $user->rights->supplier_proposal->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index 6aa6d42e590..feac750aa3b 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -588,7 +588,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be inc // Actions to build doc $upload_dir = $conf->ticket->dir_output; -$permissioncreate = $user->rights->ticket->write; +$permissiontoadd = $user->rights->ticket->write; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; // Actions to send emails diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 79c5d65b246..f689cdc71d4 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -665,7 +665,7 @@ if (empty($reshook)) { // Actions to build doc $upload_dir = $conf->user->dir_output; - $permissioncreate=$user->rights->user->user->creer; + $permissiontoadd=$user->rights->user->user->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; } diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 54f39625ad4..573b7038dde 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -248,7 +248,7 @@ if (empty($reshook)) { // Actions to build doc $upload_dir = $conf->usergroup->dir_output; - $permissioncreate=$user->rights->user->user->creer; + $permissiontoadd=$user->rights->user->user->creer; include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; } diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php index db8c5b632f6..be7c773ed25 100644 --- a/htdocs/website/websiteaccount_card.php +++ b/htdocs/website/websiteaccount_card.php @@ -67,8 +67,7 @@ if (empty($action) && empty($id) && empty($ref)) $action='view'; $permissionnote=$user->rights->websiteaccount->write; // Used by the include of actions_setnotes.inc.php $permissiondellink=$user->rights->websiteaccount->write; // Used by the include of actions_dellink.inc.php -$permissionedit=$user->rights->websiteaccount->write; // Used by the include of actions_lineupdown.inc.php -$permissiontoadd=$user->rights->websiteaccount->write; // Used by the include of actions_addupdatedelete.inc.php +$permissiontoadd=$user->rights->websiteaccount->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php // Load object include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.