Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
65f997585b
3 changed files with 9 additions and 1 deletions
|
|
@ -3881,7 +3881,7 @@ abstract class CommonObject
|
|||
$triggerName = 'EXPENSE_REPORT_MODIFY';
|
||||
break;
|
||||
default:
|
||||
$triggerName = strtoupper($this->element) . '_MODIFY';
|
||||
$triggerName = (!empty($this->TRIGGER_PREFIX) ? $this->TRIGGER_PREFIX : strtoupper($this->element)) . '_MODIFY';
|
||||
}
|
||||
$ret = $this->call_trigger($triggerName, $user);
|
||||
if ($ret < 0) {
|
||||
|
|
|
|||
|
|
@ -1918,6 +1918,10 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
|
|||
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
|
||||
$newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report", $langs->trans("MenuReportInOut"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
|
||||
$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report", $langs->trans("ByPredefinedAccountGroups"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
|
||||
|
||||
if (isModEnabled('comptabilite')) {
|
||||
$newmenu->add("/compta/resultat/projects.php?leftmenu=accountancy_report", $langs->trans("ByProject"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
|
||||
}
|
||||
|
||||
if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
|
||||
global $mysoc;
|
||||
|
|
@ -2018,6 +2022,9 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
|
|||
if ($usemenuhider || empty($leftmenu) || preg_match('/report/', $leftmenu)) {
|
||||
$newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->hasRight('compta', 'resultat', 'lire'));
|
||||
$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", $langs->trans("ByPredefinedAccountGroups"), 2, $user->hasRight('compta', 'resultat', 'lire'));
|
||||
if (isModEnabled('comptabilite')) {
|
||||
$newmenu->add("/compta/resultat/projects.php?leftmenu=accountancy_report", $langs->trans("ByProject"), 2, $user->hasRight('compta', 'resultat', 'lire'));
|
||||
}
|
||||
/* On verra ca avec module compabilite expert
|
||||
$newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,$user->hasRight('compta', 'resultat', 'lire'));
|
||||
$newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,$user->hasRight('compta', 'resultat', 'lire'));
|
||||
|
|
|
|||
|
|
@ -232,6 +232,7 @@ AccountingAccountReportsDesc=You can define here some reports of accounting acco
|
|||
AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
|
||||
ByAccounts=By accounts
|
||||
ByPredefinedAccountGroups=By predefined groups
|
||||
ByProject=By project
|
||||
ByPersonalizedAccountGroups=By personalized groups
|
||||
Personalized=Personalized
|
||||
NoReportDefined=No personalized reports defined
|
||||
|
|
|
|||
Loading…
Reference in a new issue