From 3cc24419a2a975a5a6e98a81ec50724d7ae80791 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 6 Oct 2008 23:21:00 +0000
Subject: [PATCH] Add patch from sladame to add contracts in home page.

---
 htdocs/contrat/contrat.class.php | 2163 +++++++++++++++---------------
 htdocs/index.php                 |   24 +-
 2 files changed, 1115 insertions(+), 1072 deletions(-)

diff --git a/htdocs/contrat/contrat.class.php b/htdocs/contrat/contrat.class.php
index 92e7752c6b8..c13123e2f25 100644
--- a/htdocs/contrat/contrat.class.php
+++ b/htdocs/contrat/contrat.class.php
@@ -19,11 +19,11 @@
  */
 
 /**
-	    \file       htdocs/contrat/contrat.class.php
-        \ingroup    contrat
-		\brief      Fichier de la classe des contrats
-		\version    $Id$
-*/
+ \file       htdocs/contrat/contrat.class.php
+ \ingroup    contrat
+ \brief      Fichier de la classe des contrats
+ \version    $Id$
+ */
 
 require_once(DOL_DOCUMENT_ROOT."/commonobject.class.php");
 require_once(DOL_DOCUMENT_ROOT."/product.class.php");
@@ -31,562 +31,562 @@ require_once(DOL_DOCUMENT_ROOT."/lib/price.lib.php");
 
 
 /**
-        \class      Contrat
-		\brief      Classe permettant la gestion des contrats
-*/
+ \class      Contrat
+ \brief      Classe permettant la gestion des contrats
+ */
 class Contrat extends CommonObject
 {
-    var $db;
+	var $db;
 	var $error;
 	var $element='contrat';
 	var $table_element='contrat';
 	var $table_element_line='contratdet';
 	var $fk_element='fk_contrat';
 
-    var $id;
-    var $ref;
-    var $socid;
-    var $societe;		// Objet societe
-	var $statut=0;		// 0=Draft, 
-    var $product;
+	var $id;
+	var $ref;
+	var $socid;
+	var $societe;		// Objet societe
+	var $statut=0;		// 0=Draft,
+	var $product;
 
-    var $user_author;
-    var $user_service;
-    var $user_cloture;
-    var $date_creation;
-    var $date_validation;
+	var $user_author;
+	var $user_service;
+	var $user_cloture;
+	var $date_creation;
+	var $date_validation;
 
-    var $date_contrat;
-    var $date_cloture;
+	var $date_contrat;
+	var $date_cloture;
 
-    var $commercial_signature_id;
-    var $commercial_suivi_id;
+	var $commercial_signature_id;
+	var $commercial_suivi_id;
 
 	var $note;
 	var $note_public;
-	
-    var $fk_projet;
-        
-    var $lignes=array();
-   
-        
-    /**
-     *    \brief      Constructeur de la classe
-     *    \param      DB          handler acc�s base de donn�es
-     */
-    function Contrat($DB)
-    {
-        global $langs;
-        
-        $this->db = $DB ;
-        $this->product = new Product($DB);
-        $this->societe = new Societe($DB);
-        $this->user_service = new User($DB);
-        $this->user_cloture = new User($DB);
-    }
 
-    /**
-     *      \brief      Active une ligne detail d'un contrat
-     *      \param      user        Objet User qui avtice le contrat
-     *      \param      line_id     Id de la ligne de detail � activer
-     *      \param      date        Date d'ouverture
-     *      \param      date_end    Date fin pr�vue
-     *      \return     int         < 0 si erreur, > 0 si ok
-     */
-    function active_line($user, $line_id, $date, $date_end='')
-    {
-        global $langs,$conf;
-        
-        $this->db->begin();
-    
-        $sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET statut = 4,";
-        $sql.= " date_ouverture = '".$this->db->idate($date)."',";
-        if ($date_end) $sql.= " date_fin_validite = '".$this->db->idate($date_end)."',";
-        $sql.= " fk_user_ouverture = ".$user->id.",";
+	var $fk_projet;
+
+	var $lignes=array();
+  
+
+	/**
+	 *    \brief      Constructeur de la classe
+	 *    \param      DB          handler acc�s base de donn�es
+	 */
+	function Contrat($DB)
+	{
+		global $langs;
+
+		$this->db = $DB ;
+		$this->product = new Product($DB);
+		$this->societe = new Societe($DB);
+		$this->user_service = new User($DB);
+		$this->user_cloture = new User($DB);
+	}
+
+	/**
+	 *      \brief      Active une ligne detail d'un contrat
+	 *      \param      user        Objet User qui avtice le contrat
+	 *      \param      line_id     Id de la ligne de detail � activer
+	 *      \param      date        Date d'ouverture
+	 *      \param      date_end    Date fin pr�vue
+	 *      \return     int         < 0 si erreur, > 0 si ok
+	 */
+	function active_line($user, $line_id, $date, $date_end='')
+	{
+		global $langs,$conf;
+
+		$this->db->begin();
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET statut = 4,";
+		$sql.= " date_ouverture = '".$this->db->idate($date)."',";
+		if ($date_end) $sql.= " date_fin_validite = '".$this->db->idate($date_end)."',";
+		$sql.= " fk_user_ouverture = ".$user->id.",";
 		$sql.= " date_cloture = null";
-        $sql.= " WHERE rowid = ".$line_id . " AND (statut = 0 OR statut = 3 OR statut = 5)";
-    
+		$sql.= " WHERE rowid = ".$line_id . " AND (statut = 0 OR statut = 3 OR statut = 5)";
+
 		dolibarr_syslog("Contrat::active_line sql=".$sql);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            // Appel des triggers
-            include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('CONTRACT_SERVICE_ACTIVATE',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
-    
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			// Appel des triggers
+			include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
+			$interface=new Interfaces($this->db);
+			$result=$interface->run_triggers('CONTRACT_SERVICE_ACTIVATE',$this,$user,$langs,$conf);
+			if ($result < 0) { $error++; $this->errors=$interface->errors; }
+			// Fin appel triggers
+
 			$this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->lasterror();
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
 			dolibarr_syslog("Contrat::active_line error ".$this->error);
 			$this->db->rollback();
-            return -1;
-        }
-    }
-    
-    
-    /**
-     *      \brief      Active une ligne detail d'un contrat
-     *      \param      user        Objet User qui avtice le contrat
-     *      \param      line_id     Id de la ligne de detail � activer
-     *      \param      date_end     Date fin
-     *      \return     int         <0 si erreur, >0 si ok
-     */
-    function close_line($user, $line_id, $date_end)
-    {
-        global $langs,$conf;
-        
-        // statut actif : 4
-    
-        $sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET statut = 5,";
-        $sql.= " date_cloture = '".$this->db->idate($date_end)."',";
-        $sql.= " fk_user_cloture = ".$user->id;
-        $sql.= " WHERE rowid = ".$line_id . " AND statut = 4";
-    
-        $resql = $this->db->query($sql) ;
-        if ($resql)
-        {
-            // Appel des triggers
-            include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('CONTRACT_SERVICE_CLOSE',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
-    
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
-    
+			return -1;
+		}
+	}
 
-    /**
-     *    \brief      Cloture un contrat
-     *    \param      user      Objet User qui cloture
-     *    \param      langs     Environnement langue de l'utilisateur
-     *    \param      conf      Environnement de configuration lors de l'op�ration
-     *
-     */
-    function cloture($user,$langs='',$conf='')
-    {
-        $sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET statut = 2";
-        $sql .= " , date_cloture = ".$this->db->idate(mktime()).", fk_user_cloture = ".$user->id;
-        $sql .= " WHERE rowid = ".$this->id . " AND statut = 1";
-    
-        $resql = $this->db->query($sql) ;
-        if ($resql)
-        {
-            $this->use_webcal=($conf->global->PHPWEBCALENDAR_CONTRACTSTATUS=='always'?1:0);
-    
-            // Appel des triggers
-            include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('CONTRACT_CLOSE',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
 
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
-    
-    /**
-     *    \brief      Valide un contrat
-     *    \param      user      Objet User qui valide
-     *    \param      langs     Environnement langue de l'utilisateur
-     *    \param      conf      Environnement de configuration lors de l'op�ration
-     */
-    function validate($user,$langs,$conf)
-    {
-        $sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET statut = 1";
-        $sql .= " WHERE rowid = ".$this->id . " AND statut = 0";
-    
-        $resql = $this->db->query($sql) ;
-        if ($resql)
-        {
-            $this->use_webcal=($conf->global->PHPWEBCALENDAR_CONTRACTSTATUS=='always'?1:0);
-    
-            // Appel des triggers
-            include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('CONTRACT_VALIDATE',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
-        
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
+	/**
+	 *      \brief      Active une ligne detail d'un contrat
+	 *      \param      user        Objet User qui avtice le contrat
+	 *      \param      line_id     Id de la ligne de detail � activer
+	 *      \param      date_end     Date fin
+	 *      \return     int         <0 si erreur, >0 si ok
+	 */
+	function close_line($user, $line_id, $date_end)
+	{
+		global $langs,$conf;
+
+		// statut actif : 4
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET statut = 5,";
+		$sql.= " date_cloture = '".$this->db->idate($date_end)."',";
+		$sql.= " fk_user_cloture = ".$user->id;
+		$sql.= " WHERE rowid = ".$line_id . " AND statut = 4";
+
+		$resql = $this->db->query($sql) ;
+		if ($resql)
+		{
+			// Appel des triggers
+			include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
+			$interface=new Interfaces($this->db);
+			$result=$interface->run_triggers('CONTRACT_SERVICE_CLOSE',$this,$user,$langs,$conf);
+			if ($result < 0) { $error++; $this->errors=$interface->errors; }
+			// Fin appel triggers
+
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *    \brief      Cloture un contrat
+	 *    \param      user      Objet User qui cloture
+	 *    \param      langs     Environnement langue de l'utilisateur
+	 *    \param      conf      Environnement de configuration lors de l'op�ration
+	 *
+	 */
+	function cloture($user,$langs='',$conf='')
+	{
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET statut = 2";
+		$sql .= " , date_cloture = ".$this->db->idate(mktime()).", fk_user_cloture = ".$user->id;
+		$sql .= " WHERE rowid = ".$this->id . " AND statut = 1";
+
+		$resql = $this->db->query($sql) ;
+		if ($resql)
+		{
+			$this->use_webcal=($conf->global->PHPWEBCALENDAR_CONTRACTSTATUS=='always'?1:0);
+
+			// Appel des triggers
+			include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
+			$interface=new Interfaces($this->db);
+			$result=$interface->run_triggers('CONTRACT_CLOSE',$this,$user,$langs,$conf);
+			if ($result < 0) { $error++; $this->errors=$interface->errors; }
+			// Fin appel triggers
+
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *    \brief      Valide un contrat
+	 *    \param      user      Objet User qui valide
+	 *    \param      langs     Environnement langue de l'utilisateur
+	 *    \param      conf      Environnement de configuration lors de l'op�ration
+	 */
+	function validate($user,$langs,$conf)
+	{
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET statut = 1";
+		$sql .= " WHERE rowid = ".$this->id . " AND statut = 0";
+
+		$resql = $this->db->query($sql) ;
+		if ($resql)
+		{
+			$this->use_webcal=($conf->global->PHPWEBCALENDAR_CONTRACTSTATUS=='always'?1:0);
+
+			// Appel des triggers
+			include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
+			$interface=new Interfaces($this->db);
+			$result=$interface->run_triggers('CONTRACT_VALIDATE',$this,$user,$langs,$conf);
+			if ($result < 0) { $error++; $this->errors=$interface->errors; }
+			// Fin appel triggers
+
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *    \brief      Annule un contrat
+	 *    \param      user      Objet User qui annule
+	 *    \param      langs     Environnement langue de l'utilisateur
+	 *    \param      conf      Environnement de configuration lors de l'op�ration
+	 */
+	function annule($user,$langs='',$conf='')
+	{
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET statut = 0";
+		$sql .= " , date_cloture = ".$this->db->idate(mktime()).", fk_user_cloture = ".$user->id;
+		$sql .= " WHERE rowid = ".$this->id . " AND statut = 1";
+
+		$resql = $this->db->query($sql) ;
+		if ($resql)
+		{
+			$this->use_webcal=($conf->global->PHPWEBCALENDAR_CONTRACTSTATUS=='always'?1:0);
+
+			// Appel des triggers
+			include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
+			$interface=new Interfaces($this->db);
+			$result=$interface->run_triggers('CONTRACT_CANCEL',$this,$user,$langs,$conf);
+			if ($result < 0) { $error++; $this->errors=$interface->errors; }
+			// Fin appel triggers
+
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *    \brief      Chargement depuis la base des donnees du contrat
+	 *    \param      id      Id du contrat a charger
+	 *    \return     int     <0 si ko, id du contrat charge si ok
+	 */
+	function fetch($id)
+	{
+		$sql = "SELECT rowid, statut, ref, fk_soc, ".$this->db->pdate("mise_en_service")." as datemise,";
+		$sql.= " fk_user_mise_en_service, ".$this->db->pdate("date_contrat")." as datecontrat,";
+		$sql.= " fk_user_author,";
+		$sql.= " fk_projet,";
+		$sql.= " fk_commercial_signature, fk_commercial_suivi,";
+		$sql.= " note, note_public";
+		$sql.= " FROM ".MAIN_DB_PREFIX."contrat WHERE rowid = ".$id;
 
-    /**
-     *    \brief      Annule un contrat
-     *    \param      user      Objet User qui annule
-     *    \param      langs     Environnement langue de l'utilisateur
-     *    \param      conf      Environnement de configuration lors de l'op�ration
-     */
-    function annule($user,$langs='',$conf='')
-    {
-        $sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET statut = 0";
-        $sql .= " , date_cloture = ".$this->db->idate(mktime()).", fk_user_cloture = ".$user->id;
-        $sql .= " WHERE rowid = ".$this->id . " AND statut = 1";
-    
-        $resql = $this->db->query($sql) ;
-        if ($resql)
-        {
-            $this->use_webcal=($conf->global->PHPWEBCALENDAR_CONTRACTSTATUS=='always'?1:0);
-    
-            // Appel des triggers
-            include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('CONTRACT_CANCEL',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
-        
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
-    
-    /**
-     *    \brief      Chargement depuis la base des donnees du contrat
-     *    \param      id      Id du contrat a charger
-     *    \return     int     <0 si ko, id du contrat charge si ok
-     */
-    function fetch($id)
-    {
-        $sql = "SELECT rowid, statut, ref, fk_soc, ".$this->db->pdate("mise_en_service")." as datemise,";
-        $sql.= " fk_user_mise_en_service, ".$this->db->pdate("date_contrat")." as datecontrat,";
-        $sql.= " fk_user_author,";
-        $sql.= " fk_projet,";
-        $sql.= " fk_commercial_signature, fk_commercial_suivi,";
-        $sql.= " note, note_public";
-        $sql.= " FROM ".MAIN_DB_PREFIX."contrat WHERE rowid = ".$id;
-    
 		dolibarr_syslog("Contrat::fetch sql=".$sql);
-        $resql = $this->db->query($sql) ;
-        if ($resql)
-        {
-            $result = $this->db->fetch_array($resql);
-    
-            if ($result)
-            {
-                $this->id                = $result["rowid"];
-                $this->ref               = (!isset($result["ref"]) || !$result["ref"]) ? $result["rowid"] : $result["ref"];
-                $this->statut            = $result["statut"];
-                $this->factureid         = $result["fk_facture"];
-                $this->facturedetid      = $result["fk_facturedet"];
-                $this->mise_en_service   = $result["datemise"];
-                $this->date_fin_validite = $result["datefin"];
-                $this->date_contrat      = $result["datecontrat"];
-        
-                $this->user_author_id    = $result["fk_user_author"];
-        
-                $this->commercial_signature_id = $result["fk_commercial_signature"];
-                $this->commercial_suivi_id = $result["fk_commercial_suivi"];
-        
-                $this->user_service->id  = $result["fk_user_mise_en_service"];
-                $this->user_cloture->id  = $result["fk_user_cloture"];
-    
-                $this->note              = $result["note"];
-                $this->note_public       = $result["note_public"];
+		$resql = $this->db->query($sql) ;
+		if ($resql)
+		{
+			$result = $this->db->fetch_array($resql);
+
+			if ($result)
+			{
+				$this->id                = $result["rowid"];
+				$this->ref               = (!isset($result["ref"]) || !$result["ref"]) ? $result["rowid"] : $result["ref"];
+				$this->statut            = $result["statut"];
+				$this->factureid         = $result["fk_facture"];
+				$this->facturedetid      = $result["fk_facturedet"];
+				$this->mise_en_service   = $result["datemise"];
+				$this->date_fin_validite = $result["datefin"];
+				$this->date_contrat      = $result["datecontrat"];
+
+				$this->user_author_id    = $result["fk_user_author"];
+
+				$this->commercial_signature_id = $result["fk_commercial_signature"];
+				$this->commercial_suivi_id = $result["fk_commercial_suivi"];
+
+				$this->user_service->id  = $result["fk_user_mise_en_service"];
+				$this->user_cloture->id  = $result["fk_user_cloture"];
+
+				$this->note              = $result["note"];
+				$this->note_public       = $result["note_public"];
+
+				$this->fk_projet         = $result["fk_projet"];
+
+				$this->socid            = $result["fk_soc"];
+				$this->societe->fetch($result["fk_soc"]);	// TODO A virer car la societe doit etre charg� par appel de fetch_client()
+
+				$this->db->free($resql);
+
+				return $this->id;
+			}
+			else
+			{
+				dolibarr_syslog("Contrat::Fetch Erreur contrat non trouve");
+				$this->error="Contrat non trouve";
+				return -2;
+			}
+		}
+		else
+		{
+			dolibarr_syslog("Contrat::Fetch Erreur lecture contrat");
+			$this->error=$this->db->error();
+			return -1;
+		}
+
+	}
+
+	/**
+	 *      \brief      Reinitialise le tableau lignes
+	 */
+	function fetch_lignes()
+	{
+		$this->nbofserviceswait=0;
+		$this->nbofservicesopened=0;
+		$this->nbofservicesclosed=0;
 
-                $this->fk_projet         = $result["fk_projet"];
-        
-                $this->socid            = $result["fk_soc"];
-                $this->societe->fetch($result["fk_soc"]);	// TODO A virer car la societe doit etre charg� par appel de fetch_client()
-        
-                $this->db->free($resql);
-    
-                return $this->id;
-            }
-            else
-            {
-                dolibarr_syslog("Contrat::Fetch Erreur contrat non trouve");
-                $this->error="Contrat non trouve";
-                return -2;
-            }
-        }
-        else
-        {
-            dolibarr_syslog("Contrat::Fetch Erreur lecture contrat");
-            $this->error=$this->db->error();
-            return -1;
-        }
-    
-    }
-    
-    /**
-     *      \brief      Reinitialise le tableau lignes
-     */
-    function fetch_lignes()
-    {
-        $this->nbofserviceswait=0;
-        $this->nbofservicesopened=0;
-        $this->nbofservicesclosed=0;
-		
 		// Selectionne les lignes contrats liees a un produit
-        $sql = "SELECT p.label, p.description as product_desc, p.ref,";
-        $sql.= " d.rowid, d.statut, d.description, d.price_ht, d.tva_tx, d.qty, d.remise_percent, d.subprice,";
-        $sql.= " d.info_bits, d.fk_product,";
-        $sql.= " d.date_ouverture_prevue, d.date_ouverture,";
-        $sql.= " d.date_fin_validite, d.date_cloture";
-        $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as d, ".MAIN_DB_PREFIX."product as p";
-        $sql.= " WHERE d.fk_contrat = ".$this->id ." AND d.fk_product = p.rowid";
-        $sql.= " ORDER by d.rowid ASC";
-        
-        dolibarr_syslog("Contrat::fetch_lignes sql=".$sql);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            $i = 0;
-        
-            while ($i < $num)
-            {
-                $objp                  = $this->db->fetch_object($result);
-        
-                $ligne                 = new ContratLigne($db);
-                $ligne->id             = $objp->rowid;
-                $ligne->desc           = $objp->description;  // Description ligne
-                $ligne->qty            = $objp->qty;
-                $ligne->tva_tx         = $objp->tva_tx;
-                $ligne->subprice       = $objp->subprice;
-                $ligne->statut 		   = $objp->statut;
-                $ligne->remise_percent = $objp->remise_percent;
-                $ligne->price          = $objp->price;
-                $ligne->fk_product     = $objp->fk_product;
-                $ligne->info_bits      = $objp->info_bits;
+		$sql = "SELECT p.label, p.description as product_desc, p.ref,";
+		$sql.= " d.rowid, d.statut, d.description, d.price_ht, d.tva_tx, d.qty, d.remise_percent, d.subprice,";
+		$sql.= " d.info_bits, d.fk_product,";
+		$sql.= " d.date_ouverture_prevue, d.date_ouverture,";
+		$sql.= " d.date_fin_validite, d.date_cloture";
+		$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as d, ".MAIN_DB_PREFIX."product as p";
+		$sql.= " WHERE d.fk_contrat = ".$this->id ." AND d.fk_product = p.rowid";
+		$sql.= " ORDER by d.rowid ASC";
+
+		dolibarr_syslog("Contrat::fetch_lignes sql=".$sql);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
+
+			while ($i < $num)
+			{
+				$objp                  = $this->db->fetch_object($result);
+
+				$ligne                 = new ContratLigne($db);
+				$ligne->id             = $objp->rowid;
+				$ligne->desc           = $objp->description;  // Description ligne
+				$ligne->qty            = $objp->qty;
+				$ligne->tva_tx         = $objp->tva_tx;
+				$ligne->subprice       = $objp->subprice;
+				$ligne->statut 		   = $objp->statut;
+				$ligne->remise_percent = $objp->remise_percent;
+				$ligne->price          = $objp->price;
+				$ligne->fk_product     = $objp->fk_product;
+				$ligne->info_bits      = $objp->info_bits;
+
+				$ligne->ref            = $objp->ref;
+				$ligne->libelle        = $objp->label;        // Label produit
+				$ligne->product_desc   = $objp->product_desc; // Description produit
+
+				$ligne->date_debut_prevue = $objp->date_ouverture_prevue;
+				$ligne->date_debut_reel   = $objp->date_ouverture;
+				$ligne->date_fin_prevue   = $objp->date_fin_validite;
+				$ligne->date_fin_reel     = $objp->date_cloture;
+
+				$this->lignes[]        = $ligne;
+				//dolibarr_syslog("1 ".$ligne->desc);
+				//dolibarr_syslog("2 ".$ligne->product_desc);
 
-                $ligne->ref            = $objp->ref;
-                $ligne->libelle        = $objp->label;        // Label produit
-                $ligne->product_desc   = $objp->product_desc; // Description produit
-                    
-                $ligne->date_debut_prevue = $objp->date_ouverture_prevue;
-                $ligne->date_debut_reel   = $objp->date_ouverture;
-                $ligne->date_fin_prevue   = $objp->date_fin_validite;
-                $ligne->date_fin_reel     = $objp->date_cloture;
-        
-                $this->lignes[]        = $ligne;
-                //dolibarr_syslog("1 ".$ligne->desc);
-                //dolibarr_syslog("2 ".$ligne->product_desc);
-				
 				if ($ligne->statut == 0) $this->nbofserviceswait++;
 				if ($ligne->statut == 4) $this->nbofservicesopened++;
 				if ($ligne->statut == 5) $this->nbofservicesclosed++;
 
-                $i++;
-            }
-            $this->db->free($result);
-        }
-        else
-        {
-            dolibarr_syslog("Contrat::Fetch Erreur lecture des lignes de contrats li�es aux produits");
-            return -3;
-        }
-        
-        // Selectionne les lignes contrat liees a aucun produit
-        $sql = "SELECT d.rowid, d.statut, d.qty, d.description, d.price_ht, d.subprice, d.tva_tx, d.rowid, d.remise_percent,";
-        $sql.= " d.date_ouverture_prevue, d.date_ouverture,";
-        $sql.= " d.date_fin_validite, d.date_cloture";
-        $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as d";
-        $sql.= " WHERE d.fk_contrat = ".$this->id;
-        $sql.= " AND (d.fk_product IS NULL OR d.fk_product = 0)";   // fk_product = 0 gard� pour compatibilit�
+				$i++;
+			}
+			$this->db->free($result);
+		}
+		else
+		{
+			dolibarr_syslog("Contrat::Fetch Erreur lecture des lignes de contrats li�es aux produits");
+			return -3;
+		}
+
+		// Selectionne les lignes contrat liees a aucun produit
+		$sql = "SELECT d.rowid, d.statut, d.qty, d.description, d.price_ht, d.subprice, d.tva_tx, d.rowid, d.remise_percent,";
+		$sql.= " d.date_ouverture_prevue, d.date_ouverture,";
+		$sql.= " d.date_fin_validite, d.date_cloture";
+		$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as d";
+		$sql.= " WHERE d.fk_contrat = ".$this->id;
+		$sql.= " AND (d.fk_product IS NULL OR d.fk_product = 0)";   // fk_product = 0 gard� pour compatibilit�
+
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
+
+			while ($i < $num)
+			{
+				$objp                  = $this->db->fetch_object($result);
+				$ligne                 = new ContratLigne($this->db);
+				$ligne->id 			   = $objp->rowid;
+				$ligne->libelle        = stripslashes($objp->description);
+				$ligne->desc           = stripslashes($objp->description);
+				$ligne->qty            = $objp->qty;
+				$ligne->statut 		   = $objp->statut;
+				$ligne->ref            = $objp->ref;
+				$ligne->tva_tx         = $objp->tva_tx;
+				$ligne->subprice       = $objp->subprice;
+				$ligne->remise_percent = $objp->remise_percent;
+				$ligne->price          = $objp->price;
+				$ligne->fk_product     = 0;
+
+				$ligne->date_debut_prevue = $objp->date_ouverture_prevue;
+				$ligne->date_debut_reel   = $objp->date_ouverture;
+				$ligne->date_fin_prevue   = $objp->date_fin_validite;
+				$ligne->date_fin_reel     = $objp->date_cloture;
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            $i = 0;
-        
-            while ($i < $num)
-            {
-                $objp                  = $this->db->fetch_object($result);
-                $ligne                 = new ContratLigne($this->db);
-                $ligne->id 			   = $objp->rowid;
-                $ligne->libelle        = stripslashes($objp->description);
-                $ligne->desc           = stripslashes($objp->description);
-                $ligne->qty            = $objp->qty;
-                $ligne->statut 		   = $objp->statut;
-                $ligne->ref            = $objp->ref;
-                $ligne->tva_tx         = $objp->tva_tx;
-                $ligne->subprice       = $objp->subprice;
-                $ligne->remise_percent = $objp->remise_percent;
-                $ligne->price          = $objp->price;
-                $ligne->fk_product     = 0;
-        
-                $ligne->date_debut_prevue = $objp->date_ouverture_prevue;
-                $ligne->date_debut_reel   = $objp->date_ouverture;
-                $ligne->date_fin_prevue   = $objp->date_fin_validite;
-                $ligne->date_fin_reel     = $objp->date_cloture;
-        
 				if ($ligne->statut == 0) $this->nbofserviceswait++;
 				if ($ligne->statut == 4) $this->nbofservicesopened++;
 				if ($ligne->statut == 5) $this->nbofservicesclosed++;
 
-                $this->lignes[]        = $ligne;
-                $i++;
-            }
-        
-            $this->db->free($result);
-        }
-        else
-        {
-            dolibarr_syslog("Contrat::Fetch Erreur lecture des lignes de contrat non li�es aux produits");
-            $this->error=$this->db->error();
-            return -2;
-        }
-    
+				$this->lignes[]        = $ligne;
+				$i++;
+			}
+
+			$this->db->free($result);
+		}
+		else
+		{
+			dolibarr_syslog("Contrat::Fetch Erreur lecture des lignes de contrat non li�es aux produits");
+			$this->error=$this->db->error();
+			return -2;
+		}
+
 		$this->nbofservices=sizeof($this->lignes);
-	
-        return $this->lignes;
-    }
-  
-    /**
-     *      \brief      Cree un contrat vierge en base
-     *      \param      user        Utilisateur qui cree
-     *      \param      langs       Environnement langue de l'utilisateur
-     *      \param      conf        Environnement de configuration lors de l'operation
-     *      \return     int         <0 si erreur, id contrat cre sinon
-     */
-    function create($user,$langs='',$conf='')
-    {
-        // Check parameters
-        $paramsok=1;
-        if ($this->commercial_signature_id <= 0)
-        {
-            $langs->load("commercial");
-            $this->error.=$langs->trans("ErrorFieldRequired",$langs->trans("SalesRepresentativeSignature"));
-            $paramsok=0;
-        }
-        if ($this->commercial_suivi_id <= 0)
-        {
-            $langs->load("commercial");
-            $this->error.=($this->error?"<br>":'');
-            $this->error.=$langs->trans("ErrorFieldRequired",$langs->trans("SalesRepresentativeFollowUp"));
-            $paramsok=0;
-        }
-        if (! $paramsok) return -1;
-        
-        $this->db->begin();
 
-        // Insert contract
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."contrat (datec, fk_soc, fk_user_author, date_contrat";
-        $sql.= ", fk_commercial_signature, fk_commercial_suivi";
-        $sql.= " , ref)";
-        $sql.= " VALUES (".$this->db->idate(mktime()).",".$this->socid.",".$user->id;
-        $sql.= ",".$this->db->idate($this->date_contrat);
-        $sql.= ",".($this->commercial_signature_id>0?$this->commercial_signature_id:"NULL");
-        $sql.= ",".($this->commercial_suivi_id>0?$this->commercial_suivi_id:"NULL");
-		$sql .= ", " . (strlen($this->ref)<=0 ? "null" : "'".$this->ref."'");
-        $sql.= ")";
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $error=0;
-            
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."contrat");
-    
-            // Ins�re contacts commerciaux ('SALESREPSIGN','contrat')
-            $result=$this->add_contact($this->commercial_signature_id,'SALESREPSIGN','internal');
-            if ($result < 0) $error++;
-            
-            // Ins�re contacts commerciaux ('SALESREPFOLL','contrat')
-            $result=$this->add_contact($this->commercial_suivi_id,'SALESREPFOLL','internal');
-            if ($result < 0) $error++;
+		return $this->lignes;
+	}
 
-            if (! $error)
-            {
-                // Appel des triggers
-                include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('CONTRACT_CREATE',$this,$user,$langs,$conf);
-                if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                // Fin appel triggers
-        
-                if (! $error)
-                {
-                    $this->db->commit();
-                    return $this->id;
-                }
-                else
-                {
-                    $this->error=$interface->error;
-                    dolibarr_syslog("Contrat::create - 30 - ".$this->error);
+	/**
+	 *      \brief      Cree un contrat vierge en base
+	 *      \param      user        Utilisateur qui cree
+	 *      \param      langs       Environnement langue de l'utilisateur
+	 *      \param      conf        Environnement de configuration lors de l'operation
+	 *      \return     int         <0 si erreur, id contrat cre sinon
+	 */
+	function create($user,$langs='',$conf='')
+	{
+		// Check parameters
+		$paramsok=1;
+		if ($this->commercial_signature_id <= 0)
+		{
+			$langs->load("commercial");
+			$this->error.=$langs->trans("ErrorFieldRequired",$langs->trans("SalesRepresentativeSignature"));
+			$paramsok=0;
+		}
+		if ($this->commercial_suivi_id <= 0)
+		{
+			$langs->load("commercial");
+			$this->error.=($this->error?"<br>":'');
+			$this->error.=$langs->trans("ErrorFieldRequired",$langs->trans("SalesRepresentativeFollowUp"));
+			$paramsok=0;
+		}
+		if (! $paramsok) return -1;
 
-                    $this->db->rollback();
-                    return -3;
-                }
-            }
-            else
-            {
-                $this->error="Failed to add contact";
-                dolibarr_syslog("Contrat::create - 20 - ".$this->error);
-
-                $this->db->rollback();
-                return -2;
-            }
-        }
-        else
-        {
-            $this->error=$langs->trans("UnknownError: ".$this->db->error()." - sql=".$sql);
-            dolibarr_syslog("Contrat::create - 10 - ".$this->error);
-
-            $this->db->rollback();
-            return -1;
-        }
-    }
-    
-
-    /**
-     *      \brief      Supprime l'objet de la base
-     *      \param      user        Utilisateur qui supprime
-     *      \param      langs       Environnement langue de l'utilisateur
-     *      \param      conf        Environnement de configuration lors de l'operation
-     *      \return     int         < 0 si erreur, > 0 si ok
-     */
-    function delete($user,$langs='',$conf='')
-    {
-		$error=0;
-		
 		$this->db->begin();
-		
-        if (! $error)
-        {
+
+		// Insert contract
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."contrat (datec, fk_soc, fk_user_author, date_contrat";
+		$sql.= ", fk_commercial_signature, fk_commercial_suivi";
+		$sql.= " , ref)";
+		$sql.= " VALUES (".$this->db->idate(mktime()).",".$this->socid.",".$user->id;
+		$sql.= ",".$this->db->idate($this->date_contrat);
+		$sql.= ",".($this->commercial_signature_id>0?$this->commercial_signature_id:"NULL");
+		$sql.= ",".($this->commercial_suivi_id>0?$this->commercial_suivi_id:"NULL");
+		$sql .= ", " . (strlen($this->ref)<=0 ? "null" : "'".$this->ref."'");
+		$sql.= ")";
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$error=0;
+
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."contrat");
+
+			// Ins�re contacts commerciaux ('SALESREPSIGN','contrat')
+			$result=$this->add_contact($this->commercial_signature_id,'SALESREPSIGN','internal');
+			if ($result < 0) $error++;
+
+			// Ins�re contacts commerciaux ('SALESREPFOLL','contrat')
+			$result=$this->add_contact($this->commercial_suivi_id,'SALESREPFOLL','internal');
+			if ($result < 0) $error++;
+
+			if (! $error)
+			{
+				// Appel des triggers
+				include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
+				$interface=new Interfaces($this->db);
+				$result=$interface->run_triggers('CONTRACT_CREATE',$this,$user,$langs,$conf);
+				if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				// Fin appel triggers
+
+				if (! $error)
+				{
+					$this->db->commit();
+					return $this->id;
+				}
+				else
+				{
+					$this->error=$interface->error;
+					dolibarr_syslog("Contrat::create - 30 - ".$this->error);
+
+					$this->db->rollback();
+					return -3;
+				}
+			}
+			else
+			{
+				$this->error="Failed to add contact";
+				dolibarr_syslog("Contrat::create - 20 - ".$this->error);
+
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		else
+		{
+			$this->error=$langs->trans("UnknownError: ".$this->db->error()." - sql=".$sql);
+			dolibarr_syslog("Contrat::create - 10 - ".$this->error);
+
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *      \brief      Supprime l'objet de la base
+	 *      \param      user        Utilisateur qui supprime
+	 *      \param      langs       Environnement langue de l'utilisateur
+	 *      \param      conf        Environnement de configuration lors de l'operation
+	 *      \return     int         < 0 si erreur, > 0 si ok
+	 */
+	function delete($user,$langs='',$conf='')
+	{
+		$error=0;
+
+		$this->db->begin();
+
+		if (! $error)
+		{
 			// Delete element_contact
 			/*
 			$sql = "DELETE ec";
 			$sql.= " FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc";
-	        $sql.= " WHERE ec.fk_c_type_contact = tc.rowid";
+			$sql.= " WHERE ec.fk_c_type_contact = tc.rowid";
 			$sql.= " AND tc.element='".$this->element."'";
 			$sql.= " AND ec.element_id=".$this->id;
 			*/
-			
+				
 			$sql = "SELECT ec.rowid as ecrowid";
 			$sql.= " FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc";
-	        $sql.= " WHERE ec.fk_c_type_contact = tc.rowid";
+			$sql.= " WHERE ec.fk_c_type_contact = tc.rowid";
 			$sql.= " AND tc.element='".$this->element."'";
 			$sql.= " AND ec.element_id=".$this->id;
-			
+				
 			dolibarr_syslog("Contrat::delete element_contact sql=".$sql,LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if (! $resql)
@@ -604,12 +604,12 @@ class Contrat extends CommonObject
 					$tab_resql[]= $objresql->ecrowid;
 				}
 				$this->db->free($resql);
-				
+
 				$sql= "DELETE FROM ".MAIN_DB_PREFIX."element_contact ";
 				$sql.= " WHERE ".MAIN_DB_PREFIX."element_contact.rowid IN (".implode(",",$tab_resql).")";
-				
+
 				dolibarr_syslog("Contrat::delete element_contact sql=".$sql,LOG_DEBUG);
-		        $resql=$this->db->query($sql);
+				$resql=$this->db->query($sql);
 				if (! $resql)
 				{
 					$this->error=$this->db->error();
@@ -617,9 +617,9 @@ class Contrat extends CommonObject
 				}
 			}
 		}
-		
-        if (! $error)
-        {
+
+		if (! $error)
+		{
 			// Delete contratdet_log
 			/*
 			$sql = "DELETE cdl";
@@ -628,8 +628,8 @@ class Contrat extends CommonObject
 			*/
 			$sql = "SELECT cdl.rowid as cdlrowid ";
 			$sql.= " FROM ".MAIN_DB_PREFIX."contratdet_log as cdl, ".MAIN_DB_PREFIX."contratdet as cd";
-	        $sql.= " WHERE cdl.fk_contratdet=cd.rowid AND cd.fk_contrat=".$this->id;
-			
+			$sql.= " WHERE cdl.fk_contratdet=cd.rowid AND cd.fk_contrat=".$this->id;
+				
 			dolibarr_syslog("Contrat::delete contratdet_log sql=".$sql, LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if (! $resql)
@@ -647,12 +647,12 @@ class Contrat extends CommonObject
 					$tab_resql[]= $objresql->cdlrowid;
 				}
 				$this->db->free($resql);
-				
+
 				$sql= "DELETE FROM ".MAIN_DB_PREFIX."contratdet_log ";
 				$sql.= " WHERE ".MAIN_DB_PREFIX."contratdet_log.rowid IN (".implode(",",$tab_resql).")";
-			
+					
 				dolibarr_syslog("Contrat::delete contratdet_log sql=".$sql, LOG_DEBUG);
-		        $resql=$this->db->query($sql);
+				$resql=$this->db->query($sql);
 				if (! $resql)
 				{
 					$this->error=$this->db->error();
@@ -660,51 +660,51 @@ class Contrat extends CommonObject
 				}
 			}
 		}
-		
-        if (! $error)
-        {
+
+		if (! $error)
+		{
 			// Delete contratdet
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."contratdet";
-	        $sql.= " WHERE fk_contrat=".$this->id;
+			$sql.= " WHERE fk_contrat=".$this->id;
 
 			dolibarr_syslog("Contrat::delete contratdet sql=".$sql, LOG_DEBUG);
-	        $resql=$this->db->query($sql);
+			$resql=$this->db->query($sql);
 			if (! $resql)
 			{
 				$this->error=$this->db->error();
 				$error++;
 			}
 		}
-		
-        if (! $error)
-        {
+
+		if (! $error)
+		{
 			// Delete contrat
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."contrat";
-	        $sql.= " WHERE rowid=".$this->id;
-	        
+			$sql.= " WHERE rowid=".$this->id;
+			 
 			dolibarr_syslog("Contrat::delete contrat sql=".$sql);
-	        $resql=$this->db->query($sql);
+			$resql=$this->db->query($sql);
 			if (! $resql)
 			{
 				$this->error=$this->db->error();
 				$error++;
 			}
 		}
-		
+
 		if (! $error)
-	    {
+		{
 			// Appel des triggers
 			include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
 			$interface=new Interfaces($this->db);
 			$result=$interface->run_triggers('CONTRACT_DELETE',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
+			if ($result < 0) { $error++; $this->errors=$interface->errors; }
 			// Fin appel triggers
-	
+
 			$this->db->commit();
 			return 1;
-        }
+		}
 		else
-	    {
+		{
 			$this->error=$this->db->error();
 			dolibarr_syslog("Contrat::delete ERROR ".$this->error);
 			$this->db->rollback();
@@ -712,33 +712,33 @@ class Contrat extends CommonObject
 		}
 	}
 
-    
-    /**
-     *      \brief      Ajoute une ligne de contrat en base
-     *      \param      desc            	Description de la ligne
-     *      \param      pu_ht              	Prix unitaire HT
-     *      \param      qty             	Quantit�
-     *      \param      txtva           	Taux tva
-     *      \param      fk_product      	Id produit
-     *      \param      remise_percent  	Pourcentage de remise de la ligne
-     *      \param      date_start      	Date de debut pr�vue
-     *      \param      date_end        	Date de fin pr�vue
-	 *		\param		price_base_type		HT ou TTC
-     * 	    \param    	pu_ttc             	Prix unitaire TTC
-     * 		\param    	info_bits			Bits de type de lignes
-     *      \return     int             	<0 si erreur, >0 si ok
-     */
-    function addline($desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $date_start, $date_end, $price_base_type='HT', $pu_ttc=0, $info_bits=0)
-    {
-        global $langs, $conf;
-        
-        dolibarr_syslog("Contrat::addline $desc, $pu_ht, $qty, $txtva, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type, $pu_ttc, $info_bits");
 
-        if ($this->statut == 0 || ($this->statut == 1 && $conf->global->CONTRAT_EDITWHENVALIDATED))
-        {
-        	$this->db->begin();
-        	
-        	// Clean parameters
+	/**
+	 *      \brief      Ajoute une ligne de contrat en base
+	 *      \param      desc            	Description de la ligne
+	 *      \param      pu_ht              	Prix unitaire HT
+	 *      \param      qty             	Quantit�
+	 *      \param      txtva           	Taux tva
+	 *      \param      fk_product      	Id produit
+	 *      \param      remise_percent  	Pourcentage de remise de la ligne
+	 *      \param      date_start      	Date de debut pr�vue
+	 *      \param      date_end        	Date de fin pr�vue
+	 *		\param		price_base_type		HT ou TTC
+	 * 	    \param    	pu_ttc             	Prix unitaire TTC
+	 * 		\param    	info_bits			Bits de type de lignes
+	 *      \return     int             	<0 si erreur, >0 si ok
+	 */
+	function addline($desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $date_start, $date_end, $price_base_type='HT', $pu_ttc=0, $info_bits=0)
+	{
+		global $langs, $conf;
+
+		dolibarr_syslog("Contrat::addline $desc, $pu_ht, $qty, $txtva, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type, $pu_ttc, $info_bits");
+
+		if ($this->statut == 0 || ($this->statut == 1 && $conf->global->CONTRAT_EDITWHENVALIDATED))
+		{
+			$this->db->begin();
+			 
+			// Clean parameters
 			$remise_percent=price2num($remise_percent);
 			$qty=price2num($qty);
 			if (! $qty) $qty=1;
@@ -756,270 +756,270 @@ class Contrat extends CommonObject
 			{
 				$pu=$pu_ttc;
 			}
-			
+				
 			// Calcul du total TTC et de la TVA pour la ligne a partir de
 			// qty, pu, remise_percent et txtva
-			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker 
+			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
 			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 			$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, 0, $price_base_type, $info_bits);
 			$total_ht  = $tabprice[0];
 			$total_tva = $tabprice[1];
 			$total_ttc = $tabprice[2];
 
-            // \TODO A virer
+			// \TODO A virer
 			// Anciens indicateurs: $price, $remise (a ne plus utiliser)
-            $remise = 0;
-            $price = price2num(round($pu, 2));
-            if (strlen($remise_percent) > 0)
-            {
-                $remise = round(($pu * $remise_percent / 100), 2);
-                $price = $pu - $remise;
-            }
-            
-            // Insertion dans la base
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."contratdet";
-            $sql.= " (fk_contrat, label, description, fk_product, qty, tva_tx,";
-            $sql.= " remise_percent, subprice,";
+			$remise = 0;
+			$price = price2num(round($pu, 2));
+			if (strlen($remise_percent) > 0)
+			{
+				$remise = round(($pu * $remise_percent / 100), 2);
+				$price = $pu - $remise;
+			}
+
+			// Insertion dans la base
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."contratdet";
+			$sql.= " (fk_contrat, label, description, fk_product, qty, tva_tx,";
+			$sql.= " remise_percent, subprice,";
 			$sql.= " total_ht, total_tva, total_ttc,";
 			$sql.= " info_bits,";
 			$sql.= " price_ht, remise";								// \TODO A virer
-            if ($date_start > 0) { $sql.= ",date_ouverture_prevue"; }
-            if ($date_end > 0)  { $sql.= ",date_fin_validite"; }
-            $sql.= ") VALUES ($this->id, '" . addslashes($label) . "','" . addslashes($desc) . "',";
-            $sql.= ($fk_product>0 ? $fk_product : "null").",";
-            $sql.= " '".$qty."',";
+			if ($date_start > 0) { $sql.= ",date_ouverture_prevue"; }
+			if ($date_end > 0)  { $sql.= ",date_fin_validite"; }
+			$sql.= ") VALUES ($this->id, '" . addslashes($label) . "','" . addslashes($desc) . "',";
+			$sql.= ($fk_product>0 ? $fk_product : "null").",";
+			$sql.= " '".$qty."',";
 			$sql.= " '".$txtva."',";
 			$sql.= " ".price2num($remise_percent).",".price2num($pu).",";
 			$sql.= " ".price2num($total_ht).",".price2num($total_tva).",".price2num($total_ttc).",";
 			$sql.= " '".$info_bits."',";
 			$sql.= " ".price2num($price).",".price2num( $remise);	// \TODO A virer
-            if ($date_start > 0) { $sql.= ",".$this->db->idate($date_start); }
-            if ($date_end > 0) { $sql.= ",".$this->db->idate($date_end); }
-            $sql.= ")";
+			if ($date_start > 0) { $sql.= ",".$this->db->idate($date_start); }
+			if ($date_end > 0) { $sql.= ",".$this->db->idate($date_end); }
+			$sql.= ")";
 
-            dolibarr_syslog("Contrat::addline sql=".$sql);
+			dolibarr_syslog("Contrat::addline sql=".$sql);
 
-            $resql=$this->db->query($sql);
-            if ($resql)
-            {
-                $result=$this->update_statut();
-        		if ($result > 0)
-        		{
+			$resql=$this->db->query($sql);
+			if ($resql)
+			{
+				$result=$this->update_statut();
+				if ($result > 0)
+				{
 					$this->db->commit();
 					return 1;
 				}
 				else
-        		{
-	        		dolibarr_syslog("Error sql=$sql, error=".$this->error,LOG_ERR);
+				{
+					dolibarr_syslog("Error sql=$sql, error=".$this->error,LOG_ERR);
 					$this->db->rollback();
 					return -1;
 				}
-            }
-            else
-            {
+			}
+			else
+			{
 				$this->db->rollback();
-            	$this->error=$this->db->error()." sql=".$sql;
-                dolibarr_syslog("Contrat::addline ".$this->error,LOG_ERR);
-                return -1;
-            }
-        }
-        else
-        {
+				$this->error=$this->db->error()." sql=".$sql;
+				dolibarr_syslog("Contrat::addline ".$this->error,LOG_ERR);
+				return -1;
+			}
+		}
+		else
+		{
 			dolibarr_syslog("Contrat::addline ErrorTryToAddLineOnValidatedContract", LOG_ERR);
-            return -2;
-        }
-    }
+			return -2;
+		}
+	}
 
-    /**
-     *      \brief     Mets a jour une ligne de contrat
-     *      \param     rowid            Id de la ligne de facture
-     *      \param     desc             Description de la ligne
-     *      \param     pu               Prix unitaire
-     *      \param     qty              Quantite
-     *      \param     remise_percent   Pourcentage de remise de la ligne
-     *      \param     date_start       Date de debut prevue
-     *      \param     date_end         Date de fin prevue
-     *      \param     tvatx            Taux TVA
-     *      \param     date_debut_reel  Date de debut reelle
-     *      \param     date_fin_reel    Date de fin reelle
-     *      \return    int              < 0 si erreur, > 0 si ok
-     */
-    function updateline($rowid, $desc, $pu, $qty, $remise_percent=0,
-         $date_start='', $date_end='', $tvatx,
-         $date_debut_reel='', $date_fin_reel='')
-    {
-        // Nettoyage parametres
-        $qty=trim($qty);
-        $desc=trim($desc);
-        $desc=trim($desc);
-        $price = price2num($pu);
-        $tvatx = price2num($tvatx);
-        $subprice = $price;
-        $remise = 0;
-        if (strlen($remise_percent) > 0)
-        {
-            $remise = round(($pu * $remise_percent / 100), 2);
-            $price = $pu - $remise;
-        }
-        else
-        {
-            $remise_percent=0;
-        }
+	/**
+	 *      \brief     Mets a jour une ligne de contrat
+	 *      \param     rowid            Id de la ligne de facture
+	 *      \param     desc             Description de la ligne
+	 *      \param     pu               Prix unitaire
+	 *      \param     qty              Quantite
+	 *      \param     remise_percent   Pourcentage de remise de la ligne
+	 *      \param     date_start       Date de debut prevue
+	 *      \param     date_end         Date de fin prevue
+	 *      \param     tvatx            Taux TVA
+	 *      \param     date_debut_reel  Date de debut reelle
+	 *      \param     date_fin_reel    Date de fin reelle
+	 *      \return    int              < 0 si erreur, > 0 si ok
+	 */
+	function updateline($rowid, $desc, $pu, $qty, $remise_percent=0,
+	$date_start='', $date_end='', $tvatx,
+	$date_debut_reel='', $date_fin_reel='')
+	{
+		// Nettoyage parametres
+		$qty=trim($qty);
+		$desc=trim($desc);
+		$desc=trim($desc);
+		$price = price2num($pu);
+		$tvatx = price2num($tvatx);
+		$subprice = $price;
+		$remise = 0;
+		if (strlen($remise_percent) > 0)
+		{
+			$remise = round(($pu * $remise_percent / 100), 2);
+			$price = $pu - $remise;
+		}
+		else
+		{
+			$remise_percent=0;
+		}
 
-        dolibarr_syslog("Contrat::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $date_debut_reel, $date_fin_reel, $tvatx");
-    
-        $this->db->begin();
+		dolibarr_syslog("Contrat::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $date_debut_reel, $date_fin_reel, $tvatx");
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."contratdet set description='".addslashes($desc)."'";
-        $sql .= ",price_ht='" .     price2num($price)."'";
-        $sql .= ",subprice='" .     price2num($subprice)."'";
-        $sql .= ",remise='" .       price2num($remise)."'";
-        $sql .= ",remise_percent='".price2num($remise_percent)."'";
-        $sql .= ",qty='$qty'";
-        $sql .= ",tva_tx='".        price2num($tvatx)."'";
+		$this->db->begin();
 
-        if ($date_start > 0) { $sql.= ",date_ouverture_prevue=".$this->db->idate($date_start); }
-        else { $sql.=",date_ouverture_prevue=null"; }
-        if ($date_end > 0) { $sql.= ",date_fin_validite=".$this->db->idate($date_end); }
-        else { $sql.=",date_fin_validite=null"; }
-        if ($date_debut_reel > 0) { $sql.= ",date_ouverture=".$this->db->idate($date_debut_reel); }
-        else { $sql.=",date_ouverture=null"; }
-        if ($date_fin_reel > 0) { $sql.= ",date_cloture=".$this->db->idate($date_fin_reel); }
-        else { $sql.=",date_cloture=null"; }
-        $sql .= " WHERE rowid = ".$rowid;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet set description='".addslashes($desc)."'";
+		$sql .= ",price_ht='" .     price2num($price)."'";
+		$sql .= ",subprice='" .     price2num($subprice)."'";
+		$sql .= ",remise='" .       price2num($remise)."'";
+		$sql .= ",remise_percent='".price2num($remise_percent)."'";
+		$sql .= ",qty='$qty'";
+		$sql .= ",tva_tx='".        price2num($tvatx)."'";
+
+		if ($date_start > 0) { $sql.= ",date_ouverture_prevue=".$this->db->idate($date_start); }
+		else { $sql.=",date_ouverture_prevue=null"; }
+		if ($date_end > 0) { $sql.= ",date_fin_validite=".$this->db->idate($date_end); }
+		else { $sql.=",date_fin_validite=null"; }
+		if ($date_debut_reel > 0) { $sql.= ",date_ouverture=".$this->db->idate($date_debut_reel); }
+		else { $sql.=",date_ouverture=null"; }
+		if ($date_fin_reel > 0) { $sql.= ",date_cloture=".$this->db->idate($date_fin_reel); }
+		else { $sql.=",date_cloture=null"; }
+		$sql .= " WHERE rowid = ".$rowid;
 
 		dolibarr_syslog("Contrat::UpdateLine sql=".$sql);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $result=$this->update_statut();
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$result=$this->update_statut();
 			if ($result >= 0)
 			{
 				$this->db->commit();
 				return 1;
 			}
-	        else
-	        {
-	            $this->db->rollback();
-	            dolibarr_syslog("Contrat::UpdateLigne Erreur -2");
-	            return -2;
-	        }
-        }
-        else
-        {
-            $this->db->rollback();
-            $this->error=$this->db->error();
-            dolibarr_syslog("Contrat::UpdateLigne Erreur -1");
-            return -1;
-        }
-    }
-    
-    /**
-     *      \brief      Delete a contract line
-     *      \param      idline		Id of line to delete
-     *		\param      user        User that delete
-     *      \return     int         >0 if OK, <0 if KO
-     */
-    function delete_line($idline,$user)
-    {
+			else
+			{
+				$this->db->rollback();
+				dolibarr_syslog("Contrat::UpdateLigne Erreur -2");
+				return -2;
+			}
+		}
+		else
+		{
+			$this->db->rollback();
+			$this->error=$this->db->error();
+			dolibarr_syslog("Contrat::UpdateLigne Erreur -1");
+			return -1;
+		}
+	}
+
+	/**
+	 *      \brief      Delete a contract line
+	 *      \param      idline		Id of line to delete
+	 *		\param      user        User that delete
+	 *      \return     int         >0 if OK, <0 if KO
+	 */
+	function delete_line($idline,$user)
+	{
 		global $conf, $langs;
-		
-        if ($contrat->statut == 0 ||
-			($contrat->statut == 1 && $conf->global->CONTRAT_EDITWHENVALIDATED) )
-        {
+
+		if ($contrat->statut == 0 ||
+		($contrat->statut == 1 && $conf->global->CONTRAT_EDITWHENVALIDATED) )
+		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."contratdet";
 			$sql.= " WHERE rowid=".$idline;
-		
-		   	dolibarr_syslog("Contratdet::delete sql=".$sql);
+
+			dolibarr_syslog("Contratdet::delete sql=".$sql);
 			$resql = $this->db->query($sql);
 			if (! $resql)
 			{
 				$this->error="Error ".$this->db->lasterror();
-	            dolibarr_syslog("Contratdet::delete ".$this->error, LOG_ERR);
+				dolibarr_syslog("Contratdet::delete ".$this->error, LOG_ERR);
 				return -1;
 			}
-		
-	        // Appel des triggers
-	        include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
-	        $interface=new Interfaces($this->db);
-	        $result=$interface->run_triggers('CONTRACTLINE_DELETE',$this,$user,$langs,$conf);
-	        if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	        // Fin appel triggers
+
+			// Appel des triggers
+			include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
+			$interface=new Interfaces($this->db);
+			$result=$interface->run_triggers('CONTRACTLINE_DELETE',$this,$user,$langs,$conf);
+			if ($result < 0) { $error++; $this->errors=$interface->errors; }
+			// Fin appel triggers
 
 			return 1;
-        }
-        else
-        {
-            return -2;
-        }
-    }
+		}
+		else
+		{
+			return -2;
+		}
+	}
 
 
-    /**
-     *      \brief      Update statut of contract according to services
-     *		\return     int     <0 si ko, >0 si ok
-     */
-    function update_statut()
-    {
+	/**
+	 *      \brief      Update statut of contract according to services
+	 *		\return     int     <0 si ko, >0 si ok
+	 */
+	function update_statut()
+	{
 		// If draft, we keep it (should not happen)
 		if ($this->statut == 0) return 1;
 
 		// Load $this->lignes array
-//		$this->fetch_lignes();
-		
+		//		$this->fetch_lignes();
+
 		$newstatut=1;
 		foreach($this->lignes as $key => $contractline)
 		{
-//			if ($contractline)         // Loop on each service
+			//			if ($contractline)         // Loop on each service
 		}
-		
+
 		return 1;
-    }
-    
+	}
+
 
 	/**
 	 *    	\brief      Retourne le libelle du statut du contrat
 	 *    	\param      mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-   	 *    	\return     string      	Label
-   	 */
-    function getLibStatut($mode)
-    {
+	 *    	\return     string      	Label
+	 */
+	function getLibStatut($mode)
+	{
 		return $this->LibStatut($this->statut,$mode);
-    }
+	}
 
 	/**
-   	 *    	\brief      Renvoi le libelle d'un statut donne
-   	 *    	\param      statut      	id statut
+	 *    	\brief      Renvoi le libelle d'un statut donne
+	 *    	\param      statut      	id statut
 	 *    	\param      mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-   	 *		\return     string      	Libelle
-   	 */
-    function LibStatut($statut,$mode)
-    {
-        global $langs;
-        $langs->load("contracts");
+	 *		\return     string      	Libelle
+	 */
+	function LibStatut($statut,$mode)
+	{
+		global $langs;
+		$langs->load("contracts");
 		if ($mode == 0)
 		{
-	        if ($statut == 0) { return $langs->trans("ContractStatusDraft").$text; }
-	        if ($statut == 1) { return $langs->trans("ContractStatusValidated").$text; }
-	        if ($statut == 2) { return $langs->trans("ContractStatusClosed").$text; }
+			if ($statut == 0) { return $langs->trans("ContractStatusDraft").$text; }
+			if ($statut == 1) { return $langs->trans("ContractStatusValidated").$text; }
+			if ($statut == 2) { return $langs->trans("ContractStatusClosed").$text; }
 		}
 		if ($mode == 1)
 		{
-	        if ($statut == 0) { return $langs->trans("ContractStatusDraft"); }
-	        if ($statut == 1) { return $langs->trans("ContractStatusValidated"); }
-	        if ($statut == 2) { return $langs->trans("ContractStatusClosed"); }
+			if ($statut == 0) { return $langs->trans("ContractStatusDraft"); }
+			if ($statut == 1) { return $langs->trans("ContractStatusValidated"); }
+			if ($statut == 2) { return $langs->trans("ContractStatusClosed"); }
 		}
 		if ($mode == 2)
 		{
-	        if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'),'statut0').' '.$langs->trans("ContractStatusDraft"); }
-	        if ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4').' '.$langs->trans("ContractStatusValidated"); }
-	        if ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'),'statut6').' '.$langs->trans("ContractStatusClosed"); }
+			if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'),'statut0').' '.$langs->trans("ContractStatusDraft"); }
+			if ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4').' '.$langs->trans("ContractStatusValidated"); }
+			if ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'),'statut6').' '.$langs->trans("ContractStatusClosed"); }
 		}
 		if ($mode == 3)
 		{
-	        if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'),'statut0'); }
-	        if ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4'); }
-	        if ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'),'statut6'); }
+			if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'),'statut0'); }
+			if ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4'); }
+			if ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'),'statut6'); }
 		}
 		if ($mode == 4)
 		{
@@ -1032,17 +1032,17 @@ class Contrat extends CommonObject
 			$text.=$this->nbofservicesclosed.' '.$line->LibStatut(5,3);
 			return $text;
 
-		if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'),'statut0').' '.$langs->trans("ContractStatusDraft"); }
-	        if ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4').' '.$langs->trans("ContractStatusValidated"); }
-	        if ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'),'statut6').' '.$langs->trans("ContractStatusClosed"); }
+			if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'),'statut0').' '.$langs->trans("ContractStatusDraft"); }
+			if ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4').' '.$langs->trans("ContractStatusValidated"); }
+			if ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'),'statut6').' '.$langs->trans("ContractStatusClosed"); }
 		}
 		if ($mode == 5)
 		{
-	        if ($statut == 0) { return $langs->trans("ContractStatusDraft").' '.img_picto($langs->trans('ContractStatusDraft'),'statut0'); }
-	        if ($statut == 1) { return $langs->trans("ContractStatusValidated").' '.img_picto($langs->trans('ContractStatusValidated'),'statut4'); }
-	        if ($statut == 2) { return $langs->trans("ContractStatusClosed").' '.img_picto($langs->trans('ContractStatusClosed'),'statut6'); }
+			if ($statut == 0) { return $langs->trans("ContractStatusDraft").' '.img_picto($langs->trans('ContractStatusDraft'),'statut0'); }
+			if ($statut == 1) { return $langs->trans("ContractStatusValidated").' '.img_picto($langs->trans('ContractStatusValidated'),'statut4'); }
+			if ($statut == 2) { return $langs->trans("ContractStatusClosed").' '.img_picto($langs->trans('ContractStatusClosed'),'statut6'); }
 		}
-    }
+	}
 
 
 	/**
@@ -1050,238 +1050,273 @@ class Contrat extends CommonObject
 		\param		withpicto		0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
 		\param		maxlength		Max length of ref
 		\return		string			Chaine avec URL
-	*/
+		*/
 	function getNomUrl($withpicto=0,$maxlength=0)
 	{
 		global $langs;
-		
+
 		$result='';
-		
+
 		$lien = '<a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$this->id.'">';
 		$lienfin='</a>';
-		
+
 		$picto='contract';
 
 		$label=$langs->trans("ShowContract").': '.$this->ref;
-		
+
 		if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		if ($withpicto != 2) $result.=$lien.($maxlength?dolibarr_trunc($this->ref,$maxlength):$this->ref).$lienfin;
 		return $result;
 	}
 
-  /*
-    *       \brief     Charge les informations d'ordre info dans l'objet contrat
-    *       \param     id     id du contrat a charger
-    */
-    function info($id)
-    {
-        $sql = "SELECT c.rowid, c.ref, ".$this->db->pdate("datec")." as datec, ".$this->db->pdate("date_cloture")." as date_cloture,";
-        $sql.= $this->db->pdate("c.tms")." as date_modification,";
-        $sql.= " fk_user_author, fk_user_cloture";
-        $sql.= " FROM ".MAIN_DB_PREFIX."contrat as c";
-        $sql.= " WHERE c.rowid = ".$id;
+	/*
+	 *       \brief     Charge les informations d'ordre info dans l'objet contrat
+	 *       \param     id     id du contrat a charger
+	 */
+	function info($id)
+	{
+		$sql = "SELECT c.rowid, c.ref, ".$this->db->pdate("datec")." as datec, ".$this->db->pdate("date_cloture")." as date_cloture,";
+		$sql.= $this->db->pdate("c.tms")." as date_modification,";
+		$sql.= " fk_user_author, fk_user_cloture";
+		$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c";
+		$sql.= " WHERE c.rowid = ".$id;
 
-        $result=$this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
+		$result=$this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
 
-                $this->id = $obj->rowid;
+				$this->id = $obj->rowid;
 
-                if ($obj->fk_user_author) {
-                    $cuser = new User($this->db, $obj->fk_user_author);
-                    $cuser->fetch();
-                    $this->user_creation     = $cuser;
-                }
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db, $obj->fk_user_author);
+					$cuser->fetch();
+					$this->user_creation     = $cuser;
+				}
 
-                if ($obj->fk_user_cloture) {
-                    $cuser = new User($this->db, $obj->fk_user_cloture);
-                    $cuser->fetch();
-                    $this->user_cloture = $cuser;
-                }
-			    $this->ref			     = (! $obj->ref) ? $obj->rowid : $obj->ref;
-                $this->date_creation     = $obj->datec;
-                $this->date_modification = $obj->date_modification;
-                $this->date_cloture      = $obj->date_cloture;
-            }
+				if ($obj->fk_user_cloture) {
+					$cuser = new User($this->db, $obj->fk_user_cloture);
+					$cuser->fetch();
+					$this->user_cloture = $cuser;
+				}
+				$this->ref			     = (! $obj->ref) ? $obj->rowid : $obj->ref;
+				$this->date_creation     = $obj->datec;
+				$this->date_modification = $obj->date_modification;
+				$this->date_cloture      = $obj->date_cloture;
+			}
 
-            $this->db->free($result);
+			$this->db->free($result);
 
-        }
-        else
-        {
-            dolibarr_print_error($this->db);
-        }
-    }
- 
-     /** 
-     *    \brief      Return list of line rowid
-     *    \param      statut      Status of lines to get
-     *    \return     array       Array of line's rowid
-     */
-    function array_detail($statut=-1)
-    {
-        $tab=array();
-        
-        $sql = "SELECT cd.rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
-        $sql.= " WHERE fk_contrat =".$this->id;
-        if ($statut >= 0) $sql.= " AND statut = '$statut'";
-   
-        dolibarr_syslog("Contrat::array_detail() sql=".$sql,LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $num=$this->db->num_rows($resql);
-            $i=0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($resql);
-                $tab[$i]=$obj->rowid;
-                $i++;
-            }
-            return $tab;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
-    
-    /** 
-     *  	\brief      Return list of other contracts for same company than current contract
-     *		\param		option		'all' or 'others'
-     *  	\return     array   	Array of contracts id
-     */
-    function getListOfContracts($option='all')
-    {
-        $tab=array();
-        
-        $sql = "SELECT c.rowid, c.ref";
-        $sql.= " FROM ".MAIN_DB_PREFIX."contrat as c";
-        $sql.= " WHERE fk_soc =".$this->socid;
-        if ($option == 'others') $sql.= " AND c.rowid != ".$this->id;
+		}
+		else
+		{
+			dolibarr_print_error($this->db);
+		}
+	}
 
-        dolibarr_syslog("Contrat::getOtherContracts() sql=".$sql,LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $num=$this->db->num_rows($resql);
-            $i=0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($resql);
-                $contrat=new Contrat($this->db);
-                $contrat->fetch($obj->rowid);
-                $tab[]=$contrat;
-                $i++;
-            }
-            return $tab;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
+	/**
+	 *    \brief      Return list of line rowid
+	 *    \param      statut      Status of lines to get
+	 *    \return     array       Array of line's rowid
+	 */
+	function array_detail($statut=-1)
+	{
+		$tab=array();
+
+		$sql = "SELECT cd.rowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
+		$sql.= " WHERE fk_contrat =".$this->id;
+		if ($statut >= 0) $sql.= " AND statut = '$statut'";
+		 
+		dolibarr_syslog("Contrat::array_detail() sql=".$sql,LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$num=$this->db->num_rows($resql);
+			$i=0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+				$tab[$i]=$obj->rowid;
+				$i++;
+			}
+			return $tab;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *  	\brief      Return list of other contracts for same company than current contract
+	 *		\param		option		'all' or 'others'
+	 *  	\return     array   	Array of contracts id
+	 */
+	function getListOfContracts($option='all')
+	{
+		$tab=array();
+
+		$sql = "SELECT c.rowid, c.ref";
+		$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c";
+		$sql.= " WHERE fk_soc =".$this->socid;
+		if ($option == 'others') $sql.= " AND c.rowid != ".$this->id;
+
+		dolibarr_syslog("Contrat::getOtherContracts() sql=".$sql,LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$num=$this->db->num_rows($resql);
+			$i=0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+				$contrat=new Contrat($this->db);
+				$contrat->fetch($obj->rowid);
+				$tab[]=$contrat;
+				$i++;
+			}
+			return $tab;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
 
 
-    /**
-     *      \brief      Charge indicateurs this->nbtodo et this->nbtodolate de tableau de bord
-     *      \param      user        Objet user
-     *      \param      mode        "inactive" pour services a activer, "expired" pour services expires
-     *      \return     int         <0 si ko, >0 si ok
-     */
-    function load_board($user,$mode)
-    {
-        global $conf, $user;
-        
-        $this->nbtodo=$this->nbtodolate=0;
-        if ($mode == 'inactives')
-        {
-            $sql = "SELECT cd.rowid,".$this->db->pdate("cd.date_ouverture_prevue")." as datefin";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
-            $sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."contratdet as cd";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql.= " WHERE c.statut = 1 AND c.rowid = cd.fk_contrat";
-            $sql.= " AND cd.statut = 0";
-        }
-        if ($mode == 'expired')
-        {
-            $sql = "SELECT cd.rowid,".$this->db->pdate("cd.date_fin_validite")." as datefin";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
-            $sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."contratdet as cd";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql.= " WHERE c.statut = 1 AND c.rowid = cd.fk_contrat";
-            $sql.= " AND cd.statut = 4";
-            $sql.= " AND cd.date_fin_validite < '".$this->db->idate(time())."'";
-        }
-        if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
-        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            while ($obj=$this->db->fetch_object($resql))
-            {
-                $this->nbtodo++;
-                if ($mode == 'inactives')
-                    if ($obj->datefin && $obj->datefin < (time() - $conf->contrat->services->inactifs->warning_delay)) $this->nbtodolate++;
-                if ($mode == 'expired')
-                    if ($obj->datefin && $obj->datefin < (time() - $conf->contrat->services->expires->warning_delay)) $this->nbtodolate++;
-            }
-            return 1;
-        }
-        else 
-        {
-            dolibarr_print_error($this->db);
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
+	/**
+	 *      \brief      Charge indicateurs this->nbtodo et this->nbtodolate de tableau de bord
+	 *      \param      user        Objet user
+	 *      \param      mode        "inactive" pour services a activer, "expired" pour services expires
+	 *      \return     int         <0 si ko, >0 si ok
+	 */
+	function load_board($user,$mode)
+	{
+		global $conf, $user;
+
+		$this->nbtodo=$this->nbtodolate=0;
+		if ($mode == 'inactives')
+		{
+			$sql = "SELECT cd.rowid,".$this->db->pdate("cd.date_ouverture_prevue")." as datefin";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
+			$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."contratdet as cd";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql.= " WHERE c.statut = 1 AND c.rowid = cd.fk_contrat";
+			$sql.= " AND cd.statut = 0";
+		}
+		if ($mode == 'expired')
+		{
+			$sql = "SELECT cd.rowid,".$this->db->pdate("cd.date_fin_validite")." as datefin";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
+			$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."contratdet as cd";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql.= " WHERE c.statut = 1 AND c.rowid = cd.fk_contrat";
+			$sql.= " AND cd.statut = 4";
+			$sql.= " AND cd.date_fin_validite < '".$this->db->idate(time())."'";
+		}
+		if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
+		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			while ($obj=$this->db->fetch_object($resql))
+			{
+				$this->nbtodo++;
+				if ($mode == 'inactives')
+				if ($obj->datefin && $obj->datefin < (time() - $conf->contrat->services->inactifs->warning_delay)) $this->nbtodolate++;
+				if ($mode == 'expired')
+				if ($obj->datefin && $obj->datefin < (time() - $conf->contrat->services->expires->warning_delay)) $this->nbtodolate++;
+			}
+			return 1;
+		}
+		else
+		{
+			dolibarr_print_error($this->db);
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *      \brief      Charge indicateurs this->nb de tableau de bord
+	 *      \return     int         <0 si ko, >0 si ok
+	 */
+	function load_state_board()
+	{
+		global $conf, $user;
+
+		$this->nb=array();
+
+		$sql = "SELECT count(c.rowid) as nb";
+		$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c";
+		if (!$user->rights->contrat->activer && !$user->societe_id)
+		{
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+			$sql.= " WHERE sc.fk_user = " .$user->id;
+		}
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			while ($obj=$this->db->fetch_object($resql))
+			{
+				$this->nb["Contracts"]=$obj->nb;
+			}
+			return 1;
+		}
+		else
+		{
+			dolibarr_print_error($this->db);
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
 
 
-    /* gestion des contacts d'un contrat */
-	 		
-    /**
-     *      \brief      Retourne id des contacts clients de facturation
-     *      \return     array       Liste des id contacts facturation
-     */   
-    function getIdBillingContact()
-    {
-        return $this->getIdContact('external','BILLING');
-    }
+	/* gestion des contacts d'un contrat */
+
+	/**
+	 *      \brief      Retourne id des contacts clients de facturation
+	 *      \return     array       Liste des id contacts facturation
+	 */
+	function getIdBillingContact()
+	{
+		return $this->getIdContact('external','BILLING');
+	}
+
+	/**
+	 *      \brief      Retourne id des contacts clients de prestation
+	 *      \return     array       Liste des id contacts prestation
+	 */
+	function getIdServiceContact()
+	{
+		return $this->getIdContact('external','SERVICE');
+	}
 
-    /**
-     *      \brief      Retourne id des contacts clients de prestation
-     *      \return     array       Liste des id contacts prestation
-     */   
-    function getIdServiceContact()
-    {
-        return $this->getIdContact('external','SERVICE');
-    }
-    
 }
 
 
 /**
-        \class      ContratLigne
-		\brief      Classe permettant la gestion des lignes de contrats
-*/
+ \class      ContratLigne
+ \brief      Classe permettant la gestion des lignes de contrats
+ */
 
-class ContratLigne  
+class ContratLigne
 {
 	var $db;							//!< To store db handler
 	var $error;							//!< To return error code (or message)
 	var $errors=array();				//!< To return several error codes (or messages)
 	//var $element='contratdet';			//!< Id that identify managed objects
 	//var $table_element='contratdet';	//!< Name of table without prefix where object is stored
-    
-    var $id;
-    
+
+	var $id;
+
 	var $tms;
 	var $fk_contrat;
 	var $fk_product;
@@ -1308,112 +1343,112 @@ class ContratLigne
 	var $fk_user_ouverture;
 	var $fk_user_cloture;
 	var $commentaire;
-	
+
 
 	/**
 	 *      \brief     Constructeur d'objets ligne de contrat
 	 *      \param     DB      Database access handler
 	 */
-    function ContratLigne($DB)
-    {
+	function ContratLigne($DB)
+	{
 		$this->db = $DB;
-    }
+	}
+
 
-    
 	/**
 	 *    	\brief      Retourne le libelle du statut de la ligne de contrat
 	 *		\param      mode        	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-   	 *    	\return     string      	Libelle
-   	 */
-    function getLibStatut($mode)
-    {
+	 *    	\return     string      	Libelle
+	 */
+	function getLibStatut($mode)
+	{
 		return $this->LibStatut($this->statut,$mode);
-    }
+	}
 
 	/**
-   	 *    	\brief      Renvoi le libelle d'un statut donne
-   	 *    	\param      statut      id statut
+	 *    	\brief      Renvoi le libelle d'un statut donne
+	 *    	\param      statut      id statut
 	 *		\param      mode        0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-   	 *    	\return     string      Libelle
-   	 */
-    function LibStatut($statut,$mode)
-    {
-        global $langs;
-        $langs->load("contracts");
+	 *    	\return     string      Libelle
+	 */
+	function LibStatut($statut,$mode)
+	{
+		global $langs;
+		$langs->load("contracts");
 		if ($mode == 0)
 		{
-	        if ($statut == 0) { return $langs->trans("ServiceStatusInitial"); }
-	        if ($statut == 4) { return $langs->trans("ServiceStatusRunning"); }
-	        if ($statut == 5) { return $langs->trans("ServiceStatusClosed");  }
+			if ($statut == 0) { return $langs->trans("ServiceStatusInitial"); }
+			if ($statut == 4) { return $langs->trans("ServiceStatusRunning"); }
+			if ($statut == 5) { return $langs->trans("ServiceStatusClosed");  }
 		}
 		if ($mode == 1)
 		{
-	        if ($statut == 0) { return $langs->trans("ServiceStatusInitial"); }
-	        if ($statut == 4) { return $langs->trans("ServiceStatusRunning"); }
-	        if ($statut == 5) { return $langs->trans("ServiceStatusClosed");  }
+			if ($statut == 0) { return $langs->trans("ServiceStatusInitial"); }
+			if ($statut == 4) { return $langs->trans("ServiceStatusRunning"); }
+			if ($statut == 5) { return $langs->trans("ServiceStatusClosed");  }
 		}
 		if ($mode == 2)
 		{
-	        if ($statut == 0) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0').' '.$langs->trans("ServiceStatusInitial"); }
-	        if ($statut == 4) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4').' '.$langs->trans("ServiceStatusRunning"); }
-	        if ($statut == 5) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6') .' '.$langs->trans("ServiceStatusClosed"); }
+			if ($statut == 0) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0').' '.$langs->trans("ServiceStatusInitial"); }
+			if ($statut == 4) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4').' '.$langs->trans("ServiceStatusRunning"); }
+			if ($statut == 5) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6') .' '.$langs->trans("ServiceStatusClosed"); }
 		}
 		if ($mode == 3)
 		{
-	        if ($statut == 0) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0'); }
-	        if ($statut == 4) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4'); }
-	        if ($statut == 5) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6'); }
+			if ($statut == 0) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0'); }
+			if ($statut == 4) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4'); }
+			if ($statut == 5) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6'); }
 		}
 		if ($mode == 4)
 		{
-	        if ($statut == 0) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0').' '.$langs->trans("ServiceStatusInitial"); }
-	        if ($statut == 4) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4').' '.$langs->trans("ServiceStatusRunning"); }
-	        if ($statut == 5) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6') .' '.$langs->trans("ServiceStatusClosed"); }
+			if ($statut == 0) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0').' '.$langs->trans("ServiceStatusInitial"); }
+			if ($statut == 4) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4').' '.$langs->trans("ServiceStatusRunning"); }
+			if ($statut == 5) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6') .' '.$langs->trans("ServiceStatusClosed"); }
 		}
 		if ($mode == 5)
 		{
-	        if ($statut == 0) { return $langs->trans("ServiceStatusInitial").' '.img_picto($langs->trans('ServiceStatusInitial'),'statut0'); }
-	        if ($statut == 4) { return $langs->trans("ServiceStatusRunning").' '.img_picto($langs->trans('ServiceStatusRunning'),'statut4'); }
-	        if ($statut == 5) { return $langs->trans("ServiceStatusClosed").' '.img_picto($langs->trans('ServiceStatusClosed'),'statut6'); }
+			if ($statut == 0) { return $langs->trans("ServiceStatusInitial").' '.img_picto($langs->trans('ServiceStatusInitial'),'statut0'); }
+			if ($statut == 4) { return $langs->trans("ServiceStatusRunning").' '.img_picto($langs->trans('ServiceStatusRunning'),'statut4'); }
+			if ($statut == 5) { return $langs->trans("ServiceStatusClosed").' '.img_picto($langs->trans('ServiceStatusClosed'),'statut6'); }
 		}
-    }    
+	}
 
 	/**
 		\brief      Renvoie nom clicable (avec eventuellement le picto)
 		\param		withpicto		0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
 		\return		string			Chaine avec URL
-	*/
+		*/
 	function getNomUrl($withpicto=0,$maxlength=0)
 	{
 		global $langs;
-		
+
 		$result='';
-		
+
 		$lien = '<a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$this->fk_contrat.'">';
 		$lienfin='</a>';
-		
+
 		$picto='contract';
 
 		$label=$langs->trans("ShowContractOfService").': '.$this->label;
-		
+
 		if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		if ($withpicto != 2) $result.=$lien.$this->label.$lienfin;
 		return $result;
 	}
 
-    /*
-     *    \brief      Load object in memory from database
-     *    \param      id          id object
-     *    \param      user        User that load
-     *    \return     int         <0 if KO, >0 if OK
-     */
-    function fetch($id, $user=0)
-    {
-    	global $langs;
-        $sql = "SELECT";
+	/*
+	 *    \brief      Load object in memory from database
+	 *    \param      id          id object
+	 *    \param      user        User that load
+	 *    \return     int         <0 if KO, >0 if OK
+	 */
+	function fetch($id, $user=0)
+	{
+		global $langs;
+		$sql = "SELECT";
 		$sql.= " t.rowid,";
-		
+
 		$sql.= " ".$this->db->pdate('t.tms')." as tms,";
 		$sql.= " t.fk_contrat,";
 		$sql.= " t.fk_product,";
@@ -1440,20 +1475,20 @@ class ContratLigne
 		$sql.= " t.fk_user_ouverture,";
 		$sql.= " t.fk_user_cloture,";
 		$sql.= " t.commentaire";
-		
-        $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as t";
-        $sql.= " WHERE t.rowid = ".$id;
-    
-    	dolibarr_syslog("Contratdet::fetch sql=".$sql, LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
-    
-                $this->id    = $obj->rowid;
-                
+
+		$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as t";
+		$sql.= " WHERE t.rowid = ".$id;
+
+		dolibarr_syslog("Contratdet::fetch sql=".$sql, LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id    = $obj->rowid;
+
 				$this->tms = $obj->tms;
 				$this->fk_contrat = $obj->fk_contrat;
 				$this->fk_product = $obj->fk_product;
@@ -1481,31 +1516,31 @@ class ContratLigne
 				$this->fk_user_cloture = $obj->fk_user_cloture;
 				$this->commentaire = $obj->commentaire;
 
-                
-            }
-            $this->db->free($resql);
-            
-            return 1;
-        }
-        else
-        {
-      	    $this->error="Error ".$this->db->lasterror();
-            dolibarr_syslog("ContratLigne::fetch ".$this->error, LOG_ERR);
-            return -1;
-        }
-    }
+
+			}
+			$this->db->free($resql);
+
+			return 1;
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			dolibarr_syslog("ContratLigne::fetch ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
 
 
-    /*
-     *      \brief      Update database for contract line
-     *      \param      user        	User that modify
-     *      \param      notrigger	    0=no, 1=yes (no update trigger)
-     *      \return     int         	<0 if KO, >0 if OK
-     */
-    function update($user, $notrigger=0)
-    {
-    	global $conf, $langs;
-    	
+	/*
+	 *      \brief      Update database for contract line
+	 *      \param      user        	User that modify
+	 *      \param      notrigger	    0=no, 1=yes (no update trigger)
+	 *      \return     int         	<0 if KO, >0 if OK
+	 */
+	function update($user, $notrigger=0)
+	{
+		global $conf, $langs;
+   
 		// Clean parameters
 		$this->fk_contrat=trim($this->fk_contrat);
 		$this->fk_product=trim($this->fk_product);
@@ -1527,12 +1562,12 @@ class ContratLigne
 		$this->fk_user_ouverture=trim($this->fk_user_ouverture);
 		$this->fk_user_cloture=trim($this->fk_user_cloture);
 		$this->commentaire=trim($this->commentaire);
-       
+		 
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET";
 		$sql.= " fk_contrat='".$this->fk_contrat."',";
 		$sql.= " fk_product=".($this->fk_product?"'".$this->fk_product."'":'null').",";
 		$sql.= " statut='".$this->statut."',";
@@ -1558,35 +1593,35 @@ class ContratLigne
 		$sql.= " fk_user_ouverture=".($this->fk_user_ouverture > 0?$this->fk_user_ouverture:"NULL").",";
 		$sql.= " fk_user_cloture=".($this->fk_user_cloture > 0?$this->fk_user_cloture:"NULL").",";
 		$sql.= " commentaire='".addslashes($this->commentaire)."'";
-        $sql.= " WHERE rowid=".$this->id;
+		$sql.= " WHERE rowid=".$this->id;
 
-        dolibarr_syslog("ContratLigne::update sql=".$sql, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
+		dolibarr_syslog("ContratLigne::update sql=".$sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
 			$contrat=new Contrat($this->db);
 			$contrat->fetch($this->fk_contrat);
 			$result=$contrat->update_statut();
 		}
 		else
 		{
-            $this->error="Error ".$this->db->lasterror();
-            dolibarr_syslog("ContratLigne::update ".$this->error, LOG_ERR);
-            return -1;
-        }
+			$this->error="Error ".$this->db->lasterror();
+			dolibarr_syslog("ContratLigne::update ".$this->error, LOG_ERR);
+			return -1;
+		}
 
 		if (! $notrigger)
 		{
-            // Appel des triggers
-            include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
-    	}
+			// Appel des triggers
+			include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
+			$interface=new Interfaces($this->db);
+			$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+			if ($result < 0) { $error++; $this->errors=$interface->errors; }
+			// Fin appel triggers
+		}
 
-        return 1;
-    }
+		return 1;
+	}
 
 
 	/**
@@ -1605,20 +1640,20 @@ class ContratLigne
 		$sql.= ",total_ttc=".price2num($this->total_ttc,'MT')."";
 		$sql.= " WHERE rowid = ".$this->rowid;
 
-       	dolibarr_syslog("ContratLigne::update_total sql=".$sql);
+		dolibarr_syslog("ContratLigne::update_total sql=".$sql);
 
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
 			$this->db->commit();
-			return 1;	
+			return 1;
 		}
 		else
 		{
-        	$this->error=$this->db->error();
-        	dolibarr_syslog("ContratLigne::update_total Error ".$this->error);
+			$this->error=$this->db->error();
+			dolibarr_syslog("ContratLigne::update_total Error ".$this->error);
 			$this->db->rollback();
-            return -2;
+			return -2;
 		}
 	}
 }
diff --git a/htdocs/index.php b/htdocs/index.php
index e8a7ff309f2..5f6fef7293c 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -129,7 +129,8 @@ if ($user->societe_id == 0)
                       $conf->propal->enabled && $user->rights->propale->lire,
                       $conf->commande->enabled && $user->rights->commande->lire,
                       $conf->facture->enabled && $user->rights->facture->lire,
-                      $conf->telephonie->enabled && $user->rights->telephonie->lire);
+                      $conf->telephonie->enabled && $user->rights->telephonie->lire,
+					  $conf->societe->enabled && $user->rights->contrat->activer);
     // Fichier des classes qui contiennent la methode load_state_board pour chaque ligne
     $includes=array(DOL_DOCUMENT_ROOT."/client.class.php",
                     DOL_DOCUMENT_ROOT."/prospect.class.php",
@@ -140,7 +141,8 @@ if ($user->societe_id == 0)
                     DOL_DOCUMENT_ROOT."/propal.class.php",
                     DOL_DOCUMENT_ROOT."/commande/commande.class.php",
                     DOL_DOCUMENT_ROOT."/facture.class.php",
-                    DOL_DOCUMENT_ROOT."/telephonie/lignetel.class.php");
+                    DOL_DOCUMENT_ROOT."/telephonie/lignetel.class.php",
+					DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
     // Nom des classes qui contiennent la methode load_state_board pour chaque ligne
     $classes=array('Client',
                    'Prospect',
@@ -151,7 +153,8 @@ if ($user->societe_id == 0)
 				   'Propal',
 				   'Commande',
 				   'Facture',
-                   'LigneTel');
+                   'LigneTel',
+                   'Contrat');
     // Clé de tableau retourné par la methode load_state_board pour chaque ligne
     $keys=array('customers',
                 'prospects',
@@ -162,7 +165,8 @@ if ($user->societe_id == 0)
 				'proposals',
 				'orders',
 				'invoices',
-                'sign');
+                'sign',
+				'Contracts');
     // Icon des lignes du tableau de bord
     $icons=array('company',
                  'company',
@@ -173,7 +177,8 @@ if ($user->societe_id == 0)
 				 'propal',
 				 'order',
 				 'bill',
-                 'phoning');
+                 'phoning',
+				 'order');
     // Translation keyword
     $titres=array("Customers",
                   "Prospects",
@@ -184,7 +189,8 @@ if ($user->societe_id == 0)
                   "CommercialProposals",
                   "CustomersOrders",
                   "BillsCustomers",
-                  "Lignes de téléphonie suivis");
+                  "Lignes de telephonie suivis",
+                  "Contracts");
     // Lien des lignes du tableau de bord
     $links=array(DOL_URL_ROOT.'/comm/clients.php',
                  DOL_URL_ROOT.'/comm/prospect/prospects.php',
@@ -195,7 +201,8 @@ if ($user->societe_id == 0)
                  DOL_URL_ROOT.'/comm/propal.php?mainmenu=commercial',
                  DOL_URL_ROOT.'/commande/liste.php?mainmenu=commercial',
                  DOL_URL_ROOT.'/compta/facture.php?mainmenu=accountancy',
-                 DOL_URL_ROOT.'/telephonie/ligne/index.php');
+                 DOL_URL_ROOT.'/telephonie/ligne/index.php',
+				 DOL_URL_ROOT.'/contrat/liste.php');
     // Translation lang files
     $langfile=array("bills",
                     "prospects",
@@ -206,7 +213,8 @@ if ($user->societe_id == 0)
                     "propal",
                     "orders",
                     "bills",
-                    "");
+                    "",
+					"Contracts");
                  
 	//print memory_get_usage()."<br>";