From e4e5dbe69417d1814d57d3658ce577469d3eada3 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Mon, 4 Aug 2003 12:46:47 +0000
Subject: [PATCH] modif mineure

---
 htdocs/compta/facture.php3       | 10 +++++-----
 htdocs/contrat/contrat.class.php |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/facture.php3 b/htdocs/compta/facture.php3
index 95882ba7689..01d280e38dc 100644
--- a/htdocs/compta/facture.php3
+++ b/htdocs/compta/facture.php3
@@ -574,10 +574,10 @@ else
 		    print '<input type="hidden" name="action" value="updateligne">';
 		    print '<input type="hidden" name="rowid" value="'.$rowid.'">';
 		    print "<TR $bc[$var]>";
-		    print '<TD><textarea name="desc" cols="60" rows="3">'.stripslashes($objp->description).'</textarea></TD>';
-		    print '<TD align="center"><input type="text" name="qty" value="'.$objp->qty.'"></TD>';
-		    print '<TD align="right"><input type="text" name="price" value="'.price($objp->price).'"></TD>';
-		    print '<td colspan="2"><input type="submit"></td>';
+		    print '<TD colspan="2"><textarea name="desc" cols="60" rows="3">'.stripslashes($objp->description).'</textarea></TD>';
+		    print '<TD align="center"><input size="4" type="text" name="qty" value="'.$objp->qty.'"></TD>';
+		    print '<TD align="right"><input size="8" type="text" name="price" value="'.price($objp->price).'"></TD>';
+		    print '<td align="right" colspan="2"><input type="submit" value="Enregistrer"></td>';
 		    print '</tr>' . "\n";
 		    print "</form>\n";
 		  }
@@ -627,7 +627,7 @@ else
 	 * Fin Ajout ligne
 	 *
 	 */
-	if ($user->societe_id == 0)
+	if ($user->societe_id == 0 && $fac->paye == 0)
 	  {
 	    print "<p><TABLE border=\"1\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\"><tr>";
 	
diff --git a/htdocs/contrat/contrat.class.php b/htdocs/contrat/contrat.class.php
index 6e5f8bfd242..4e1d25b8c1b 100644
--- a/htdocs/contrat/contrat.class.php
+++ b/htdocs/contrat/contrat.class.php
@@ -74,7 +74,7 @@ class Contrat
       $sql = "SELECT rowid, enservice, fk_soc, fk_product, ".$this->db->pdate("mise_en_service")." as datemise";
       $sql .= ", fk_user_mise_en_service, ".$this->db->pdate("date_cloture")." as datecloture";
       $sql .= ", ".$this->db->pdate("fin_validite")." as datefin";
-      $sql .= ", fk_user_cloture";
+      $sql .= ", fk_user_cloture, fk_facture";
       $sql .= " FROM llx_contrat WHERE rowid = $id";
 
       $result = $this->db->query($sql) ;
@@ -85,6 +85,7 @@ class Contrat
 
 	  $this->id                = $result["rowid"];
 	  $this->enservice         = $result["enservice"];
+	  $this->factureid         = $result["fk_facture"];
 	  $this->mise_en_service   = $result["datemise"];
 	  $this->date_cloture      = $result["datecloture"];
 	  $this->date_fin_validite = $result["datefin"];