diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 3d9cd447802..9eab5cd6a70 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2175,7 +2175,8 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
if ($userAccess >= 0)
{
$projectstatic->ref = $objp->ref;
- $projectstatic->statut = $objp->status;
+ $projectstatic->statut = $objp->status; // deprecated
+ $projectstatic->status = $objp->status;
$projectstatic->title = $objp->title;
$projectstatic->datee = $db->jdate($objp->datee);
$projectstatic->dateo = $db->jdate($objp->dateo);
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 74c82423966..54075318246 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -493,7 +493,7 @@ class Project extends CommonObject
if (empty($id) && empty($ref)) return -1;
$sql = "SELECT rowid, ref, title, description, public, datec, opp_amount, budget_amount,";
- $sql .= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_modif, fk_user_close, fk_statut, fk_opp_status, opp_percent,";
+ $sql .= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_modif, fk_user_close, fk_statut as status, fk_opp_status, opp_percent,";
$sql .= " note_private, note_public, model_pdf, usage_opportunity, usage_task, usage_bill_time, usage_organize_event, entity";
$sql .= " FROM ".MAIN_DB_PREFIX."projet";
if (!empty($id))
@@ -534,7 +534,8 @@ class Project extends CommonObject
$this->user_modification_id = $obj->fk_user_modif;
$this->user_close_id = $obj->fk_user_close;
$this->public = $obj->public;
- $this->statut = $obj->fk_statut;
+ $this->statut = $obj->status; // deprecated
+ $this->status = $obj->status;
$this->opp_status = $obj->fk_opp_status;
$this->opp_amount = $obj->opp_amount;
$this->opp_percent = $obj->opp_percent;
@@ -994,7 +995,7 @@ class Project extends CommonObject
*/
public function getLibStatut($mode = 0)
{
- return $this->LibStatut($this->statut, $mode);
+ return $this->LibStatut(isset($this->statut)?$this->statut:$this->status, $mode);
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1055,6 +1056,9 @@ class Project extends CommonObject
if (!empty($this->datee))
$label .= ($label ? '
' : '').''.$langs->trans('DateEnd').': '.dol_print_date($this->datee, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
if ($moreinpopup) $label .= '
'.$moreinpopup;
+ if (isset($this->status)) {
+ $label .= '
'.$langs->trans("Status").": ".$this->getLibStatut(5);
+ }
$url = '';
if ($option != 'nolink')
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 0613fd75e8f..143a932ff28 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -172,8 +172,8 @@ 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, 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";
+$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 .= " 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').")";
@@ -208,6 +208,7 @@ if ($resql)
$projectstatic->dateo = $obj->dateo;
$projectstatic->datep = $obj->datep;
$projectstatic->thirdparty_name = $obj->name;
+ $projectstatic->status = $obj->status;
$companystatic->id = $obj->socid;
$companystatic->name = $obj->name;
@@ -217,6 +218,7 @@ if ($resql)
$companystatic->code_client = $obj->code_client;
$companystatic->code_fournisseur = $obj->code_fournisseur;
$companystatic->canvas = $obj->canvas;
+ $companystatic->status = $obj->thirdpartystatus;
print '
';
print '| ';
@@ -243,7 +245,7 @@ if ($resql)
}
print ' | ';
print ''.dol_print_date($db->jdate($obj->datem), 'day').' | ';
- print ''.$projectstatic->LibStatut($obj->fk_statut, 3).' | ';
+ print ''.$projectstatic->LibStatut($obj->status, 3).' | ';
print '
';
$i++;
}
@@ -265,14 +267,14 @@ print_liste_field_titre("NbOfProjects", "", "", "", "", '', $sortfield, $sortord
print "\n";
$sql = "SELECT COUNT(p.rowid) as nb, SUM(p.opp_amount)";
-$sql .= ", s.nom as name, s.rowid as socid";
+$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 .= " 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').")";
$sql .= " AND p.fk_statut = 1";
if ($mine || empty($user->rights->projet->all->lire)) $sql .= " AND p.rowid IN (".$projectsListId.")"; // If we have this test true, it also means projectset is not 2
if ($socid) $sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-$sql .= " GROUP BY s.nom, s.rowid";
+$sql .= " GROUP BY s.rowid, s.nom, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.canvas, s.status";
$sql .= $db->order($sortfield, $sortorder);
//$sql .= $db->plimit($max + 1, 0);
@@ -299,6 +301,9 @@ if ($resql)
{
$companystatic->id = $obj->socid;
$companystatic->name = $obj->name;
+ $companystatic->email = $obj->email;
+ $companystatic->status = $obj->status;
+
print $companystatic->getNomUrl(1);
}
else
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index bd35d29f3b2..13011cbb5f7 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -6,41 +6,40 @@
/* ============================================================================== */
:root {
- --colorbackhmenu1: rgb();
- --colorbackvmenu1: rgb();
- --colorbacktitle1: rgb();
- --colorbacktabcard1: rgb();
- --colorbacktabactive: rgb();
- --colorbacklineimpair1: rgb();
- --colorbacklineimpair2: rgb();
- --colorbacklinepair1: rgb();
- --colorbacklinepair2: rgb();
- --colorbacklinepairhover: rgb();
- --colorbacklinepairchecked: rgb();
- --colorbackbody: rgb();
- --colortexttitlenotab: rgb();
- --colortexttitle: rgb();
- --colortext: rgb();
- --colortextlink: rgb();
- --colortextbackhmenu: #;
- --colortextbackvmenu: #) ;
- --listetotal: #551188;
- --inputbackgroundcolor: #FFF;
- --inputbordercolor: rgba(0,0,0,.2);
- --tooltipbgcolor: ;
- --tooltipfontcolor : ;
- --oddevencolor: #202020;
- --colorboxstatsborder: #ddd;
- --dolgraphbg: rgba(255,255,255,0);
- --fieldrequiredcolor: #000055;
- --colortextbacktab: #) ;
- --colorboxiconbg: #eee;
- --refidnocolor:#444;
- --tableforfieldcolor:#666;
- --amountremaintopaycolor:#880000;
- --amountpaymentcomplete:#008800;
- --amountremaintopaybackcolor:none;
-
+ --colorbackhmenu1: rgb();
+ --colorbackvmenu1: rgb();
+ --colorbacktitle1: rgb();
+ --colorbacktabcard1: rgb();
+ --colorbacktabactive: rgb();
+ --colorbacklineimpair1: rgb();
+ --colorbacklineimpair2: rgb();
+ --colorbacklinepair1: rgb();
+ --colorbacklinepair2: rgb();
+ --colorbacklinepairhover: rgb();
+ --colorbacklinepairchecked: rgb();
+ --colorbackbody: rgb();
+ --colortexttitlenotab: rgb();
+ --colortexttitle: rgb();
+ --colortext: rgb();
+ --colortextlink: rgb();
+ --colortextbackhmenu: #;
+ --colortextbackvmenu: #) ;
+ --listetotal: #551188;
+ --inputbackgroundcolor: #FFF;
+ --inputbordercolor: rgba(0,0,0,.2);
+ --tooltipbgcolor: ;
+ --tooltipfontcolor : ;
+ --oddevencolor: #202020;
+ --colorboxstatsborder: #ddd;
+ --dolgraphbg: rgba(255,255,255,0);
+ --fieldrequiredcolor: #000055;
+ --colortextbacktab: #) ;
+ --colorboxiconbg: #eee;
+ --refidnocolor:#444;
+ --tableforfieldcolor:#666;
+ --amountremaintopaycolor:#880000;
+ --amountpaymentcomplete:#008800;
+ --amountremaintopaybackcolor:none;
}