Merge branch 'develop' into 11.0_https

This commit is contained in:
Alexandre SPANGARO
2019-10-01 06:11:43 +02:00
894 changed files with 75831 additions and 24232 deletions

View File

@@ -1266,7 +1266,7 @@ class Commande extends CommonOrder
$object->fetch_optionals($object->id);
$e = new ExtraFields($this->db);
$element_extrafields = $e->fetch_name_optionals_label($this->element);
$element_extrafields = $e->fetch_name_optionals_label($this->table_element);
foreach($object->array_options as $options_key => $value) {
if(array_key_exists(str_replace('options_', '', $options_key), $element_extrafields)){