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

WIP

Browse Source
This commit is contained in:
Alexandre SPANGARO 2019-05-05 14:07:42 +02:00
parent be1eb7829e
commit 4e16992796
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/accountancy/closure/index.php
View File

@ -36,7 +36,7 @@ if (empty($conf->accounting->enabled)) {
} }
if ($user->societe_id > 0) if ($user->societe_id > 0)
accessforbidden(); accessforbidden();
if (! $user->rights->accounting->closure->read) if (! $user->rights->accounting->fiscalyear->closure)
accessforbidden(); accessforbidden();

4
htdocs/core/menus/standard/eldy.lib.php
View File

@ -1304,10 +1304,10 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
// Closure // Closure
if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2) { if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
$newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&leftmenu=accountancy_closure", $langs->trans("Closure"), 1, $user->rights->accounting->closure->read, '', $mainmenu, 'closure'); $newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->rights->accounting->fiscalyear->closure, '', $mainmenu, 'closure');
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_closure/', $leftmenu)) { if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_closure/', $leftmenu)) {
$newmenu->add("/accountancy/closure/validation.php?leftmenu=accountancy_closure", $langs->trans("MenuAccountancyValidationMovements"), 2, $user->rights->accounting->closure->read); $newmenu->add("/accountancy/closure/validation.php?leftmenu=accountancy_closure", $langs->trans("MenuAccountancyValidationMovements"), 2, $user->rights->accounting->fiscalyear->closure);
} }
} }

8
htdocs/core/modules/modAccounting.class.php
View File

@ -228,6 +228,14 @@ class modAccounting extends DolibarrModules
$this->rights[$r][5] = ''; $this->rights[$r][5] = '';
$r++; $r++;
$this->rights[$r][0] = 50431;
$this->rights[$r][1] = 'Validate movements of a fiscal year';
$this->rights[$r][2] = 'w';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'fiscalyear';
$this->rights[$r][5] = 'closure';
$r++;
// Menus // Menus
//------- //-------

2
htdocs/langs/en_US/accountancy.lang
View File

@ -97,6 +97,8 @@ MenuExpenseReportAccounts=Expense report accounts
MenuLoanAccounts=Loan accounts MenuLoanAccounts=Loan accounts
MenuProductsAccounts=Product accounts MenuProductsAccounts=Product accounts
MenuClosureAccounts=Closure accounts MenuClosureAccounts=Closure accounts
MenuAccountancyClosure=Closure
MenuAccountancyValidationMovements=Validate movements
ProductsBinding=Products accounts ProductsBinding=Products accounts
TransferInAccounting=Transfer in accounting TransferInAccounting=Transfer in accounting
RegistrationInAccounting=Registration in accounting RegistrationInAccounting=Registration in accounting