From cf299a5bbf52d02cda3f783dcde4391bf564d184 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 4 Sep 2005 15:18:27 +0000
Subject: [PATCH] =?UTF-8?q?New:=20Possibilit=E9=20de=20g=E9n=E9rer=20une?=
 =?UTF-8?q?=20facture=20depuis=20un=20contrat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/facture.php        |  4 +++-
 htdocs/contrat/contrat.class.php | 17 +++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index bc71aa5c02a..402c7712679 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -238,8 +238,10 @@ if ($_POST["action"] == 'add')
                         $lines = $contrat->fetch_lignes();
                         for ($i = 0 ; $i < sizeof($lines) ; $i++)
                         {
+                            $liblignefac=($contrat->lignes[$i]->desc?$contrat->lignes[$i]->desc:$contrat->lignes[$i]->libelle);
+
                             $result = $facture->addline($facid,
-                            addslashes($lines[$i]->description),
+                            addslashes($liblignefac),
                             $lines[$i]->subprice,
                             $lines[$i]->qty,
                             $lines[$i]->tva_tx,
diff --git a/htdocs/contrat/contrat.class.php b/htdocs/contrat/contrat.class.php
index 4bc8d9e7321..702b897c2a5 100644
--- a/htdocs/contrat/contrat.class.php
+++ b/htdocs/contrat/contrat.class.php
@@ -539,8 +539,9 @@ class Contrat
      */
     function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $datestart='', $dateend='', $tvatx)
     {
-        if ($this->statut == 0)
-        {
+// On doit pouvoir modifier datestart et dateend meme si non brouillon
+//        if ($this->statut == 0)
+//        {
             // Nettoyage parametres
             $qty=trim($qty);
             $desc=trim($desc);
@@ -595,12 +596,12 @@ class Contrat
     
                 return -1;
             }
-        }
-        else
-        {
-            dolibarr_syslog("Contrat::UpdateLigne Erreur -2 Contrat en mode incompatible pour cette action");
-            return -2;
-        }
+//        }
+//        else
+//        {
+//            dolibarr_syslog("Contrat::UpdateLigne Erreur -2 Contrat en mode incompatible pour cette action");
+//            return -2;
+//        }
     }
     
     /**