mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-04 08:02:22 +01:00
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
This commit is contained in:
@@ -600,6 +600,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
|
|||||||
{
|
{
|
||||||
global $user, $langs, $conf, $db, $hookmanager;
|
global $user, $langs, $conf, $db, $hookmanager;
|
||||||
global $projectstatic, $taskstatic, $extrafields;
|
global $projectstatic, $taskstatic, $extrafields;
|
||||||
|
global $objectoffield;
|
||||||
|
|
||||||
$lastprojectid = 0;
|
$lastprojectid = 0;
|
||||||
|
|
||||||
@@ -936,6 +937,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
|
|||||||
$extrafieldsobjectkey = $taskstatic->table_element;
|
$extrafieldsobjectkey = $taskstatic->table_element;
|
||||||
$extrafieldsobjectprefix = 'efpt.';
|
$extrafieldsobjectprefix = 'efpt.';
|
||||||
$obj = $lines[$i];
|
$obj = $lines[$i];
|
||||||
|
$object = $lines[$i];
|
||||||
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
|
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
|
||||||
// Fields from hook
|
// Fields from hook
|
||||||
$parameters = array('arrayfields' => $arrayfields, 'obj' => $lines[$i]);
|
$parameters = array('arrayfields' => $arrayfields, 'obj' => $lines[$i]);
|
||||||
|
|||||||
Reference in New Issue
Block a user