lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Warning sur retard propal alors que tou est ok

Browse Source
This commit is contained in:
Laurent Destailleur 2006-09-16 01:27:30 +00:00
parent 29a0f71859
commit 14cd650c19
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/fiche.php
View File

@ -417,7 +417,7 @@ if ($socid > 0)
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td nowrap><a href=\"propal.php?propalid=$objp->propalid\">".img_object($langs->trans("ShowPropal"),"propal")." ".$objp->ref."</a>\n"; 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(); print " ".img_warning();
} }

14
htdocs/comm/prospect/fiche.php
View File

@ -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."/prospect.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/actioncomm.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('companies');
$langs->load('projects'); $langs->load('projects');
@ -154,12 +155,14 @@ if ($socid > 0)
$tableaushown=0; $tableaushown=0;
$propal_static=new Propal($db);
/* /*
* Liste de propales * Dernieres propales
* *
*/ */
print '<table class="noborder" width="100%">'; 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.= " ".$db->pdate("p.datep")." as dp, ".$db->pdate("p.fin_validite")." as datelimite,";
$sql.= " c.label as statut, c.id as statutid"; $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"; $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 "<td><a href=\"../propal.php?propalid=$objp->propalid\">";
print img_object($langs->trans("ShowPropal"),"propal"); print img_object($langs->trans("ShowPropal"),"propal");
print " $objp->ref</a>\n"; 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><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=\"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++; $i++;
} }
$db->free(); $db->free();

2
htdocs/propal.class.php
View File

@ -58,7 +58,7 @@ class Propal extends CommonObject
var $author; var $author;
var $ref; var $ref;
var $ref_client; var $ref_client;
var $status; var $statut; // 0, 1, 2, 3, 4
var $datep; var $datep;
var $fin_validite; var $fin_validite;
var $price; // Total HT var $price; // Total HT