Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-04 08:02:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Third-party details in Lists in project index

Browse Source
This commit is contained in:
Stephane Lesage
2020-12-08 15:03:02 +01:00
parent 3161f35971
commit 5d8dfadd09
2 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/core/lib/project.lib.php
View File

@@ -2168,7 +2168,11 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
if (empty($arrayidofprojects)) $arrayidofprojects[0] = -1;
// Get list of project with calculation on tasks
$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, s.email, s.client, s.fournisseur,";
$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc,";
$sql2 .= " s.rowid as socid, s.nom as socname, s.name_alias,";
$sql2 .= " s.code_client, s.code_compta, s.client,";
$sql2 .= " s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur,";
$sql2 .= " s.logo, s.email, s.entity,";
$sql2 .= " p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_percent, p.opp_amount,";
$sql2 .= " p.dateo, p.datee,";
$sql2 .= " COUNT(t.rowid) as nb, SUM(t.planned_workload) as planned_workload, SUM(t.planned_workload * t.progress / 100) as declared_progess_workload";
@@ -2237,12 +2241,18 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
print '<td class="nowraponall tdoverflowmax100">';
if ($objp->fk_soc > 0)
{
$thirdpartystatic->id = $objp->fk_soc;
$thirdpartystatic->ref = $objp->socname;
$thirdpartystatic->id = $objp->socid;
$thirdpartystatic->name = $objp->socname;
//$thirdpartystatic->name_alias = $objp->name_alias;
//$thirdpartystatic->code_client = $objp->code_client;
$thirdpartystatic->code_compta = $objp->code_compta;
$thirdpartystatic->client = $objp->client;
//$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
$thirdpartystatic->fournisseur = $objp->fournisseur;
$thirdpartystatic->logo = $objp->logo;
$thirdpartystatic->email = $objp->email;
$thirdpartystatic->entity = $objp->entity;
print $thirdpartystatic->getNomUrl(1);
}
print '</td>';