From d815534293c40b4632561c29ab81ccc13e56014d Mon Sep 17 00:00:00 2001
From: bcroq <bcroq>
Date: Fri, 3 Oct 2003 20:21:32 +0000
Subject: [PATCH] =?UTF-8?q?dans=20les=20urls,=20le=20s=E9parateur=20des=20?=
 =?UTF-8?q?param=E8tres=20doit=20s'=E9crire=20"&amp;"=20et=20non=20avec=20?=
 =?UTF-8?q?un=20simple=20"&"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/fourn/facture/fiche.php   | 14 +++++++-------
 htdocs/fourn/facture/pre.inc.php |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index fb16c29634a..6a506f75e92 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -312,12 +312,12 @@ else
 	      print '<td align="center">'.price($fac->lignes[$i][5])."</td>";  
 	      print '<td align="right">'.price($fac->lignes[$i][6])."</td>";
 	      print '<td align="center">[';
-	      print '<a href="fiche.php?facid='.$facid.'&action=del_ligne&ligne_id='.$fac->lignes[$i][7].'">Supprimer</a>]</td>';
+	      print '<a href="fiche.php?facid='.$facid.'&amp;action=del_ligne&amp;ligne_id='.$fac->lignes[$i][7].'">Supprimer</a>]</td>';
 	      print '</tr>';
 	    }
 
 	  /* Nouvelle ligne */
-	  print "<form action=\"$PHP_SELF?facid=$obj->rowid&action=add_ligne\" method=\"post\">";
+	  print "<form action=\"$PHP_SELF?facid=$obj->rowid&amp;action=add_ligne\" method=\"post\">";
 	  print "<tr $bc[1]>";
 	  print '<td>';
 	  print '<input size="30" name="label" type="text">';
@@ -459,11 +459,11 @@ else
   
       if ($obj->statut == 0 && $user->societe_id == 0)
 	{
-	  print '<td align="center" width="25%">[<a href="index.php?facid='.$facid.'&action=delete">Supprimer</a>]</td>';
+	  print '<td align="center" width="25%">[<a href="index.php?facid='.$facid.'&amp;action=delete">Supprimer</a>]</td>';
 	}
       elseif ($obj->statut == 1 && $obj->paye == 0  && $user->societe_id == 0)
 	{
-	  print '<td align="center" width="25%">[<a href="paiement.php?facid='.$fac->id.'&action=create">Emmettre un paiement</a>]</td>';
+	  print '<td align="center" width="25%">[<a href="paiement.php?facid='.$fac->id.'&amp;action=create">Emmettre un paiement</a>]</td>';
 	}
       else
 	{
@@ -472,7 +472,7 @@ else
 
       if ($obj->statut == 0 && $user->societe_id == 0)    
 	{
-	  print '<td align="center" width="25%">[<a href="fiche.php?facid='.$obj->rowid.'&action=edit">Editer</a>]</td>';
+	  print '<td align="center" width="25%">[<a href="fiche.php?facid='.$obj->rowid.'&amp;action=edit">Editer</a>]</td>';
 	}
       else
 	{
@@ -481,7 +481,7 @@ else
  
       if ($obj->statut == 1 && abs($resteapayer == 0) && $obj->paye == 0  && $user->societe_id == 0)
 	{
-	  print "<td align=\"center\" width=\"25%\">[<a href=\"$PHP_SELF?facid=$facid&action=payed\">Classer 'Payée'</a>]</td>";
+	  print "<td align=\"center\" width=\"25%\">[<a href=\"$PHP_SELF?facid=$facid&amp;action=payed\">Classer 'Payée'</a>]</td>";
 	}
       else
 	{
@@ -490,7 +490,7 @@ else
 
       if ($obj->statut == 0  && $user->societe_id == 0)
 	{
-	  print "<td align=\"center\" bgcolor=\"#e0e0e0\" width=\"25%\">[<a href=\"$PHP_SELF?facid=$facid&action=valid\">Valider</a>]</td>";
+	  print "<td align=\"center\" bgcolor=\"#e0e0e0\" width=\"25%\">[<a href=\"$PHP_SELF?facid=$facid&amp;action=valid\">Valider</a>]</td>";
 	}
       else
 	{
diff --git a/htdocs/fourn/facture/pre.inc.php b/htdocs/fourn/facture/pre.inc.php
index 50c3edadb2a..4d02fd98a9e 100644
--- a/htdocs/fourn/facture/pre.inc.php
+++ b/htdocs/fourn/facture/pre.inc.php
@@ -38,7 +38,7 @@ function llxHeader($head = "", $urlp = "") {
 
   if ($user->societe_id == 0) 
     {
-      $menu->add_submenu(DOL_URL_ROOT."/soc.php?&action=create","Nouvelle société");
+      $menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create","Nouvelle société");
     }