From bd1b3d9b0c6f3f7300a5b5a545a4748d7aeee22c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 13 Apr 2026 15:48:20 +0200 Subject: [PATCH] Fix edit product type from kit and variant tab. --- htdocs/product/composition/card.php | 13 ++++++------- htdocs/variants/combinations.php | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index 59ac3e1e711..dfbabdb43f7 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -32,11 +32,6 @@ // Load Dolibarr environment require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; -require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; - /** * @var Conf $conf * @var DoliDB $db @@ -44,6 +39,10 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; // Load translation files required by the page $langs->loadLangs(array('bills', 'products', 'stocks')); @@ -265,9 +264,9 @@ if ($id > 0 || !empty($ref)) { if (isModEnabled("product") && isModEnabled("service")) { $typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service"); print ''; - print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', (string) $object->type, $object, (int) $usercancreate, $typeformat) : $langs->trans('Type'); + print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', (string) $object->type, $object, 0, $typeformat) : $langs->trans('Type'); print ''; - print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat); + print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat); print ''; } diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php index e2a58e99bdc..6a77e684615 100644 --- a/htdocs/variants/combinations.php +++ b/htdocs/variants/combinations.php @@ -440,9 +440,9 @@ if (!empty($id) || !empty($ref)) { if (isModEnabled("product") && isModEnabled("service")) { $typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service"); print ''; - print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', (string) $object->type, $object, (int) $usercancreate, $typeformat) : $langs->trans('Type'); + print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', (string) $object->type, $object, 0, $typeformat) : $langs->trans('Type'); print ''; - print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat); + print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat); print ''; }