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

FIX #7156

Browse Source
This commit is contained in:
Laurent Destailleur 2017-08-23 16:57:07 +02:00
parent 947acfffe2
commit 1b1d1a8d0b
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/societe/soc.php
View File

@ -168,9 +168,12 @@ if (empty($reshook))
}
// Merge extrafields
foreach ($soc_origin->array_options as $key => $val)
if (is_array($soc_origin->array_options))
{
if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
foreach ($soc_origin->array_options as $key => $val)
{
if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
}
}
// TODO Merge categories