diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index c8db65157bb..1c381f423f8 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -2416,7 +2416,7 @@ if ($id > 0) { print ''; print '
'; - print ''; + print ''; print ''; if (!is_null($withentity)) { print ''; diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php index 5d3fb059173..e4fa30a1c7b 100644 --- a/htdocs/commande/list_det.php +++ b/htdocs/commande/list_det.php @@ -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'); diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 79794fa354c..b174d1b7918 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -9,7 +9,7 @@ * Copyright (C) 2016-2018 Ferran Marcet * Copyright (C) 2019 Nicolas Zabouri * Copyright (C) 2021-2024 Alexandre Spangaro - * Copyright (C) 2024-2025 MDW + * Copyright (C) 2024-2026 MDW * Copyright (C) 2024 Frédéric France * Copyright (C) 2024 Benjamin Falière * Copyright (C) 2025 Charlene Benke @@ -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 diff --git a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php index fe0e6ae5ecf..af4f42fcb1c 100644 --- a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php +++ b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php @@ -86,7 +86,7 @@ $(document).ready(function() { $('#refreshbutton').click( function() { console.log("Click on refreshbutton"); - dolBlockUI("trans('PleaseBePatient'); ?>"); + dolBlockUI("transnoentities('PleaseBePatient'); ?>"); $.get("", { action: 'build', diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index c45ffc4f5e9..81143f6a252 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -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) { diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index c5f39c18f51..367ac37ad10 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -6,7 +6,7 @@ * Copyright (C) 2019 Nicolas ZABOURI * Copyright (C) 2020 Thibault FOUCART * Copyright (C) 2023 Christophe Battarel - * Copyright (C) 2024-2025 MDW + * Copyright (C) 2024-2026 MDW * Copyright (C) 2024 Benjamin Falière * Copyright (C) 2024 Vincent Maury * Copyright (C) 2024 William Mead @@ -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); diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index d0ee10746a1..4d44df68ce6 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1213,7 +1213,7 @@ if ($action == 'create') { print ''.$langs->trans("ThirdParty").''; $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 ' '; print ''; print ''; diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 03cab798c4f..f89f34f8c10 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -9,7 +9,7 @@ * Copyright (C) 2021-2024 Frédéric France * Copyright (C) 2022-2026 Charlène Benke * Copyright (C) 2024 William Mead - * Copyright (C) 2024-2025 MDW + * Copyright (C) 2024-2026 MDW * Copyright (C) 2024 Benjamin Falière * * 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) { diff --git a/htdocs/install/mysql/migration/21.0.0-22.0.0.sql b/htdocs/install/mysql/migration/21.0.0-22.0.0.sql index 9a65bc79542..2a1ca5221e4 100644 --- a/htdocs/install/mysql/migration/21.0.0-22.0.0.sql +++ b/htdocs/install/mysql/migration/21.0.0-22.0.0.sql @@ -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 diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 18272e87df3..e23112fe7ef 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -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'); } }