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

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0

Browse Source 
Conflicts:
	htdocs/adherents/class/adherent.class.php
This commit is contained in:
Laurent Destailleur
2020-05-28 20:17:26 +02:00
parent 5cec3eb052 113144ea21
commit 3606ed2bda
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/class/extrafields.class.php
View File

@@ -1676,8 +1676,13 @@ class ExtraFields
}
elseif ($type == 'select')
{
if ($langfile && $param['options'][$value]) $value = $langs->trans($param['options'][$value]);
else $value = $param['options'][$value];
$valstr = $param['options'][$value];
if (($pos = strpos($valstr, "|")) !== false)
{
$valstr = substr($valstr, 0, $pos);
}
if ($langfile && $valstr) $value = $langs->trans($valstr);
else $value = $valstr;
}
elseif ($type == 'sellist')
{