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

Uniformisation affichage.

Browse Source
This commit is contained in:
Laurent Destailleur 2004-11-25 23:23:20 +00:00
parent 72ec6483eb
commit c6727a2828
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/comm/propal.php
View File

@ -48,7 +48,7 @@ require("../actioncomm.class.php");
require("../lib/CMailFile.class.php"); require("../lib/CMailFile.class.php");
/* /*
* Sécurité accés client * Sécurité accés client
*/ */
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
@ -62,7 +62,7 @@ if ($user->societe_id > 0)
if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes') if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
{ {
if ($user->rights->propale->supprimer ) if ($user->rights->propale->supprimer)
{ {
$propal = new Propal($db, 0, $_GET["propalid"]); $propal = new Propal($db, 0, $_GET["propalid"]);
$propal->delete($user); $propal->delete($user);
@ -141,7 +141,6 @@ if ($_GET["action"] == 'commande')
$propal->create_commande($user); $propal->create_commande($user);
} }
if ($_GET["action"] == 'modif' && $user->rights->propale->creer) if ($_GET["action"] == 'modif' && $user->rights->propale->creer)
{ {
/* /*
@ -244,7 +243,7 @@ if ($_GET["propalid"])
$h=0; $h=0;
$head[$h][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id; $head[$h][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans("Prop").": $propal->ref"; $head[$h][1] = $langs->trans("Card");
$hselected=$h; $hselected=$h;
$h++; $h++;
@ -256,7 +255,7 @@ if ($_GET["propalid"])
$head[$h][1] = $langs->trans("Info"); $head[$h][1] = $langs->trans("Info");
$h++; $h++;
dolibarr_fiche_head($head, $hselected, $societe->nom); dolibarr_fiche_head($head, $hselected, $langs->trans("Prop").": $propal->ref");
/* /*
* Confirmation de la suppression de la propale * Confirmation de la suppression de la propale
@ -299,7 +298,7 @@ if ($_GET["propalid"])
print "<table class=\"border\" width=\"100%\">"; print "<table class=\"border\" width=\"100%\">";
print '<tr><td>'.$langs->trans("Companies").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
if ($societe->client == 1) if ($societe->client == 1)
{ {
$url ='fiche.php?socid='.$societe->id; $url ='fiche.php?socid='.$societe->id;
@ -309,7 +308,7 @@ if ($_GET["propalid"])
$url = DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$societe->id; $url = DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$societe->id;
} }
print '<a href="'.$url.'">'.$societe->nom.'</a></td>'; print '<a href="'.$url.'">'.$societe->nom.'</a></td>';
print '<td>'.$langs->trans("Status").'</td><td align="left"><b>'.$obj->lst.'</b></td></tr>'; print '<td align="left">'.$langs->trans("Status").'</td><td align="left">'.$obj->lst.'</td></tr>';
print '<tr><td>'.$langs->trans("Date").'</td><td colspan="3">'.strftime("%A %d %B %Y",$propal->date); print '<tr><td>'.$langs->trans("Date").'</td><td colspan="3">'.strftime("%A %d %B %Y",$propal->date);
if ($propal->fin_validite) if ($propal->fin_validite)
@ -323,7 +322,7 @@ if ($_GET["propalid"])
$author->fetch(''); $author->fetch('');
print $author->fullname.'</td></tr>'; print $author->fullname.'</td></tr>';
print "<tr><td>".$langs->trans("To")."</td><td colspan=\"3\">$obj->firstname $obj->name &lt;$obj->email&gt;</td>"; print "<tr><td>".$langs->trans("To")."</td><td colspan=\"3\">$obj->firstname $obj->name".($obj->email?"&lt;$obj->email&gt;":"")."</td>";
print '<td valign="top" colspan="2" width="50%" rowspan="4">'.$langs->trans("Note").' :<br>'. nl2br($propal->note)."</td></tr>"; print '<td valign="top" colspan="2" width="50%" rowspan="4">'.$langs->trans("Note").' :<br>'. nl2br($propal->note)."</td></tr>";

2
htdocs/comm/propal/document.php
View File

@ -20,7 +20,7 @@
* $Source$ * $Source$
*/ */
/*! \file htdocs/comm/propal/document.php /*! \file htdocs/comm/propal/document.php
\ingroup propale \ingroup propale
\brief Page de gestion des documents attachées à une proposition commerciale \brief Page de gestion des documents attachées à une proposition commerciale
\version $Revision$ \version $Revision$

4
htdocs/comm/propal/info.php
View File

@ -52,7 +52,7 @@ if ($_GET["propalid"])
$h=0; $h=0;
$head[$h][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id; $head[$h][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans("Prop").": $propal->ref"; $head[$h][1] = $langs->trans("Card");
$h++; $h++;
$head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?propalid='.$propal->id; $head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?propalid='.$propal->id;
@ -64,7 +64,7 @@ if ($_GET["propalid"])
$hselected=$h; $hselected=$h;
$h++; $h++;
dolibarr_fiche_head($head, $hselected, $societe->nom); dolibarr_fiche_head($head, $hselected, $langs->trans("Prop").": $propal->ref");
$propal->info($propal->id); $propal->info($propal->id);

10
htdocs/comm/propal/note.php
View File

@ -76,7 +76,7 @@ if ($_GET["propalid"])
$h=0; $h=0;
$head[$h][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id; $head[$h][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans("Prop").": $propal->ref"; $head[$h][1] = $langs->trans("Card");
$h++; $h++;
$head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?propalid='.$propal->id; $head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?propalid='.$propal->id;
@ -88,11 +88,11 @@ if ($_GET["propalid"])
$head[$h][1] = $langs->trans("Info"); $head[$h][1] = $langs->trans("Info");
$h++; $h++;
dolibarr_fiche_head($head, $hselected, $societe->nom); dolibarr_fiche_head($head, $hselected, $langs->trans("Prop").": $propal->ref");
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td>Société</td><td>'; print '<tr><td>'.$langs->trans("Company").'</td><td>';
if ($societe->client == 1) if ($societe->client == 1)
{ {
$url ='fiche.php?socid='.$societe->id; $url ='fiche.php?socid='.$societe->id;
@ -102,9 +102,9 @@ if ($_GET["propalid"])
$url = DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$societe->id; $url = DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$societe->id;
} }
print '<a href="'.$url.'">'.$societe->nom.'</a></td>'; print '<a href="'.$url.'">'.$societe->nom.'</a></td>';
print '<td>'.$langs->trans("Status").'</td><td align="center"><b>'.$propal->statut_libelle.'</b></td></tr>'; print '<td>'.$langs->trans("Status").'</td><td align="left">'.$propal->statut_libelle.'</td></tr>';
print '<tr><td>Date</td><td>'.strftime("%A %d %B %Y",$propal->date); print '<tr><td>'.$langs->trans("Date").'</td><td>'.strftime("%A %d %B %Y",$propal->date);
if ($propal->fin_validite) if ($propal->fin_validite)
{ {
print " (".strftime("%d %B %Y",$propal->fin_validite).")"; print " (".strftime("%d %B %Y",$propal->fin_validite).")";