Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv

This commit is contained in:
Frédéric France
2022-09-08 18:59:23 +02:00
183 changed files with 4285 additions and 2949 deletions

View File

@@ -50,6 +50,17 @@ $modBarCodeThirdparty = '';
$maxperinit = 1000;
// Security check (enable the most restrictive one)
//if ($user->socid > 0) accessforbidden();
//if ($user->socid > 0) $socid = $user->socid;
if (!isModEnabled('barcode')) {
accessforbidden('Module not enabled');
}
//restrictedArea($user, 'barcode');
if (empty($user->admin)) {
accessforbidden('Must be admin');
}
/*
* Actions
@@ -263,13 +274,6 @@ if ($action == 'initbarcodeproducts') {
* View
*/
if (!$user->admin) {
accessforbidden();
}
if (empty($conf->barcode->enabled)) {
accessforbidden();
}
$form = new Form($db);
llxHeader('', $langs->trans("MassBarcodeInit"));