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

Fix: uniformisation du code

Browse Source 
Add: icone pdf sur les listes
This commit is contained in:
Regis Houssin 2007-07-13 17:10:38 +00:00
parent f5b9db2956
commit 3eac433909
2 changed files with 97 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
htdocs/comm/index.php
View File

@ -84,6 +84,8 @@ if (isset($_GET["action"]) && $_GET["action"] == 'del_bookmark')
* Affichage page * Affichage page
*/ */
$html = new Form($db);
llxHeader(); llxHeader();
print_fiche_titre($langs->trans("CommercialArea")); print_fiche_titre($langs->trans("CommercialArea"));
@ -572,8 +574,30 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
{ {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$var=!$var; $var=!$var;
print "<tr $bc[$var]><td width=\"15%\" nowrap><a href=\"propal.php?propalid=".$obj->propalid."\">".img_object($langs->trans("ShowPropal"),"propal")." ".$obj->ref."</a>"; print "<tr $bc[$var]>";
if ($obj->dp < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); print '<td width="20%" nowrap="nowrap">';
$propalstatic->id=$obj->propalid;
$propalstatic->ref=$obj->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td width="90" class="nobordernopadding" nowrap="nowrap">';
print $propalstatic->getNomUrl(1);
print '</td>';
print '<td width="20" class="nobordernopadding" nowrap="nowrap">';
if ($obj->dp < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
print '</td>';
print '<td width="16" align="right" class="nobordernopadding">';
$filename=sanitize_string($obj->ref);
$filedir=$conf->propal->dir_output . '/' . sanitize_string($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?propalid='.$obj->propalid;
$html->show_documents('propal',$filename,$filedir,$urlsource,'','','','','',1);
print '</td></tr></table>';
print "</td>"; print "</td>";
print "<td><a href=\"fiche.php?socid=".$obj->rowid."\">".img_object($langs->trans("ShowCompany"),"company")." ".dolibarr_trunc($obj->nom,44)."</a></td>\n"; print "<td><a href=\"fiche.php?socid=".$obj->rowid."\">".img_object($langs->trans("ShowCompany"),"company")." ".dolibarr_trunc($obj->nom,44)."</a></td>\n";
print "<td align=\"right\">"; print "<td align=\"right\">";
@ -618,35 +642,56 @@ if ($conf->propal->enabled && $user->rights->propale->lire) {
$sql .= $db->plimit($NBMAX, 0); $sql .= $db->plimit($NBMAX, 0);
if ( $db->query($sql) ) if ( $db->query($sql) )
{ {
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $i = 0;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="6">'.$langs->trans("LastClosedProposals",$NBMAX).'</td></tr>'; print '<tr class="liste_titre"><td colspan="6">'.$langs->trans("LastClosedProposals",$NBMAX).'</td></tr>';
$var=False; $var=False;
while ($i < $num) while ($i < $num)
{ {
$objp = $db->fetch_object(); $objp = $db->fetch_object();
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td nowrap>'; print '<td width="20%" nowrap="nowrap">';
print '<a href="propal.php?propalid='.$objp->propalid.'">'.img_object($langs->trans("ShowPropal"),"propal").' ';
print $objp->ref.'</a></td>'; $propalstatic->id=$objp->propalid;
print '<td><a href="fiche.php?socid='.$objp->rowid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).'</a></td>'; $propalstatic->ref=$objp->ref;
print "<td>&nbsp;</td>";
print "<td align=\"right\">"; print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print dolibarr_print_date($objp->dp)."</td>\n"; print '<td width="90" class="nobordernopadding" nowrap="nowrap">';
print "<td align=\"right\">".price($objp->price)."</td>\n"; print $propalstatic->getNomUrl(1);
print "<td align=\"center\" width=\"14\">".$propalstatic->LibStatut($objp->fk_statut,3)."</td>\n"; print '</td>';
print "</tr>\n";
$i++; print '<td width="20" class="nobordernopadding" nowrap="nowrap">';
$var=!$var; print '&nbsp;';
print '</td>';
print '<td width="16" align="right" class="nobordernopadding">';
$filename=sanitize_string($objp->ref);
$filedir=$conf->propal->dir_output . '/' . sanitize_string($objp->ref);
$urlsource=$_SERVER['PHP_SELF'].'?propalid='.$objp->propalid;
$html->show_documents('propal',$filename,$filedir,$urlsource,'','','','','',1);
print '</td></tr></table>';
print '</td>';
print '<td><a href="fiche.php?socid='.$objp->rowid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).'</a></td>';
print "<td align=\"right\">";
print dolibarr_print_date($objp->dp)."</td>\n";
print "<td align=\"right\">".price($objp->price)."</td>\n";
print "<td align=\"center\" width=\"14\">".$propalstatic->LibStatut($objp->fk_statut,3)."</td>\n";
print "</tr>\n";
$i++;
$var=!$var;
} }
print "</table>"; print "</table>";
$db->free(); $db->free();
} }
} }

24
htdocs/propal.class.php
View File

@ -2131,6 +2131,30 @@ class Propal extends CommonObject
return ""; return "";
} }
} }
/**
\brief Renvoie nom clicable (avec eventuellement le picto)
\param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
\param option Sur quoi pointe le lien
\return string Chaine avec URL
*/
function getNomUrl($withpicto=0,$option='')
{
global $langs;
$result='';
$lien = '<a href="'.DOL_URL_ROOT.'/comm/propal.php?id='.$this->id.'">';
$lienfin='</a>';
$picto='order';
$label=$langs->trans("ShowPropal").': '.$this->ref;
if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
$result.=$lien.$this->ref.$lienfin;
return $result;
}
} }