diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index c3f046431b0..17e063244df 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1215,6 +1215,8 @@ if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permissio
$db->rollback();
}
}
+
+
// 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')) && $permissiontodelete)
{
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 9e8dcc3184e..7b92af43ef0 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -1134,4 +1134,17 @@ class MouvementStock extends CommonObject
return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
}
+
+ /**
+ * Delete object in database
+ *
+ * @param User $user User that deletes
+ * @param bool $notrigger false=launch triggers after, true=disable triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ public function delete(User $user, $notrigger = false)
+ {
+ return $this->deleteCommon($user, $notrigger);
+ //return $this->deleteCommon($user, $notrigger, 1);
+ }
}
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index dea7580aeb7..48806ce51b8 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -54,8 +54,11 @@ $ref = GETPOST('ref', 'alpha');
$msid = GETPOST('msid', 'int');
$product_id = GETPOST("product_id", 'int');
$action = GETPOST('action', 'aZ09');
+$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
$cancel = GETPOST('cancel', 'alpha');
$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'movementlist';
+$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
// Security check
//$result=restrictedArea($user, 'stock', $id, 'entrepot&stock');
@@ -123,15 +126,19 @@ if (!$user->rights->stock->mouvement->lire) {
accessforbidden();
}
+$permissiontoread = $user->rights->stock->mouvement->lire;
+$permissiontoadd = $user->rights->stock->mouvement->creer;
+$permissiontodelete = $user->rights->stock->mouvement->creer; // There is no deletion permission for stock movement as we shoul dnever delete
+
+$usercanread = $user->rights->stock->mouvement->lire;
+$usercancreate = $user->rights->stock->mouvement->creer;
+$usercandelete = $user->rights->stock->mouvement->creer;
+
/*
* Actions
*/
-$usercanread = (($user->rights->stock->mouvement->lire));
-$usercancreate = (($user->rights->stock->mouvement->creer));
-$usercandelete = (($user->rights->stock->mouvement->supprimer));
-
if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
@@ -139,26 +146,35 @@ $parameters = array();
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-// Do we click on purge search criteria ?
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
+if (empty($reshook))
{
- $year = '';
- $month = '';
- $search_ref = '';
- $search_movement = "";
- $search_type_mouvement = "";
- $search_inventorycode = "";
- $search_product_ref = "";
- $search_product = "";
- $search_warehouse = "";
- $search_user = "";
- $search_batch = "";
- $search_qty = '';
- $sall = "";
- $toselect = '';
- $search_array_options = array();
+ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+ // Do we click on purge search criteria ?
+ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
+ {
+ $year = '';
+ $month = '';
+ $search_ref = '';
+ $search_movement = "";
+ $search_type_mouvement = "";
+ $search_inventorycode = "";
+ $search_product_ref = "";
+ $search_product = "";
+ $search_warehouse = "";
+ $search_user = "";
+ $search_batch = "";
+ $search_qty = '';
+ $sall = "";
+ $toselect = '';
+ $search_array_options = array();
+ }
+
+ // Mass actions
+ $objectclass = 'MouvementStock';
+ $objectlabel = 'MouvementStock';
+ $uploaddir = $conf->stock->dir_output;
+ include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
}
// Correct stock
@@ -600,8 +616,8 @@ if ($resql)
$resqlbis = $db->query($sql);
if ($resqlbis)
{
- $obj = $db->fetch_object($resqlbis);
- $lastmovementdate = $db->jdate($obj->datem);
+ $objbis = $db->fetch_object($resqlbis);
+ $lastmovementdate = $db->jdate($objbis->datem);
}
else
{
@@ -694,8 +710,9 @@ if ($resql)
// 'presend'=>$langs->trans("SendByMail"),
// 'builddoc'=>$langs->trans("PDFMerge"),
);
- //if ($user->rights->stock->supprimer) $arrayofmassactions['predelete']=''.$langs->trans("Delete");
- if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+ // By default, we should never accept deletion of stock movement.
+ if (! empty($conf->global->STOCK_ALLOW_DELETE_OF_MOVEMENT) && $permissiontodelete) $arrayofmassactions['predelete']=''.$langs->trans("Delete");
+ if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
print '