Mise en conformité

This commit is contained in:
Rodolphe Quiedeville 2003-10-14 15:30:39 +00:00
parent 713658a877
commit db03cda30f
7 changed files with 38 additions and 33 deletions

View File

@ -361,14 +361,14 @@ if ($propalid)
$var=!$var; $var=!$var;
print "<TR $bc[$var]>"; print "<TR $bc[$var]>";
print "<td>[$objp->ref]</td>\n"; print "<td>[$objp->ref]</td>\n";
print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->prodid.'">'.$objp->product.'</td>'; print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->prodid.'">'.$objp->product.'</a></td>';
print '<td align="center">'.$objp->tva_tx.' %</td>'; print '<td align="center">'.$objp->tva_tx.' %</td>';
print "<td align=\"center\">".$objp->qty."</td>\n"; print "<td align=\"center\">".$objp->qty."</td>\n";
print '<td align="center">'.$objp->remise_percent.' %</td>'; print '<td align="center">'.$objp->remise_percent.' %</td>';
print '<td align="right">'.price($objp->subprice).'</td>'; print '<td align="right">'.price($objp->subprice).'</td>';
if ($obj->statut == 0 && $user->rights->propale->creer) if ($obj->statut == 0 && $user->rights->propale->creer)
{ {
print '<td align="center"><a href="propal.php?propalid='.$propalid.'&ligne='.$objp->rowid.'&action=del_ligne">Supprimer</a></td>'; print '<td align="center"><a href="propal.php?propalid='.$propalid.'&amp;ligne='.$objp->rowid.'&amp;action=del_ligne">Supprimer</a></td>';
} }
else else
{ {
@ -399,7 +399,7 @@ if ($propalid)
print "<TD align=\"right\">".price($objp->subprice)."</td>"; print "<TD align=\"right\">".price($objp->subprice)."</td>";
if ($obj->statut == 0 && $user->rights->propale->creer) if ($obj->statut == 0 && $user->rights->propale->creer)
{ {
print '<td align="center"><a href="propal.php?propalid='.$propalid.'&ligne='.$objp->rowid.'&action=del_ligne">Supprimer</a></td>'; print '<td align="center"><a href="propal.php?propalid='.$propalid.'&amp;ligne='.$objp->rowid.'&amp;action=del_ligne">Supprimer</a></td>';
} }
else else
{ {
@ -493,7 +493,7 @@ if ($propalid)
{ {
if ($user->rights->propale->supprimer) if ($user->rights->propale->supprimer)
{ {
print "<td width=\"20%\">[<a href=\"$PHP_SELF?propalid=$propalid&action=delete\">Supprimer</a>]</td>"; print "<td width=\"20%\">[<a href=\"$PHP_SELF?propalid=$propalid&amp;action=delete\">Supprimer</a>]</td>";
} }
else else
{ {
@ -504,7 +504,7 @@ if ($propalid)
{ {
if ($obj->statut == 1 && $user->rights->propale->cloturer) if ($obj->statut == 1 && $user->rights->propale->cloturer)
{ {
print "<td width=\"20%\">[<a href=\"$PHP_SELF?propalid=$propalid&action=statut\">Cloturer</a>]</td>"; print "<td width=\"20%\">[<a href=\"$PHP_SELF?propalid=$propalid&amp;action=statut\">Cloturer</a>]</td>";
} }
else else
{ {
@ -517,7 +517,7 @@ if ($propalid)
*/ */
if ($obj->statut < 2 && $user->rights->propale->creer) if ($obj->statut < 2 && $user->rights->propale->creer)
{ {
print '<td width="20%">[<a href="'.$PHP_SELF."?propalid=$propalid&action=pdf\">Générer</a>]</td>"; print '<td width="20%">[<a href="'.$PHP_SELF."?propalid=$propalid&amp;action=pdf\">Générer</a>]</td>";
} }
else else
{ {
@ -535,7 +535,7 @@ if ($propalid)
if ($user->rights->propale->envoyer) if ($user->rights->propale->envoyer)
{ {
print "<td width=\"20%\">"; print "<td width=\"20%\">";
print "[<a href=\"$PHP_SELF?propalid=$propalid&action=presend\">Envoyer la proposition</a>]</td>"; print "[<a href=\"$PHP_SELF?propalid=$propalid&amp;action=presend\">Envoyer la proposition</a>]</td>";
} }
else else
{ {
@ -558,7 +558,7 @@ if ($propalid)
{ {
if ($user->rights->propale->valider) if ($user->rights->propale->valider)
{ {
print "<td align=\"center\" width=\"20%\">[<a href=\"$PHP_SELF?propalid=$propalid&valid=1\">Valider</a>]</td>"; print "<td align=\"center\" width=\"20%\">[<a href=\"$PHP_SELF?propalid=$propalid&amp;valid=1\">Valider</a>]</td>";
} }
else else
{ {
@ -569,7 +569,7 @@ if ($propalid)
{ {
if ($user->rights->propale->creer) if ($user->rights->propale->creer)
{ {
print "<td align=\"center\" width=\"20%\">[<a href=\"$PHP_SELF?propalid=$propalid&action=modif\">Modifier</a>]</td>"; print "<td align=\"center\" width=\"20%\">[<a href=\"$PHP_SELF?propalid=$propalid&amp;action=modif\">Modifier</a>]</td>";
} }
else else
{ {
@ -636,7 +636,7 @@ if ($propalid)
$file = PROPALE_OUTPUTDIR . "/$obj->ref/$obj->ref.pdf"; $file = PROPALE_OUTPUTDIR . "/$obj->ref/$obj->ref.pdf";
if (file_exists($file)) if (file_exists($file))
{ {
print "<tr $bc[0]><td>Propale PDF</a></td>"; print "<tr $bc[0]><td>Propale PDF</td>";
print '<td><a href="'.PROPALE_OUTPUT_URL.'/'.$propal->ref.'/'.$propal->ref.'.pdf">'.$propal->ref.'.pdf</a></td>'; print '<td><a href="'.PROPALE_OUTPUT_URL.'/'.$propal->ref.'/'.$propal->ref.'.pdf">'.$propal->ref.'.pdf</a></td>';
print '<td align="right">'.filesize($file). ' bytes</td>'; print '<td align="right">'.filesize($file). ' bytes</td>';
print '<td align="right">'.strftime("%d %b %Y %H:%M:%S",filemtime($file)).'</td></tr>'; print '<td align="right">'.strftime("%d %b %Y %H:%M:%S",filemtime($file)).'</td></tr>';
@ -715,7 +715,7 @@ if ($propalid)
$from_name = $user->fullname ; //$conf->propal->fromtoname; $from_name = $user->fullname ; //$conf->propal->fromtoname;
$from_mail = $user->email; //conf->propal->fromtomail; $from_mail = $user->email; //conf->propal->fromtomail;
print "<form method=\"post\" action=\"$PHP_SELF?propalid=$propalid&action=send\">\n"; print "<form method=\"post\" action=\"$PHP_SELF?propalid=$propalid&amp;action=send\">\n";
print "<input type=\"hidden\" name=\"replytoname\" value=\"$replytoname\">\n"; print "<input type=\"hidden\" name=\"replytoname\" value=\"$replytoname\">\n";
print "<input type=\"hidden\" name=\"replytomail\" value=\"$replytomail\">\n"; print "<input type=\"hidden\" name=\"replytomail\" value=\"$replytomail\">\n";
@ -840,7 +840,7 @@ if ($propalid)
if ( $db->query($sql) ) if ( $db->query($sql) )
{ {
$num = $db->num_rows(); $num = $db->num_rows();
print_barre_liste("Propositions commerciales", $page, $PHP_SELF,"&socidp=$socidp",$sortfield,$sortorder,'',$num); print_barre_liste("Propositions commerciales", $page, $PHP_SELF,"&amp;socidp=$socidp",$sortfield,$sortorder,'',$num);
$i = 0; $i = 0;
@ -848,14 +848,14 @@ if ($propalid)
print '<TR class="liste_titre">'; print '<TR class="liste_titre">';
print_liste_field_titre_new ("Réf",$PHP_SELF,"p.ref","","&socidp=$socidp",'width="15%"',$sortfield); print_liste_field_titre_new ("Réf",$PHP_SELF,"p.ref","","&amp;socidp=$socidp",'width="15%"',$sortfield);
print_liste_field_titre_new ("Société",$PHP_SELF,"s.nom","","&socidp=$socidp",'width="30%"',$sortfield); print_liste_field_titre_new ("Société",$PHP_SELF,"s.nom","","&amp;socidp=$socidp",'width="30%"',$sortfield);
print_liste_field_titre_new ("Date",$PHP_SELF,"p.datep","","&socidp=$socidp", 'width="25%" align="right" colspan="2"',$sortfield); print_liste_field_titre_new ("Date",$PHP_SELF,"p.datep","","&amp;socidp=$socidp", 'width="25%" align="right" colspan="2"',$sortfield);
print_liste_field_titre_new ("Prix",$PHP_SELF,"p.price","","&socidp=$socidp", ' width="20%" align="right"',$sortfield); print_liste_field_titre_new ("Prix",$PHP_SELF,"p.price","","&amp;socidp=$socidp", ' width="20%" align="right"',$sortfield);
print_liste_field_titre_new ("Statut",$PHP_SELF,"p.fk_statut","","&socidp=$socidp",'width="10%" align="center"',$sortfield); print_liste_field_titre_new ("Statut",$PHP_SELF,"p.fk_statut","","&amp;socidp=$socidp",'width="10%" align="center"',$sortfield);
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;
@ -885,7 +885,7 @@ if ($propalid)
$m = strftime("%m",$objp->dp); $m = strftime("%m",$objp->dp);
print strftime("%d",$objp->dp)."\n"; print strftime("%d",$objp->dp)."\n";
print " <a href=\"propal.php?year=$y&month=$m\">"; print " <a href=\"propal.php?year=$y&amp;month=$m\">";
print strftime("%B",$objp->dp)."</a>\n"; print strftime("%B",$objp->dp)."</a>\n";
print " <a href=\"propal.php?year=$y\">"; print " <a href=\"propal.php?year=$y\">";
print strftime("%Y",$objp->dp)."</a></TD>\n"; print strftime("%Y",$objp->dp)."</a></TD>\n";

View File

@ -40,24 +40,24 @@ llxHeader("","","Accueil Produits et services");
print_titre("Produits et services"); print_titre("Produits et services");
print '<TABLE border="0" width="100%" cellspacing="0" cellpadding="4">'; print '<table border="0" width="100%" cellspacing="0" cellpadding="4">';
print '<tr><td valign="top" width="30%">'; print '<tr><td valign="top" width="30%">';
/*
print '<TABLE border="0" width="100%" cellspacing="0" cellpadding="4">'; * Produits en ventes et hors vente
*/
print '<table border="0" width="100%" cellspacing="0" cellpadding="4">';
print '<tr class="liste_titre"><td colspan="2">Hors vente</td></tr>'; print '<tr class="liste_titre"><td colspan="2">Hors vente</td></tr>';
print "<TR $bc[0]>"; print "<tr $bc[0]>";
print '<td><a href="liste.php?type=0&envente=0">Produits hors vente</a></td></tr>'; print '<td><a href="liste.php?type=0&amp;envente=0">Produits hors vente</a></td></tr>';
print "<TR $bc[1]>"; print "<tr $bc[1]>";
print '<td><a href="liste.php?type=1&envente=0">Services hors vente</a></td></tr></table>'; print '<td><a href="liste.php?type=1&amp;envente=0">Services hors vente</a></td></tr></table>';
print "</td>";
print '</td><td valign="top" width="70%">'; print '</td><td valign="top" width="70%">';
/*
* Derniers produits
*/
$sql = "SELECT p.rowid, p.label, p.price, p.ref FROM llx_product as p WHERE envente=1"; $sql = "SELECT p.rowid, p.label, p.price, p.ref FROM llx_product as p WHERE envente=1";
$sql .= " ORDER BY p.datec DESC "; $sql .= " ORDER BY p.datec DESC ";
$sql .= $db->plimit(15 ,0); $sql .= $db->plimit(15 ,0);
@ -71,7 +71,7 @@ if ($result)
if ($num > 0) if ($num > 0)
{ {
print '<TABLE border="0" width="100%" cellspacing="0" cellpadding="4">'; print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
print '<tr class="liste_titre"><td colspan="2">Derniers produits et services</td></tr>'; print '<tr class="liste_titre"><td colspan="2">Derniers produits et services</td></tr>';
@ -80,7 +80,7 @@ if ($result)
{ {
$objp = $db->fetch_object( $i); $objp = $db->fetch_object( $i);
$var=!$var; $var=!$var;
print "<TR $bc[$var]>"; print "<tr $bc[$var]>";
print "<TD><a href=\"fiche.php?id=$objp->rowid\">$objp->ref</a></TD>\n"; print "<TD><a href=\"fiche.php?id=$objp->rowid\">$objp->ref</a></TD>\n";
print "<TD>$objp->label</TD></tr>\n"; print "<TD>$objp->label</TD></tr>\n";
$i++; $i++;
@ -95,7 +95,7 @@ else
print $db->error() . "<br>" .$sql; print $db->error() . "<br>" .$sql;
} }
print '</tr></table>'; print '</td></tr></table>';
$db->close(); $db->close();

View File

@ -20,6 +20,7 @@
body { body {
background: #fce8fd; background: #fce8fd;
margin: 0px;
text-decoration: none ; text-decoration: none ;
color:black; color:black;
font-family: Verdana, Arial, Helvetica; font-family: Verdana, Arial, Helvetica;

View File

@ -19,6 +19,7 @@
*/ */
body { body {
background: #e0ebeb; background: #e0ebeb;
margin: 0px;
font-family: sans-serif; font-size: 0.9em; font-family: sans-serif; font-size: 0.9em;
} }
/* /*

View File

@ -21,6 +21,7 @@
body { body {
background: #EEEEEE; background: #EEEEEE;
margin: 0px;
background-image: url("/theme/freelug/img/background.png"); background-image: url("/theme/freelug/img/background.png");
font-family: Helvetica, Verdana; font-size: 12px; font-family: Helvetica, Verdana; font-size: 12px;
text-decoration: none ; text-decoration: none ;

View File

@ -21,6 +21,7 @@
body body
{ {
background: #eae0ff; background: #eae0ff;
margin: 0px;
font-family: Helvetica, Verdana; font-size: 12px; font-family: Helvetica, Verdana; font-size: 12px;
} }
/* /*

View File

@ -21,6 +21,7 @@
body body
{ {
background: #ebe0eb; background: #ebe0eb;
margin: 0px;
font-family: sans-serif; font-size: 0.9em; font-family: sans-serif; font-size: 0.9em;
} }
/* /*