From e06fac4460d037c2d2cea5038c0ab579069f6aff Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 4 Apr 2026 12:15:13 +0200 Subject: [PATCH 1/4] Fix option CATEGORY_EDIT_IN_MENU_NOT_IN_POPUP --- htdocs/core/modules/modKnowledgeManagement.class.php | 2 +- htdocs/core/modules/modTicket.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/modKnowledgeManagement.class.php b/htdocs/core/modules/modKnowledgeManagement.class.php index 3647dc53537..8dfb2d48569 100644 --- a/htdocs/core/modules/modKnowledgeManagement.class.php +++ b/htdocs/core/modules/modKnowledgeManagement.class.php @@ -354,7 +354,7 @@ class modKnowledgeManagement extends DolibarrModules 'url' => '/categories/categorie_list.php?type=13', 'langs' => 'knowledgemanagement', 'position' => 112, - 'enabled' => 'isModEnabled("knowledgemanagement") && isModEnabled("category")', + 'enabled' => 'isModEnabled("knowledgemanagement") && isModEnabled("category") && getDolGlobalString("CATEGORY_EDIT_IN_MENU_NOT_IN_POPUP")', 'perms' => '$user->hasRight("knowledgemanagement", "knowledgerecord", "read")', 'target' => '', 'user' => 0 diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php index 20bd365bb2b..386bef1793d 100644 --- a/htdocs/core/modules/modTicket.class.php +++ b/htdocs/core/modules/modTicket.class.php @@ -360,7 +360,7 @@ class modTicket extends DolibarrModules 'url' => '/categories/categorie_list.php?type=12', 'langs' => 'ticket', 'position' => 107, - 'enabled' => 'isModEnabled("ticket") && isModEnabled("categorie")', + 'enabled' => 'isModEnabled("ticket") && isModEnabled("categorie") && getDolGlobalString("CATEGORY_EDIT_IN_MENU_NOT_IN_POPUP")', 'perms' => '$user->hasRight("ticket","read")', 'target' => '', 'user' => 0); From ccef1102e6850b7545be7bad91cf0cc4c74ac6ea Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 4 Apr 2026 13:07:19 +0200 Subject: [PATCH 2/4] Fix missing delete of ajax file --- htdocs/modulebuilder/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php index 745f8899a7d..32aa8ae3a73 100644 --- a/htdocs/modulebuilder/index.php +++ b/htdocs/modulebuilder/index.php @@ -2061,6 +2061,7 @@ if ($dirins && $action == 'confirm_deleteobject' && $objectname /* && $user->has 'myobject_agenda.php' => strtolower($objectname).'_agenda.php', 'myobject_list.php' => strtolower($objectname).'_list.php', 'admin/myobject_extrafields.php' => 'admin/'.strtolower($objectname).'_extrafields.php', + 'ajax/myobject.lib.php' => 'ajax/'.strtolower($objectname).'.php', 'lib/mymodule_myobject.lib.php' => 'lib/'.strtolower($module).'_'.strtolower($objectname).'.lib.php', 'test/phpunit/MyObjectTest.php' => 'test/phpunit/'.strtolower($objectname).'Test.php', 'sql/llx_mymodule_myobject.sql' => 'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql', From 40afa9210e768f22fd386cb2b9eb3fd5c7d2fd2d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 7 Apr 2026 18:48:56 +0200 Subject: [PATCH 3/4] css --- htdocs/core/tpl/objectline_edit.tpl.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index 2291df4273f..48fa4c4a60e 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -254,7 +254,7 @@ $coldisplay++; } $coldisplay++; - print 'total_ttc / (float) $line->qty, 'MU'); } - print 'qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." "; - print ' Date: Wed, 8 Apr 2026 13:37:43 +0200 Subject: [PATCH 4/4] More complete stubs --- dev/tools/phan/config.php | 1 + dev/tools/phan/stubs/phpunit.phan_php | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 dev/tools/phan/stubs/phpunit.phan_php diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php index 8f35bcc3c34..c34c4af3a6f 100644 --- a/dev/tools/phan/config.php +++ b/dev/tools/phan/config.php @@ -506,6 +506,7 @@ return [ 'pdo_mysql' => PHAN_DIR . '/stubs/pdo_mysql.phan_php', 'pdo_pgsql' => PHAN_DIR . '/stubs/pdo_pgsql.phan_php', 'pdo_sqlite' => PHAN_DIR . '/stubs/pdo_sqlite.phan_php', + 'phpunit' => PHAN_DIR . '/stubs/phpunit.phan_php', 'pgsql' => PHAN_DIR . '/stubs/pgsql.phan_php', 'session' => PHAN_DIR . '/stubs/session.phan_php', 'simplexml' => PHAN_DIR . '/stubs/SimpleXML.phan_php', diff --git a/dev/tools/phan/stubs/phpunit.phan_php b/dev/tools/phan/stubs/phpunit.phan_php new file mode 100644 index 00000000000..351d2e4478b --- /dev/null +++ b/dev/tools/phan/stubs/phpunit.phan_php @@ -0,0 +1,6 @@ +