Fix CI
This commit is contained in:
parent
b3d3a7176f
commit
2e925dfa40
1 changed files with 8 additions and 6 deletions
|
|
@ -22,6 +22,8 @@
|
|||
/**
|
||||
* @var ?Conf $conf
|
||||
* @var User $user
|
||||
*
|
||||
* @var int $showImportButton
|
||||
*/
|
||||
|
||||
// Protection to avoid direct call of template
|
||||
|
|
@ -36,12 +38,12 @@ global $user;
|
|||
global $noMoreLinkedObjectBlockAfter;
|
||||
|
||||
$langs = $GLOBALS['langs'];
|
||||
'@phan-var-force Translate $langs';
|
||||
$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
|
||||
'@phan-var-force Translate $langs';
|
||||
'@phan-var-force Asset[] $linkedObjectBlock';
|
||||
/**
|
||||
* @var Asset[] $linkedObjectBlock
|
||||
* @var CommonObject $object
|
||||
* @var Asset[] $linkedObjectBlock
|
||||
* @var Translate $langs
|
||||
*/
|
||||
|
||||
|
|
@ -49,7 +51,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
|
|||
$langs->load("assets");
|
||||
|
||||
$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
|
||||
'@phan-var-force CommonObject[] $linkedObjectBlock'; // Repeat because type lost after dol_sort_array)
|
||||
'@phan-var-force Asset[] $linkedObjectBlock'; // Repeat because type lost after dol_sort_array)
|
||||
/** @var Asset[] $linkedObjectBlock */
|
||||
|
||||
$total = 0;
|
||||
|
|
@ -64,12 +66,12 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
|
|||
echo '<tr class="'.$trclass.'" >';
|
||||
echo '<td class="linkedcol-element tdoverflowmax100">'.$langs->trans("Asset");
|
||||
if (!empty($showImportButton) && getDolGlobalString('MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES')) {
|
||||
print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&action=selectlines&token='.newToken().'" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'" > <i class="fa fa-indent"></i> </a';
|
||||
print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&action=selectlines&token='.newToken().'" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"> <i class="fa fa-indent"></i> </a>';
|
||||
}
|
||||
echo '</td>';
|
||||
echo '<td class="linkedcol-name tdoverflowmax150" >'.$objectlink->getNomUrl(1).'</td>';
|
||||
echo '<td class="linkedcol-ref" align="center">'.$objectlink->label.'</td>';
|
||||
echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date_start, 'day').'</td>';
|
||||
echo '<td class="linkedcol-ref center">'.$objectlink->label.'</td>';
|
||||
echo '<td class="linkedcol-date center">'.dol_print_date($objectlink->date_start, 'day').'</td>';
|
||||
echo '<td class="linkedcol-amount right">';
|
||||
if ($user->hasRight('asset', 'read')) {
|
||||
$total += $objectlink->acquisition_value_ht;
|
||||
|
|
|
|||
Loading…
Reference in a new issue