diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index 324707e8900..7130551bb0c 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -417,7 +417,7 @@ if ($socid > 0)
$objp = $db->fetch_object($resql);
print "
";
print "propalid\">".img_object($langs->trans("ShowPropal"),"propal")." ".$objp->ref."\n";
- if ( ($objp->dp < time() - $conf->propal->cloture->warning_delay) && $objp->statutid == 1 )
+ if ( ($objp->dp < time() - $conf->propal->cloture->warning_delay) && $objp->fk_statut == 1 )
{
print " ".img_warning();
}
diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php
index bb79cec63c3..074776a37cc 100644
--- a/htdocs/comm/prospect/fiche.php
+++ b/htdocs/comm/prospect/fiche.php
@@ -32,6 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/prospect.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
+if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
$langs->load('companies');
$langs->load('projects');
@@ -154,12 +155,14 @@ if ($socid > 0)
$tableaushown=0;
+ $propal_static=new Propal($db);
+
/*
- * Liste de propales
+ * Dernieres propales
*
*/
print '';
- $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price, p.ref, p.remise,";
+ $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.fk_statut, p.price, p.ref, p.remise, ";
$sql.= " ".$db->pdate("p.datep")." as dp, ".$db->pdate("p.fin_validite")." as datelimite,";
$sql.= " c.label as statut, c.id as statutid";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
@@ -189,10 +192,13 @@ if ($socid > 0)
print "| propalid\">";
print img_object($langs->trans("ShowPropal"),"propal");
print " $objp->ref\n";
- if ($objp->datelimite < (time() - $conf->propale->warning_delay)) print img_warning($langs->trans("Late"));
+ if ( ($objp->dp < time() - $conf->propal->cloture->warning_delay) && $objp->fk_statut == 1 )
+ {
+ print " ".img_warning();
+ }
print " | ".dolibarr_print_date($objp->dp,"%d %B %Y")." | \n";
print "".price($objp->price)." | \n";
- print "".$objp->statut." | \n";
+ print "".$propal_static->LibStatut($objp->fk_statut,5)." | \n";
$i++;
}
$db->free();
diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php
index f1e9deb1682..2ea5fb431e7 100644
--- a/htdocs/propal.class.php
+++ b/htdocs/propal.class.php
@@ -58,7 +58,7 @@ class Propal extends CommonObject
var $author;
var $ref;
var $ref_client;
- var $status;
+ var $statut; // 0, 1, 2, 3, 4
var $datep;
var $fin_validite;
var $price; // Total HT
|