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

Automated merge from 22.0 to 23.0 by tool pullmerge.sh

Browse source
This commit is contained in:
Laurent Destailleur 2026-06-22 13:23:05 +02:00
commit ee8933f3ec
10 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
htdocs/admin/dict.php
View file

@ -2416,7 +2416,7 @@ if ($id > 0) {
print '<td colspan="3" class="center">';
print '<div name="'.(isset($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
print '<input type="hidden" name="page" value="'.dol_escape_htmltag((string) $page).'">';
print '<input type="hidden" name="page" value="'.((int) $page).'">';
print '<input type="hidden" name="rowid" value="'.dol_escape_htmltag($rowid).'">';
if (!is_null($withentity)) {
print '<input type="hidden" name="entity" value="'.$withentity.'">';

2
htdocs/commande/list_det.php
View file

@ -131,7 +131,7 @@ $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat',
$search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
$search_login = GETPOST('search_login', 'alpha');
$search_categ_cus = GETPOST("search_categ_cus", 'intcomma');
$search_billed = GETPOST('search_billed', 'intcomma') ? GETPOST('search_billed', 'intcomma') : GETPOST('billed', 'intcomma');
$search_billed = GETPOST('search_billed', 'intcomma');
$search_status = GETPOST('search_status', 'intcomma');
$search_project_ref = GETPOST('search_project_ref', 'alpha');
$search_project = GETPOST('search_project', 'alpha');

4
htdocs/contrat/list.php
View file

@ -9,7 +9,7 @@
* Copyright (C) 2016-2018 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2019 Nicolas Zabouri <info@inovea-conseil.com>
* Copyright (C) 2021-2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 Benjamin Falière <benjamin.faliere@altairis.fr>
* Copyright (C) 2025 Charlene Benke <charlene@patas-monkey.com>
@ -514,7 +514,7 @@ if ($search_date_modif_end) {
$sql .= " AND c.tms <= '".$db->idate($search_date_modif_end)."'";
}
if ($search_signed_status != '' && $search_signed_status >= 0) {
$sql .= ' AND c.signed_status = '.urlencode($search_signed_status);
$sql .= " AND c.signed_status = '".$db->escape($search_signed_status)."'";
}
// Add where from extra fields

2
htdocs/ecm/tpl/enablefiletreeajax.tpl.php
View file

@ -86,7 +86,7 @@ $(document).ready(function() {
$('#refreshbutton').click( function() {
console.log("Click on refreshbutton");
dolBlockUI("<?php echo $langs->trans('PleaseBePatient'); ?>");
dolBlockUI("<?php echo $langs->transnoentities('PleaseBePatient'); ?>");
$.get("<?php echo DOL_URL_ROOT.'/ecm/ajax/ecmdatabase.php'; ?>", {
action: 'build',

2
htdocs/expedition/card.php
View file

@ -1961,7 +1961,7 @@ if ($action == 'create' && $usercancreate) {
if ($res < 0) {
dol_print_error($db, $product->error, $product->errors);
}
if (getDolGlobalInt('PRODUIT_SOUSPRODUITS') && !getDolGlobalInt('PRODUIT_SOUSPRODUITS_ALSO_ENABLE_PARENT_STOCK_MOVE')) {
if (getDolGlobalInt('PRODUIT_SOUSPRODUITS')) {
$productChildrenNb = $product->hasFatherOrChild(1);
}
if ($productChildrenNb > 0) {

6
htdocs/expedition/list.php
View file

@ -6,7 +6,7 @@
* Copyright (C) 2019 Nicolas ZABOURI <info@inovea-conseil.com>
* Copyright (C) 2020 Thibault FOUCART <support@ptibogxiv.net>
* Copyright (C) 2023 Christophe Battarel <christophe@altairis.fr>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Benjamin Falière <benjamin.faliere@altairis.fr>
* Copyright (C) 2024 Vincent Maury <vmaury@timgroup.fr>
* Copyright (C) 2024 William Mead <william.mead@manchenumerique.fr>
@ -742,13 +742,13 @@ if ($search_status != '' && $search_status >= 0) {
$sql .= " AND e.fk_statut = ".((int) $search_status);
}
if ($search_signed_status != '' && $search_signed_status >= 0) {
$sql .= ' AND e.signed_status = '.urlencode($search_signed_status);
$sql .= " AND e.signed_status = ".((int) $search_signed_status);
}
if ($search_ref_customer != '') {
$sql .= natural_search('e.ref_customer', $search_ref_customer);
}
if ($search_billed != '' && $search_billed >= 0) {
$sql .= ' AND e.billed = '.((int) $search_billed);
$sql .= " AND e.billed = ".((int) $search_billed);
}
if ($search_town) {
$sql .= natural_search('s.town', $search_town);

2
htdocs/fichinter/card.php
View file

@ -1213,7 +1213,7 @@ if ($action == 'create') {
print '<tr><td class="fieldrequired">'.$langs->trans("ThirdParty").'</td><td>';
$filter = '(s.status:=:1)';
print $form->select_company('', 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth300');
print $form->select_company('', 'socid', $filter, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300');
print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
print '</td></tr>';
print '</table>';

6
htdocs/fichinter/list.php
View file

@ -9,7 +9,7 @@
* Copyright (C) 2021-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2022-2026 Charlène Benke <charlene@patas-monkey.com>
* Copyright (C) 2024 William Mead <william.mead@manchenumerique.fr>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024-2026 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Benjamin Falière <benjamin.faliere@altairis.fr>
*
* This program is free software; you can redistribute it and/or modify
@ -340,10 +340,10 @@ if ($search_desc) {
}
}
if ($search_status != '' && $search_status >= 0) {
$sql .= ' AND f.fk_statut = '.urlencode($search_status);
$sql .= ' AND f.fk_statut = '.((int) ($search_status));
}
if ($search_signed_status != '' && $search_signed_status >= 0) {
$sql .= ' AND f.signed_status = '.urlencode($search_signed_status);
$sql .= ' AND f.signed_status = '.((int) $search_signed_status);
}
if (!getDolGlobalString('FICHINTER_DISABLE_DETAILS') && $atleastonefieldinlines) {
if ($search_date_start) {

2
htdocs/install/mysql/migration/21.0.0-22.0.0.sql
View file

@ -332,4 +332,6 @@ ALTER TABLE llx_webhook_history MODIFY COLUMN url varchar(255);
UPDATE llx_c_socialnetworks SET icon = 'fa-mastodon' WHERE icon = '' AND code = 'mastodon';
ALTER TABLE llx_adherent MODIFY COLUMN societe VARCHAR(128);
-- end of migration

3
htdocs/product/class/product.class.php
View file

@ -6624,6 +6624,9 @@ class Product extends CommonObject
break;
}
}
} elseif (getDolGlobalInt('PRODUIT_SOUSPRODUITS_ALSO_ENABLE_PARENT_STOCK_MOVE') && empty($productCachedList)) {
// if all sub product are not stock managed when use parent stock
$this->load_stock('warehouseopen');
}
}