FIX confusion between permto... and permisstionto...

htdocs/accountancy/customer/list.php

@@ -129,8 +129,8 @@ if (empty($reshook))
 
 	// Mass actions
 	$objectclass='AccountingAccount';
-	$permtoread = $user->rights->accounting->read;
+	$permissiontoread = $user->rights->accounting->read;
-	$permtodelete = $user->rights->accounting->delete;
+	$permissiontodelete = $user->rights->accounting->delete;
 	$uploaddir = $conf->accounting->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/accountancy/expensereport/list.php

@@ -112,8 +112,8 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 // Mass actions
 $objectclass='ExpenseReport';
 $objectlabel='ExpenseReport';
-$permtoread = $user->rights->expensereport->read;
+$permissiontoread = $user->rights->expensereport->read;
-$permtodelete = $user->rights->expensereport->delete;
+$permissiontodelete = $user->rights->expensereport->delete;
 $uploaddir = $conf->expensereport->dir_output;
 include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 

htdocs/accountancy/supplier/list.php

@@ -133,8 +133,8 @@ if (empty($reshook))
 
 	// Mass actions
 	$objectclass='AccountingAccount';
-	$permtoread = $user->rights->accounting->read;
+	$permissiontoread = $user->rights->accounting->read;
-	$permtodelete = $user->rights->accounting->delete;
+	$permissiontodelete = $user->rights->accounting->delete;
 	$uploaddir = $conf->accounting->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/adherents/list.php

@@ -232,8 +232,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='Adherent';
 	$objectlabel='Members';
-	$permtoread = $user->rights->adherent->lire;
+	$permissiontoread = $user->rights->adherent->lire;
-	$permtodelete = $user->rights->adherent->supprimer;
+	$permissiontodelete = $user->rights->adherent->supprimer;
 	$uploaddir = $conf->adherent->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/admin/emailcollector_list.php

@@ -156,8 +156,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='EmailCollector';
 	$objectlabel='EmailCollector';
-	$permtoread = $user->rights->emailcollector->read;
+	$permissiontoread = $user->rights->emailcollector->read;
-	$permtodelete = $user->rights->emailcollector->delete;
+	$permissiontodelete = $user->rights->emailcollector->delete;
 	$uploaddir = $conf->emailcollector->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/admin/mails_senderprofile_list.php

@@ -148,8 +148,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='EmailSenderProfile';
 	$objectlabel='EmailSenderProfile';
-	$permtoread = $user->admin;
+	$permissiontoread = $user->admin;
-	$permtodelete = $user->admin;
+	$permissiontodelete = $user->admin;
 	$uploaddir = $conf->admin->dir_output.'/senderprofiles';
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/asset/list.php

@@ -152,8 +152,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='Asset';
 	$objectlabel='Asset';
-	$permtoread = $user->rights->asset->read;
+	$permissiontoread = $user->rights->asset->read;
-	$permtodelete = $user->rights->asset->delete;
+	$permissiontodelete = $user->rights->asset->delete;
 	$uploaddir = $conf->asset->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/bom/bom_list.php

@@ -1,6 +1,5 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -151,8 +150,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='BOM';
 	$objectlabel='BillOfMaterials';
-	$permtoread = $user->rights->bom->read;
+	$permissiontoread = $user->rights->bom->read;
-	$permtodelete = $user->rights->bom->delete;
+	$permissiontodelete = $user->rights->bom->delete;
 	$uploaddir = $conf->bom->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -303,7 +302,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 // List of mass actions available
 $arrayofmassactions =  array(
 	//'presend'=>$langs->trans("SendByMail"),
-	//'builddoc'=>$langs->trans("PDFMerge"),
+	'disable'=>$langs->trans("Disable"),
 );
 if ($user->rights->bom->delete) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions=array();
