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

Fix board exepense report to approve

Browse Source
This commit is contained in:
Maxime Kohlhaas 2020-05-22 00:50:13 +02:00
parent 9e3e8df60f
commit 6b1eef9827
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/index.php
View File

@ -450,35 +450,35 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->socid && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT)) { if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->socid && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT)) {
include_once DOL_DOCUMENT_ROOT . '/compta/paiement/cheque/class/remisecheque.class.php'; include_once DOL_DOCUMENT_ROOT . '/compta/paiement/cheque/class/remisecheque.class.php';
$board = new RemiseCheque($db); $board = new RemiseCheque($db);
$dashboardlines['RemiseCheque'] = $board->load_board($user); $dashboardlines[$board->element] = $board->load_board($user);
} }
// Number of foundation members // Number of foundation members
if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire && !$user->socid) { if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire && !$user->socid) {
include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php'; include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
$board = new Adherent($db); $board = new Adherent($db);
$dashboardlines['Adherent'] = $board->load_board($user); $dashboardlines[$board->element] = $board->load_board($user);
} }
// Number of expense reports to approve // Number of expense reports to approve
if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->approve) { if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->approve) {
include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php'; include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
$board = new ExpenseReport($db); $board = new ExpenseReport($db);
$dashboardlines['ExpenseReport'] = $board->load_board($user, 'toapprove'); $dashboardlines[$board->element . '_toapprove'] = $board->load_board($user, 'toapprove');
} }
// Number of expense reports to pay // Number of expense reports to pay
if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid) { if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid) {
include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php'; include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
$board = new ExpenseReport($db); $board = new ExpenseReport($db);
$dashboardlines['ExpenseReport'] = $board->load_board($user, 'topay'); $dashboardlines[$board->element . '_topay'] = $board->load_board($user, 'topay');
} }
// Number of holidays to approve // Number of holidays to approve
if (!empty($conf->holiday->enabled) && $user->rights->holiday->approve) { if (!empty($conf->holiday->enabled) && $user->rights->holiday->approve) {
include_once DOL_DOCUMENT_ROOT . '/holiday/class/holiday.class.php'; include_once DOL_DOCUMENT_ROOT . '/holiday/class/holiday.class.php';
$board = new Holiday($db); $board = new Holiday($db);
$dashboardlines['Holiday'] = $board->load_board($user); $dashboardlines[$board->element] = $board->load_board($user);
} }
$object = new stdClass(); $object = new stdClass();
@ -556,28 +556,28 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
array( array(
'groupName' => 'BankAccount', 'groupName' => 'BankAccount',
'stats' => 'stats' =>
array('bank_account', 'RemiseCheque'), array('bank_account', 'chequereceipt'),
), ),
'Adherent' => 'member' =>
array( array(
'groupName' => 'Members', 'groupName' => 'Members',
'globalStatsKey' => 'members', 'globalStatsKey' => 'members',
'stats' => 'stats' =>
array('Adherent'), array('member'),
), ),
'ExpenseReport' => 'expensereport' =>
array( array(
'groupName' => 'ExpenseReport', 'groupName' => 'ExpenseReport',
'globalStatsKey' => 'expensereports', 'globalStatsKey' => 'expensereports',
'stats' => 'stats' =>
array('ExpenseReport'), array('expensereport_toapprove', 'expensereport_topay'),
), ),
'Holiday' => 'holiday' =>
array( array(
'groupName' => 'Holidays', 'groupName' => 'Holidays',
'globalStatsKey' => 'holidays', 'globalStatsKey' => 'holidays',
'stats' => 'stats' =>
array('Holiday'), array('holiday'),
), ),
); );

2
htdocs/theme/eldy/info-box.inc.php
View File

@ -226,7 +226,7 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
.fa-dol-bank_account:before { .fa-dol-bank_account:before {
content: "\f19c"; content: "\f19c";
} }
.fa-dol-adherent:before { .fa-dol-member:before {
content: "\f0c0"; content: "\f0c0";
} }
.fa-dol-expensereport:before { .fa-dol-expensereport:before {

2
htdocs/theme/md/info-box.inc.php
View File

@ -164,7 +164,7 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
.fa-dol-bank_account:before { .fa-dol-bank_account:before {
content: "\f19c"; content: "\f19c";
} }
.fa-dol-adherent:before { .fa-dol-member:before {
content: "\f0c0"; content: "\f0c0";
} }
.fa-dol-expensereport:before { .fa-dol-expensereport:before {