Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-05 00:22:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects

Browse Source 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/product/admin/product.php
	htdocs/product/card.php
This commit is contained in:
arnaud
2017-03-10 12:16:55 +01:00
parent b3d27521cb 1d31603ad2
commit a796a321cc
18 changed files with 931 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/lib/usergroups.lib.php
View File

@@ -239,6 +239,11 @@ function user_admin_prepare_head()
$head[$h][2] = 'card';
$h++;
$head[$h][0] = DOL_URL_ROOT.'/admin/usergroup.php';
$head[$h][1] = $langs->trans("Group");
$head[$h][2] = 'usergroupcard';
$h++;
$head[$h][0] = DOL_URL_ROOT.'/user/admin/user_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFields");
$head[$h][2] = 'attributes';