Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2024-05-21 20:05:41 +02:00
commit 5b35b2be30
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/contact/card.php
View File

@ -454,16 +454,13 @@ if (empty($reshook)) {
$no_email = GETPOST('no_email', 'int');
$result = $object->setNoEmail($no_email);
if ($result < 0) {
$error++;
setEventMessages($object->error, $object->errors, 'errors');
$action = 'edit';
}
}
$action = 'view';
} else {
$error++;
setEventMessages($object->error, $object->errors, 'errors');
$action = 'edit';
}
}
}
@ -473,6 +470,9 @@ if (empty($reshook)) {
header("Location: ".$backtopage);
exit;
}
$action = 'view';
} else {
$action = 'edit';
}
}

2
htdocs/core/menus/standard/auguria.lib.php
View File

@ -342,7 +342,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
$newmenu = $menuArbo->menuLeftCharger($newmenu, $mainmenu, $leftmenu, ($user->socid ? 1 : 0), 'auguria', $tabMenu);
// We update newmenu for special dynamic menus
if (isModEnabled('banque') && $user->rights->banque->lire && $mainmenu == 'bank') { // Entry for each bank account
if (isModEnabled('banque') && $user->hasRight('banque', 'lire') && $mainmenu == 'bank') { // Entry for each bank account
include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Required for to get Account::TYPE_CASH for example
$sql = "SELECT rowid, label, courant, rappro, courant";