+
trans('SendNewPasswordDesc'); ?>
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 8425aa2c4c6..5fd5cb57c8b 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -302,6 +302,8 @@ CurrentVersion=Dolibarr current version
CallUpdatePage=Go to the page that updates the database structure and data: %s.
LastStableVersion=Latest stable version
LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
UpdateServerOffline=Update server offline
WithCounter=Manage a counter
GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:
{000000} corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask.
{000000+000} same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s.
{000000@x} same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required.
{dd} day (01 to 31).
{mm} month (01 to 12).
{yy}, {yyyy} or {y} year over 2, 4 or 1 numbers.
@@ -1099,7 +1101,7 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
NewTranslationStringToShow=New translation string to show
OriginalValueWas=The original translation is overwritten. Original value was:
%s
TransKeyWithoutOriginalValue=You forced a new translation for the translation key '%s' that does not exists in any language files
-TotalNumberOfActivatedModules=Total number of activated feature modules: %s / %s
+TotalNumberOfActivatedModules=Activated feature/modules: %s / %s
YouMustEnableOneModule=You must at least enable 1 module
ClassNotFoundIntoPathWarning=Class %s not found into PHP path
YesInSummer=Yes in summer
diff --git a/htdocs/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php
index 37db7d02e4c..2a60252f7f8 100644
--- a/htdocs/societe/admin/contact_extrafields.php
+++ b/htdocs/societe/admin/contact_extrafields.php
@@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup');
$head = societe_admin_prepare_head();
-dol_fiche_head($head, 'attributes_contacts', $langs->trans("ThirdParties"), 0, 'company');
+dol_fiche_head($head, 'attributes_contacts', $langs->trans("ThirdParties"), -1, 'company');
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 517672d14ed..63ba12197fd 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -307,7 +307,7 @@ print load_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup');
$head = societe_admin_prepare_head();
-dol_fiche_head($head, 'general', $langs->trans("ThirdParties"), 0, 'company');
+dol_fiche_head($head, 'general', $langs->trans("ThirdParties"), -1, 'company');
$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php
index 89f44d53aa7..a722ec61b86 100644
--- a/htdocs/societe/admin/societe_extrafields.php
+++ b/htdocs/societe/admin/societe_extrafields.php
@@ -71,7 +71,7 @@ print load_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup');
$head = societe_admin_prepare_head();
-dol_fiche_head($head, 'attributes', $langs->trans("ThirdParties"), 0, 'company');
+dol_fiche_head($head, 'attributes', $langs->trans("ThirdParties"), -1, 'company');
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
diff --git a/htdocs/theme/dolibarr_logo.png b/htdocs/theme/dolibarr_logo.png
old mode 100644
new mode 100755
index 3ee46b51553..5287d9dcc25
Binary files a/htdocs/theme/dolibarr_logo.png and b/htdocs/theme/dolibarr_logo.png differ
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f4d5c5c32bd..b6e1fa0569d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -90,7 +90,7 @@ $colorbacklinepair1='248,248,248'; // line pair
$colorbacklinepair2='248,248,248'; // line pair
$colorbacklinepairhover='238,246,252'; // line pair
$colorbackbody='255,255,255';
-$colortexttitlenotab='60,60,20';
+$colortexttitlenotab='100,60,20';
$colortexttitle='0,0,0';
$colortext='0,0,0';
$colortextlink='0,0,120';
@@ -988,6 +988,9 @@ div.fiche {
dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?>
dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
}
+div.fiche>table:first-child {
+ margin-bottom: 15px !important;
+}
div.fichecenter {
/* margin-top: 10px; */
width: 100%;
@@ -2018,6 +2021,9 @@ a.tabTitle {
white-space: nowrap;
}
+a.tabunactive {
+ color: rgb() !important;
+}
a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
font-family: ;
padding: 12px 9px 12px;
@@ -3034,7 +3040,7 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; }
div.titre {
font-family: ;
font-size: 14px;
- /* font-weight: bold; */
+ font-weight: bold;
color: rgb();
text-decoration: none;
padding-top: 5px;
diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php
index 99eab0e3a88..8dad702935f 100644
--- a/htdocs/user/admin/group_extrafields.php
+++ b/htdocs/user/admin/group_extrafields.php
@@ -71,7 +71,7 @@ print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
$head = user_admin_prepare_head();
-dol_fiche_head($head, 'attributes_group', $langs->trans("MenuUsersAndGroups"), 0, 'user');
+dol_fiche_head($head, 'attributes_group', $langs->trans("MenuUsersAndGroups"), -1, 'user');
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php
index bb035d9f95f..28bf22da654 100644
--- a/htdocs/user/admin/user_extrafields.php
+++ b/htdocs/user/admin/user_extrafields.php
@@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
$head = user_admin_prepare_head();
-dol_fiche_head($head, 'attributes', $langs->trans("MenuUsersAndGroups"), 0, 'user');
+dol_fiche_head($head, 'attributes', $langs->trans("MenuUsersAndGroups"), -1, 'user');
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';