From 78f14f525ffcdf872feefeab6e26a6a0c69f7d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 21 Aug 2025 15:41:24 +0200 Subject: [PATCH 1/4] add doc (#35023) --- htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php index 090dc40cb77..2f886a9e1e4 100644 --- a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php +++ b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php @@ -33,7 +33,10 @@ global $user; /** @var User $user */ $langs = $GLOBALS['langs']; '@phan-var-force Translate $langs'; -/** '@var Translate $langs */ +/** + * @var CommonObject $object + * @var Translate $langs + */ $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; '@phan-var-force SupplierProposal[] $linkedObjectBlock'; /** @var SupplierProposal[] $linkedObjectBlock */ From aa33a71c62fd73902ae83379d7e915c1d0e03c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 21 Aug 2025 15:41:42 +0200 Subject: [PATCH 2/4] add doc (#35024) --- htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php index 1f7c3df8bd4..5f781a13c73 100644 --- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php @@ -33,7 +33,10 @@ global $noMoreLinkedObjectBlockAfter; $langs = $GLOBALS['langs']; '@phan-var-force Translate $langs'; -/** @var Translate $langs */ +/** + * @var CommonObject $object + * @var Translate $langs + */ $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; '@phan-var-force CommandeFournisseur[] $linkedObjectBlock'; /** @var CommandeFournisseur[] $linkedObjectBlock */ From 9f87233a6152574fcd00aa17156f48a56046aba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 21 Aug 2025 15:42:04 +0200 Subject: [PATCH 3/4] add doc (#35025) --- htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php index adc547c8dbf..e06ecaa000f 100644 --- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php @@ -35,6 +35,10 @@ global $noMoreLinkedObjectBlockAfter; $langs = $GLOBALS['langs']; '@phan-var-force Translate $langs'; +/** + * @var CommonObject $object + * @var Translate $langs + */ $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; '@phan-var-force FactureFournisseur[] $linkedObjectBlock'; /** @var FactureFournisseur[] $linkedObjectBlock */ From b51468f556d598eb17834f79a1b83eea66ee6562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 21 Aug 2025 15:46:02 +0200 Subject: [PATCH 4/4] fix resource agenda (#35028) Co-authored-by: Laurent Destailleur --- htdocs/core/lib/company.lib.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index d6bccb6c5f4..b35b8e772b4 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -1949,6 +1949,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr } elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "element_resources as er"; $sql .= " ON er.resource_type = 'dolresource'"; + $sql .= " AND er.element_type = 'action'"; $sql .= " AND er.element_id = a.id"; $sql .= " AND er.resource_id = " . ((int) $filterobj->id); } elseif (is_object($filterobj) && get_class($filterobj) == 'Project') {