vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse source
This commit is contained in:
Laurent Destailleur 2026-03-20 18:22:05 +01:00
commit 4fcb0a4048
5 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
htdocs/commande/card.php
View file

@ -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 '<tr><td>' . $langs->trans('Warehouse') . '</td><td>';
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 '</td></tr>';
@ -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 '<tr><td>';
$editenable = $usercancreate;
print $form->editfieldkey("Warehouse", 'warehouse', '', $object, (int) $editenable);

4
htdocs/commande/list.php
View file

@ -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 .= '<div class="divsearchfield">';
$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');

4
htdocs/commande/list_det.php
View file

@ -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 .= '</div>';
}
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 .= '<div class="divsearchfield">';
$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');

2
htdocs/expedition/shipment.php
View file

@ -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 '<tr><td>';
print '<table width="100%" class="nobordernopadding"><tr><td>';
print $langs->trans('Warehouse');

11
htdocs/theme/eldy/tooltips.inc.css
View file

@ -48,7 +48,7 @@ div.ui-tooltip.jquery-tooltip {
/*backdrop-filter: blur(3px); */ /* useless if background as no opacity under 1 value */
border-radius: 0.375rem;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 20px rgba(0, 0, 0, 0.08);
pointer-events: none;
}
@ -87,8 +87,6 @@ div.ui-tooltip.jquery-tooltip.--light-mode {
--tooltip-bg-color: #ffffff;
--tooltip-border-color: #d1d5db;
}
/* Base tooltip */
.dol-tooltip::after {
content: attr(data-title);
@ -114,7 +112,7 @@ div.ui-tooltip.jquery-tooltip.--light-mode {
border: 1px solid var(--tooltip-border-color);
border-radius: 0.375rem;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 20px rgba(0, 0, 0, 0.08);
pointer-events: none;
text-transform: none;
@ -122,10 +120,13 @@ div.ui-tooltip.jquery-tooltip.--light-mode {
}
.dol-tooltip.--dar-mode::after {
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
}
/* Arrow */
.dol-tooltip::before {
z-index: 1;
content: "";
position: absolute;
left: 50%;