From 14cd650c19e19d45666619f698c243abd4f4dba9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 16 Sep 2006 01:27:30 +0000
Subject: [PATCH] Fix: Warning sur retard propal alors que tou est ok

---
 htdocs/comm/fiche.php          |  2 +-
 htdocs/comm/prospect/fiche.php | 14 ++++++++++----
 htdocs/propal.class.php        |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

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 "<tr $bc[$var]>";
                 print "<td nowrap><a href=\"propal.php?propalid=$objp->propalid\">".img_object($langs->trans("ShowPropal"),"propal")." ".$objp->ref."</a>\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 '<table class="noborder" width="100%">';
-    $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 "<td><a href=\"../propal.php?propalid=$objp->propalid\">";
             print img_object($langs->trans("ShowPropal"),"propal");
             print " $objp->ref</a>\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 "</td><td align=\"right\">".dolibarr_print_date($objp->dp,"%d %B %Y")."</td>\n";
             print "<td align=\"right\">".price($objp->price)."</td>\n";
-            print "<td align=\"center\">".$objp->statut."</td></tr>\n";
+            print "<td align=\"right\">".$propal_static->LibStatut($objp->fk_statut,5)."</td></tr>\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