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

Fix: Forget to remove view after moving it into prospect area home page.

Browse Source
This commit is contained in:
Laurent Destailleur 2011-08-08 12:22:52 +00:00
parent 8f0a8aa7fe
commit 0cd2bf0989
1 changed files with 2 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
htdocs/comm/index.php
View File

@ -21,7 +21,7 @@
* \file htdocs/comm/index.php
* \ingroup commercial
* \brief Home page of commercial area
* \version $Id: index.php,v 1.171 2011/08/03 00:46:26 eldy Exp $
* \version $Id: index.php,v 1.172 2011/08/08 12:22:52 eldy Exp $
*/
require("../main.inc.php");
@ -272,86 +272,6 @@ $NBMAX=3;
$max=3;
/*
* Last modified proposals
*/
if ($conf->propal->enabled && $user->rights->propale->lire)
{
$sql = "SELECT s.nom as name, s.rowid as socid, s.client, s.canvas, p.rowid as propalid, p.total_ht, p.ref, p.fk_statut, p.datep as dp";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."propal as p";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE p.fk_soc = s.rowid";
$sql.= " AND p.entity = ".$conf->entity;
//$sql.= " AND p.fk_statut > 1";
if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
if ($socid) $sql.= " AND s.rowid = ".$socid;
$sql.= " ORDER BY p.datep DESC";
$sql.= $db->plimit($NBMAX, 0);
$resql=$db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("LastModifiedProposals",$NBMAX).'</td></tr>';
$var=False;
while ($i < $num)
{
$objp = $db->fetch_object($resql);
print '<tr '.$bc[$var].'>';
// Ref
print '<td nowrap="nowrap" width="140">';
$propalstatic->id=$objp->propalid;
$propalstatic->ref=$objp->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td class="nobordernopadding" nowrap="nowrap">';
print $propalstatic->getNomUrl(1);
print '</td>';
print '<td width="18" class="nobordernopadding" nowrap="nowrap">';
// TODO se baser sur datep ou fin_validite ?
if (($objp->fk_statut <= 1) && ($db->jdate($objp->dp) < ($now - $conf->propal->cloture->warning_delay))) print img_warning($langs->trans("Late"));
print '</td>';
print '<td width="16" align="center" class="nobordernopadding">';
$filename=dol_sanitizeFileName($objp->ref);
$filedir=$conf->propale->dir_output . '/' . dol_sanitizeFileName($objp->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->propalid;
$formfile->show_documents('propal',$filename,$filedir,$urlsource,'','','',1,'',1);
print '</td></tr></table>';
print '</td>';
print '<td align="left">';
$companystatic->id=$objp->socid;
$companystatic->name=$objp->name;
$companystatic->client=$objp->client;
$companystatic->canvas=$objp->canvas;
print $companystatic->getNomUrl(1,'customer',44);
print '</td>';
print '<td align="right">';
print dol_print_date($db->jdate($objp->dp),'day').'</td>'."\n";
print '<td align="right">'.price($objp->total_ht).'</td>'."\n";
print '<td align="center" width="14">'.$propalstatic->LibStatut($objp->fk_statut,3).'</td>'."\n";
print '</tr>'."\n";
$i++;
$var=!$var;
}
print "</table><br>";
$db->free($resql);
}
else
{
dol_print_error($db,'');
}
}
/*
* Last modified customers or prospects
*/
@ -631,5 +551,5 @@ print '</table>';
$db->close();
llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.171 $');
llxFooter('$Date: 2011/08/08 12:22:52 $ - $Revision: 1.172 $');
?>