lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/13.0' into 13-company-disable-workflow

Browse Source
This commit is contained in:
root 2021-04-21 15:38:46 +02:00
commit c5b0a1b02c
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/comm/mailing/cibles.php
View File

@ -689,6 +689,7 @@ if ($object->fetch($id) >= 0)
// Search Icon // Search Icon
print '<td class="right">'; print '<td class="right">';
print '<!-- ID mailing_cibles = '.$obj->rowid.' -->';
if ($obj->statut == 0) // Not sent yet if ($obj->statut == 0) // Not sent yet
{ {
if ($user->rights->mailing->creer && $allowaddtarget) { if ($user->rights->mailing->creer && $allowaddtarget) {

2
htdocs/core/modules/modAgenda.class.php
View File

@ -413,7 +413,7 @@ class modAgenda extends DolibarrModules
'langs' => 'agenda', 'langs' => 'agenda',
'position' => 170, 'position' => 170,
'perms' => '$user->rights->agenda->allactions->read', 'perms' => '$user->rights->agenda->allactions->read',
'enabled' => '$conf->categorie->enabled&&$conf->categorie->enabled', 'enabled' => '$conf->categorie->enabled',
'target' => '', 'target' => '',
'user' => 2 'user' => 2
); );

4
htdocs/fichinter/list.php
View File

@ -259,6 +259,10 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
$parameters = array(); $parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint; $sql .= $hookmanager->resPrint;
// Add GroupBy from hooks
$parameters = array('all' => $all, 'fieldstosearchall' => $fieldstosearchall);
$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
$sql .= $db->order($sortfield, $sortorder); $sql .= $db->order($sortfield, $sortorder);
// Count total nb of records // Count total nb of records