diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 6a6dfa21d61..f9510bc37ee 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -549,7 +549,7 @@ if ($resql) {
/*
$moreforfilter .= '
';
$moreforfilter .= img_picto($langs->trans('Categories'), 'category', 'class="pictofixedwidth"');
- $categoriesProductArr = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', '', 64, 0, 1);
+ $categoriesProductArr = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', '', 64, 0, 3);
$categoriesProductArr[-2] = '- '.$langs->trans('NotCategorized').' -';
$moreforfilter .= Form::multiselectarray('search_category_product_list', $categoriesProductArr, $searchCategoryProductList, 0, 0, 'minwidth300');
$moreforfilter .= '
';
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index c1ff111b9c4..f688d1e4445 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1122,7 +1122,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
// Categories
if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
print '
| '.$form->editfieldkey("Categories", 'memcats', '', $object, 0).' | ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, 0, 'parent', 0, 0, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, '', 'parent', 64, 0, 3);
print img_picto('', 'category').$form->multiselectarray('memcats', $cate_arbo, GETPOST('memcats', 'array'), 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
print " |
";
}
@@ -1378,7 +1378,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
print '
| '.$form->editfieldkey("Categories", 'memcats', '', $object, 0).' | ';
print '';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, null, null, null, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, '', '', 64, 0, 3);
$c = new Categorie($db);
$cats = $c->containing($object->id, Categorie::TYPE_MEMBER);
$arrayselected = array();
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index a91f063dee4..6e1361287b8 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1432,7 +1432,7 @@ if ($action == 'create') {
if (isModEnabled('category')) {
// Categories
print ' |
| '.$langs->trans("Categories").' | ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 3);
print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'minwidth300 quatrevingtpercent widthcentpercentminusx', 0, 0);
print " |
";
}
@@ -1984,7 +1984,7 @@ if ($id > 0) {
// Tags-Categories
if (isModEnabled('category')) {
print '
| '.$langs->trans("Categories").' | ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 3);
$c = new Categorie($db);
$cats = $c->containing($object->id, Categorie::TYPE_ACTIONCOMM);
$arrayselected = array();
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 0a6c4cb7579..920cf5fef45 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -484,7 +484,7 @@ if ($action == 'create') {
// Tags-Categories
if (isModEnabled('category')) {
print ' |
| '.$langs->trans("Categories").' | ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 3);
$arrayselected = array();
$c = new Categorie($db);
@@ -1044,7 +1044,7 @@ if ($action == 'create') {
// Tags-Categories
if (isModEnabled('category')) {
print ' |
| '.$langs->trans("Categories").' | ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 3);
$arrayselected = array();
$c = new Categorie($db);
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 7f00e98c4f9..8a89d1a015f 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -877,7 +877,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
// Categories
if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
print ' |
| '.$form->editfieldkey('Categories', 'contcats', '', $object, 0).' | ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_CONTACT, null, 'parent', null, null, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_CONTACT, '', 'parent', 64, 0, 3);
print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('contcats', $cate_arbo, GETPOST('contcats', 'array'), null, null, null, null, '90%');
print " |
";
}
@@ -1175,7 +1175,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
$arrayselected = array();
print '
| '.$form->editfieldkey('Categories', 'contcats', '', $object, 0).' | ';
print '';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_CONTACT, null, null, null, null, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_CONTACT, '', '', 64, 0, 3);
$c = new Categorie($db);
$cats = $c->containing($object->id, 'contact');
foreach ($cats as $cat) {
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 4626c571e58..48bc9c5866b 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -808,7 +808,7 @@ if (isModEnabled('category') && $user->hasRight('categorie', 'lire') && ($user->
include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$moreforfilter .= ' ';
$tmptitle = $langs->trans('IncludingProductWithTag');
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 3);
$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'widthcentpercentminusx maxwidth300', 1);
$moreforfilter .= ' ';
}
@@ -817,7 +817,7 @@ if (getDolGlobalString('MAIN_SEARCH_CATEGORY_CUSTOMER_ON_CONTRACT_LIST') && isMo
$moreforfilter .= '';
$tmptitle = $langs->transnoentities('CustomersProspectsCategoriesShort');
$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
- $categoriesArr = $form->select_all_categories(Categorie::TYPE_CUSTOMER, '', '', 64, 0, 1);
+ $categoriesArr = $form->select_all_categories(Categorie::TYPE_CUSTOMER, '', '', 64, 0, 3);
$categoriesArr[-2] = '- '.$langs->trans('NotCategorized').' -';
$moreforfilter .= Form::multiselectarray('search_category_customer_list', $categoriesArr, $searchCategoryCustomerList, 0, 0, 'minwidth300', 0, 0, '', 'category', $tmptitle);
$moreforfilter .= ' ';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8ec200a31a4..78b4c8a6578 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -9126,7 +9126,7 @@ class Form
if ($rendermode == 0) {
$arrayselected = array();
- $cate_arbo = $this->select_all_categories($type, '', 'parent', 64, 0, 1);
+ $cate_arbo = $this->select_all_categories($type, '', 'parent', 64, 0, 3);
foreach ($categories as $c) {
$arrayselected[] = $c->id;
}
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 48a56b916a8..b3b483abe65 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -463,7 +463,7 @@ class FormTicket
// Categories
if (isModEnabled('category')) {
include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_TICKET, '', 'parent', 64, 0, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_TICKET, '', 'parent', 64, 0, 3);
if (count($cate_arbo)) {
// Categories
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index 1fa1a8a20f1..0db2a2ae996 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -192,7 +192,7 @@ if ($action == 'create') {
$object->fields['answer']['enabled'] = 1;
if (isModEnabled('category')) {
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', 'parent', 64, 0, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', 'parent', 64, 0, 3);
if (count($cate_arbo)) {
// Categories
@@ -249,7 +249,7 @@ if (($id || $ref) && $action == 'edit') {
$object->fields['answer']['enabled'] = 1;
if (isModEnabled('category')) {
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', 'parent', 64, 0, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', 'parent', 64, 0, 3);
if (count($cate_arbo)) {
// Categories
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index f2ee512c004..65e61a5c00d 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -497,7 +497,7 @@ if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
/*
$moreforfilter .= ' ';
$moreforfilter .= img_picto($langs->trans('Categories'), 'category', 'class="pictofixedwidth"');
- $categoriesKnowledgeArr = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', '', 64, 0, 1);
+ $categoriesKnowledgeArr = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', '', 64, 0, 3);
$categoriesKnowledgeArr[-2] = '- '.$langs->trans('NotCategorized').' -';
$moreforfilter .= Form::multiselectarray('search_category_knowledgemanagement_list', $categoriesKnowledgeArr, $searchCategoryKnowledgemanagementList, 0, 0, 'minwidth300');
$moreforfilter .= ' ';
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index b81567d7b09..cdccc64fa07 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -158,7 +158,7 @@ print img_picto('', 'product').$form->multiselectarray('products', $TProducts, $
print ' |
';
// Categories
-$TCats = $form->select_all_categories('product', array(), '', 64, 0, 1);
+$TCats = $form->select_all_categories('product', array(), '', 64, 0, 3);
print '
';
print '| '.$langs->trans('Category').' | ';
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index e6837605980..f215cd14100 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -121,7 +121,7 @@ print img_picto('', 'product').$form->select_produits(($id > 0 ? $id : ''), 'id'
print '
';
// Categories
-$TCats = $form->select_all_categories('product', array(), '', 64, 0, 1);
+$TCats = $form->select_all_categories('product', array(), '', 64, 0, 3);
print '
';
print '| '.$langs->trans('Category').' | ';
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index b5d71cc49fa..9d076144121 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1685,7 +1685,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
if (isModEnabled('category')) {
// Categories
print '
| '.$langs->trans("Categories").' | ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 3);
print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
print " |
";
}
@@ -2294,7 +2294,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
// Tags-Categories
if (isModEnabled('category')) {
print '
| '.$langs->trans("Categories").' | ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 3);
$c = new Categorie($db);
$cats = $c->containing($object->id, Categorie::TYPE_PRODUCT);
$arrayselected = array();
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index d9ff6026f0d..65ba4dbf744 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -481,7 +481,7 @@ if (getDolGlobalString('MAIN_SEARCH_CATEGORY_PRODUCT_ON_LISTS') && isModEnabled(
$moreforfilter .= '';
$tmptitle = $langs->transnoentities('ProductsCategoriesShort');
$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
- $categoriesProductArr = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', '', 64, 0, 1);
+ $categoriesProductArr = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', '', 64, 0, 3);
$categoriesProductArr[-2] = '- '.$langs->trans('NotCategorized').' -';
$moreforfilter .= Form::multiselectarray('search_category_product_list', $categoriesProductArr, $searchCategoryProductList, 0, 0, 'minwidth300', 0, 0, '', 'category', $tmptitle);
$moreforfilter .= ' ';
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 7ac5cf97541..03f9daac2b1 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -392,7 +392,7 @@ if ($action == 'create') {
if (isModEnabled('category')) {
// Categories
print ' | '.$langs->trans("Categories").' | ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_WAREHOUSE, '', 'parent', 64, 0, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_WAREHOUSE, '', 'parent', 64, 0, 3);
print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
print " | ";
}
@@ -977,7 +977,7 @@ if ($action == 'create') {
// Tags-Categories
if (isModEnabled('category')) {
print ' | '.$langs->trans("Categories").' | ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_WAREHOUSE, '', 'parent', 64, 0, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_WAREHOUSE, '', 'parent', 64, 0, 3);
$c = new Categorie($db);
$cats = $c->containing($object->id, Categorie::TYPE_WAREHOUSE);
$arrayselected = array();
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 4d3fd801d3e..4abed50260b 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -882,7 +882,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
if (isModEnabled('category')) {
// Categories
print ' | | '.$langs->trans("Categories").' | ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_PROJECT, '', 'parent', 64, 0, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_PROJECT, '', 'parent', 64, 0, 3);
$arrayselected = GETPOST('categories', 'array');
print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
print " | ";
@@ -1274,7 +1274,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
if (isModEnabled('category')) {
$arrayselected = array();
print ' | '.$langs->trans("Categories").' | ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_PROJECT, '', 'parent', 64, 0, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_PROJECT, '', 'parent', 64, 0, 3);
$c = new Categorie($db);
$cats = $c->containing($object->id, Categorie::TYPE_PROJECT);
foreach ($cats as $cat) {
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 12c5b45a927..79ca634c1bd 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -1136,7 +1136,7 @@ if (getDolGlobalString('MAIN_SEARCH_CATEGORY_CUSTOMER_ON_PROJECT_LIST') && isMod
/*$moreforfilter .= '';
$tmptitle = $langs->transnoentities('CustomersProspectsCategoriesShort');
$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
- $categoriesArr = $form->select_all_categories(Categorie::TYPE_CUSTOMER, '', '', 64, 0, 1);
+ $categoriesArr = $form->select_all_categories(Categorie::TYPE_CUSTOMER, '', '', 64, 0, 3);
$categoriesArr[-2] = '- '.$langs->trans('NotCategorized').' -';
$moreforfilter .= Form::multiselectarray('search_category_customer_list', $categoriesArr, $searchCategoryCustomerList, 0, 0, 'minwidth300im minwidth300 widthcentpercentminusx', 0, 0, '', 'category', $tmptitle);
$moreforfilter .= ' ';
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 34be3bb5c3f..7afad1aee62 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -818,7 +818,7 @@ if (getDolGlobalString('MAIN_SEARCH_CATEGORY_CUSTOMER_ON_TASK_LIST') && isModEna
$moreforfilter .= ' ';
$tmptitle = $langs->transnoentities('CustomersProspectsCategoriesShort');
$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
- $categoriesArr = $form->select_all_categories(Categorie::TYPE_CUSTOMER, '', '', 64, 0, 1);
+ $categoriesArr = $form->select_all_categories(Categorie::TYPE_CUSTOMER, '', '', 64, 0, 3);
$categoriesArr[-2] = '- '.$langs->trans('NotCategorized').' -';
$moreforfilter .= Form::multiselectarray('search_category_customer_list', $categoriesArr, $searchCategoryCustomerList, 0, 0, 'minwidth300', 0, 0, '', 'category', $tmptitle);
$moreforfilter .= ' ';
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index cf8fffc67e9..02e0921b95f 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1699,13 +1699,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
// Customer
print ' | '.$form->editfieldkey('CustomersProspectsCategoriesShort', 'custcats', '', $object, 0).' | ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, '', 'parent', 64, 0, 3);
print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
print " | ";
if (getDolGlobalString('THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION')) {
print '| '.$form->editfieldkey('ContactCategoriesShort', 'contcats', '', $object, 0).' | ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_CONTACT, null, 'parent', null, null, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_CONTACT, '', 'parent', 64, 0, 3);
print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('contcats', $cate_arbo, GETPOST('contcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
print " | ";
}
@@ -1713,7 +1713,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
// Supplier
if (isModEnabled("supplier_proposal") || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
print '| '.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).' | ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, 'parent', null, null, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, '', 'parent', 64, 0, 3);
print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
print " | ";
}
@@ -2454,7 +2454,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
// Customer
print '| '.$form->editfieldkey('CustomersCategoriesShort', 'custcats', '', $object, 0).' | ';
print '';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, null, null, null, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, '', '', 64, 0, 3);
$c = new Categorie($db);
$cats = $c->containing($object->id, Categorie::TYPE_CUSTOMER);
$arrayselected = array();
@@ -2468,7 +2468,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
print ' | | '.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).' | ';
print '';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, null, null, null, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, '', '', 64, 0, 3);
$c = new Categorie($db);
$cats = $c->containing($object->id, Categorie::TYPE_SUPPLIER);
$arrayselected = array();
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index da17e5aafa4..1d3d13649b8 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -1792,14 +1792,14 @@ while ($i < $imaxinloop) {
}
if (!empty($arrayfields['s.rowid']['checked'])) {
print ' | ';
- print $obj->rowid;
+ print dol_escape_htmltag($obj->rowid);
print " | \n";
if (!$i) {
$totalarray['nbfield']++;
}
}
if (!empty($arrayfields['s.nom']['checked'])) {
- print '';
+ print ' | ';
if ($contextpage == 'poslist') {
print dol_escape_htmltag($companystatic->name);
} else {
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index addd6fade71..311b17beb4b 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1303,7 +1303,7 @@ if ($action == 'create' || $action == 'presend') {
print ' | ';
if ($user->hasRight('ticket', 'write') && $action == 'categories') {
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_TICKET, '', 'parent', 64, 0, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_TICKET, '', 'parent', 64, 0, 3);
if (is_array($cate_arbo)) {
// Categories
print '';
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index de7acee9dd4..df9c74c1b5e 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -396,7 +396,7 @@ if ($user->hasRight('ticket', 'read')) {
print " | \n";
// Creation date
- print '';
+ print ' | ';
print dol_print_date($db->jdate($objp->datec), 'dayhour');
print " | ";
| |