vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse source
This commit is contained in:
Laurent Destailleur 2026-07-07 15:43:41 +02:00
commit e9caac12bb
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
htdocs/product/stats/facture.php
View file

@ -137,7 +137,7 @@ $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product
$toselect = GETPOST('toselect', 'array:int');
$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'invoicelist';
$massaction = GETPOST('massaction', 'alpha');
$diroutputmassaction = $conf->invoice->dir_output.'/temp/massgeneration/'.$user->id;
$diroutputmassaction = isModEnabled('invoice') ? $conf->invoice->dir_output.'/temp/massgeneration/'.$user->id : '';
if (GETPOST('cancel', 'alpha')) {
$action = 'list';
@ -146,6 +146,10 @@ if (GETPOST('cancel', 'alpha')) {
if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
$massaction = '';
}
if (!isModEnabled('invoice')) {
// The mass actions of this page rely on the invoice module (objects, permissions, upload directory)
$massaction = '';
}
$arrayfields = array(
'f.ref' => array('label' => "Ref", 'checked' => '1', 'position' => 5),
's.nom' => array('label' => "ThirdParty", 'checked' => '1', 'position' => 50),
@ -164,9 +168,10 @@ $formother = new FormOther($db);
$arrayofmassactions = array(
'presend' => img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
);
$arrayofmassactions = array();
if (isModEnabled('invoice')) {
$arrayofmassactions['presend'] = img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail");
}
$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
$arrayofselected = is_array($toselect) ? $toselect : array();
$selectedfields = (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
@ -180,7 +185,7 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
if ($reshook < 0) {
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
}
if (empty($reshook)) {
if (empty($reshook) && isModEnabled('invoice')) {
$objectclass = 'Facture';
$objectlabel = 'Invoices';
$permissiontoread = $user->hasRight("facture", "lire");