From f00da8948091bf0bdbbb5f0b7f04f7920aa30e4a Mon Sep 17 00:00:00 2001 From: atm-jonathan <146709163+atm-jonathan@users.noreply.github.com> Date: Fri, 20 Mar 2026 18:03:18 +0100 Subject: [PATCH] separate new and conf condition (#37547) Co-authored-by: Laurent Destailleur --- htdocs/commande/card.php | 12 ++---------- htdocs/commande/list.php | 4 ++-- htdocs/commande/list_det.php | 4 ++-- htdocs/expedition/shipment.php | 2 -- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 9213a6967fa..9faf429400d 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -52,6 +52,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/order.lib.php'; require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php'; require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php'; +require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php'; if (isModEnabled("propal")) { require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php'; @@ -2136,6 +2137,7 @@ $form = new Form($db); $formfile = new FormFile($db); $formorder = new FormOrder($db); $formmargin = new FormMargin($db); +$formproduct = new FormProduct($db); if (isModEnabled('project')) { $formproject = new FormProjets($db); } @@ -2433,8 +2435,6 @@ if ($action == 'create' && $usercancreate) { // Warehouse if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')) { - require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php'; - $formproduct = new FormProduct($db); print '' . $langs->trans('Warehouse') . ''; print img_picto('', 'stock', 'class="pictofixedwidth"') . $formproduct->selectWarehouses((GETPOSTISSET('warehouse_id') ? GETPOST('warehouse_id') : $warehouse_id), 'warehouse_id', '', 1, 0, 0, '', 0, 0, array(), 'maxwidth500 widthcentpercentminusxx'); print ''; @@ -2683,8 +2683,6 @@ if ($action == 'create' && $usercancreate) { $formquestion = array(); if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_VALIDATE_ORDER') && $qualified_for_stock_change) { $langs->load("stocks"); - require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php'; - $formproduct = new FormProduct($db); $forcecombo = 0; if ($conf->browser->name == 'ie') { $forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy @@ -2845,8 +2843,6 @@ if ($action == 'create' && $usercancreate) { $formquestion = array(); if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_VALIDATE_ORDER') && $qualified_for_stock_change) { $langs->load("stocks"); - require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php'; - $formproduct = new FormProduct($db); $forcecombo = 0; if ($conf->browser->name == 'ie') { $forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy @@ -2885,8 +2881,6 @@ if ($action == 'create' && $usercancreate) { $formquestion = array(); if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_VALIDATE_ORDER') && $qualified_for_stock_change) { $langs->load("stocks"); - require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php'; - $formproduct = new FormProduct($db); $forcecombo = 0; if ($conf->browser->name == 'ie') { $forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy @@ -3161,8 +3155,6 @@ if ($action == 'create' && $usercancreate) { // Warehouse if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')) { $langs->load('stocks'); - require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php'; - $formproduct = new FormProduct($db); print ''; $editenable = $usercancreate; print $form->editfieldkey("Warehouse", 'warehouse', '', $object, (int) $editenable); diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index b86c4406119..fbe8e91e02f 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -54,6 +54,7 @@ if (isModEnabled('margin')) { require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; if (isModEnabled('category')) { @@ -947,6 +948,7 @@ if (!$error && $massaction === 'setbilled' && $permissiontoclose && $objectclass $form = new Form($db); $formother = new FormOther($db); $formfile = new FormFile($db); +$formproduct = new FormProduct($db); $formmargin = null; if (isModEnabled('margin')) { $formmargin = new FormMargin($db); @@ -1756,8 +1758,6 @@ if (isModEnabled('category') && $user->hasRight("categorie", "lire")) { } // If Stock is enabled if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')) { - require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; - $formproduct = new FormProduct($db); $moreforfilter .= '
'; $tmptitle = $langs->trans('Warehouse'); $moreforfilter .= img_picto($tmptitle, 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', 1, 0, 0, $tmptitle, 0, 0, array(), 'maxwidth250 widthcentpercentminusx'); diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php index 982022ecdfc..d325bf50130 100644 --- a/htdocs/commande/list_det.php +++ b/htdocs/commande/list_det.php @@ -55,6 +55,7 @@ if (isModEnabled('margin')) { require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; if (isModEnabled('category')) { @@ -367,6 +368,7 @@ $now = dol_now(); $form = new Form($db); $formother = new FormOther($db); $formfile = new FormFile($db); +$formproduct = new FormProduct($db); $formmargin = null; if (isModEnabled('margin')) { $formmargin = new FormMargin($db); @@ -975,8 +977,6 @@ if ($resql) { $moreforfilter .= '
'; } if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')) { - require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; - $formproduct = new FormProduct($db); $moreforfilter .= '
'; $tmptitle = $langs->trans('Warehouse'); $moreforfilter .= img_picto($tmptitle, 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', 1, 0, 0, $tmptitle, 0, 0, array(), 'minwidth300imp maxwidth300 widthcentpercentminusx'); diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index ef5349acefe..690a754f09e 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -427,8 +427,6 @@ if ($order_id > 0 || !empty($ref)) { // Warehouse if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')) { - require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; - $formproduct = new FormProduct($db); print ''; print '
'; print $langs->trans('Warehouse');