From e15d91640bd8ca40e88e7498233353190c08a6cb Mon Sep 17 00:00:00 2001 From: Frans Bosman Date: Thu, 22 Aug 2019 09:43:04 +0200 Subject: [PATCH 1/3] Update card.php --- htdocs/commande/card.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index a44054cdfd0..c603eba168c 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1758,7 +1758,14 @@ if ($action == 'create' && $usercancreate) $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); print $hookmanager->resPrint; if (empty($reshook)) { - print $object->showOptionals($extrafields, 'edit'); + // copy from thirdparty + $tpExtrafields = new Extrafields($db); + $tpExtrafieldLabels = $tpExtrafields->fetch_name_optionals_label($soc->table_element); + if ($soc->fetch_optionals() > 0) { + $object->array_options = array_merge($object->array_options, $soc->array_options); + } + print $object->showOptionals($extrafields, 'edit'); + } // Template to use by default From a822a34a51e0de54a168f3b30e21ebef7f8ecbda Mon Sep 17 00:00:00 2001 From: Frans Bosman Date: Sun, 25 Aug 2019 19:54:42 +0200 Subject: [PATCH 2/3] Update card.php --- htdocs/commande/card.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index c603eba168c..3f5449d4f18 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1765,7 +1765,6 @@ if ($action == 'create' && $usercancreate) $object->array_options = array_merge($object->array_options, $soc->array_options); } print $object->showOptionals($extrafields, 'edit'); - } // Template to use by default From 23311abd6a1471f74397877db991c4a726d82adc Mon Sep 17 00:00:00 2001 From: Frans Bosman Date: Sun, 25 Aug 2019 19:57:49 +0200 Subject: [PATCH 3/3] Update card.php --- htdocs/commande/card.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 3f5449d4f18..dea2d0c0ed8 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1758,12 +1758,14 @@ if ($action == 'create' && $usercancreate) $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); print $hookmanager->resPrint; if (empty($reshook)) { + if (! empty($conf->global->THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_ORDER)) // copy from thirdparty $tpExtrafields = new Extrafields($db); $tpExtrafieldLabels = $tpExtrafields->fetch_name_optionals_label($soc->table_element); if ($soc->fetch_optionals() > 0) { $object->array_options = array_merge($object->array_options, $soc->array_options); } + }; print $object->showOptionals($extrafields, 'edit'); }