Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
ldestailleur
2025-08-21 15:49:19 +02:00
parent 1578615cf5 b51468f556
commit 2ccd961f97
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/lib/company.lib.php
View File

@@ -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') {

5
htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
View File

@@ -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 */

4
htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
View File

@@ -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 */

5
htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
View File

@@ -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 */