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

Merge remote-tracking branch 'origin/3.8' into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2015-07-20 00:55:30 +02:00
commit 2df2e8b44e
3 changed files with 8553 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8551
dev/initdata/mysqldump_dolibarr_3.8.0.sql Normal file
View File

File diff suppressed because one or more lines are too long

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

@ -1224,6 +1224,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
if (! empty($conf->holiday->enabled)) if (! empty($conf->holiday->enabled))
{ {
$langs->load("holiday"); $langs->load("holiday");
$langs->load("trips");
$newmenu->add("/holiday/list.php?&leftmenu=hrm", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->read, '', $mainmenu, 'hrm'); $newmenu->add("/holiday/list.php?&leftmenu=hrm", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->read, '', $mainmenu, 'hrm');
$newmenu->add("/holiday/card.php?&action=request", $langs->trans("New"), 1,$user->rights->holiday->write); $newmenu->add("/holiday/card.php?&action=request", $langs->trans("New"), 1,$user->rights->holiday->write);

2
htdocs/user/card.php
View File

@ -408,7 +408,7 @@ if ($action == 'update' && ! $_POST["cancel"])
} }
else else
{ {
setEventMessage($object->error, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
} }
} }