diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 736044fafe7..74e624ca7cb 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -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 '
';
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 ' | ';
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 71791d1a655..576bda7d09f 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -213,8 +213,12 @@ print_projecttasks_array($db, $form, $socid, $projectsListId, 0, 0, $listofoppst
print '';
// Latest modified projects
-$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut as status, p.tms as datem,";
-$sql .= " s.rowid as socid, s.nom as name, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.canvas, s.status as thirdpartystatus";
+$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut as status, p.tms as datem";
+$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+$sql .= ", s.code_client, s.code_compta, s.client";
+$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+$sql .= ", s.logo, s.email, s.entity";
+$sql .= ", s.canvas, s.status as thirdpartystatus";
$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
$sql .= " WHERE p.entity IN (".getEntity('project').")";
@@ -253,11 +257,16 @@ if ($resql)
$companystatic->id = $obj->socid;
$companystatic->name = $obj->name;
- $companystatic->email = $obj->email;
+ //$companystatic->name_alias = $obj->name_alias;
+ //$companystatic->code_client = $obj->code_client;
+ $companystatic->code_compta = $obj->code_compta;
$companystatic->client = $obj->client;
+ //$companystatic->code_fournisseur = $obj->code_fournisseur;
+ $companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
$companystatic->fournisseur = $obj->fournisseur;
- $companystatic->code_client = $obj->code_client;
- $companystatic->code_fournisseur = $obj->code_fournisseur;
+ $companystatic->logo = $obj->logo;
+ $companystatic->email = $obj->email;
+ $companystatic->entity = $obj->entity;
$companystatic->canvas = $obj->canvas;
$companystatic->status = $obj->thirdpartystatus;
@@ -307,7 +316,11 @@ print_liste_field_titre("NbOfProjects", $_SERVER["PHP_SELF"], "nb", "", "", '',
print "\n";
$sql = "SELECT COUNT(p.rowid) as nb, SUM(p.opp_amount)";
-$sql .= ", s.rowid as socid, s.nom as name, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.canvas, s.status";
+$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+$sql .= ", s.code_client, s.code_compta, s.client";
+$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+$sql .= ", s.logo, s.email, s.entity";
+$sql .= ", s.canvas, s.status";
$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
$sql .= " WHERE p.entity IN (".getEntity('project').")";
@@ -341,9 +354,17 @@ if ($resql)
{
$companystatic->id = $obj->socid;
$companystatic->name = $obj->name;
- $companystatic->email = $obj->email;
+ $companystatic->name_alias = $obj->name_alias;
+ $companystatic->code_client = $obj->code_client;
+ $companystatic->code_compta = $obj->code_compta;
$companystatic->client = $obj->client;
+ $companystatic->code_fournisseur = $obj->code_fournisseur;
+ $companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
$companystatic->fournisseur = $obj->fournisseur;
+ $companystatic->logo = $obj->logo;
+ $companystatic->email = $obj->email;
+ $companystatic->entity = $obj->entity;
+ $companystatic->canvas = $obj->canvas;
$companystatic->status = $obj->status;
print $companystatic->getNomUrl(1);