@@ -539,6 +538,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
+
 if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
 {
 	$hidegeneratedfilelistifempty=1;

htdocs/comm/mailing/list.php

@@ -102,8 +102,8 @@ if (empty($reshook))
 	// Mass actions
 	/*$objectclass='MyObject';
 	$objectlabel='MyObject';
-	$permtoread = $user->rights->mymodule->read;
+	$permissiontoread = $user->rights->mymodule->read;
-	$permtodelete = $user->rights->mymodule->delete;
+	$permissiontodelete = $user->rights->mymodule->delete;
 	$uploaddir = $conf->mymodule->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 	*/

htdocs/comm/propal/list.php

@@ -241,8 +241,8 @@ if (empty($reshook))
 {
 	$objectclass='Propal';
 	$objectlabel='Proposals';
-	$permtoread = $user->rights->propal->lire;
+	$permissiontoread = $user->rights->propal->lire;
-	$permtodelete = $user->rights->propal->supprimer;
+	$permissiontodelete = $user->rights->propal->supprimer;
 	$permtoclose = $user->rights->propal->cloturer;
 	$uploaddir = $conf->propal->multidir_output[$conf->entity];
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';

htdocs/commande/list.php

@@ -220,8 +220,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='Commande';
 	$objectlabel='Orders';
-	$permtoread = $user->rights->commande->lire;
+	$permissiontoread = $user->rights->commande->lire;
-	$permtodelete = $user->rights->commande->supprimer;
+	$permissiontodelete = $user->rights->commande->supprimer;
 	$uploaddir = $conf->commande->multidir_output[$conf->entity];
 	$trigger_name='ORDER_SENTBYMAIL';
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';

htdocs/compta/bank/bankentries_list.php

@@ -209,8 +209,8 @@ if (empty($reshook))
 {
     $objectclass='Account';
     $objectlabel='BankTransaction';
-    $permtoread = $user->rights->banque->lire;
+    $permissiontoread = $user->rights->banque->lire;
-    $permtodelete = $user->rights->banque->supprimer;
+    $permissiontodelete = $user->rights->banque->supprimer;
     $uploaddir = $conf->bank->dir_output;
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/compta/cashcontrol/cashcontrol_list.php

@@ -168,8 +168,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='CashControl';
 	$objectlabel='CashControl';
-	$permtoread = ($user->rights->cashdesk->use || $user->rights->takepos->use);
+	$permissiontoread = ($user->rights->cashdesk->use || $user->rights->takepos->use);
-	$permtodelete = ($user->rights->cashdesk->use || $user->rights->takepos->use);
+	$permissiontodelete = ($user->rights->cashdesk->use || $user->rights->takepos->use);
 
 	//$uploaddir = '';
 	//include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';

htdocs/compta/facture/card-rec.php

@@ -146,8 +146,8 @@ if (empty($reshook))
 	// Mass actions
 	/*$objectclass='MyObject';
     $objectlabel='MyObject';
-    $permtoread = $user->rights->mymodule->read;
+    $permissiontoread = $user->rights->mymodule->read;
-    $permtodelete = $user->rights->mymodule->delete;
+    $permissiontodelete = $user->rights->mymodule->delete;
     $uploaddir = $conf->mymodule->dir_output;
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';*/
 

htdocs/compta/facture/invoicetemplate_list.php

@@ -191,8 +191,8 @@ if (empty($reshook))
 	// Mass actions
 	/*$objectclass='MyObject';
     $objectlabel='MyObject';
-    $permtoread = $user->rights->mymodule->read;
+    $permissiontoread = $user->rights->mymodule->read;
-    $permtodelete = $user->rights->mymodule->delete;
+    $permissiontodelete = $user->rights->mymodule->delete;
     $uploaddir = $conf->mymodule->dir_output;
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';*/
 }

htdocs/compta/facture/list.php

@@ -265,9 +265,9 @@ if (empty($reshook))
 {
 	$objectclass='Facture';
 	$objectlabel='Invoices';
-	$permtoread = $user->rights->facture->lire;
+	$permissiontoread = $user->rights->facture->lire;
-	$permtocreate = $user->rights->facture->creer;
+	$permissiontoadd = $user->rights->facture->creer;
-	$permtodelete = $user->rights->facture->supprimer;
+	$permissiontodelete = $user->rights->facture->supprimer;
 	$uploaddir = $conf->facture->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/contact/list.php

@@ -254,8 +254,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='Contact';
 	$objectlabel='Contact';
-	$permtoread = $user->rights->societe->lire;
+	$permissiontoread = $user->rights->societe->lire;
-	$permtodelete = $user->rights->societe->supprimer;
+	$permissiontodelete = $user->rights->societe->supprimer;
 	$uploaddir = $conf->societe->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/contrat/list.php

@@ -188,8 +188,8 @@ if (empty($reshook))
 {
 	$objectclass='Contrat';
 	$objectlabel='Contracts';
-	$permtoread = $user->rights->contrat->lire;
+	$permissiontoread = $user->rights->contrat->lire;
-	$permtodelete = $user->rights->contrat->supprimer;
+	$permissiontodelete = $user->rights->contrat->supprimer;
 	$uploaddir = $conf->contrat->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/core/actions_massactions.inc.php

@@ -30,7 +30,7 @@
 // $objectclass and $objectlabel must be defined
 // $parameters, $object, $action must be defined for the hook.
 
-// $permtoread, $permtocreate and $permtodelete may be defined
+// $permissiontoread, $permissiontoadd and $permissiontodelete may be defined
 // $uploaddir may be defined (example to $conf->projet->dir_output."/";)
 // $toselect may be defined
 // $diroutputmassaction may be defined
@@ -43,6 +43,11 @@ if (empty($objectclass) || empty($uploaddir))
 	exit;
 }
 
+// For backward compatibility
+if (! empty($permtoread) && empty($permissiontoread)) $permissiontoread = $permtoread;
+if (! empty($permtocreate) && empty($permissiontoadd)) $permissiontoadd = $permtocreate;
+if (! empty($permtodelete) && empty($permissiontodelete)) $permissiontoread = $permtodelete;
+
 
 // Mass actions. Controls on number of lines checked.
 $maxformassaction=(empty($conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS)?1000:$conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
@@ -924,7 +929,7 @@ if (!$error && $massaction == 'cancelorders')
 }
 
 
-if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_search'))
+if (! $error && $massaction == "builddoc" && $permissiontoread && ! GETPOST('button_search'))
 {
 	if (empty($diroutputmassaction))
 	{
@@ -1105,7 +1110,7 @@ if ($action == 'remove_file')
 }
 
 // Validate records
-if (! $error && $massaction == 'validate' && $permtocreate)
+if (! $error && $massaction == 'validate' && $permissiontoadd)
 {
 	$objecttmp=new $objectclass($db);
 
@@ -1170,6 +1175,62 @@ if (! $error && $massaction == 'validate' && $permtocreate)
 		//var_dump($listofobjectthirdparties);exit;
 	}
 }
+var_dump($permissiontoadd);
+// Validate records
+if (! $error && $massaction == 'disable' && $permissiontocreate)
+{
+	$objecttmp=new $objectclass($db);
+
+	if (! $error)
+	{
+		$db->begin();
+
+		$nbok = 0;
+		foreach($toselect as $toselectid)
+		{
+			$result=$objecttmp->fetch($toselectid);
+			if ($result > 0)
+			{
+				//if (in_array($objecttmp->element, array('societe','member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1);
+				//else
+				$result = $objecttmp->close($user);
+				if ($result == $objecttmp::STATUS_VALIDATED)
+				{
+					$langs->load("errors");
+					setEventMessages($langs->trans("ErrorObjectMustHaveStatusValidatedToBeDisabled", $objecttmp->ref), null, 'errors');
+					$error++;
+					break;
+				}
+				elseif ($result < 0)
+				{
+					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+					$error++;
+					break;
+				}
+				else $nbok++;
+			}
+			else
+			{
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				$error++;
+				break;
+			}
+		}
+
+		if (! $error)
+		{
+			if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+			else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+			$db->commit();
+		}
+		else
+		{
+			$db->rollback();
+		}
+		//var_dump($listofobjectthirdparties);exit;
+	}
+}
+
 // Closed records
 if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permtoclose) {
     $db->begin();
@@ -1206,7 +1267,7 @@ if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permtoclo
     }
 }
 // Delete record from mass action (massaction = 'delete' for direct delete, action/confirm='delete'/'yes' with a confirmation step before)
-if (! $error && ($massaction == 'delete' || ($action == 'delete' && $confirm == 'yes')) && $permtodelete)
+if (! $error && ($massaction == 'delete' || ($action == 'delete' && $confirm == 'yes')) && $permissiontodelete)
 {
 	$db->begin();
 
@@ -1272,7 +1333,7 @@ if (! $error && ($massaction == 'delete' || ($action == 'delete' && $confirm ==
 
 // Generate document foreach object according to model linked to object
 // @TODO : propose model selection
-if (! $error && $massaction == 'generate_doc' && $permtoread)
+if (! $error && $massaction == 'generate_doc' && $permissiontoread)
 {
     $db->begin();
 

htdocs/core/class/html.formfile.class.php

@@ -1471,7 +1471,7 @@ class FormFile
 	 *  @param  string	$param              Parameters on sort links
 	 *  @param  int		$forcedownload      Force to open dialog box "Save As" when clicking on file
 	 *  @param  string	$relativepath       Relative path of docs (autodefined if not provided)
-	 *  @param  int		$permtodelete       Permission to delete
+	 *  @param  int		$permissiontodelete       Permission to delete
 	 *  @param  int		$useinecm           Change output for use in ecm module
 	 *  @param  int		$textifempty        Text to show if filearray is empty
 	 *  @param  int		$maxlength          Maximum length of file name shown
@@ -1480,7 +1480,7 @@ class FormFile
 	 *  @return int                 		<0 if KO, nb of files shown if OK
 	 *  @see list_of_documents()
 	 */
-	public function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload = 0, $relativepath = '', $permtodelete = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $url = '', $addfilterfields = 0)
+	public function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload = 0, $relativepath = '', $permissiontodelete = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $url = '', $addfilterfields = 0)
 	{
         // phpcs:enable
 		global $user, $conf, $langs, $form;
@@ -1703,7 +1703,7 @@ class FormFile
 				//if ($forcedownload) print '&attachment=1';
 				//print '&file='.urlencode($relativefile).'">';
 				//print img_view().'</a> &nbsp; ';
-				//if ($permtodelete) print '<a href="'.$url.'?id='.$object->id.'&section='.$_REQUEST["section"].'&action=delete&urlfile='.urlencode($file['name']).'">'.img_delete().'</a>';
+				//if ($permissiontodelete) print '<a href="'.$url.'?id='.$object->id.'&section='.$_REQUEST["section"].'&action=delete&urlfile='.urlencode($file['name']).'">'.img_delete().'</a>';
 				//else print '&nbsp;';
 				print "</td></tr>\n";
 			}
@@ -1758,13 +1758,13 @@ class FormFile
 	 * Show array with linked files
 	 *
 	 * @param 	Object		$object			Object
-	 * @param 	int			$permtodelete	Deletion is allowed
+	 * @param 	int			$permissiontodelete	Deletion is allowed
 	 * @param 	string		$action			Action
 	 * @param 	string		$selected		???
 	 * @param	string		$param			More param to add into URL
 	 * @return 	int							Number of links
 	 */
-	public function listOfLinks($object, $permtodelete = 1, $action = null, $selected = null, $param = '')
+	public function listOfLinks($object, $permissiontodelete = 1, $action = null, $selected = null, $param = '')
 	{
 		global $user, $conf, $langs, $user;
 		global $sortfield, $sortorder;
@@ -1878,7 +1878,7 @@ class FormFile
 				print '<td class="center"></td>';
 				print '<td class="right">';
 				print '<a href="' . $_SERVER['PHP_SELF'] . '?action=update&linkid=' . $link->id . $param . '" class="editfilelink reposition" >' . img_edit() . '</a>';	// id= is included into $param
-				if ($permtodelete) {
+				if ($permissiontodelete) {
 					print ' &nbsp; <a href="'. $_SERVER['PHP_SELF'] .'?action=delete&linkid=' . $link->id . $param . '" class="deletefilelink">' . img_delete() . '</a>';	// id= is included into $param
 				} else {
 					print '&nbsp;';

htdocs/cron/list.php

@@ -178,12 +178,12 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='CronJob';
 	$objectlabel='CronJob';
-	$permtoread = $user->rights->cron->read;
+	$permissiontoread = $user->rights->cron->read;
-	$permtocreate = $user->rights->cron->create?$user->rights->cron->create:$user->rights->cron->write;
+	$permissiontoadd = $user->rights->cron->create?$user->rights->cron->create:$user->rights->cron->write;
-	$permtodelete = $user->rights->cron->delete;
+	$permissiontodelete = $user->rights->cron->delete;
 	$uploaddir = $conf->cron->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-	if ($permtocreate)
+	if ($permissiontoadd)
 	{
 		$tmpcron = new Cronjob($db);
 		foreach($toselect as $id)

htdocs/expedition/list.php

@@ -165,9 +165,9 @@ if (empty($reshook))
 {
     $objectclass  = 'Expedition';
     $objectlabel  = 'Sendings';
-    $permtoread   = $user->rights->expedition->lire;
+    $permissiontoread   = $user->rights->expedition->lire;
-    $permtocreate = $user->rights->expedition->creer;
+    $permissiontoadd = $user->rights->expedition->creer;
-    $permtodelete = $user->rights->expedition->supprimer;
+    $permissiontodelete = $user->rights->expedition->supprimer;
     $uploaddir    = $conf->expedition->dir_output . '/sending';
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/expensereport/list.php

@@ -195,8 +195,8 @@ if (empty($reshook))
 	// Mass actions
     $objectclass='ExpenseReport';
     $objectlabel='ExpenseReport';
-    $permtoread = $user->rights->expensereport->lire;
+    $permissiontoread = $user->rights->expensereport->lire;
-    $permtodelete = $user->rights->expensereport->supprimer;
+    $permissiontodelete = $user->rights->expensereport->supprimer;
     $uploaddir = $conf->expensereport->dir_output;
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 

htdocs/fichinter/list.php

@@ -160,8 +160,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='Fichinter';
 	$objectlabel='Interventions';
-	$permtoread = $user->rights->ficheinter->lire;
+	$permissiontoread = $user->rights->ficheinter->lire;
-	$permtodelete = $user->rights->ficheinter->supprimer;
+	$permissiontodelete = $user->rights->ficheinter->supprimer;
 	$uploaddir = $conf->ficheinter->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/fourn/commande/list.php

@@ -223,8 +223,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='CommandeFournisseur';
 	$objectlabel='SupplierOrders';
-	$permtoread = $user->rights->fournisseur->commande->lire;
+	$permissiontoread = $user->rights->fournisseur->commande->lire;
-	$permtodelete = $user->rights->fournisseur->commande->supprimer;
+	$permissiontodelete = $user->rights->fournisseur->commande->supprimer;
 	$uploaddir = $conf->fournisseur->commande->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 

htdocs/fourn/facture/list.php

@@ -241,9 +241,9 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='FactureFournisseur';
 	$objectlabel='SupplierInvoices';
-	$permtoread = $user->rights->fournisseur->facture->lire;
+	$permissiontoread = $user->rights->fournisseur->facture->lire;
-	$permtocreate = $user->rights->fournisseur->facture->creer;
+	$permissiontoadd = $user->rights->fournisseur->facture->creer;
-	$permtodelete = $user->rights->fournisseur->facture->supprimer;
+	$permissiontodelete = $user->rights->fournisseur->facture->supprimer;
 	$uploaddir = $conf->fournisseur->facture->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/holiday/define_holiday.php

@@ -95,8 +95,8 @@ if (empty($reshook))
     /*
     $objectclass='Skeleton';
     $objectlabel='Skeleton';
-    $permtoread = $user->rights->skeleton->read;
+    $permissiontoread = $user->rights->skeleton->read;
-    $permtodelete = $user->rights->skeleton->delete;
+    $permissiontodelete = $user->rights->skeleton->delete;
     $uploaddir = $conf->skeleton->dir_output;
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
     */

htdocs/holiday/list.php

@@ -196,8 +196,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='Holiday';
 	$objectlabel='Holiday';
-	$permtoread = $user->rights->holiday->read;
+	$permissiontoread = $user->rights->holiday->read;
-	$permtodelete = $user->rights->holiday->delete;
+	$permissiontodelete = $user->rights->holiday->delete;
 	$uploaddir = $conf->holiday->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/holiday/view_log.php

@@ -110,8 +110,8 @@ if (empty($reshook))
     // Mass actions
     /*$objectclass='MyObject';
     $objectlabel='MyObject';
-    $permtoread = $user->rights->mymodule->read;
+    $permissiontoread = $user->rights->mymodule->read;
-    $permtodelete = $user->rights->mymodule->delete;
+    $permissiontodelete = $user->rights->mymodule->delete;
     $uploaddir = $conf->mymodule->dir_output;
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
     */

htdocs/margin/checkMargins.php

@@ -120,8 +120,8 @@ if (empty($reshook))
     if ((string) $type == '1') { $objectlabel='Services'; }
     if ((string) $type == '0') { $objectlabel='Products'; }
 
-    $permtoread = $user->rights->produit->lire;
+    $permissiontoread = $user->rights->produit->lire;
-    $permtodelete = $user->rights->produit->supprimer;
+    $permissiontodelete = $user->rights->produit->supprimer;
     $uploaddir = $conf->product->dir_output;
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
     */

htdocs/modulebuilder/template/myobject_list.php

@@ -153,9 +153,9 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
-$permtoread = $user->rights->mymodule->myobject->read;
+$permissiontoread = $user->rights->mymodule->myobject->read;
 $permtowrite = $user->rights->mymodule->myobject->write;
-$permtodelete = $user->rights->mymodule->myobject->delete;
+$permissiontodelete = $user->rights->mymodule->myobject->delete;
 
 
 /*
@@ -347,7 +347,7 @@ $arrayofmassactions =  array(
     //'builddoc'=>$langs->trans("PDFMerge"),
     //'presend'=>$langs->trans("SendByMail"),
 );
-if ($permtodelete) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if ($permissiontodelete) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
@@ -594,7 +594,7 @@ if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $n
 	$urlsource.=str_replace('&amp;', '&', $param);
 
 	$filedir=$diroutputmassaction;
-	$genallowed=$permtoread;
+	$genallowed=$permissiontoread;
 	$delallowed=$permtowrite;
 
 	print $formfile->showdocuments('massfilesarea_mymodule', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);

htdocs/mrp/mo_list.php

@@ -177,8 +177,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='Mo';
 	$objectlabel='Mo';
-	$permtoread = $user->rights->mrp->read;
+	$permissiontoread = $user->rights->mrp->read;
-	$permtodelete = $user->rights->mrp->delete;
+	$permissiontodelete = $user->rights->mrp->delete;
 	$uploaddir = $conf->mrp->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/opensurvey/list.php

@@ -133,8 +133,8 @@ if (empty($reshook))
     // Mass actions
     $objectclass='Opensurveysondage';
     $objectlabel='Opensurveysondage';
-    $permtoread = $user->rights->opensurvey->read;
+    $permissiontoread = $user->rights->opensurvey->read;
-    $permtodelete = $user->rights->opensurvey->write;
+    $permissiontodelete = $user->rights->opensurvey->write;
     $uploaddir = $conf->opensurvey->dir_output;
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/product/inventory/list.php

@@ -153,8 +153,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='Inventory';
 	$objectlabel='Inventory';
-	$permtoread = $user->rights->stock->lire;
+	$permissiontoread = $user->rights->stock->lire;
-	$permtodelete = $user->rights->stock->supprimer;
+	$permissiontodelete = $user->rights->stock->supprimer;
 	$uploaddir = $conf->stock->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/product/list.php

@@ -253,8 +253,8 @@ if (empty($reshook))
 	if ((string) $search_type == '1') { $objectlabel='Services'; }
 	if ((string) $search_type == '0') { $objectlabel='Products'; }
 
-	$permtoread = $user->rights->produit->lire;
+	$permissiontoread = $user->rights->produit->lire;
-	$permtodelete = $user->rights->produit->supprimer;
+	$permissiontodelete = $user->rights->produit->supprimer;
 	$uploaddir = $conf->product->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/product/stock/list.php

@@ -144,8 +144,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='Entrepot';
 	$objectlabel='Warehouse';
-	$permtoread = $user->rights->stock->lire;
+	$permissiontoread = $user->rights->stock->lire;
-	$permtodelete = $user->rights->stock->supprimer;
+	$permissiontodelete = $user->rights->stock->supprimer;
 	$uploaddir = $conf->stock->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/product/stock/movement_card.php

@@ -421,8 +421,8 @@ if (empty($reshook) && $action != 'remove_file')
 {
     $objectclass='MouvementStock';
     $objectlabel='Movements';
-    $permtoread = $user->rights->stock->lire;
+    $permissiontoread = $user->rights->stock->lire;
-    $permtodelete = $user->rights->stock->supprimer;
+    $permissiontodelete = $user->rights->stock->supprimer;
     $uploaddir = $conf->stock->dir_output . "/movement/";
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/product/stock/productlot_list.php

@@ -158,8 +158,8 @@ if (empty($reshook))
 {
 	$objectclass='ProductLot';
 	$objectlabel='LotSerial';
-	$permtoread = $user->rights->stock->read;
+	$permissiontoread = $user->rights->stock->read;
-	$permtodelete = $user->rights->stock->delete;
+	$permissiontodelete = $user->rights->stock->delete;
 	$uploaddir = $conf->stock->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/projet/list.php

@@ -202,8 +202,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='Project';
 	$objectlabel='Project';
-	$permtoread = $user->rights->projet->lire;
+	$permissiontoread = $user->rights->projet->lire;
-	$permtodelete = $user->rights->projet->supprimer;
+	$permissiontodelete = $user->rights->projet->supprimer;
 	$uploaddir = $conf->projet->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 

htdocs/projet/tasks.php

@@ -163,8 +163,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='Task';
 	$objectlabel='Tasks';
-	$permtoread = $user->rights->projet->lire;
+	$permissiontoread = $user->rights->projet->lire;
-	$permtodelete = $user->rights->projet->supprimer;
+	$permissiontodelete = $user->rights->projet->supprimer;
 	$uploaddir = $conf->projet->dir_output.'/tasks';
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/projet/tasks/list.php

@@ -184,8 +184,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='Task';
 	$objectlabel='Tasks';
-	$permtoread = $user->rights->projet->lire;
+	$permissiontoread = $user->rights->projet->lire;
-	$permtodelete = $user->rights->projet->supprimer;
+	$permissiontodelete = $user->rights->projet->supprimer;
 	$uploaddir = $conf->projet->dir_output.'/tasks';
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/societe/list.php

@@ -304,8 +304,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='Societe';
 	$objectlabel='ThirdParty';
-	$permtoread = $user->rights->societe->lire;
+	$permissiontoread = $user->rights->societe->lire;
-	$permtodelete = $user->rights->societe->supprimer;
+	$permissiontodelete = $user->rights->societe->supprimer;
 	$uploaddir = $conf->societe->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 

htdocs/societe/website.php

@@ -156,8 +156,8 @@ if (empty($reshook))
     // Mass actions
     $objectclass='WebsiteAccount';
     $objectlabel='WebsiteAccount';
-    $permtoread = $user->rights->societe->lire;
+    $permissiontoread = $user->rights->societe->lire;
-    $permtodelete = $user->rights->societe->supprimer;
+    $permissiontodelete = $user->rights->societe->supprimer;
     $uploaddir = $conf->societe->dir_output;
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/supplier_proposal/list.php

@@ -214,8 +214,8 @@ if (empty($reshook))
 {
 	$objectclass='SupplierProposal';
 	$objectlabel='SupplierProposals';
-	$permtoread = $user->rights->supplier_proposal->lire;
+	$permissiontoread = $user->rights->supplier_proposal->lire;
-	$permtodelete = $user->rights->supplier_proposal->supprimer;
+	$permissiontodelete = $user->rights->supplier_proposal->supprimer;
 	$uploaddir = $conf->supplier_proposal->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/ticket/list.php

@@ -176,8 +176,8 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='Ticket';
 	$objectlabel='Ticket';
-	$permtoread = $user->rights->ticket->read;
+	$permissiontoread = $user->rights->ticket->read;
-	$permtodelete = $user->rights->ticket->delete;
+	$permissiontodelete = $user->rights->ticket->delete;
 	$uploaddir = $conf->ticket->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

htdocs/zapier/hook_list.php

@@ -191,8 +191,8 @@ if (empty($reshook)) {
     // Mass actions
     $objectclass='Hook';
     $objectlabel='Hook';
-    $permtoread = $user->rights->mymodule->read;
+    $permissiontoread = $user->rights->mymodule->read;
-    $permtodelete = $user->rights->mymodule->delete;
+    $permissiontodelete = $user->rights->mymodule->delete;
     $uploaddir = $conf->mymodule->dir_output;
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }