From 336e1937f13600424cb91d4960ff13f70596309c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 13 Aug 2005 21:23:02 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Pb=20de=20classe=20commande=20charg=E9e?=
 =?UTF-8?q?=202=20fois.=20Tous=20les=20chemins=20des=20require=20doivent?=
 =?UTF-8?q?=20etre=20de=20la=20forme=20DOL=5FDOCUMENT=5FROOT."/commande/co?=
 =?UTF-8?q?mmande.class.php"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/propal.php   | 12 +++++++-----
 htdocs/compta/propal.php |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 2c595519bed..7b68ed1b0af 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -41,7 +41,7 @@ if (!$user->rights->propale->lire)
 	accessforbidden();
 
 if ($conf->projet->enabled)   require_once(DOL_DOCUMENT_ROOT.'/project.class.php');
-if ($conf->commande->enabled) require_once('../commande/commande.class.php');
+if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php');
 require_once('./propal_model_pdf.class.php');
 require_once('../propal.class.php');
 require_once('../actioncomm.class.php');
@@ -811,15 +811,17 @@ if ($_GET['propalid'])
     {
       print '<form action="propal.php?propalid='.$propal->id.'" method="post">';
       print '<table class="border" width="100%">';
-      print '<tr><td>'.$langs->trans("CloseAs").': ';
+      print '<tr><td>'.$langs->trans('Note').'</td><td><textarea cols="60" rows="2" wrap="soft" name="note">';
+      print $obj->note;
+      print '</textarea></td></tr>';
+      print '<tr><td>'.$langs->trans("CloseAs").'</td><td>';
       print '<input type="hidden" name="action" value="setstatut">';
       print '<select name="statut">';
       print '<option value="2">'.$propal->labelstatut[2].'</option>';
       print '<option value="3">'.$propal->labelstatut[3].'</option>';
       print '</select>';
-      print '</td></tr><tr><td>'.$langs->trans('Note').': <br><textarea cols="60" rows="4" wrap="soft" name="note">';
-      print $obj->note;
-      print '</textarea></td></tr><tr><td align="center"><input type="submit" value="'.$langs->trans('Valid').'"></td>';
+      print '</td></tr>';
+      print '<tr><td align="center" colspan="2"><input type="submit" value="'.$langs->trans('Valid').'"></td>';
       print '</tr></table></form>';
     }
 
diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php
index 032297c601d..cb7fc178944 100644
--- a/htdocs/compta/propal.php
+++ b/htdocs/compta/propal.php
@@ -35,7 +35,7 @@ if (!$user->rights->propale->lire)
   accessforbidden();
 
 if ($conf->projet->enabled)   require_once(DOL_DOCUMENT_ROOT.'/project.class.php');
-if ($conf->commande->enabled) require_once('../commande/commande.class.php');
+if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php');
 require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
 require_once("../propal.class.php");
 //require_once("../actioncomm.class.php");