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

This commit is contained in:
Laurent Destailleur 2026-05-10 18:54:10 +02:00
commit 4d6031fc06

View file

@ -5426,7 +5426,7 @@ if ($mode == 'replacesite' || $massaction == 'replace') {
print $langs->trans("WEBSITE_TYPE_CONTAINER");
print '</div>';
print '<div class="tagtd">';
print img_picto('', 'object_technic', 'class="paddingrightonly"').' ';
print img_picto('', 'object_technic', 'class="pictofixedwidth"').' ';
print $formwebsite->selectTypeOfContainer('optioncontainertype', (GETPOST('optioncontainertype', 'alpha') ? GETPOST('optioncontainertype', 'alpha') : ''), 1, '', 1, 'minwidth125 maxwidth400 widthcentpercentminusx');
print '</div>';
print '</div>';
@ -5436,7 +5436,7 @@ if ($mode == 'replacesite' || $massaction == 'replace') {
print $langs->trans("Language");
print '</div>';
print '<div class="tagtd">';
print img_picto('', 'language', 'class="paddingrightonly"').' '.$formadmin->select_language(GETPOSTISSET('optionlanguage') ? GETPOST('optionlanguage') : '', 'optionlanguage', 0, array(), '1', 0, 0, 'minwidth125 maxwidth400 widthcentpercentminusx', 2, 0, 0, array(), 1);
print img_picto('', 'language', 'class="pictofixedwidth"').' '.$formadmin->select_language(GETPOSTISSET('optionlanguage') ? GETPOST('optionlanguage') : '', 'optionlanguage', 0, array(), '1', 0, 0, 'minwidth125 maxwidth400 widthcentpercentminusx', 2, 0, 0, array(), 1);
print '</div>';
print '</div>';
@ -5448,7 +5448,7 @@ if ($mode == 'replacesite' || $massaction == 'replace') {
print '</div>';
print '<div class="tagtd">';
//print $form->selectCategories(Categorie::TYPE_WEBSITE_PAGE, 'optioncategory', $object);
print img_picto('', 'category', 'class="paddingrightonly"').' '.$form->select_all_categories(Categorie::TYPE_WEBSITE_PAGE, GETPOSTISSET('optioncategory') ? GETPOST('optioncategory') : '', 'optioncategory', 0, 0, 0, 0, 'minwidth125 maxwidth400 widthcentpercentminusx');
print img_picto('', 'category', 'class="pictofixedwidth"').' '.$form->select_all_categories(Categorie::TYPE_WEBSITE_PAGE, GETPOSTISSET('optioncategory') ? GETPOST('optioncategory') : '', 'optioncategory', 0, 0, 0, 0, 'minwidth125 maxwidth400 widthcentpercentminusx');
include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
print ajax_combobox('optioncategory');
print '</div>';