From f265a205befabac76303e11892b476bbdf7a77b7 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 2 Apr 2007 23:47:54 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20suppression=20du=20bouton=20de=20modific?=
 =?UTF-8?q?ation=20de=20la=20remise=20fixe=20+=20modification=20esth=E9tiq?=
 =?UTF-8?q?ue=20mineure?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/facture/apercu.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
index cf479140598..b26100b2cca 100644
--- a/htdocs/compta/facture/apercu.php
+++ b/htdocs/compta/facture/apercu.php
@@ -109,6 +109,7 @@ if ($_GET["facid"] > 0)
 
 		// Remise globale
 		print '<tr><td>'.$langs->trans('GlobalDiscount').'</td>';
+/*
 		if ($fac->brouillon == 1 && $user->rights->facture->creer)
 		{
 			print '<form action="facture.php?facid='.$fac->id.'" method="post">';
@@ -119,12 +120,14 @@ if ($_GET["facid"] > 0)
 		}
 		else
 		{
+*/
 			print '<td colspan="3">'.$fac->remise_percent.'%</td>';
-		}
+//		}
 
         $nbrows=5;
         if ($conf->global->FAC_USE_CUSTOMER_ORDER_REF) $nbrows++;
-		print '<td rowspan="'.$nbrows.'" colspan="2" valign="top">';
+        if ($conf->projet->enabled) $nbrows++;
+		    print '<td rowspan="'.$nbrows.'" colspan="2" valign="top">';
 
         /*
          * Documents
@@ -199,9 +202,9 @@ if ($_GET["facid"] > 0)
                     imagick_writeimages( $handle, $file .".png");
                 }
                 else
-				{
-                    $langs->load("other");
-							print '<font class="error">'.$langs->trans("ErrorNoImagickReadimage").'</font>';
+				        {
+                   $langs->load("other");
+							     print '<font class="error">'.$langs->trans("ErrorNoImagickReadimage").'</font>';
                 }
             }