Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'develop' into develop-ecmfiles

Browse Source
This commit is contained in:
Laurent Destailleur
2018-04-13 23:08:26 +02:00
committed by GitHub
parent e054d1ae8d ab720abca2
commit 93ea46c58c
12 changed files with 70 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/core/lib/functions.lib.php
View File

@@ -5792,7 +5792,7 @@ function dol_concatdesc($text1,$text2,$forxml=false)
*/
function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $object=null)
{
global $db, $conf, $mysoc, $user;
global $db, $conf, $mysoc, $user, $extrafields;
$substitutionarray=array();
@@ -5964,13 +5964,17 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
// Create dynamic tags for __EXTRAFIELD_FIELD__
if ($object->table_element && $object->id > 0)
{
$extrafieldstmp = new ExtraFields($db);
$extralabels = $extrafieldstmp->fetch_name_optionals_label($object->table_element, true);
if ($object->fetch_optionals() > 0)
{
foreach ($extrafieldstmp->attributes[$object->table_element]['label'] as $key => $label) {
$substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];
}
if (! is_object($extrafields)) $extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($object->table_element, true);
if ($object->fetch_optionals() > 0)
{
if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
{
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {
$substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];
}
}
}
}