alxarafe / alixar

dolibarr/htdocs/contrat/class/api_contracts.class.php

Indentation +130 added lines, -130 removed lines

@@ -17,9 +17,9 @@ 
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
- use Luracast\Restler\RestException;
+    use Luracast\Restler\RestException;
 
- require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
 /**
  * API class for contracts
@@ -35,9 +35,9 @@ 
      */
     static $FIELDS = array(
         'socid',
-    	'date_contrat',
-    	'commercial_signature_id',
-    	'commercial_suivi_id'
+        'date_contrat',
+        'commercial_signature_id',
+        'commercial_suivi_id'
     );
 
     /**
@@ -50,8 +50,8 @@ 
      */
     function __construct()
     {
-		global $db, $conf;
-		$this->db = $db;
+        global $db, $conf;
+        $this->db = $db;
         $this->contract = new Contrat($this->db);
     }
 
@@ -67,21 +67,21 @@ 
      */
     function get($id)
     {
-		if(! DolibarrApiAccess::$user->rights->contrat->lire) {
-			throw new RestException(401);
-		}
+        if(! DolibarrApiAccess::$user->rights->contrat->lire) {
+            throw new RestException(401);
+        }
 
         $result = $this->contract->fetch($id);
         if( ! $result ) {
             throw new RestException(404, 'Contract not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
+        if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
 
         $this->contract->fetchObjectLinked();
-		return $this->_cleanObjectDatas($this->contract);
+        return $this->_cleanObjectDatas($this->contract);
     }
 
 
@@ -99,7 +99,7 @@ 
      * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
      * @return  array                               Array of contract objects
      *
-	 * @throws RestException
+     * @throws RestException
      */
     function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
     {
@@ -136,7 +136,7 @@ 
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
@@ -175,7 +175,7 @@ 
         if( ! count($obj_ret)) {
             throw new RestException(404, 'No contract found');
         }
-		return $obj_ret;
+        return $obj_ret;
     }
 
     /**
@@ -186,9 +186,9 @@ 
      */
     function post($request_data = null)
     {
-      if(! DolibarrApiAccess::$user->rights->contrat->creer) {
-			  throw new RestException(401, "Insuffisant rights");
-		  }
+        if(! DolibarrApiAccess::$user->rights->contrat->creer) {
+                throw new RestException(401, "Insuffisant rights");
+            }
         // Check mandatory fields
         $result = $this->_validate($request_data);
 
@@ -222,15 +222,15 @@ 
     {
         if(! DolibarrApiAccess::$user->rights->contrat->lire) {
             throw new RestException(401);
-		}
+        }
 
         $result = $this->contract->fetch($id);
         if( ! $result ) {
             throw new RestException(404, 'Contract not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
-		    throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
         $this->contract->getLinesArray();
         $result = array();
@@ -253,18 +253,18 @@ 
     function postLine($id, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->contrat->creer) {
-			throw new RestException(401);
-		}
+            throw new RestException(401);
+        }
 
         $result = $this->contract->fetch($id);
         if( ! $result ) {
             throw new RestException(404, 'Contract not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-		$request_data = (object) $request_data;
+        $request_data = (object) $request_data;
         $updateRes = $this->contract->addline(
             $request_data->desc,
             $request_data->subprice,
@@ -277,13 +277,13 @@ 
             $request_data->date_start,			// date_start = date planned start, date ouverture = date_start_real
             $request_data->date_end,			// date_end = date planned end, date_cloture = date_end_real
             $request_data->HT,
-      		$request_data->subprice_excl_tax,
-      		$request_data->info_bits,
+                $request_data->subprice_excl_tax,
+                $request_data->info_bits,
             $request_data->fk_fournprice,
-			$request_data->pa_ht,
-      		$request_data->array_options,
-      		$request_data->fk_unit,
-      		$request_data->rang
+            $request_data->pa_ht,
+                $request_data->array_options,
+                $request_data->fk_unit,
+                $request_data->rang
         );
 
         if ($updateRes > 0) {
@@ -306,17 +306,17 @@ 
     function putLine($id, $lineid, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->contrat->creer) {
-			throw new RestException(401);
-		}
+            throw new RestException(401);
+        }
 
         $result = $this->contract->fetch($id);
         if( ! $result ) {
             throw new RestException(404, 'Contrat not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
+        if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
 
         $request_data = (object) $request_data;
 
@@ -328,12 +328,12 @@ 
             $request_data->remise_percent,
             $request_data->date_ouveture_prevue,
             $request_data->date_fin_validite,
-      		$request_data->tva_tx,
+                $request_data->tva_tx,
             $request_data->localtax1_tx,
             $request_data->localtax2_tx,
             $request_data->date_ouverture,
             $request_data->date_cloture,
-      		'HT',
+                'HT',
             $request_data->info_bits,
             $request_data->fk_fourn_price,
             $request_data->pa_ht,
@@ -365,28 +365,28 @@ 
      */
     function activateLine($id, $lineid, $datestart, $dateend = null, $comment = null)
     {
-    	if(! DolibarrApiAccess::$user->rights->contrat->creer) {
-    		throw new RestException(401);
-    	}
+        if(! DolibarrApiAccess::$user->rights->contrat->creer) {
+            throw new RestException(401);
+        }
 
-    	$result = $this->contract->fetch($id);
-    	if (! $result) {
-    		throw new RestException(404, 'Contrat not found');
-    	}
+        $result = $this->contract->fetch($id);
+        if (! $result) {
+            throw new RestException(404, 'Contrat not found');
+        }
 
-    	if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
-    		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-    	}
+        if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
 
-    	$updateRes = $this->contract->active_line(DolibarrApiAccess::$user, $lineid, $datestart, $dateend, $comment);
+        $updateRes = $this->contract->active_line(DolibarrApiAccess::$user, $lineid, $datestart, $dateend, $comment);
 
-    	if ($updateRes > 0) {
-    		$result = $this->get($id);
-    		unset($result->line);
-    		return $this->_cleanObjectDatas($result);
-    	}
+        if ($updateRes > 0) {
+            $result = $this->get($id);
+            unset($result->line);
+            return $this->_cleanObjectDatas($result);
+        }
 
-    	return false;
+        return false;
     }
 
     /**
@@ -403,30 +403,30 @@ 
      */
     function unactivateLine($id, $lineid, $datestart, $comment = null)
     {
-    	if (! DolibarrApiAccess::$user->rights->contrat->creer) {
-    		throw new RestException(401);
-    	}
+        if (! DolibarrApiAccess::$user->rights->contrat->creer) {
+            throw new RestException(401);
+        }
 
-    	$result = $this->contract->fetch($id);
-    	if (! $result) {
-    		throw new RestException(404, 'Contrat not found');
-    	}
+        $result = $this->contract->fetch($id);
+        if (! $result) {
+            throw new RestException(404, 'Contrat not found');
+        }
 
-    	if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
-    		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-    	}
+        if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
 
-    	$request_data = (object) $request_data;
+        $request_data = (object) $request_data;
 
-    	$updateRes = $this->contract->close_line(DolibarrApiAccess::$user, $lineid, $datestart, $comment);
+        $updateRes = $this->contract->close_line(DolibarrApiAccess::$user, $lineid, $datestart, $comment);
 
-    	if ($updateRes > 0) {
-    		$result = $this->get($id);
-    		unset($result->line);
-    		return $this->_cleanObjectDatas($result);
-    	}
+        if ($updateRes > 0) {
+            $result = $this->get($id);
+            unset($result->line);
+            return $this->_cleanObjectDatas($result);
+        }
 
-    	return false;
+        return false;
     }
 
     /**
@@ -445,16 +445,16 @@ 
     function deleteLine($id, $lineid)
     {
         if (! DolibarrApiAccess::$user->rights->contrat->creer) {
-			throw new RestException(401);
-		}
+            throw new RestException(401);
+        }
 
         $result = $this->contract->fetch($id);
         if (! $result) {
             throw new RestException(404, 'Contrat not found');
         }
 
-		if (! DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        if (! DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
         // TODO Check the lineid $lineid is a line of object
@@ -465,7 +465,7 @@ 
         }
         else
         {
-      	    throw new RestException(405, $this->contract->error);
+                throw new RestException(405, $this->contract->error);
         }
     }
 
@@ -480,17 +480,17 @@ 
     function put($id, $request_data = null)
     {
         if (! DolibarrApiAccess::$user->rights->contrat->creer) {
-			throw new RestException(401);
-		}
+            throw new RestException(401);
+        }
 
         $result = $this->contract->fetch($id);
         if (! $result) {
             throw new RestException(404, 'Contrat not found');
         }
 
-		if (! DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
+        if (! DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
         foreach($request_data as $field => $value) {
             if ($field == 'id') continue;
             $this->contract->$field = $value;
@@ -502,7 +502,7 @@ 
         }
         else
         {
-        	throw new RestException(500, $this->contract->error);
+            throw new RestException(500, $this->contract->error);
         }
     }
 
@@ -516,16 +516,16 @@ 
     function delete($id)
     {
         if (! DolibarrApiAccess::$user->rights->contrat->supprimer) {
-			throw new RestException(401);
-		}
+            throw new RestException(401);
+        }
         $result = $this->contract->fetch($id);
         if (! $result) {
             throw new RestException(404, 'Contract not found');
         }
 
-		if (! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
+        if (! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
 
         if (! $this->contract->delete(DolibarrApiAccess::$user)) {
             throw new RestException(500, 'Error when delete contract : '.$this->contract->error);
@@ -558,24 +558,24 @@ 
     function validate($id, $notrigger=0)
     {
         if (! DolibarrApiAccess::$user->rights->contrat->creer) {
-			throw new RestException(401);
-		}
+            throw new RestException(401);
+        }
         $result = $this->contract->fetch($id);
         if (! $result) {
             throw new RestException(404, 'Contract not found');
         }
 
-		if (! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
+        if (! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
 
-		$result = $this->contract->validate(DolibarrApiAccess::$user, '', $notrigger);
-		if ($result == 0) {
-		    throw new RestException(304, 'Error nothing done. May be object is already validated');
-		}
-		if ($result < 0) {
-		    throw new RestException(500, 'Error when validating Contract: '.$this->contract->error);
-		}
+        $result = $this->contract->validate(DolibarrApiAccess::$user, '', $notrigger);
+        if ($result == 0) {
+            throw new RestException(304, 'Error nothing done. May be object is already validated');
+        }
+        if ($result < 0) {
+            throw new RestException(500, 'Error when validating Contract: '.$this->contract->error);
+        }
 
         return array(
             'success' => array(
@@ -603,32 +603,32 @@ 
      */
     function close($id, $notrigger=0)
     {
-    	if (! DolibarrApiAccess::$user->rights->contrat->creer) {
-    		throw new RestException(401);
-    	}
-    	$result = $this->contract->fetch($id);
-    	if (! $result) {
-    		throw new RestException(404, 'Contract not found');
-    	}
-
-    	if (! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
-    		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-    	}
-
-    	$result = $this->contract->closeAll(DolibarrApiAccess::$user, $notrigger);
-    	if ($result == 0) {
-    		throw new RestException(304, 'Error nothing done. May be object is already close');
-    	}
-    	if ($result < 0) {
-    		throw new RestException(500, 'Error when closing Contract: '.$this->contract->error);
-    	}
-
-    	return array(
-	    	'success' => array(
-		    	'code' => 200,
-		    	'message' => 'Contract closed (Ref='.$this->contract->ref.'). All services were closed.'
-	    	)
-    	);
+        if (! DolibarrApiAccess::$user->rights->contrat->creer) {
+            throw new RestException(401);
+        }
+        $result = $this->contract->fetch($id);
+        if (! $result) {
+            throw new RestException(404, 'Contract not found');
+        }
+
+        if (! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->contract->closeAll(DolibarrApiAccess::$user, $notrigger);
+        if ($result == 0) {
+            throw new RestException(304, 'Error nothing done. May be object is already close');
+        }
+        if ($result < 0) {
+            throw new RestException(500, 'Error when closing Contract: '.$this->contract->error);
+        }
+
+        return array(
+            'success' => array(
+                'code' => 200,
+                'message' => 'Contract closed (Ref='.$this->contract->ref.'). All services were closed.'
+            )
+        );
     }
 
 

Spacing +57 added lines, -57 removed lines

@@ -67,16 +67,16 @@ 
      */
     function get($id)
     {
-		if(! DolibarrApiAccess::$user->rights->contrat->lire) {
+		if (!DolibarrApiAccess::$user->rights->contrat->lire) {
 			throw new RestException(401);
 		}
 
         $result = $this->contract->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Contract not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -112,18 +112,18 @@ 
 
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
 
         $sql = "SELECT t.rowid";
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql.= " FROM ".MAIN_DB_PREFIX."contrat as t";
+        $sql .= " FROM ".MAIN_DB_PREFIX."contrat as t";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql.= ' WHERE t.entity IN ('.getEntity('contrat').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
-        if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
-        if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+        $sql .= ' WHERE t.entity IN ('.getEntity('contrat').')';
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+        if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
+        if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
         // Insert sale filter
         if ($search_sale > 0)
         {
@@ -132,23 +132,23 @@ 
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
+        $sql .= $db->order($sortfield, $sortorder);
+        if ($limit) {
             if ($page < 0)
             {
                 $page = 0;
             }
             $offset = $limit * $page;
 
-            $sql.= $db->plimit($limit + 1, $offset);
+            $sql .= $db->plimit($limit + 1, $offset);
         }
 
         dol_syslog("API Rest request");
@@ -158,12 +158,12 @@ 
         {
             $num = $db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
-            $i=0;
+            $i = 0;
             while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $contrat_static = new Contrat($db);
-                if($contrat_static->fetch($obj->rowid)) {
+                if ($contrat_static->fetch($obj->rowid)) {
                     $obj_ret[] = $this->_cleanObjectDatas($contrat_static);
                 }
                 $i++;
@@ -172,7 +172,7 @@ 
         else {
             throw new RestException(503, 'Error when retrieve contrat list : '.$db->lasterror());
         }
-        if( ! count($obj_ret)) {
+        if (!count($obj_ret)) {
             throw new RestException(404, 'No contract found');
         }
 		return $obj_ret;
@@ -186,13 +186,13 @@ 
      */
     function post($request_data = null)
     {
-      if(! DolibarrApiAccess::$user->rights->contrat->creer) {
+      if (!DolibarrApiAccess::$user->rights->contrat->creer) {
 			  throw new RestException(401, "Insuffisant rights");
 		  }
         // Check mandatory fields
         $result = $this->_validate($request_data);
 
-        foreach($request_data as $field => $value) {
+        foreach ($request_data as $field => $value) {
             $this->contract->$field = $value;
         }
         /*if (isset($request_data["lines"])) {
@@ -220,16 +220,16 @@ 
      */
     function getLines($id)
     {
-        if(! DolibarrApiAccess::$user->rights->contrat->lire) {
+        if (!DolibarrApiAccess::$user->rights->contrat->lire) {
             throw new RestException(401);
 		}
 
         $result = $this->contract->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Contract not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
 		    throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
         $this->contract->getLinesArray();
@@ -252,16 +252,16 @@ 
      */
     function postLine($id, $request_data = null)
     {
-        if(! DolibarrApiAccess::$user->rights->contrat->creer) {
+        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
 			throw new RestException(401);
 		}
 
         $result = $this->contract->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Contract not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 		$request_data = (object) $request_data;
@@ -274,8 +274,8 @@ 
             $request_data->localtax2_tx,
             $request_data->fk_product,
             $request_data->remise_percent,
-            $request_data->date_start,			// date_start = date planned start, date ouverture = date_start_real
-            $request_data->date_end,			// date_end = date planned end, date_cloture = date_end_real
+            $request_data->date_start, // date_start = date planned start, date ouverture = date_start_real
+            $request_data->date_end, // date_end = date planned end, date_cloture = date_end_real
             $request_data->HT,
       		$request_data->subprice_excl_tax,
       		$request_data->info_bits,
@@ -305,16 +305,16 @@ 
      */
     function putLine($id, $lineid, $request_data = null)
     {
-        if(! DolibarrApiAccess::$user->rights->contrat->creer) {
+        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
 			throw new RestException(401);
 		}
 
         $result = $this->contract->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Contrat not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -365,16 +365,16 @@ 
      */
     function activateLine($id, $lineid, $datestart, $dateend = null, $comment = null)
     {
-    	if(! DolibarrApiAccess::$user->rights->contrat->creer) {
+    	if (!DolibarrApiAccess::$user->rights->contrat->creer) {
     		throw new RestException(401);
     	}
 
     	$result = $this->contract->fetch($id);
-    	if (! $result) {
+    	if (!$result) {
     		throw new RestException(404, 'Contrat not found');
     	}
 
-    	if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+    	if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
     		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
     	}
 
@@ -403,16 +403,16 @@ 
      */
     function unactivateLine($id, $lineid, $datestart, $comment = null)
     {
-    	if (! DolibarrApiAccess::$user->rights->contrat->creer) {
+    	if (!DolibarrApiAccess::$user->rights->contrat->creer) {
     		throw new RestException(401);
     	}
 
     	$result = $this->contract->fetch($id);
-    	if (! $result) {
+    	if (!$result) {
     		throw new RestException(404, 'Contrat not found');
     	}
 
-    	if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+    	if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
     		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
     	}
 
@@ -444,16 +444,16 @@ 
      */
     function deleteLine($id, $lineid)
     {
-        if (! DolibarrApiAccess::$user->rights->contrat->creer) {
+        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
 			throw new RestException(401);
 		}
 
         $result = $this->contract->fetch($id);
-        if (! $result) {
+        if (!$result) {
             throw new RestException(404, 'Contrat not found');
         }
 
-		if (! DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
@@ -479,19 +479,19 @@ 
      */
     function put($id, $request_data = null)
     {
-        if (! DolibarrApiAccess::$user->rights->contrat->creer) {
+        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
 			throw new RestException(401);
 		}
 
         $result = $this->contract->fetch($id);
-        if (! $result) {
+        if (!$result) {
             throw new RestException(404, 'Contrat not found');
         }
 
-		if (! DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-        foreach($request_data as $field => $value) {
+        foreach ($request_data as $field => $value) {
             if ($field == 'id') continue;
             $this->contract->$field = $value;
         }
@@ -515,19 +515,19 @@ 
      */
     function delete($id)
     {
-        if (! DolibarrApiAccess::$user->rights->contrat->supprimer) {
+        if (!DolibarrApiAccess::$user->rights->contrat->supprimer) {
 			throw new RestException(401);
 		}
         $result = $this->contract->fetch($id);
-        if (! $result) {
+        if (!$result) {
             throw new RestException(404, 'Contract not found');
         }
 
-		if (! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        if (! $this->contract->delete(DolibarrApiAccess::$user)) {
+        if (!$this->contract->delete(DolibarrApiAccess::$user)) {
             throw new RestException(500, 'Error when delete contract : '.$this->contract->error);
         }
 
@@ -555,17 +555,17 @@ 
      *   "notrigger": 0
      * }
      */
-    function validate($id, $notrigger=0)
+    function validate($id, $notrigger = 0)
     {
-        if (! DolibarrApiAccess::$user->rights->contrat->creer) {
+        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
 			throw new RestException(401);
 		}
         $result = $this->contract->fetch($id);
-        if (! $result) {
+        if (!$result) {
             throw new RestException(404, 'Contract not found');
         }
 
-		if (! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -601,17 +601,17 @@ 
      *   "notrigger": 0
      * }
      */
-    function close($id, $notrigger=0)
+    function close($id, $notrigger = 0)
     {
-    	if (! DolibarrApiAccess::$user->rights->contrat->creer) {
+    	if (!DolibarrApiAccess::$user->rights->contrat->creer) {
     		throw new RestException(401);
     	}
     	$result = $this->contract->fetch($id);
-    	if (! $result) {
+    	if (!$result) {
     		throw new RestException(404, 'Contract not found');
     	}
 
-    	if (! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+    	if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
     		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
     	}
 

Braces +30 added lines, -15 removed lines

@@ -112,18 +112,33 @@ 
 
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) {
+            $search_sale = DolibarrApiAccess::$user->id;
+        }
 
         $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+            $sql .= ", sc.fk_soc, sc.fk_user";
+        }
+        // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
         $sql.= " FROM ".MAIN_DB_PREFIX."contrat as t";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+            $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        }
+        // We need this table joined to the select in order to filter by sale
 
         $sql.= ' WHERE t.entity IN ('.getEntity('contrat').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
-        if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
-        if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+            $sql.= " AND t.fk_soc = sc.fk_soc";
+        }
+        if ($socids) {
+            $sql.= " AND t.fk_soc IN (".$socids.")";
+        }
+        if ($search_sale > 0) {
+            $sql.= " AND t.rowid = sc.fk_soc";
+        }
+        // Join for the needed table to filter by sale
         // Insert sale filter
         if ($search_sale > 0)
         {
@@ -168,8 +183,7 @@ 
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve contrat list : '.$db->lasterror());
         }
         if( ! count($obj_ret)) {
@@ -462,8 +476,7 @@ 
         $updateRes = $this->contract->deleteline($lineid, DolibarrApiAccess::$user);
         if ($updateRes > 0) {
             return $this->get($id);
-        }
-        else
+        } else
         {
       	    throw new RestException(405, $this->contract->error);
         }
@@ -492,15 +505,16 @@ 
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
         foreach($request_data as $field => $value) {
-            if ($field == 'id') continue;
+            if ($field == 'id') {
+                continue;
+            }
             $this->contract->$field = $value;
         }
 
         if ($this->contract->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else
+        } else
         {
         	throw new RestException(500, $this->contract->error);
         }
@@ -670,8 +684,9 @@ 
     {
         $contrat = array();
         foreach (Contracts::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
+            if (!isset($data[$field])) {
+                            throw new RestException(400, "$field field missing");
+            }
             $contrat[$field] = $data[$field];
         }
         return $contrat;

dolibarr/htdocs/contrat/class/contrat.class.php

Indentation +3075 added lines, -3075 removed lines

@@ -42,30 +42,30 @@ 
  */
 class Contrat extends CommonObject
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element='contrat';
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element='contrat';
 
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element='contrat';
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element='contrat';
 
-	/**
-	 * @var int    Name of subtable line
-	 */
-	public $table_element_line='contratdet';
+    /**
+     * @var int    Name of subtable line
+     */
+    public $table_element_line='contratdet';
 
-	/**
-	 * @var int Field with ID of parent key if this field has a parent
-	 */
-	public $fk_element='fk_contrat';
+    /**
+     * @var int Field with ID of parent key if this field has a parent
+     */
+    public $fk_element='fk_contrat';
 
     /**
-	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-	 */
-	public $picto='contract';
+     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+     */
+    public $picto='contract';
 
     /**
      * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
@@ -79,1737 +79,1737 @@ 
      */
     public $restrictiononfksoc = 1;
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected $table_ref_field = 'ref';
-
-	/**
-	 * Customer reference of the contract
-	 * @var string
-	 */
-	public $ref_customer;
-
-	/**
-	 * Supplier reference of the contract
-	 * @var string
-	 */
-	public $ref_supplier;
-
-	/**
-	 * Client id linked to the contract
-	 * @var int
-	 */
-	public $socid;
-
-	public $societe;		// Objet societe
-
-	/**
-	 * Status of the contract
-	 * @var int
-	 */
-	public $statut=0;		// 0=Draft,
-
-	public $product;
-
-	/**
-	 * @var int		Id of user author of the contract
-	 */
-	public $fk_user_author;
-
-	/**
-	 * TODO: Which is the correct one?
-	 * Author of the contract
-	 * @var int
-	 */
-	public $user_author_id;
-
-	/**
-	 * @var User 	Object user that create the contract. Set by the info method.
-	 */
-	public $user_creation;
-
-	/**
-	 * @var User 	Object user that close the contract. Set by the info method.
-	 */
-	public $user_cloture;
-
-	/**
-	 * @var int		Date of creation
-	 */
-	public $date_creation;
-
-	/**
-	 * @var int		Date of last modification. Not filled until you call ->info()
-	 */
-	public $date_modification;
-
-	/**
-	 * @var int		Date of validation
-	 */
-	public $date_validation;
-
-	/**
-	 * @var int		Date when contract was signed
-	 */
-	public $date_contrat;
-
-	/**
-	 * @var int		Date of contract closure
-	 * @deprecated we close contract lines, not a contract
-	 */
-	public $date_cloture;
-
-	public $commercial_signature_id;
-	public $commercial_suivi_id;
-
-	/**
-	 * @deprecated Use fk_project instead
-	 * @see fk_project
-	 */
-	public $fk_projet;
-
-	public $extraparams=array();
-
-	/**
-	 * @var ContratLigne[]		Contract lines
-	 */
-	public $lines=array();
-
-	/**
-	 * Maps ContratLigne IDs to $this->lines indexes
-	 * @var int[]
-	 */
-	protected $lines_id_index_mapper=array();
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-	/**
-	 *	Return next contract ref
-	 *
-	 *	@param	Societe		$soc		Thirdparty object
-	 *	@return string					free reference for contract
-	 */
-	function getNextNumRef($soc)
-	{
-		global $db, $langs, $conf;
-		$langs->load("contracts");
-
-		if (!empty($conf->global->CONTRACT_ADDON))
-		{
-			$mybool = false;
-
-			$file = $conf->global->CONTRACT_ADDON.".php";
-			$classname = $conf->global->CONTRACT_ADDON;
-
-			// Include file with class
-			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-
-			foreach ($dirmodels as $reldir) {
-
-				$dir = dol_buildpath($reldir."core/modules/contract/");
-
-				// Load file with numbering class (if found)
-				$mybool|=@include_once $dir.$file;
-			}
-
-			if (! $mybool)
-			{
-				dol_print_error('',"Failed to include file ".$file);
-				return '';
-			}
-
-			$obj = new $classname();
-			$numref = $obj->getNextValue($soc,$this);
-
-			if ( $numref != "")
-			{
-				return $numref;
-			}
-			else
-			{
-				$this->error = $obj->error;
-				dol_print_error($db,get_class($this)."::getNextValue ".$obj->error);
-				return "";
-			}
-		}
-		else
-		{
-			$langs->load("errors");
-			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
-			return "";
-		}
-	}
+    /**
+     * {@inheritdoc}
+     */
+    protected $table_ref_field = 'ref';
+
+    /**
+     * Customer reference of the contract
+     * @var string
+     */
+    public $ref_customer;
+
+    /**
+     * Supplier reference of the contract
+     * @var string
+     */
+    public $ref_supplier;
+
+    /**
+     * Client id linked to the contract
+     * @var int
+     */
+    public $socid;
+
+    public $societe;		// Objet societe
+
+    /**
+     * Status of the contract
+     * @var int
+     */
+    public $statut=0;		// 0=Draft,
+
+    public $product;
+
+    /**
+     * @var int		Id of user author of the contract
+     */
+    public $fk_user_author;
+
+    /**
+     * TODO: Which is the correct one?
+     * Author of the contract
+     * @var int
+     */
+    public $user_author_id;
+
+    /**
+     * @var User 	Object user that create the contract. Set by the info method.
+     */
+    public $user_creation;
+
+    /**
+     * @var User 	Object user that close the contract. Set by the info method.
+     */
+    public $user_cloture;
+
+    /**
+     * @var int		Date of creation
+     */
+    public $date_creation;
+
+    /**
+     * @var int		Date of last modification. Not filled until you call ->info()
+     */
+    public $date_modification;
+
+    /**
+     * @var int		Date of validation
+     */
+    public $date_validation;
+
+    /**
+     * @var int		Date when contract was signed
+     */
+    public $date_contrat;
+
+    /**
+     * @var int		Date of contract closure
+     * @deprecated we close contract lines, not a contract
+     */
+    public $date_cloture;
+
+    public $commercial_signature_id;
+    public $commercial_suivi_id;
+
+    /**
+     * @deprecated Use fk_project instead
+     * @see fk_project
+     */
+    public $fk_projet;
+
+    public $extraparams=array();
+
+    /**
+     * @var ContratLigne[]		Contract lines
+     */
+    public $lines=array();
+
+    /**
+     * Maps ContratLigne IDs to $this->lines indexes
+     * @var int[]
+     */
+    protected $lines_id_index_mapper=array();
+
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+    /**
+     *	Return next contract ref
+     *
+     *	@param	Societe		$soc		Thirdparty object
+     *	@return string					free reference for contract
+     */
+    function getNextNumRef($soc)
+    {
+        global $db, $langs, $conf;
+        $langs->load("contracts");
+
+        if (!empty($conf->global->CONTRACT_ADDON))
+        {
+            $mybool = false;
+
+            $file = $conf->global->CONTRACT_ADDON.".php";
+            $classname = $conf->global->CONTRACT_ADDON;
+
+            // Include file with class
+            $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+            foreach ($dirmodels as $reldir) {
+
+                $dir = dol_buildpath($reldir."core/modules/contract/");
+
+                // Load file with numbering class (if found)
+                $mybool|=@include_once $dir.$file;
+            }
+
+            if (! $mybool)
+            {
+                dol_print_error('',"Failed to include file ".$file);
+                return '';
+            }
+
+            $obj = new $classname();
+            $numref = $obj->getNextValue($soc,$this);
+
+            if ( $numref != "")
+            {
+                return $numref;
+            }
+            else
+            {
+                $this->error = $obj->error;
+                dol_print_error($db,get_class($this)."::getNextValue ".$obj->error);
+                return "";
+            }
+        }
+        else
+        {
+            $langs->load("errors");
+            print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+            return "";
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Activate a contract line
+     *
+     *  @param	User		$user       Objet User who activate contract
+     *  @param  int			$line_id    Id of line to activate
+     *  @param  int			$date       Opening date
+     *  @param  int|string	$date_end   Expected end date
+     * 	@param	string		$comment	A comment typed by user
+     *  @return int         			<0 if KO, >0 if OK
+     */
+    function active_line($user, $line_id, $date, $date_end='', $comment='')
+    {
+        // phpcs:enable
+        $result = $this->lines[$this->lines_id_index_mapper[$line_id]]->active_line($user, $date, $date_end, $comment);
+        if ($result < 0)
+        {
+            $this->error = $this->lines[$this->lines_id_index_mapper[$line_id]]->error;
+            $this->errors = $this->lines[$this->lines_id_index_mapper[$line_id]]->errors;
+        }
+        return $result;
+    }
+
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Activate a contract line
-	 *
-	 *  @param	User		$user       Objet User who activate contract
-	 *  @param  int			$line_id    Id of line to activate
-	 *  @param  int			$date       Opening date
-	 *  @param  int|string	$date_end   Expected end date
-	 * 	@param	string		$comment	A comment typed by user
-	 *  @return int         			<0 if KO, >0 if OK
-	 */
-	function active_line($user, $line_id, $date, $date_end='', $comment='')
-	{
+    /**
+     *  Close a contract line
+     *
+     *  @param	User		$user       Objet User who close contract
+     *  @param  int			$line_id    Id of line to close
+     *  @param  int			$date_end	End date
+     * 	@param	string		$comment	A comment typed by user
+     *  @return int         			<0 if KO, >0 if OK
+     */
+    function close_line($user, $line_id, $date_end, $comment='')
+    {
         // phpcs:enable
-		$result = $this->lines[$this->lines_id_index_mapper[$line_id]]->active_line($user, $date, $date_end, $comment);
-		if ($result < 0)
-		{
-			$this->error = $this->lines[$this->lines_id_index_mapper[$line_id]]->error;
-			$this->errors = $this->lines[$this->lines_id_index_mapper[$line_id]]->errors;
-		}
-		return $result;
-	}
+        $result=$this->lines[$this->lines_id_index_mapper[$line_id]]->close_line($user, $date_end, $comment);
+        if ($result < 0)
+        {
+            $this->error = $this->lines[$this->lines_id_index_mapper[$line_id]]->error;
+            $this->errors = $this->lines[$this->lines_id_index_mapper[$line_id]]->errors;
+        }
+        return $result;
+    }
+
+
+    /**
+     *  Open all lines of a contract
+     *
+     *  @param	User		$user      		Object User making action
+     *  @param	int|string	$date_start		Date start (now if empty)
+     *  @param	int			$notrigger		1=Does not execute triggers, 0=Execute triggers
+     *  @param	string		$comment		Comment
+     *	@return	int							<0 if KO, >0 if OK
+     *  @see closeAll
+     */
+    function activateAll($user, $date_start='', $notrigger=0, $comment='')
+    {
+        if (empty($date_start)) $date_start = dol_now();
+
+        $this->db->begin();
+
+        $error=0;
+
+        // Load lines
+        $this->fetch_lines();
+
+        foreach($this->lines as $contratline)
+        {
+            // Open lines not already open
+            if ($contratline->statut != ContratLigne::STATUS_OPEN)
+            {
+                $contratline->context = $this->context;
+
+                $result = $contratline->active_line($user, $date_start, -1, $comment);
+                if ($result < 0)
+                {
+                    $error++;
+                    $this->error = $contratline->error;
+                    $this->errors = $contratline->errors;
+                    break;
+                }
+            }
+        }
+
+        if (! $error && $this->statut == 0)
+        {
+            $result=$this->validate($user, '', $notrigger);
+            if ($result < 0) $error++;
+        }
+
+        if (! $error)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     * Close all lines of a contract
+     *
+     * @param	User		$user      		Object User making action
+     * @param	int			$notrigger		1=Does not execute triggers, 0=Execute triggers
+     * @param	string		$comment		Comment
+     * @return	int							<0 if KO, >0 if OK
+     * @see activateAll
+     */
+    function closeAll(User $user, $notrigger=0, $comment='')
+    {
+        $this->db->begin();
+
+        // Load lines
+        $this->fetch_lines();
+
+        $now = dol_now();
+
+        $error = 0;
+
+        foreach($this->lines as $contratline)
+        {
+            // Close lines not already closed
+            if ($contratline->statut != ContratLigne::STATUS_CLOSED)
+            {
+                $contratline->date_cloture=$now;
+                $contratline->fk_user_cloture=$user->id;
+                $contratline->statut=ContratLigne::STATUS_CLOSED;
+                $result=$contratline->close_line($user, $now, $comment, $notrigger);
+                if ($result < 0)
+                {
+                    $error++;
+                    $this->error = $contratline->error;
+                    $this->errors = $contratline->errors;
+                    break;
+                }
+            }
+        }
+
+        if (! $error && $this->statut == 0)
+        {
+            $result=$this->validate($user, '', $notrigger);
+            if ($result < 0) $error++;
+        }
+
+        if (! $error)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     * Validate a contract
+     *
+     * @param	User	$user      		Objet User
+     * @param   string	$force_number	Reference to force on contract (not implemented yet)
+     * @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
+     * @return	int						<0 if KO, >0 if OK
+     */
+    function validate(User $user, $force_number='', $notrigger=0)
+    {
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        global $langs, $conf;
+
+        $now=dol_now();
+
+        $error=0;
+        dol_syslog(get_class($this).'::validate user='.$user->id.', force_number='.$force_number);
+
+
+        $this->db->begin();
+
+        $this->fetch_thirdparty();
+
+        // A contract is validated so we can move thirdparty to status customer
+        if (empty($conf->global->CONTRACT_DISABLE_AUTOSET_AS_CLIENT_ON_CONTRACT_VALIDATION))
+        {
+            $result=$this->thirdparty->set_as_client();
+        }
+
+        // Define new ref
+        if ($force_number)
+        {
+            $num = $force_number;
+        }
+        else if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+        {
+            $num = $this->getNextNumRef($this->thirdparty);
+        }
+        else
+        {
+            $num = $this->ref;
+        }
+        $this->newref = $num;
+
+        if ($num)
+        {
+            $sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET ref = '".$num."', statut = 1";
+            //$sql.= ", fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
+            $sql .= " WHERE rowid = ".$this->id . " AND statut = 0";
+
+            dol_syslog(get_class($this)."::validate", LOG_DEBUG);
+            $resql = $this->db->query($sql);
+            if (! $resql)
+            {
+                dol_print_error($this->db);
+                $error++;
+                $this->error=$this->db->lasterror();
+            }
+
+            // Trigger calls
+            if (! $error && ! $notrigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('CONTRACT_VALIDATE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
+            }
+
+            if (! $error)
+            {
+                $this->oldref = $this->ref;
+
+                // Rename directory if dir was a temporary ref
+                if (preg_match('/^[\(]?PROV/i', $this->ref))
+                {
+                    // Rename of object directory ($this->ref = old ref, $num = new ref)
+                    // to  not lose the linked files
+                    $oldref = dol_sanitizeFileName($this->ref);
+                    $newref = dol_sanitizeFileName($num);
+                    $dirsource = $conf->contract->dir_output.'/'.$oldref;
+                    $dirdest = $conf->contract->dir_output.'/'.$newref;
+                    if (file_exists($dirsource))
+                    {
+                        dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
+
+                        if (@rename($dirsource, $dirdest))
+                        {
+                            dol_syslog("Rename ok");
+                            // Rename docs starting with $oldref with $newref
+                            $listoffiles=dol_dir_list($conf->contract->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+                            foreach($listoffiles as $fileentry)
+                            {
+                                $dirsource=$fileentry['name'];
+                                $dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+                                $dirsource=$fileentry['path'].'/'.$dirsource;
+                                $dirdest=$fileentry['path'].'/'.$dirdest;
+                                @rename($dirsource, $dirdest);
+                            }
+                        }
+                    }
+                }
+            }
+
+            // Set new ref and define current statut
+            if (! $error)
+            {
+                $this->ref = $num;
+                $this->statut = 1;
+                $this->brouillon = 0;
+                $this->date_validation = $now;
+            }
+        }
+        else
+        {
+            $error++;
+        }
+
+        if (! $error)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     * Unvalidate a contract
+     *
+     * @param	User	$user      		Object User
+     * @param	int		$notrigger		1=Does not execute triggers, 0=execute triggers
+     * @return	int						<0 if KO, >0 if OK
+     */
+    function reopen($user, $notrigger=0)
+    {
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        global $langs, $conf;
+
+        $now=dol_now();
+
+        $error=0;
+        dol_syslog(get_class($this).'::reopen user='.$user->id);
+
+        $this->db->begin();
+
+        $this->fetch_thirdparty();
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET statut = 0";
+        //$sql.= ", fk_user_valid = null, date_valid = null";
+        $sql .= " WHERE rowid = ".$this->id . " AND statut = 1";
+
+        dol_syslog(get_class($this)."::validate", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (! $resql)
+        {
+            dol_print_error($this->db);
+            $error++;
+            $this->error=$this->db->lasterror();
+        }
+
+        // Trigger calls
+        if (! $error && ! $notrigger)
+        {
+            // Call trigger
+            $result=$this->call_trigger('CONTRACT_REOPEN',$user);
+            if ($result < 0) {
+                $error++;
+            }
+            // End call triggers
+        }
+
+        // Set new ref and define current status
+        if (! $error)
+        {
+            $this->statut=0;
+            $this->brouillon=1;
+            $this->date_validation=$now;
+        }
+
+        if (! $error)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     *    Load a contract from database
+     *
+     *    @param	int		$id     		Id of contract to load
+     *    @param	string	$ref			Ref
+     *    @param	string	$ref_customer	Customer ref
+     *    @param	string	$ref_supplier	Supplier ref
+     *    @return   int     				<0 if KO, 0 if not found, Id of contract if OK
+     */
+    function fetch($id, $ref='', $ref_customer='', $ref_supplier='')
+    {
+        $sql = "SELECT rowid, statut, ref, fk_soc, mise_en_service as datemise,";
+        $sql.= " ref_supplier, ref_customer,";
+        $sql.= " ref_ext,";
+        $sql.= " fk_user_mise_en_service, date_contrat as datecontrat,";
+        $sql.= " fk_user_author, fin_validite, date_cloture,";
+        $sql.= " fk_projet,";
+        $sql.= " fk_commercial_signature, fk_commercial_suivi,";
+        $sql.= " note_private, note_public, model_pdf, extraparams";
+        $sql.= " FROM ".MAIN_DB_PREFIX."contrat";
+        if (! $id) $sql.=" WHERE entity IN (".getEntity('contract').")";
+        else $sql.= " WHERE rowid=".$id;
+        if ($ref_customer)
+        {
+            $sql.= " AND ref_customer = '".$this->db->escape($ref_customer)."'";
+        }
+        if ($ref_supplier)
+        {
+            $sql.= " AND ref_supplier = '".$this->db->escape($ref_supplier)."'";
+        }
+        if ($ref)
+        {
+            $sql.= " AND ref='".$this->db->escape($ref)."'";
+        }
+
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+
+            if ($obj)
+            {
+                $this->id						= $obj->rowid;
+                $this->ref						= (!isset($obj->ref) || !$obj->ref) ? $obj->rowid : $obj->ref;
+                $this->ref_customer				= $obj->ref_customer;
+                $this->ref_supplier				= $obj->ref_supplier;
+                $this->ref_ext					= $obj->ref_ext;
+                $this->statut					= $obj->statut;
+                $this->mise_en_service			= $this->db->jdate($obj->datemise);
+
+                $this->date_contrat				= $this->db->jdate($obj->datecontrat);
+                $this->date_creation			= $this->db->jdate($obj->datecontrat);
+
+                $this->fin_validite				= $this->db->jdate($obj->fin_validite);
+                $this->date_cloture				= $this->db->jdate($obj->date_cloture);
+
+
+                $this->user_author_id			= $obj->fk_user_author;
+
+                $this->commercial_signature_id	= $obj->fk_commercial_signature;
+                $this->commercial_suivi_id		= $obj->fk_commercial_suivi;
+
+                $this->note_private				= $obj->note_private;
+                $this->note_public				= $obj->note_public;
+                $this->modelpdf					= $obj->model_pdf;
+
+                $this->fk_projet				= $obj->fk_projet; // deprecated
+                $this->fk_project				= $obj->fk_projet;
+
+                $this->socid					= $obj->fk_soc;
+                $this->fk_soc					= $obj->fk_soc;
+
+                $this->extraparams				= (array) json_decode($obj->extraparams, true);
+
+                $this->db->free($resql);
+
+                // Retreive all extrafields
+                // fetch optionals attributes and labels
+                $this->fetch_optionals();
+
+                // Lines
+                $result=$this->fetch_lines();
+                if ($result < 0)
+                {
+                    $this->error=$this->db->lasterror();
+                    return -3;
+                }
+
+                return $this->id;
+            }
+            else
+            {
+                dol_syslog(get_class($this)."::fetch Contract not found");
+                $this->error="Contract not found";
+                return 0;
+            }
+        }
+        else
+        {
+            dol_syslog(get_class($this)."::fetch Error searching contract");
+            $this->error=$this->db->error();
+            return -1;
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Load lines array into this->lines.
+     *  This set also nbofserviceswait, nbofservicesopened, nbofservicesexpired and nbofservicesclosed
+     *
+     *  @return ContratLigne[]   Return array of contract lines
+     */
+    function fetch_lines()
+    {
+        // phpcs:enable
+        $this->nbofserviceswait=0;
+        $this->nbofservicesopened=0;
+        $this->nbofservicesexpired=0;
+        $this->nbofservicesclosed=0;
+
+        $total_ttc=0;
+        $total_vat=0;
+        $total_ht=0;
+
+        $now=dol_now();
+
+        require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+        $extrafieldsline=new ExtraFields($this->db);
+        $line = new ContratLigne($this->db);
+        $extralabelsline=$extrafieldsline->fetch_name_optionals_label($line->table_element,true);
+
+        $this->lines=array();
+        $pos = 0;
+
+        // Selects contract lines related to a product
+        $sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref,";
+        $sql.= " d.rowid, d.fk_contrat, d.statut, d.description, d.price_ht, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.remise_percent, d.subprice, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht,";
+        $sql.= " d.total_ht,";
+        $sql.= " d.total_tva,";
+        $sql.= " d.total_localtax1,";
+        $sql.= " d.total_localtax2,";
+        $sql.= " d.total_ttc,";
+        $sql.= " d.info_bits, d.fk_product,";
+        $sql.= " d.date_ouverture_prevue, d.date_ouverture,";
+        $sql.= " d.date_fin_validite, d.date_cloture,";
+        $sql.= " d.fk_user_author,";
+        $sql.= " d.fk_user_ouverture,";
+        $sql.= " d.fk_user_cloture,";
+        $sql.= " d.fk_unit";
+        $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as d LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
+        $sql.= " WHERE d.fk_contrat = ".$this->id;
+        $sql.= " ORDER by d.rowid ASC";
+
+        dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $num = $this->db->num_rows($result);
+            $i = 0;
+
+            while ($i < $num)
+            {
+                $objp					= $this->db->fetch_object($result);
+
+                $line					= new ContratLigne($this->db);
+                $line->id				= $objp->rowid;
+                $line->ref				= $objp->rowid;
+                $line->fk_contrat		= $objp->fk_contrat;
+                $line->desc				= $objp->description;  // Description line
+                $line->qty				= $objp->qty;
+                $line->vat_src_code 	= $objp->vat_src_code ;
+                $line->tva_tx			= $objp->tva_tx;
+                $line->localtax1_tx		= $objp->localtax1_tx;
+                $line->localtax2_tx		= $objp->localtax2_tx;
+                $line->localtax1_type	= $objp->localtax1_type;
+                $line->localtax2_type	= $objp->localtax2_type;
+                $line->subprice			= $objp->subprice;
+                $line->statut			= $objp->statut;
+                $line->remise_percent	= $objp->remise_percent;
+                $line->price_ht			= $objp->price_ht;
+                $line->price			= $objp->price_ht;	// For backward compatibility
+                $line->total_ht			= $objp->total_ht;
+                $line->total_tva		= $objp->total_tva;
+                $line->total_localtax1	= $objp->total_localtax1;
+                $line->total_localtax2	= $objp->total_localtax2;
+                $line->total_ttc		= $objp->total_ttc;
+                $line->fk_product		= (($objp->fk_product > 0)?$objp->fk_product:0);
+                $line->info_bits		= $objp->info_bits;
+
+                $line->fk_fournprice 	= $objp->fk_fournprice;
+                $marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
+                $line->pa_ht 			= $marginInfos[0];
+
+                $line->fk_user_author	= $objp->fk_user_author;
+                $line->fk_user_ouverture= $objp->fk_user_ouverture;
+                $line->fk_user_cloture  = $objp->fk_user_cloture;
+                $line->fk_unit           = $objp->fk_unit;
+
+                $line->ref				= $objp->product_ref;	// deprecated
+                $line->product_ref		= $objp->product_ref;   // Product Ref
+                $line->product_desc		= $objp->product_desc;  // Product Description
+                $line->product_label	= $objp->product_label; // Product Label
+
+                $line->description		= $objp->description;
+
+                $line->date_start            = $this->db->jdate($objp->date_ouverture_prevue);
+                $line->date_start_real       = $this->db->jdate($objp->date_ouverture);
+                $line->date_end              = $this->db->jdate($objp->date_fin_validite);
+                $line->date_end_real         = $this->db->jdate($objp->date_cloture);
+                // For backward compatibility
+                $line->date_ouverture_prevue = $this->db->jdate($objp->date_ouverture_prevue);
+                $line->date_ouverture        = $this->db->jdate($objp->date_ouverture);
+                $line->date_fin_validite     = $this->db->jdate($objp->date_fin_validite);
+                $line->date_cloture          = $this->db->jdate($objp->date_cloture);
+                $line->date_debut_prevue = $this->db->jdate($objp->date_ouverture_prevue);
+                $line->date_debut_reel   = $this->db->jdate($objp->date_ouverture);
+                $line->date_fin_prevue   = $this->db->jdate($objp->date_fin_validite);
+                $line->date_fin_reel     = $this->db->jdate($objp->date_cloture);
+
+                // Retreive all extrafields for contract
+                // fetch optionals attributes and labels
+                $line->fetch_optionals();
+
+                $this->lines[$pos]			= $line;
+                $this->lines_id_index_mapper[$line->id] = $pos;
+
+                //dol_syslog("1 ".$line->desc);
+                //dol_syslog("2 ".$line->product_desc);
+
+                if ($line->statut == ContratLigne::STATUS_INITIAL) $this->nbofserviceswait++;
+                if ($line->statut == ContratLigne::STATUS_OPEN && (empty($line->date_fin_prevue) || $line->date_fin_prevue >= $now)) $this->nbofservicesopened++;
+                if ($line->statut == ContratLigne::STATUS_OPEN && (! empty($line->date_fin_prevue) && $line->date_fin_prevue < $now)) $this->nbofservicesexpired++;
+                if ($line->statut == ContratLigne::STATUS_CLOSED) $this->nbofservicesclosed++;
+
+                $total_ttc+=$objp->total_ttc;   // TODO Not saved into database
+                $total_vat+=$objp->total_tva;
+                $total_ht+=$objp->total_ht;
+
+                $i++;
+                $pos++;
+            }
+            $this->db->free($result);
+        }
+        else
+        {
+            dol_syslog(get_class($this)."::Fetch Erreur lecture des lignes de contrats liees aux produits");
+            return -3;
+        }
+
+        $this->nbofservices=count($this->lines);
+        $this->total_ttc = price2num($total_ttc);   // TODO For the moment value is false as value is not stored in database for line linked to products
+        $this->total_vat = price2num($total_vat);   // TODO For the moment value is false as value is not stored in database for line linked to products
+        $this->total_ht = price2num($total_ht);     // TODO For the moment value is false as value is not stored in database for line linked to products
+
+        return $this->lines;
+    }
+
+    /**
+     *  Create a contract into database
+     *
+     *  @param	User	$user       User that create
+     *  @return int  				<0 if KO, id of contract if OK
+     */
+    function create($user)
+    {
+        global $conf,$langs,$mysoc;
+
+        // 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();
+
+        $now=dol_now();
+
+        // Insert contract
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."contrat (datec, fk_soc, fk_user_author, date_contrat,";
+        $sql.= " fk_commercial_signature, fk_commercial_suivi, fk_projet,";
+        $sql.= " ref, entity, note_private, note_public, ref_customer, ref_supplier, ref_ext)";
+        $sql.= " VALUES ('".$this->db->idate($now)."',".$this->socid.",".$user->id;
+        $sql.= ", ".(dol_strlen($this->date_contrat)!=0 ? "'".$this->db->idate($this->date_contrat)."'" : "NULL");
+        $sql.= ",".($this->commercial_signature_id>0?$this->commercial_signature_id:"NULL");
+        $sql.= ",".($this->commercial_suivi_id>0?$this->commercial_suivi_id:"NULL");
+        $sql.= ",".($this->fk_project>0?$this->fk_project:"NULL");
+        $sql.= ", ".(dol_strlen($this->ref)<=0 ? "null" : "'".$this->db->escape($this->ref)."'");
+        $sql.= ", ".$conf->entity;
+        $sql.= ", ".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL");
+        $sql.= ", ".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL");
+        $sql.= ", ".(!empty($this->ref_customer)?("'".$this->db->escape($this->ref_customer)."'"):"NULL");
+        $sql.= ", ".(!empty($this->ref_supplier)?("'".$this->db->escape($this->ref_supplier)."'"):"NULL");
+        $sql.= ", ".(!empty($this->ref_ext)?("'".$this->db->escape($this->ref_ext)."'"):"NULL");
+        $sql.= ")";
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $error=0;
+
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."contrat");
+
+            // Load object modContract
+            $module=(! empty($conf->global->CONTRACT_ADDON)?$conf->global->CONTRACT_ADDON:'mod_contract_serpis');
+            if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php')
+            {
+                $module = substr($module, 0, dol_strlen($module)-4);
+            }
+            $result=dol_include_once('/core/modules/contract/'.$module.'.php');
+            if ($result > 0)
+            {
+                $modCodeContract = new $module();
+
+                if (!empty($modCodeContract->code_auto)) {
+                    // Update ref
+                    $sql = 'UPDATE '.MAIN_DB_PREFIX."contrat SET ref='(PROV".$this->id.")' WHERE rowid=".$this->id;
+                    if ($this->db->query($sql))
+                    {
+                        if ($this->id)
+                        {
+                            $this->ref="(PROV".$this->id.")";
+                        }
+                    }
+                } else {
+                    $error++;
+                    $this->error='Failed to get PROV number';
+                }
+            }
+
+            if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
+            {
+                $result=$this->insertExtraFields();
+                if ($result < 0)
+                {
+                    $error++;
+                }
+            }
+
+            // Insert business contacts ('SALESREPSIGN','contrat')
+            if (! $error)
+            {
+                $result=$this->add_contact($this->commercial_signature_id,'SALESREPSIGN','internal');
+                if ($result < 0) $error++;
+            }
+
+            // Insert business contacts ('SALESREPFOLL','contrat')
+            if (! $error)
+            {
+                $result=$this->add_contact($this->commercial_suivi_id,'SALESREPFOLL','internal');
+                if ($result < 0) $error++;
+            }
+
+            if (! $error)
+            {
+                if (! empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
+                {
+                    $this->linked_objects = $this->linkedObjectsIds;	// TODO Replace linked_objects with linkedObjectsIds
+                }
+
+                // Add object linked
+                if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
+                {
+                    foreach($this->linked_objects as $origin => $tmp_origin_id)
+                    {
+                        if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+                        {
+                            foreach($tmp_origin_id as $origin_id)
+                            {
+                                $ret = $this->add_object_linked($origin, $origin_id);
+                                if (! $ret)
+                                {
+                                    $this->error=$this->db->lasterror();
+                                    $error++;
+                                }
+                            }
+                        }
+                        else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+                        {
+                            $origin_id = $tmp_origin_id;
+                            $ret = $this->add_object_linked($origin, $origin_id);
+                            if (! $ret)
+                            {
+                                $this->error=$this->db->lasterror();
+                                $error++;
+                            }
+                        }
+                    }
+                }
+
+                if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id))   // Get contact from origin object
+                {
+                    $originforcontact = $this->origin;
+                    $originidforcontact = $this->origin_id;
+                    if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
+                    {
+                        require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+                        $exp = new Expedition($db);
+                        $exp->fetch($this->origin_id);
+                        $exp->fetchObjectLinked();
+                        if (count($exp->linkedObjectsIds['commande']) > 0)
+                        {
+                            foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
+                            {
+                                $originforcontact = 'commande';
+                                $originidforcontact = $value->id;
+                                break; // We take first one
+                            }
+                        }
+                    }
+
+                    $sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
+                    $sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
+
+                    $resqlcontact = $this->db->query($sqlcontact);
+                    if ($resqlcontact)
+                    {
+                        while($objcontact = $this->db->fetch_object($resqlcontact))
+                        {
+                            if ($objcontact->source == 'internal' && in_array($objcontact->code, array('SALESREPSIGN', 'SALESREPFOLL'))) continue;    // ignore this, already forced previously
+
+                            //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
+                            $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source);    // May failed because of duplicate key or because code of contact type does not exists for new object
+                        }
+                    }
+                    else dol_print_error($resqlcontact);
+                }
+            }
+
+            if (! $error)
+            {
+                // Call trigger
+                $result=$this->call_trigger('CONTRACT_CREATE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
+
+                if (! $error)
+                {
+                    $this->db->commit();
+                    return $this->id;
+                }
+                else
+                {
+                    dol_syslog(get_class($this)."::create - 30 - ".$this->error, LOG_ERR);
+                    $this->db->rollback();
+                    return -3;
+                }
+            }
+            else
+            {
+                $this->error="Failed to add contract";
+                dol_syslog(get_class($this)."::create - 20 - ".$this->error, LOG_ERR);
+                $this->db->rollback();
+                return -2;
+            }
+        }
+        else
+        {
+            $this->error=$langs->trans("UnknownError: ".$this->db->error()." -", LOG_DEBUG);
+
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+
+    /**
+     *  Supprime l'objet de la base
+     *
+     *  @param	User		$user       Utilisateur qui supprime
+     *  @return int         			< 0 si erreur, > 0 si ok
+     */
+    function delete($user)
+    {
+        global $conf, $langs;
+        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+
+        $error=0;
+
+        $this->db->begin();
+
+        // Call trigger
+        $result=$this->call_trigger('CONTRACT_DELETE',$user);
+        if ($result < 0) { $error++; }
+        // End call triggers
+
+        if (! $error)
+        {
+            // Delete linked contacts
+            $res = $this->delete_linked_contact();
+            if ($res < 0)
+            {
+                dol_syslog(get_class($this)."::delete error", LOG_ERR);
+                $error++;
+            }
+        }
+
+        if (! $error)
+        {
+            // Delete linked object
+            $res = $this->deleteObjectLinked();
+            if ($res < 0) $error++;
+        }
+
+        if (! $error)
+        {
+            // Delete contratdet_log
+            /*
+			$sql = "DELETE cdl";
+			$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 = "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;
+
+            dol_syslog(get_class($this)."::delete contratdet_log", LOG_DEBUG);
+            $resql=$this->db->query($sql);
+            if (! $resql)
+            {
+                $this->error=$this->db->error();
+                $error++;
+            }
+            $numressql=$this->db->num_rows($resql);
+            if (! $error && $numressql )
+            {
+                $tab_resql=array();
+                for($i=0;$i<$numressql;$i++)
+                {
+                    $objresql=$this->db->fetch_object($resql);
+                    $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).")";
+
+                dol_syslog(get_class($this)."::delete contratdet_log", LOG_DEBUG);
+                $resql=$this->db->query($sql);
+                if (! $resql)
+                {
+                    $this->error=$this->db->error();
+                    $error++;
+                }
+            }
+        }
+
+        if (! $error)
+        {
+            // Delete contratdet
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."contratdet";
+            $sql.= " WHERE fk_contrat=".$this->id;
+
+            dol_syslog(get_class($this)."::delete contratdet", LOG_DEBUG);
+            $resql=$this->db->query($sql);
+            if (! $resql)
+            {
+                $this->error=$this->db->error();
+                $error++;
+            }
+        }
+
+        if (! $error)
+        {
+            // Delete contrat
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."contrat";
+            $sql.= " WHERE rowid=".$this->id;
+
+            dol_syslog(get_class($this)."::delete contrat", LOG_DEBUG);
+            $resql=$this->db->query($sql);
+            if (! $resql)
+            {
+                $this->error=$this->db->error();
+                $error++;
+            }
+        }
+
+        // Removed extrafields
+        if (! $error) {
+            $result=$this->deleteExtraFields();
+            if ($result < 0)
+            {
+                $error++;
+                dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
+            }
+        }
+
+        if (! $error)
+        {
+            // We remove directory
+            $ref = dol_sanitizeFileName($this->ref);
+            if ($conf->contrat->dir_output)
+            {
+                $dir = $conf->contrat->dir_output . "/" . $ref;
+                if (file_exists($dir))
+                {
+                    $res=@dol_delete_dir_recursive($dir);
+                    if (! $res)
+                    {
+                        $this->error='ErrorFailToDeleteDir';
+                        $error++;
+                    }
+                }
+            }
+        }
+
+        if (! $error)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     *  Update object into database
+     *
+     *  @param	User	$user        User that modifies
+     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+     *  @return int     		   	 <0 if KO, >0 if OK
+     */
+    function update($user, $notrigger=0)
+    {
+        global $conf, $langs;
+        $error=0;
+
+        // Clean parameters
+        if (empty($this->fk_commercial_signature) && $this->commercial_signature_id > 0) $this->fk_commercial_signature = $this->commercial_signature_id;
+        if (empty($this->fk_commercial_suivi) && $this->commercial_suivi_id > 0) $this->fk_commercial_suivi = $this->commercial_suivi_id;
+        if (empty($this->fk_soc) && $this->socid > 0) $this->fk_soc = $this->socid;
+        if (empty($this->fk_project) && $this->projet > 0) $this->fk_project = $this->projet;
+
+        if (isset($this->ref)) $this->ref=trim($this->ref);
+        if (isset($this->ref_customer)) $this->ref_customer=trim($this->ref_customer);
+        if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
+        if (isset($this->ref_ext)) $this->ref_ext=trim($this->ref_ext);
+        if (isset($this->entity)) $this->entity=trim($this->entity);
+        if (isset($this->statut)) $this->statut=(int) $this->statut;
+        if (isset($this->fk_soc)) $this->fk_soc=trim($this->fk_soc);
+        if (isset($this->fk_commercial_signature)) $this->fk_commercial_signature=trim($this->fk_commercial_signature);
+        if (isset($this->fk_commercial_suivi)) $this->fk_commercial_suivi=trim($this->fk_commercial_suivi);
+        if (isset($this->fk_user_mise_en_service)) $this->fk_user_mise_en_service=trim($this->fk_user_mise_en_service);
+        if (isset($this->fk_user_cloture)) $this->fk_user_cloture=trim($this->fk_user_cloture);
+        if (isset($this->note_private)) $this->note_private=trim($this->note_private);
+        if (isset($this->note_public)) $this->note_public=trim($this->note_public);
+        if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+        //if (isset($this->extraparams)) $this->extraparams=trim($this->extraparams);
+
+        // Check parameters
+        // Put here code to add a control on parameters values
+
+        // Update request
+        $sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET";
+        $sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
+        $sql.= " ref_customer=".(isset($this->ref_customer)?"'".$this->db->escape($this->ref_customer)."'":"null").",";
+        $sql.= " ref_supplier=".(isset($this->ref_supplier)?"'".$this->db->escape($this->ref_supplier)."'":"null").",";
+        $sql.= " ref_ext=".(isset($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null").",";
+        $sql.= " entity=".$conf->entity.",";
+        $sql.= " date_contrat=".(dol_strlen($this->date_contrat)!=0 ? "'".$this->db->idate($this->date_contrat)."'" : 'null').",";
+        $sql.= " statut=".(isset($this->statut)?$this->statut:"null").",";
+        $sql.= " mise_en_service=".(dol_strlen($this->mise_en_service)!=0 ? "'".$this->db->idate($this->mise_en_service)."'" : 'null').",";
+        $sql.= " fin_validite=".(dol_strlen($this->fin_validite)!=0 ? "'".$this->db->idate($this->fin_validite)."'" : 'null').",";
+        $sql.= " date_cloture=".(dol_strlen($this->date_cloture)!=0 ? "'".$this->db->idate($this->date_cloture)."'" : 'null').",";
+        $sql.= " fk_soc=".($this->fk_soc > 0 ? $this->fk_soc:"null").",";
+        $sql.= " fk_projet=".($this->fk_project > 0 ? $this->fk_project:"null").",";
+        $sql.= " fk_commercial_signature=".(isset($this->fk_commercial_signature)?$this->fk_commercial_signature:"null").",";
+        $sql.= " fk_commercial_suivi=".(isset($this->fk_commercial_suivi)?$this->fk_commercial_suivi:"null").",";
+        $sql.= " fk_user_mise_en_service=".(isset($this->fk_user_mise_en_service)?$this->fk_user_mise_en_service:"null").",";
+        $sql.= " fk_user_cloture=".(isset($this->fk_user_cloture)?$this->fk_user_cloture:"null").",";
+        $sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
+        $sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
+        $sql.= " import_key=".(isset($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null")."";
+        //$sql.= " extraparams=".(isset($this->extraparams)?"'".$this->db->escape($this->extraparams)."'":"null")."";
+        $sql.= " WHERE rowid=".$this->id;
+
+        $this->db->begin();
+
+        $resql = $this->db->query($sql);
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0)
+        {
+            $result=$this->insertExtraFields();
+            if ($result < 0)
+            {
+                $error++;
+            }
+        }
+
+        if (! $error && ! $notrigger)
+        {
+            // Call triggers
+            $result=$this->call_trigger('CONTRACT_MODIFY',$user);
+            if ($result < 0) { $error++; }
+            // End call triggers
+        }
+
+        // Commit or rollback
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
+    }
+
+
+    /**
+     *  Ajoute une ligne de contrat en base
+     *
+     *  @param	string		$desc            	Description de la ligne
+     *  @param  float		$pu_ht              Prix unitaire HT
+     *  @param  int			$qty             	Quantite
+     *  @param  float		$txtva           	Taux tva
+     *  @param  float		$txlocaltax1        Local tax 1 rate
+     *  @param  float		$txlocaltax2        Local tax 2 rate
+     *  @param  int			$fk_product      	Id produit
+     *  @param  float		$remise_percent  	Pourcentage de remise de la ligne
+     *  @param  int			$date_start      	Date de debut prevue
+     *  @param  int			$date_end        	Date de fin prevue
+     *	@param	string		$price_base_type	HT or TTC
+     * 	@param  float		$pu_ttc             Prix unitaire TTC
+     * 	@param  int			$info_bits			Bits de type de lignes
+     * 	@param  int			$fk_fournprice		Fourn price id
+     *  @param  int			$pa_ht				Buying price HT
+     *  @param	array		$array_options		extrafields array
+     * 	@param 	string		$fk_unit 			Code of the unit to use. Null to use the default one
+     * 	@param 	string		$rang 				Position
+     *  @return int             				<0 if KO, >0 if OK
+     */
+    function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $fk_fournprice=null, $pa_ht = 0,$array_options=0, $fk_unit = null, $rang=0)
+    {
+        global $user, $langs, $conf, $mysoc;
+        $error=0;
+
+        dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type, $pu_ttc, $info_bits, $rang");
+
+        // Check parameters
+        if ($fk_product <= 0 && empty($desc))
+        {
+            $this->error="ErrorDescRequiredForFreeProductLines";
+            return -1;
+        }
+
+        if ($this->statut >= 0)
+        {
+            $this->db->begin();
+
+            // Clean parameters
+            $pu_ht=price2num($pu_ht);
+            $pu_ttc=price2num($pu_ttc);
+            $pa_ht=price2num($pa_ht);
+            if (!preg_match('/\((.*)\)/', $txtva)) {
+                $txtva = price2num($txtva);               // $txtva can have format '5.0(XXX)' or '5'
+            }
+            $txlocaltax1=price2num($txlocaltax1);
+            $txlocaltax2=price2num($txlocaltax2);
+            $remise_percent=price2num($remise_percent);
+            $qty=price2num($qty);
+            if (empty($qty)) $qty=1;
+            if (empty($info_bits)) $info_bits=0;
+            if (empty($pu_ht) || ! is_numeric($pu_ht))  $pu_ht=0;
+            if (empty($pu_ttc)) $pu_ttc=0;
+            if (empty($txtva) || ! is_numeric($txtva)) $txtva=0;
+            if (empty($txlocaltax1) || ! is_numeric($txlocaltax1)) $txlocaltax1=0;
+            if (empty($txlocaltax2) || ! is_numeric($txlocaltax2)) $txlocaltax2=0;
+
+            if ($price_base_type=='HT')
+            {
+                $pu=$pu_ht;
+            }
+            else
+            {
+                $pu=$pu_ttc;
+            }
+
+            // Check parameters
+            if (empty($remise_percent)) $remise_percent=0;
+
+            $localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->societe, $mysoc);
+
+            // Clean vat code
+            $vat_src_code='';
+            if (preg_match('/\((.*)\)/', $txtva, $reg))
+            {
+                $vat_src_code = $reg[1];
+                $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+            }
+
+            // 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
+            // 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, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, 1,$mysoc, $localtaxes_type);
+            $total_ht  = $tabprice[0];
+            $total_tva = $tabprice[1];
+            $total_ttc = $tabprice[2];
+            $total_localtax1= $tabprice[9];
+            $total_localtax2= $tabprice[10];
+
+            $localtax1_type=$localtaxes_type[0];
+            $localtax2_type=$localtaxes_type[2];
+
+            // TODO A virer
+            // Anciens indicateurs: $price, $remise (a ne plus utiliser)
+            $remise = 0;
+            $price = price2num(round($pu_ht, 2));
+            if (dol_strlen($remise_percent) > 0)
+            {
+                $remise = round(($pu_ht * $remise_percent / 100), 2);
+                $price = $pu_ht - $remise;
+            }
+
+            if (empty($pa_ht)) $pa_ht=0;
+
+
+            // if buy price not defined, define buyprice as configured in margin admin
+            if ($this->pa_ht == 0)
+            {
+                if (($result = $this->defineBuyPrice($pu_ht, $remise_percent, $fk_product)) < 0)
+                {
+                    return $result;
+                }
+                else
+                {
+                    $pa_ht = $result;
+                }
+            }
+
+            // Insertion dans la base
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."contratdet";
+            $sql.= " (fk_contrat, label, description, fk_product, qty, tva_tx, vat_src_code,";
+            $sql.= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice,";
+            $sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc,";
+            $sql.= " info_bits,";
+            $sql.= " price_ht, remise, fk_product_fournisseur_price, buy_price_ht";
+            if ($date_start > 0) { $sql.= ",date_ouverture_prevue"; }
+            if ($date_end > 0)   { $sql.= ",date_fin_validite"; }
+            $sql.= ", fk_unit";
+            $sql.= ") VALUES (";
+            $sql.= $this->id.", '', '" . $this->db->escape($desc) . "',";
+            $sql.= ($fk_product>0 ? $fk_product : "null").",";
+            $sql.= " ".$qty.",";
+            $sql.= " ".$txtva.",";
+            $sql.= " ".($vat_src_code?"'".$vat_src_code."'":"null").",";
+            $sql.= " ".$txlocaltax1.",";
+            $sql.= " ".$txlocaltax2.",";
+            $sql.= " '".$localtax1_type."',";
+            $sql.= " '".$localtax2_type."',";
+            $sql.= " ".price2num($remise_percent).",";
+            $sql.= " ".price2num($pu_ht).",";
+            $sql.= " ".price2num($total_ht).",".price2num($total_tva).",".price2num($total_localtax1).",".price2num($total_localtax2).",".price2num($total_ttc).",";
+            $sql.= " '".$info_bits."',";
+            $sql.= " ".price2num($price).",".price2num($remise).",";
+            if (isset($fk_fournprice)) $sql.= ' '.$fk_fournprice.',';
+            else $sql.= ' null,';
+            if (isset($pa_ht)) $sql.= ' '.price2num($pa_ht);
+            else $sql.= ' null';
+            if ($date_start > 0) { $sql.= ",'".$this->db->idate($date_start)."'"; }
+            if ($date_end > 0) { $sql.= ",'".$this->db->idate($date_end)."'"; }
+            $sql.= ", ".($fk_unit?"'".$this->db->escape($fk_unit)."'":"null");
+            $sql.= ")";
+
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $contractlineid = $this->db->last_insert_id(MAIN_DB_PREFIX."contratdet");
+
+                if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+                {
+                    $contractline = new ContratLigne($this->db);
+                    $contractline->array_options=$array_options;
+                    $contractline->id=$contractlineid;
+                    $result=$contractline->insertExtraFields();
+                    if ($result < 0)
+                    {
+                        $this->error[]=$contractline->error;
+                        $error++;
+                    }
+                }
+
+                if (empty($error)) {
+                    // Call trigger
+                    $result=$this->call_trigger('LINECONTRACT_INSERT',$user);
+                    if ($result < 0)
+                    {
+                        $error++;
+                    }
+                    // End call triggers
+                }
+
+                if ($error)
+                {
+                    $this->db->rollback();
+                    return -1;
+                }
+                else
+                {
+                    $this->db->commit();
+                    return $contractlineid;
+                }
+            }
+            else
+            {
+                $this->db->rollback();
+                $this->error=$this->db->error()." sql=".$sql;
+                return -1;
+            }
+        }
+        else
+        {
+            dol_syslog(get_class($this)."::addline ErrorTryToAddLineOnValidatedContract", LOG_ERR);
+            return -2;
+        }
+    }
+
+    /**
+     *  Mets a jour une ligne de contrat
+     *
+     *  @param	int			$rowid            	Id de la ligne de facture
+     *  @param  string		$desc             	Description de la ligne
+     *  @param  float		$pu               	Prix unitaire
+     *  @param  int			$qty              	Quantite
+     *  @param  float		$remise_percent   	Pourcentage de remise de la ligne
+     *  @param  int			$date_start       	Date de debut prevue
+     *  @param  int			$date_end         	Date de fin prevue
+     *  @param  float		$tvatx            	Taux TVA
+     *  @param  float		$localtax1tx      	Local tax 1 rate
+     *  @param  float		$localtax2tx      	Local tax 2 rate
+     *  @param  int|string	$date_debut_reel  	Date de debut reelle
+     *  @param  int|string	$date_fin_reel    	Date de fin reelle
+     *	@param	string		$price_base_type	HT or TTC
+     * 	@param  int			$info_bits			Bits de type de lignes
+     * 	@param  int			$fk_fournprice		Fourn price id
+     *  @param  int			$pa_ht				Buying price HT
+     *  @param	array		$array_options		extrafields array
+     * 	@param 	string		$fk_unit 			Code of the unit to use. Null to use the default one
+     *  @return int              				< 0 si erreur, > 0 si ok
+     */
+    function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $tvatx, $localtax1tx=0.0, $localtax2tx=0.0, $date_debut_reel='', $date_fin_reel='', $price_base_type='HT', $info_bits=0, $fk_fournprice=null, $pa_ht = 0,$array_options=0, $fk_unit = null)
+    {
+        global $user, $conf, $langs, $mysoc;
+
+        $error=0;
+
+        // Clean parameters
+        $qty=trim($qty);
+        $desc=trim($desc);
+        $desc=trim($desc);
+        $price = price2num($pu);
+        $tvatx = price2num($tvatx);
+        $localtax1tx = price2num($localtax1tx);
+        $localtax2tx = price2num($localtax2tx);
+        $pa_ht=price2num($pa_ht);
+        if (empty($fk_fournprice)) $fk_fournprice=0;
+
+        $subprice = $price;
+        $remise = 0;
+        if (dol_strlen($remise_percent) > 0)
+        {
+            $remise = round(($pu * $remise_percent / 100), 2);
+            $price = $pu - $remise;
+        }
+        else
+        {
+            $remise_percent=0;
+        }
+
+        dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $date_debut_reel, $date_fin_reel, $tvatx, $localtax1tx, $localtax2tx, $price_base_type, $info_bits");
+
+        $this->db->begin();
+
+        // Calcul du total TTC et de la TVA pour la ligne a partir de
+        // qty, pu, remise_percent et tvatx
+        // 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.
+
+        $localtaxes_type=getLocalTaxesFromRate($tvatx, 0, $this->societe, $mysoc);
+        $tvatx = preg_replace('/\s*\(.*\)/','',$tvatx);  // Remove code into vatrate.
+
+        $tabprice=calcul_price_total($qty, $pu, $remise_percent, $tvatx, $localtax1tx, $localtax2tx, 0, $price_base_type, $info_bits, 1, $mysoc, $localtaxes_type);
+        $total_ht  = $tabprice[0];
+        $total_tva = $tabprice[1];
+        $total_ttc = $tabprice[2];
+        $total_localtax1= $tabprice[9];
+        $total_localtax2= $tabprice[10];
+
+        $localtax1_type=$localtaxes_type[0];
+        $localtax2_type=$localtaxes_type[2];
+
+        // TODO A virer
+        // Anciens indicateurs: $price, $remise (a ne plus utiliser)
+        $remise = 0;
+        $price = price2num(round($pu, 2));
+        if (dol_strlen($remise_percent) > 0)
+        {
+            $remise = round(($pu * $remise_percent / 100), 2);
+            $price = $pu - $remise;
+        }
+
+        if (empty($pa_ht)) $pa_ht=0;
+
+        // if buy price not defined, define buyprice as configured in margin admin
+        if ($this->pa_ht == 0)
+        {
+            if (($result = $this->defineBuyPrice($pu_ht, $remise_percent)) < 0)
+            {
+                return $result;
+            }
+            else
+            {
+                $pa_ht = $result;
+            }
+        }
 
+        $sql = "UPDATE ".MAIN_DB_PREFIX."contratdet set description='".$this->db->escape($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)."'";
+        $sql.= ",localtax1_tx='".  price2num($localtax1tx)."'";
+        $sql.= ",localtax2_tx='".  price2num($localtax2tx)."'";
+        $sql.= ",localtax1_type='".$localtax1_type."'";
+        $sql.= ",localtax2_type='".$localtax2_type."'";
+        $sql.= ", total_ht='".     price2num($total_ht)."'";
+        $sql.= ", total_tva='".    price2num($total_tva)."'";
+        $sql.= ", total_localtax1='".price2num($total_localtax1)."'";
+        $sql.= ", total_localtax2='".price2num($total_localtax2)."'";
+        $sql.= ", total_ttc='".      price2num($total_ttc)."'";
+        $sql.= ", fk_product_fournisseur_price=".($fk_fournprice > 0 ? $fk_fournprice : "null");
+        $sql.= ", buy_price_ht='".price2num($pa_ht)."'";
+        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 .= ", fk_unit=".($fk_unit?"'".$this->db->escape($fk_unit)."'":"null");
+        $sql .= " WHERE rowid = ".$rowid;
+
+        dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $result=$this->update_statut($user);
+            if ($result >= 0)
+            {
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Close a contract line
-	 *
-	 *  @param	User		$user       Objet User who close contract
-	 *  @param  int			$line_id    Id of line to close
-	 *  @param  int			$date_end	End date
-	 * 	@param	string		$comment	A comment typed by user
-	 *  @return int         			<0 if KO, >0 if OK
-	 */
-	function close_line($user, $line_id, $date_end, $comment='')
-	{
-        // phpcs:enable
-		$result=$this->lines[$this->lines_id_index_mapper[$line_id]]->close_line($user, $date_end, $comment);
-		if ($result < 0)
-		{
-			$this->error = $this->lines[$this->lines_id_index_mapper[$line_id]]->error;
-			$this->errors = $this->lines[$this->lines_id_index_mapper[$line_id]]->errors;
-		}
-		return $result;
-	}
-
-
-	/**
-	 *  Open all lines of a contract
-	 *
-	 *  @param	User		$user      		Object User making action
-	 *  @param	int|string	$date_start		Date start (now if empty)
-     *  @param	int			$notrigger		1=Does not execute triggers, 0=Execute triggers
-     *  @param	string		$comment		Comment
-	 *	@return	int							<0 if KO, >0 if OK
-	 *  @see closeAll
-	 */
-	function activateAll($user, $date_start='', $notrigger=0, $comment='')
-	{
-		if (empty($date_start)) $date_start = dol_now();
-
-		$this->db->begin();
-
-		$error=0;
-
-		// Load lines
-		$this->fetch_lines();
-
-		foreach($this->lines as $contratline)
-		{
-			// Open lines not already open
-			if ($contratline->statut != ContratLigne::STATUS_OPEN)
-			{
-				$contratline->context = $this->context;
-
-				$result = $contratline->active_line($user, $date_start, -1, $comment);
-				if ($result < 0)
-				{
-					$error++;
-					$this->error = $contratline->error;
-					$this->errors = $contratline->errors;
-					break;
-				}
-			}
-		}
-
-		if (! $error && $this->statut == 0)
-		{
-			$result=$this->validate($user, '', $notrigger);
-			if ($result < 0) $error++;
-		}
-
-		if (! $error)
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 * Close all lines of a contract
-	 *
-	 * @param	User		$user      		Object User making action
-     * @param	int			$notrigger		1=Does not execute triggers, 0=Execute triggers
-     * @param	string		$comment		Comment
-	 * @return	int							<0 if KO, >0 if OK
-	 * @see activateAll
-	 */
-	function closeAll(User $user, $notrigger=0, $comment='')
-	{
-		$this->db->begin();
-
-		// Load lines
-		$this->fetch_lines();
-
-		$now = dol_now();
-
-		$error = 0;
-
-		foreach($this->lines as $contratline)
-		{
-			// Close lines not already closed
-			if ($contratline->statut != ContratLigne::STATUS_CLOSED)
-	        {
-				$contratline->date_cloture=$now;
-				$contratline->fk_user_cloture=$user->id;
-				$contratline->statut=ContratLigne::STATUS_CLOSED;
-				$result=$contratline->close_line($user, $now, $comment, $notrigger);
-				if ($result < 0)
-				{
-					$error++;
-					$this->error = $contratline->error;
-					$this->errors = $contratline->errors;
-					break;
-				}
-	        }
-		}
-
-		if (! $error && $this->statut == 0)
-		{
-			$result=$this->validate($user, '', $notrigger);
-			if ($result < 0) $error++;
-		}
+                if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+                {
+                    $contractline = new ContratLigne($this->db);
+                    $contractline->array_options=$array_options;
+                    $contractline->id= $rowid;
+                    $result=$contractline->insertExtraFields();
+                    if ($result < 0)
+                    {
+                        $this->error[]=$contractline->error;
+                        $error++;
+                    }
+                }
 
-        if (! $error)
-        {
-            $this->db->commit();
-            return 1;
+                if (empty($error)) {
+                    // Call trigger
+                    $result=$this->call_trigger('LINECONTRACT_UPDATE',$user);
+                    if ($result < 0)
+                    {
+                        $this->db->rollback();
+                        return -3;
+                    }
+                    // End call triggers
+
+                    $this->db->commit();
+                    return 1;
+                }
+            }
+            else
+            {
+                $this->db->rollback();
+                dol_syslog(get_class($this)."::updateline Erreur -2");
+                return -2;
+            }
         }
         else
         {
             $this->db->rollback();
+            $this->error=$this->db->error();
+            dol_syslog(get_class($this)."::updateline Erreur -1");
             return -1;
         }
-	}
-
-	/**
-	 * Validate a contract
-	 *
-	 * @param	User	$user      		Objet User
-	 * @param   string	$force_number	Reference to force on contract (not implemented yet)
-     * @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-	 * @return	int						<0 if KO, >0 if OK
-	 */
-	function validate(User $user, $force_number='', $notrigger=0)
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		global $langs, $conf;
-
-		$now=dol_now();
-
-		$error=0;
-		dol_syslog(get_class($this).'::validate user='.$user->id.', force_number='.$force_number);
-
-
-		$this->db->begin();
-
-		$this->fetch_thirdparty();
-
-		// A contract is validated so we can move thirdparty to status customer
-		if (empty($conf->global->CONTRACT_DISABLE_AUTOSET_AS_CLIENT_ON_CONTRACT_VALIDATION))
-		{
-			$result=$this->thirdparty->set_as_client();
-		}
-
-		// Define new ref
-		if ($force_number)
-		{
-			$num = $force_number;
-		}
-		else if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
-		{
-			$num = $this->getNextNumRef($this->thirdparty);
-		}
-		else
-		{
-			$num = $this->ref;
-		}
-        $this->newref = $num;
-
-		if ($num)
-		{
-			$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET ref = '".$num."', statut = 1";
-			//$sql.= ", fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
-			$sql .= " WHERE rowid = ".$this->id . " AND statut = 0";
-
-			dol_syslog(get_class($this)."::validate", LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if (! $resql)
-			{
-				dol_print_error($this->db);
-				$error++;
-				$this->error=$this->db->lasterror();
-			}
-
-			// Trigger calls
-			if (! $error && ! $notrigger)
-			{
-                // Call trigger
-                $result=$this->call_trigger('CONTRACT_VALIDATE',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-			}
-
-			if (! $error)
-			{
-            	$this->oldref = $this->ref;
-
-				// Rename directory if dir was a temporary ref
-				if (preg_match('/^[\(]?PROV/i', $this->ref))
-				{
-					// Rename of object directory ($this->ref = old ref, $num = new ref)
-					// to  not lose the linked files
-					$oldref = dol_sanitizeFileName($this->ref);
-					$newref = dol_sanitizeFileName($num);
-					$dirsource = $conf->contract->dir_output.'/'.$oldref;
-					$dirdest = $conf->contract->dir_output.'/'.$newref;
-					if (file_exists($dirsource))
-					{
-						dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
-
-						if (@rename($dirsource, $dirdest))
-						{
-							dol_syslog("Rename ok");
-						    // Rename docs starting with $oldref with $newref
-            				$listoffiles=dol_dir_list($conf->contract->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-            				foreach($listoffiles as $fileentry)
-            				{
-            					$dirsource=$fileentry['name'];
-            					$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-            					$dirsource=$fileentry['path'].'/'.$dirsource;
-            					$dirdest=$fileentry['path'].'/'.$dirdest;
-            					@rename($dirsource, $dirdest);
-            				}
-						}
-					}
-				}
-			}
-
-			// Set new ref and define current statut
-			if (! $error)
-			{
-				$this->ref = $num;
-				$this->statut = 1;
-				$this->brouillon = 0;
-				$this->date_validation = $now;
-			}
-		}
-		else
-		{
-			$error++;
-		}
-
-		if (! $error)
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 * Unvalidate a contract
-	 *
-	 * @param	User	$user      		Object User
-     * @param	int		$notrigger		1=Does not execute triggers, 0=execute triggers
-	 * @return	int						<0 if KO, >0 if OK
-	 */
-	function reopen($user, $notrigger=0)
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		global $langs, $conf;
-
-		$now=dol_now();
-
-		$error=0;
-		dol_syslog(get_class($this).'::reopen user='.$user->id);
-
-		$this->db->begin();
-
-		$this->fetch_thirdparty();
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET statut = 0";
-		//$sql.= ", fk_user_valid = null, date_valid = null";
-		$sql .= " WHERE rowid = ".$this->id . " AND statut = 1";
-
-		dol_syslog(get_class($this)."::validate", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql)
-		{
-			dol_print_error($this->db);
-			$error++;
-			$this->error=$this->db->lasterror();
-		}
-
-		// Trigger calls
-		if (! $error && ! $notrigger)
-		{
-			// Call trigger
-			$result=$this->call_trigger('CONTRACT_REOPEN',$user);
-			if ($result < 0) {
-				$error++;
-			}
-			// End call triggers
-		}
-
-		// Set new ref and define current status
-		if (! $error)
-		{
-			$this->statut=0;
-			$this->brouillon=1;
-			$this->date_validation=$now;
-		}
-
-		if (! $error)
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 *    Load a contract from database
-	 *
-	 *    @param	int		$id     		Id of contract to load
-	 *    @param	string	$ref			Ref
-	 *    @param	string	$ref_customer	Customer ref
-	 *    @param	string	$ref_supplier	Supplier ref
-	 *    @return   int     				<0 if KO, 0 if not found, Id of contract if OK
-	 */
-	function fetch($id, $ref='', $ref_customer='', $ref_supplier='')
-	{
-		$sql = "SELECT rowid, statut, ref, fk_soc, mise_en_service as datemise,";
-		$sql.= " ref_supplier, ref_customer,";
-		$sql.= " ref_ext,";
-		$sql.= " fk_user_mise_en_service, date_contrat as datecontrat,";
-		$sql.= " fk_user_author, fin_validite, date_cloture,";
-		$sql.= " fk_projet,";
-		$sql.= " fk_commercial_signature, fk_commercial_suivi,";
-		$sql.= " note_private, note_public, model_pdf, extraparams";
-		$sql.= " FROM ".MAIN_DB_PREFIX."contrat";
-		if (! $id) $sql.=" WHERE entity IN (".getEntity('contract').")";
-		else $sql.= " WHERE rowid=".$id;
-		if ($ref_customer)
-		{
-			$sql.= " AND ref_customer = '".$this->db->escape($ref_customer)."'";
-		}
-		if ($ref_supplier)
-		{
-			$sql.= " AND ref_supplier = '".$this->db->escape($ref_supplier)."'";
-		}
-		if ($ref)
-		{
-			$sql.= " AND ref='".$this->db->escape($ref)."'";
-		}
-
-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-
-			if ($obj)
-			{
-				$this->id						= $obj->rowid;
-				$this->ref						= (!isset($obj->ref) || !$obj->ref) ? $obj->rowid : $obj->ref;
-				$this->ref_customer				= $obj->ref_customer;
-				$this->ref_supplier				= $obj->ref_supplier;
-				$this->ref_ext					= $obj->ref_ext;
-				$this->statut					= $obj->statut;
-				$this->mise_en_service			= $this->db->jdate($obj->datemise);
-
-				$this->date_contrat				= $this->db->jdate($obj->datecontrat);
-				$this->date_creation			= $this->db->jdate($obj->datecontrat);
-
-				$this->fin_validite				= $this->db->jdate($obj->fin_validite);
-				$this->date_cloture				= $this->db->jdate($obj->date_cloture);
-
-
-				$this->user_author_id			= $obj->fk_user_author;
-
-				$this->commercial_signature_id	= $obj->fk_commercial_signature;
-				$this->commercial_suivi_id		= $obj->fk_commercial_suivi;
-
-				$this->note_private				= $obj->note_private;
-				$this->note_public				= $obj->note_public;
-				$this->modelpdf					= $obj->model_pdf;
-
-				$this->fk_projet				= $obj->fk_projet; // deprecated
-				$this->fk_project				= $obj->fk_projet;
-
-				$this->socid					= $obj->fk_soc;
-				$this->fk_soc					= $obj->fk_soc;
-
-				$this->extraparams				= (array) json_decode($obj->extraparams, true);
-
-				$this->db->free($resql);
-
-				// Retreive all extrafields
-				// fetch optionals attributes and labels
-				$this->fetch_optionals();
-
-				// Lines
-				$result=$this->fetch_lines();
-				if ($result < 0)
-				{
-					$this->error=$this->db->lasterror();
-					return -3;
-				}
-
-				return $this->id;
-			}
-			else
-			{
-				dol_syslog(get_class($this)."::fetch Contract not found");
-				$this->error="Contract not found";
-				return 0;
-			}
-		}
-		else
-		{
-			dol_syslog(get_class($this)."::fetch Error searching contract");
-			$this->error=$this->db->error();
-			return -1;
-		}
-	}
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Load lines array into this->lines.
-	 *  This set also nbofserviceswait, nbofservicesopened, nbofservicesexpired and nbofservicesclosed
-	 *
-	 *  @return ContratLigne[]   Return array of contract lines
-	 */
-	function fetch_lines()
-	{
-        // phpcs:enable
-		$this->nbofserviceswait=0;
-		$this->nbofservicesopened=0;
-		$this->nbofservicesexpired=0;
-		$this->nbofservicesclosed=0;
-
-		$total_ttc=0;
-		$total_vat=0;
-		$total_ht=0;
+    }
 
-		$now=dol_now();
+    /**
+     *  Delete a contract line
+     *
+     *  @param	int		$idline		Id of line to delete
+     *	@param  User	$user       User that delete
+     *  @return int         		>0 if OK, <0 if KO
+     */
+    function deleteline($idline, User $user)
+    {
+        global $conf, $langs;
 
-		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-		$extrafieldsline=new ExtraFields($this->db);
-		$line = new ContratLigne($this->db);
-		$extralabelsline=$extrafieldsline->fetch_name_optionals_label($line->table_element,true);
+        $error=0;
 
-		$this->lines=array();
-        $pos = 0;
+        if ($this->statut >= 0)
+        {
 
-		// Selects contract lines related to a product
-		$sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref,";
-		$sql.= " d.rowid, d.fk_contrat, d.statut, d.description, d.price_ht, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.remise_percent, d.subprice, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht,";
-		$sql.= " d.total_ht,";
-		$sql.= " d.total_tva,";
-		$sql.= " d.total_localtax1,";
-		$sql.= " d.total_localtax2,";
-		$sql.= " d.total_ttc,";
-		$sql.= " d.info_bits, d.fk_product,";
-		$sql.= " d.date_ouverture_prevue, d.date_ouverture,";
-		$sql.= " d.date_fin_validite, d.date_cloture,";
-		$sql.= " d.fk_user_author,";
-		$sql.= " d.fk_user_ouverture,";
-		$sql.= " d.fk_user_cloture,";
-		$sql.= " d.fk_unit";
-		$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as d LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
-		$sql.= " WHERE d.fk_contrat = ".$this->id;
-		$sql.= " ORDER by d.rowid ASC";
-
-		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$num = $this->db->num_rows($result);
-			$i = 0;
-
-			while ($i < $num)
-			{
-				$objp					= $this->db->fetch_object($result);
-
-				$line					= new ContratLigne($this->db);
-				$line->id				= $objp->rowid;
-				$line->ref				= $objp->rowid;
-				$line->fk_contrat		= $objp->fk_contrat;
-				$line->desc				= $objp->description;  // Description line
-				$line->qty				= $objp->qty;
-				$line->vat_src_code 	= $objp->vat_src_code ;
-				$line->tva_tx			= $objp->tva_tx;
-				$line->localtax1_tx		= $objp->localtax1_tx;
-				$line->localtax2_tx		= $objp->localtax2_tx;
-				$line->localtax1_type	= $objp->localtax1_type;
-				$line->localtax2_type	= $objp->localtax2_type;
-				$line->subprice			= $objp->subprice;
-				$line->statut			= $objp->statut;
-				$line->remise_percent	= $objp->remise_percent;
-				$line->price_ht			= $objp->price_ht;
-				$line->price			= $objp->price_ht;	// For backward compatibility
-				$line->total_ht			= $objp->total_ht;
-				$line->total_tva		= $objp->total_tva;
-				$line->total_localtax1	= $objp->total_localtax1;
-				$line->total_localtax2	= $objp->total_localtax2;
-				$line->total_ttc		= $objp->total_ttc;
-				$line->fk_product		= (($objp->fk_product > 0)?$objp->fk_product:0);
-				$line->info_bits		= $objp->info_bits;
-
-				$line->fk_fournprice 	= $objp->fk_fournprice;
-				$marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
-				$line->pa_ht 			= $marginInfos[0];
-
-				$line->fk_user_author	= $objp->fk_user_author;
-				$line->fk_user_ouverture= $objp->fk_user_ouverture;
-				$line->fk_user_cloture  = $objp->fk_user_cloture;
-				$line->fk_unit           = $objp->fk_unit;
-
-				$line->ref				= $objp->product_ref;	// deprecated
-				$line->product_ref		= $objp->product_ref;   // Product Ref
-				$line->product_desc		= $objp->product_desc;  // Product Description
-				$line->product_label	= $objp->product_label; // Product Label
-
-				$line->description		= $objp->description;
-
-				$line->date_start            = $this->db->jdate($objp->date_ouverture_prevue);
-				$line->date_start_real       = $this->db->jdate($objp->date_ouverture);
-				$line->date_end              = $this->db->jdate($objp->date_fin_validite);
-				$line->date_end_real         = $this->db->jdate($objp->date_cloture);
-				// For backward compatibility
-				$line->date_ouverture_prevue = $this->db->jdate($objp->date_ouverture_prevue);
-				$line->date_ouverture        = $this->db->jdate($objp->date_ouverture);
-				$line->date_fin_validite     = $this->db->jdate($objp->date_fin_validite);
-				$line->date_cloture          = $this->db->jdate($objp->date_cloture);
-				$line->date_debut_prevue = $this->db->jdate($objp->date_ouverture_prevue);
-				$line->date_debut_reel   = $this->db->jdate($objp->date_ouverture);
-				$line->date_fin_prevue   = $this->db->jdate($objp->date_fin_validite);
-				$line->date_fin_reel     = $this->db->jdate($objp->date_cloture);
-
-				// Retreive all extrafields for contract
-				// fetch optionals attributes and labels
-				$line->fetch_optionals();
-
-				$this->lines[$pos]			= $line;
-				$this->lines_id_index_mapper[$line->id] = $pos;
-
-				//dol_syslog("1 ".$line->desc);
-				//dol_syslog("2 ".$line->product_desc);
-
-				if ($line->statut == ContratLigne::STATUS_INITIAL) $this->nbofserviceswait++;
-				if ($line->statut == ContratLigne::STATUS_OPEN && (empty($line->date_fin_prevue) || $line->date_fin_prevue >= $now)) $this->nbofservicesopened++;
-				if ($line->statut == ContratLigne::STATUS_OPEN && (! empty($line->date_fin_prevue) && $line->date_fin_prevue < $now)) $this->nbofservicesexpired++;
-				if ($line->statut == ContratLigne::STATUS_CLOSED) $this->nbofservicesclosed++;
-
-				$total_ttc+=$objp->total_ttc;   // TODO Not saved into database
-                $total_vat+=$objp->total_tva;
-                $total_ht+=$objp->total_ht;
+            // Call trigger
+            $result=$this->call_trigger('LINECONTRACT_DELETE',$user);
+            if ($result < 0) return -1;
+            // End call triggers
 
-				$i++;
-				$pos++;
-			}
-			$this->db->free($result);
-		}
-		else
-		{
-			dol_syslog(get_class($this)."::Fetch Erreur lecture des lignes de contrats liees aux produits");
-			return -3;
-		}
-
-		$this->nbofservices=count($this->lines);
-        $this->total_ttc = price2num($total_ttc);   // TODO For the moment value is false as value is not stored in database for line linked to products
-        $this->total_vat = price2num($total_vat);   // TODO For the moment value is false as value is not stored in database for line linked to products
-        $this->total_ht = price2num($total_ht);     // TODO For the moment value is false as value is not stored in database for line linked to products
+            $this->db->begin();
 
-		return $this->lines;
-	}
-
-	/**
-	 *  Create a contract into database
-	 *
-	 *  @param	User	$user       User that create
-	 *  @return int  				<0 if KO, id of contract if OK
-	 */
-	function create($user)
-	{
-		global $conf,$langs,$mysoc;
-
-		// 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();
-
-		$now=dol_now();
-
-		// Insert contract
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."contrat (datec, fk_soc, fk_user_author, date_contrat,";
-		$sql.= " fk_commercial_signature, fk_commercial_suivi, fk_projet,";
-		$sql.= " ref, entity, note_private, note_public, ref_customer, ref_supplier, ref_ext)";
-		$sql.= " VALUES ('".$this->db->idate($now)."',".$this->socid.",".$user->id;
-		$sql.= ", ".(dol_strlen($this->date_contrat)!=0 ? "'".$this->db->idate($this->date_contrat)."'" : "NULL");
-		$sql.= ",".($this->commercial_signature_id>0?$this->commercial_signature_id:"NULL");
-		$sql.= ",".($this->commercial_suivi_id>0?$this->commercial_suivi_id:"NULL");
-		$sql.= ",".($this->fk_project>0?$this->fk_project:"NULL");
-		$sql.= ", ".(dol_strlen($this->ref)<=0 ? "null" : "'".$this->db->escape($this->ref)."'");
-		$sql.= ", ".$conf->entity;
-		$sql.= ", ".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL");
-		$sql.= ", ".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL");
-		$sql.= ", ".(!empty($this->ref_customer)?("'".$this->db->escape($this->ref_customer)."'"):"NULL");
-		$sql.= ", ".(!empty($this->ref_supplier)?("'".$this->db->escape($this->ref_supplier)."'"):"NULL");
-		$sql.= ", ".(!empty($this->ref_ext)?("'".$this->db->escape($this->ref_ext)."'"):"NULL");
-		$sql.= ")";
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$error=0;
-
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."contrat");
-
-			// Load object modContract
-			$module=(! empty($conf->global->CONTRACT_ADDON)?$conf->global->CONTRACT_ADDON:'mod_contract_serpis');
-			if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php')
-			{
-				$module = substr($module, 0, dol_strlen($module)-4);
-			}
-			$result=dol_include_once('/core/modules/contract/'.$module.'.php');
-			if ($result > 0)
-			{
-				$modCodeContract = new $module();
-
-				if (!empty($modCodeContract->code_auto)) {
-					// Update ref
-					$sql = 'UPDATE '.MAIN_DB_PREFIX."contrat SET ref='(PROV".$this->id.")' WHERE rowid=".$this->id;
-					if ($this->db->query($sql))
-					{
-						if ($this->id)
-						{
-							$this->ref="(PROV".$this->id.")";
-						}
-					}
-				} else {
-					$error++;
-					$this->error='Failed to get PROV number';
-				}
-			}
-
-			if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
-			{
-				$result=$this->insertExtraFields();
-				if ($result < 0)
-				{
-					$error++;
-				}
-			}
-
-			// Insert business contacts ('SALESREPSIGN','contrat')
-			if (! $error)
-			{
-    			$result=$this->add_contact($this->commercial_signature_id,'SALESREPSIGN','internal');
-    			if ($result < 0) $error++;
-			}
-
-			// Insert business contacts ('SALESREPFOLL','contrat')
-			if (! $error)
-			{
-                $result=$this->add_contact($this->commercial_suivi_id,'SALESREPFOLL','internal');
-			    if ($result < 0) $error++;
-			}
-
-			if (! $error)
-			{
-				if (! empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
-				{
-					$this->linked_objects = $this->linkedObjectsIds;	// TODO Replace linked_objects with linkedObjectsIds
-				}
-
-				// Add object linked
-    			if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
-    			{
-    			    foreach($this->linked_objects as $origin => $tmp_origin_id)
-    			    {
-    			        if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
-    			        {
-    			            foreach($tmp_origin_id as $origin_id)
-    			            {
-    			                $ret = $this->add_object_linked($origin, $origin_id);
-    			                if (! $ret)
-    			                {
-    			                    $this->error=$this->db->lasterror();
-    			                    $error++;
-    			                }
-    			            }
-    			        }
-    			        else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
-    			        {
-    			            $origin_id = $tmp_origin_id;
-    			            $ret = $this->add_object_linked($origin, $origin_id);
-    			            if (! $ret)
-    			            {
-    			                $this->error=$this->db->lasterror();
-    			                $error++;
-    			            }
-    			        }
-    			    }
-    			}
-
-    			if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id))   // Get contact from origin object
-    			{
-    			    $originforcontact = $this->origin;
-    			    $originidforcontact = $this->origin_id;
-    			    if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
-    			    {
-    			        require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
-    			        $exp = new Expedition($db);
-    			        $exp->fetch($this->origin_id);
-    			        $exp->fetchObjectLinked();
-    			        if (count($exp->linkedObjectsIds['commande']) > 0)
-    			        {
-    			            foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
-    			            {
-    			                $originforcontact = 'commande';
-    			                $originidforcontact = $value->id;
-    			                break; // We take first one
-    			            }
-    			        }
-    			    }
-
-    			    $sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
-    			    $sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
-
-    			    $resqlcontact = $this->db->query($sqlcontact);
-    			    if ($resqlcontact)
-    			    {
-    			        while($objcontact = $this->db->fetch_object($resqlcontact))
-    			        {
-    			            if ($objcontact->source == 'internal' && in_array($objcontact->code, array('SALESREPSIGN', 'SALESREPFOLL'))) continue;    // ignore this, already forced previously
-
-    			            //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
-    			            $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source);    // May failed because of duplicate key or because code of contact type does not exists for new object
-    			        }
-    			    }
-    			    else dol_print_error($resqlcontact);
-    			}
-			}
-
-			if (! $error)
-			{
-                // Call trigger
-                $result=$this->call_trigger('CONTRACT_CREATE',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."contratdet";
+            $sql.= " WHERE rowid=".$idline;
 
-				if (! $error)
-				{
-					$this->db->commit();
-					return $this->id;
-				}
-				else
-				{
-					dol_syslog(get_class($this)."::create - 30 - ".$this->error, LOG_ERR);
-					$this->db->rollback();
-					return -3;
-				}
-			}
-			else
-			{
-				$this->error="Failed to add contract";
-				dol_syslog(get_class($this)."::create - 20 - ".$this->error, LOG_ERR);
-				$this->db->rollback();
-				return -2;
-			}
-		}
-		else
-		{
-			$this->error=$langs->trans("UnknownError: ".$this->db->error()." -", LOG_DEBUG);
-
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-
-	/**
-	 *  Supprime l'objet de la base
-	 *
-	 *  @param	User		$user       Utilisateur qui supprime
-	 *  @return int         			< 0 si erreur, > 0 si ok
-	 */
-	function delete($user)
-	{
-		global $conf, $langs;
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-
-		$error=0;
-
-		$this->db->begin();
-
-	    // Call trigger
-	    $result=$this->call_trigger('CONTRACT_DELETE',$user);
-	    if ($result < 0) { $error++; }
-	    // End call triggers
-
-		if (! $error)
-		{
-			// Delete linked contacts
-			$res = $this->delete_linked_contact();
-			if ($res < 0)
-			{
-				dol_syslog(get_class($this)."::delete error", LOG_ERR);
-				$error++;
-			}
-		}
-
-		if (! $error)
-		{
-			// Delete linked object
-			$res = $this->deleteObjectLinked();
-			if ($res < 0) $error++;
-		}
-
-		if (! $error)
-		{
-			// Delete contratdet_log
-			/*
-			$sql = "DELETE cdl";
-			$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 = "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;
+            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+            $resql = $this->db->query($sql);
+            if (! $resql)
+            {
+                $this->error="Error ".$this->db->lasterror();
+                $error++;
+            }
 
-			dol_syslog(get_class($this)."::delete contratdet_log", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if (! $resql)
-			{
-				$this->error=$this->db->error();
-				$error++;
-			}
-			$numressql=$this->db->num_rows($resql);
-			if (! $error && $numressql )
-			{
-				$tab_resql=array();
-				for($i=0;$i<$numressql;$i++)
-				{
-					$objresql=$this->db->fetch_object($resql);
-					$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).")";
-
-				dol_syslog(get_class($this)."::delete contratdet_log", LOG_DEBUG);
-				$resql=$this->db->query($sql);
-				if (! $resql)
-				{
-					$this->error=$this->db->error();
-					$error++;
-				}
-			}
-		}
-
-		if (! $error)
-		{
-			// Delete contratdet
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."contratdet";
-			$sql.= " WHERE fk_contrat=".$this->id;
-
-			dol_syslog(get_class($this)."::delete contratdet", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if (! $resql)
-			{
-				$this->error=$this->db->error();
-				$error++;
-			}
-		}
-
-		if (! $error)
-		{
-			// Delete contrat
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."contrat";
-			$sql.= " WHERE rowid=".$this->id;
-
-			dol_syslog(get_class($this)."::delete contrat", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if (! $resql)
-			{
-				$this->error=$this->db->error();
-				$error++;
-			}
-		}
-
-		// Removed extrafields
-		if (! $error) {
-			$result=$this->deleteExtraFields();
-			if ($result < 0)
-			{
-				$error++;
-				dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
-			}
-		}
-
-		if (! $error)
-		{
-			// We remove directory
-			$ref = dol_sanitizeFileName($this->ref);
-			if ($conf->contrat->dir_output)
-			{
-				$dir = $conf->contrat->dir_output . "/" . $ref;
-				if (file_exists($dir))
-				{
-					$res=@dol_delete_dir_recursive($dir);
-					if (! $res)
-					{
-						$this->error='ErrorFailToDeleteDir';
-						$error++;
-					}
-				}
-			}
-		}
-
-		if (! $error)
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 *  Update object into database
-	 *
-	 *  @param	User	$user        User that modifies
-	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 <0 if KO, >0 if OK
-	 */
-	function update($user, $notrigger=0)
-	{
-		global $conf, $langs;
-		$error=0;
-
-		// Clean parameters
-		if (empty($this->fk_commercial_signature) && $this->commercial_signature_id > 0) $this->fk_commercial_signature = $this->commercial_signature_id;
-		if (empty($this->fk_commercial_suivi) && $this->commercial_suivi_id > 0) $this->fk_commercial_suivi = $this->commercial_suivi_id;
-		if (empty($this->fk_soc) && $this->socid > 0) $this->fk_soc = $this->socid;
-		if (empty($this->fk_project) && $this->projet > 0) $this->fk_project = $this->projet;
-
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-		if (isset($this->ref_customer)) $this->ref_customer=trim($this->ref_customer);
-		if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
-		if (isset($this->ref_ext)) $this->ref_ext=trim($this->ref_ext);
-		if (isset($this->entity)) $this->entity=trim($this->entity);
-		if (isset($this->statut)) $this->statut=(int) $this->statut;
-		if (isset($this->fk_soc)) $this->fk_soc=trim($this->fk_soc);
-		if (isset($this->fk_commercial_signature)) $this->fk_commercial_signature=trim($this->fk_commercial_signature);
-		if (isset($this->fk_commercial_suivi)) $this->fk_commercial_suivi=trim($this->fk_commercial_suivi);
-		if (isset($this->fk_user_mise_en_service)) $this->fk_user_mise_en_service=trim($this->fk_user_mise_en_service);
-		if (isset($this->fk_user_cloture)) $this->fk_user_cloture=trim($this->fk_user_cloture);
-		if (isset($this->note_private)) $this->note_private=trim($this->note_private);
-		if (isset($this->note_public)) $this->note_public=trim($this->note_public);
-		if (isset($this->import_key)) $this->import_key=trim($this->import_key);
-		//if (isset($this->extraparams)) $this->extraparams=trim($this->extraparams);
-
-		// Check parameters
-		// Put here code to add a control on parameters values
-
-		// Update request
-    	$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET";
-		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
-		$sql.= " ref_customer=".(isset($this->ref_customer)?"'".$this->db->escape($this->ref_customer)."'":"null").",";
-		$sql.= " ref_supplier=".(isset($this->ref_supplier)?"'".$this->db->escape($this->ref_supplier)."'":"null").",";
-		$sql.= " ref_ext=".(isset($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null").",";
-		$sql.= " entity=".$conf->entity.",";
-		$sql.= " date_contrat=".(dol_strlen($this->date_contrat)!=0 ? "'".$this->db->idate($this->date_contrat)."'" : 'null').",";
-		$sql.= " statut=".(isset($this->statut)?$this->statut:"null").",";
-		$sql.= " mise_en_service=".(dol_strlen($this->mise_en_service)!=0 ? "'".$this->db->idate($this->mise_en_service)."'" : 'null').",";
-		$sql.= " fin_validite=".(dol_strlen($this->fin_validite)!=0 ? "'".$this->db->idate($this->fin_validite)."'" : 'null').",";
-		$sql.= " date_cloture=".(dol_strlen($this->date_cloture)!=0 ? "'".$this->db->idate($this->date_cloture)."'" : 'null').",";
-		$sql.= " fk_soc=".($this->fk_soc > 0 ? $this->fk_soc:"null").",";
-		$sql.= " fk_projet=".($this->fk_project > 0 ? $this->fk_project:"null").",";
-		$sql.= " fk_commercial_signature=".(isset($this->fk_commercial_signature)?$this->fk_commercial_signature:"null").",";
-		$sql.= " fk_commercial_suivi=".(isset($this->fk_commercial_suivi)?$this->fk_commercial_suivi:"null").",";
-		$sql.= " fk_user_mise_en_service=".(isset($this->fk_user_mise_en_service)?$this->fk_user_mise_en_service:"null").",";
-		$sql.= " fk_user_cloture=".(isset($this->fk_user_cloture)?$this->fk_user_cloture:"null").",";
-		$sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
-		$sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
-		$sql.= " import_key=".(isset($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null")."";
-		//$sql.= " extraparams=".(isset($this->extraparams)?"'".$this->db->escape($this->extraparams)."'":"null")."";
-		$sql.= " WHERE rowid=".$this->id;
-
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0)
-		{
-			$result=$this->insertExtraFields();
-			if ($result < 0)
-			{
-				$error++;
-			}
-		}
-
-		if (! $error && ! $notrigger)
-		{
-			// Call triggers
-			$result=$this->call_trigger('CONTRACT_MODIFY',$user);
-			if ($result < 0) { $error++; }
-			// End call triggers
-		}
-
-		// Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
-	}
-
-
-	/**
-	 *  Ajoute une ligne de contrat en base
-	 *
-	 *  @param	string		$desc            	Description de la ligne
-	 *  @param  float		$pu_ht              Prix unitaire HT
-	 *  @param  int			$qty             	Quantite
-	 *  @param  float		$txtva           	Taux tva
-	 *  @param  float		$txlocaltax1        Local tax 1 rate
-	 *  @param  float		$txlocaltax2        Local tax 2 rate
-	 *  @param  int			$fk_product      	Id produit
-	 *  @param  float		$remise_percent  	Pourcentage de remise de la ligne
-	 *  @param  int			$date_start      	Date de debut prevue
-	 *  @param  int			$date_end        	Date de fin prevue
-	 *	@param	string		$price_base_type	HT or TTC
-	 * 	@param  float		$pu_ttc             Prix unitaire TTC
-	 * 	@param  int			$info_bits			Bits de type de lignes
-	 * 	@param  int			$fk_fournprice		Fourn price id
-	 *  @param  int			$pa_ht				Buying price HT
-	 *  @param	array		$array_options		extrafields array
-	 * 	@param 	string		$fk_unit 			Code of the unit to use. Null to use the default one
-	 * 	@param 	string		$rang 				Position
-	 *  @return int             				<0 if KO, >0 if OK
-	 */
-	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $fk_fournprice=null, $pa_ht = 0,$array_options=0, $fk_unit = null, $rang=0)
-	{
-		global $user, $langs, $conf, $mysoc;
-		$error=0;
-
-		dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type, $pu_ttc, $info_bits, $rang");
-
-		// Check parameters
-		if ($fk_product <= 0 && empty($desc))
-		{
-			$this->error="ErrorDescRequiredForFreeProductLines";
-			return -1;
-		}
-
-		if ($this->statut >= 0)
-		{
-			$this->db->begin();
-
-			// Clean parameters
-			$pu_ht=price2num($pu_ht);
-			$pu_ttc=price2num($pu_ttc);
-			$pa_ht=price2num($pa_ht);
-			if (!preg_match('/\((.*)\)/', $txtva)) {
-				$txtva = price2num($txtva);               // $txtva can have format '5.0(XXX)' or '5'
-			}
-			$txlocaltax1=price2num($txlocaltax1);
-			$txlocaltax2=price2num($txlocaltax2);
-			$remise_percent=price2num($remise_percent);
-			$qty=price2num($qty);
-			if (empty($qty)) $qty=1;
-			if (empty($info_bits)) $info_bits=0;
-			if (empty($pu_ht) || ! is_numeric($pu_ht))  $pu_ht=0;
-			if (empty($pu_ttc)) $pu_ttc=0;
-			if (empty($txtva) || ! is_numeric($txtva)) $txtva=0;
-			if (empty($txlocaltax1) || ! is_numeric($txlocaltax1)) $txlocaltax1=0;
-            if (empty($txlocaltax2) || ! is_numeric($txlocaltax2)) $txlocaltax2=0;
+            if (empty($error)) {
+                // Remove extrafields
+                if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+                {
+                    $contractline = new ContratLigne($this->db);
+                    $contractline->id= $idline;
+                    $result=$contractline->deleteExtraFields();
+                    if ($result < 0)
+                    {
+                        $error++;
+                        $this->error="Error ".get_class($this)."::delete deleteExtraFields error -4 ".$contractline->error;
+                    }
+                }
+            }
 
-			if ($price_base_type=='HT')
-			{
-				$pu=$pu_ht;
-			}
-			else
-			{
-				$pu=$pu_ttc;
-			}
-
-			// Check parameters
-			if (empty($remise_percent)) $remise_percent=0;
-
-			$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->societe, $mysoc);
-
-			// Clean vat code
-			$vat_src_code='';
-			if (preg_match('/\((.*)\)/', $txtva, $reg))
-			{
-				$vat_src_code = $reg[1];
-				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
-			}
-
-			// 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
-			// 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, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, 1,$mysoc, $localtaxes_type);
-			$total_ht  = $tabprice[0];
-			$total_tva = $tabprice[1];
-			$total_ttc = $tabprice[2];
-			$total_localtax1= $tabprice[9];
-			$total_localtax2= $tabprice[10];
-
-			$localtax1_type=$localtaxes_type[0];
-			$localtax2_type=$localtaxes_type[2];
-
-			// TODO A virer
-			// Anciens indicateurs: $price, $remise (a ne plus utiliser)
-			$remise = 0;
-			$price = price2num(round($pu_ht, 2));
-			if (dol_strlen($remise_percent) > 0)
-			{
-				$remise = round(($pu_ht * $remise_percent / 100), 2);
-				$price = $pu_ht - $remise;
-			}
-
-		    if (empty($pa_ht)) $pa_ht=0;
-
-
-			// if buy price not defined, define buyprice as configured in margin admin
-			if ($this->pa_ht == 0)
-			{
-				if (($result = $this->defineBuyPrice($pu_ht, $remise_percent, $fk_product)) < 0)
-				{
-					return $result;
-				}
-				else
-				{
-					$pa_ht = $result;
-				}
-			}
-
-			// Insertion dans la base
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."contratdet";
-			$sql.= " (fk_contrat, label, description, fk_product, qty, tva_tx, vat_src_code,";
-			$sql.= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice,";
-			$sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc,";
-			$sql.= " info_bits,";
-			$sql.= " price_ht, remise, fk_product_fournisseur_price, buy_price_ht";
-			if ($date_start > 0) { $sql.= ",date_ouverture_prevue"; }
-			if ($date_end > 0)   { $sql.= ",date_fin_validite"; }
-			$sql.= ", fk_unit";
-			$sql.= ") VALUES (";
-			$sql.= $this->id.", '', '" . $this->db->escape($desc) . "',";
-			$sql.= ($fk_product>0 ? $fk_product : "null").",";
-			$sql.= " ".$qty.",";
-			$sql.= " ".$txtva.",";
-			$sql.= " ".($vat_src_code?"'".$vat_src_code."'":"null").",";
-			$sql.= " ".$txlocaltax1.",";
-			$sql.= " ".$txlocaltax2.",";
-			$sql.= " '".$localtax1_type."',";
-			$sql.= " '".$localtax2_type."',";
-			$sql.= " ".price2num($remise_percent).",";
-			$sql.= " ".price2num($pu_ht).",";
-			$sql.= " ".price2num($total_ht).",".price2num($total_tva).",".price2num($total_localtax1).",".price2num($total_localtax2).",".price2num($total_ttc).",";
-			$sql.= " '".$info_bits."',";
-			$sql.= " ".price2num($price).",".price2num($remise).",";
-			if (isset($fk_fournprice)) $sql.= ' '.$fk_fournprice.',';
-			else $sql.= ' null,';
-			if (isset($pa_ht)) $sql.= ' '.price2num($pa_ht);
-			else $sql.= ' null';
-			if ($date_start > 0) { $sql.= ",'".$this->db->idate($date_start)."'"; }
-			if ($date_end > 0) { $sql.= ",'".$this->db->idate($date_end)."'"; }
-			$sql.= ", ".($fk_unit?"'".$this->db->escape($fk_unit)."'":"null");
-			$sql.= ")";
-
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$contractlineid = $this->db->last_insert_id(MAIN_DB_PREFIX."contratdet");
-
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
-				{
-					$contractline = new ContratLigne($this->db);
-					$contractline->array_options=$array_options;
-					$contractline->id=$contractlineid;
-					$result=$contractline->insertExtraFields();
-					if ($result < 0)
-					{
-						$this->error[]=$contractline->error;
-						$error++;
-					}
-				}
-
-				if (empty($error)) {
-				    // Call trigger
-				    $result=$this->call_trigger('LINECONTRACT_INSERT',$user);
-				    if ($result < 0)
-				    {
-				    	$error++;
-				    }
-				    // End call triggers
-				}
-
-				if ($error)
-				{
-					$this->db->rollback();
-					return -1;
-				}
-				else
-				{
-					$this->db->commit();
-					return $contractlineid;
-				}
-			}
-			else
-			{
-				$this->db->rollback();
-				$this->error=$this->db->error()." sql=".$sql;
-				return -1;
-			}
-		}
-		else
-		{
-			dol_syslog(get_class($this)."::addline ErrorTryToAddLineOnValidatedContract", LOG_ERR);
-			return -2;
-		}
-	}
-
-	/**
-	 *  Mets a jour une ligne de contrat
-	 *
-	 *  @param	int			$rowid            	Id de la ligne de facture
-	 *  @param  string		$desc             	Description de la ligne
-	 *  @param  float		$pu               	Prix unitaire
-	 *  @param  int			$qty              	Quantite
-	 *  @param  float		$remise_percent   	Pourcentage de remise de la ligne
-	 *  @param  int			$date_start       	Date de debut prevue
-	 *  @param  int			$date_end         	Date de fin prevue
-	 *  @param  float		$tvatx            	Taux TVA
-	 *  @param  float		$localtax1tx      	Local tax 1 rate
-	 *  @param  float		$localtax2tx      	Local tax 2 rate
-	 *  @param  int|string	$date_debut_reel  	Date de debut reelle
-	 *  @param  int|string	$date_fin_reel    	Date de fin reelle
-	 *	@param	string		$price_base_type	HT or TTC
-	 * 	@param  int			$info_bits			Bits de type de lignes
-	 * 	@param  int			$fk_fournprice		Fourn price id
-	 *  @param  int			$pa_ht				Buying price HT
-	 *  @param	array		$array_options		extrafields array
-	 * 	@param 	string		$fk_unit 			Code of the unit to use. Null to use the default one
-	 *  @return int              				< 0 si erreur, > 0 si ok
-	 */
-	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $tvatx, $localtax1tx=0.0, $localtax2tx=0.0, $date_debut_reel='', $date_fin_reel='', $price_base_type='HT', $info_bits=0, $fk_fournprice=null, $pa_ht = 0,$array_options=0, $fk_unit = null)
-	{
-		global $user, $conf, $langs, $mysoc;
-
-		$error=0;
-
-		// Clean parameters
-		$qty=trim($qty);
-		$desc=trim($desc);
-		$desc=trim($desc);
-		$price = price2num($pu);
-		$tvatx = price2num($tvatx);
-		$localtax1tx = price2num($localtax1tx);
-		$localtax2tx = price2num($localtax2tx);
-		$pa_ht=price2num($pa_ht);
-		if (empty($fk_fournprice)) $fk_fournprice=0;
-
-		$subprice = $price;
-		$remise = 0;
-		if (dol_strlen($remise_percent) > 0)
-		{
-			$remise = round(($pu * $remise_percent / 100), 2);
-			$price = $pu - $remise;
-		}
-		else
-		{
-			$remise_percent=0;
-		}
-
-		dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $date_debut_reel, $date_fin_reel, $tvatx, $localtax1tx, $localtax2tx, $price_base_type, $info_bits");
-
-		$this->db->begin();
-
-		// Calcul du total TTC et de la TVA pour la ligne a partir de
-		// qty, pu, remise_percent et tvatx
-		// 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.
-
-		$localtaxes_type=getLocalTaxesFromRate($tvatx, 0, $this->societe, $mysoc);
-		$tvatx = preg_replace('/\s*\(.*\)/','',$tvatx);  // Remove code into vatrate.
-
-		$tabprice=calcul_price_total($qty, $pu, $remise_percent, $tvatx, $localtax1tx, $localtax2tx, 0, $price_base_type, $info_bits, 1, $mysoc, $localtaxes_type);
-		$total_ht  = $tabprice[0];
-		$total_tva = $tabprice[1];
-		$total_ttc = $tabprice[2];
-		$total_localtax1= $tabprice[9];
-		$total_localtax2= $tabprice[10];
-
-		$localtax1_type=$localtaxes_type[0];
-		$localtax2_type=$localtaxes_type[2];
-
-		// TODO A virer
-		// Anciens indicateurs: $price, $remise (a ne plus utiliser)
-		$remise = 0;
-		$price = price2num(round($pu, 2));
-		if (dol_strlen($remise_percent) > 0)
-		{
-		    $remise = round(($pu * $remise_percent / 100), 2);
-		    $price = $pu - $remise;
-		}
-
-	    if (empty($pa_ht)) $pa_ht=0;
-
-		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0)
-		{
-			if (($result = $this->defineBuyPrice($pu_ht, $remise_percent)) < 0)
-			{
-				return $result;
-			}
-			else
-			{
-				$pa_ht = $result;
-			}
-		}
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet set description='".$this->db->escape($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)."'";
-		$sql.= ",localtax1_tx='".  price2num($localtax1tx)."'";
-		$sql.= ",localtax2_tx='".  price2num($localtax2tx)."'";
-		$sql.= ",localtax1_type='".$localtax1_type."'";
-		$sql.= ",localtax2_type='".$localtax2_type."'";
-		$sql.= ", total_ht='".     price2num($total_ht)."'";
-		$sql.= ", total_tva='".    price2num($total_tva)."'";
-		$sql.= ", total_localtax1='".price2num($total_localtax1)."'";
-		$sql.= ", total_localtax2='".price2num($total_localtax2)."'";
-		$sql.= ", total_ttc='".      price2num($total_ttc)."'";
-		$sql.= ", fk_product_fournisseur_price=".($fk_fournprice > 0 ? $fk_fournprice : "null");
-		$sql.= ", buy_price_ht='".price2num($pa_ht)."'";
-		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 .= ", fk_unit=".($fk_unit?"'".$this->db->escape($fk_unit)."'":"null");
-		$sql .= " WHERE rowid = ".$rowid;
-
-		dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$result=$this->update_statut($user);
-			if ($result >= 0)
-			{
-
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
-				{
-					$contractline = new ContratLigne($this->db);
-					$contractline->array_options=$array_options;
-					$contractline->id= $rowid;
-					$result=$contractline->insertExtraFields();
-					if ($result < 0)
-					{
-						$this->error[]=$contractline->error;
-						$error++;
-					}
-				}
-
-				if (empty($error)) {
-			        // Call trigger
-			        $result=$this->call_trigger('LINECONTRACT_UPDATE',$user);
-			        if ($result < 0)
-			        {
-			            $this->db->rollback();
-			            return -3;
-			        }
-			        // End call triggers
-
-					$this->db->commit();
-					return 1;
-				}
-			}
-			else
-			{
-				$this->db->rollback();
-				dol_syslog(get_class($this)."::updateline Erreur -2");
-				return -2;
-			}
-		}
-		else
-		{
-			$this->db->rollback();
-			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::updateline Erreur -1");
-			return -1;
-		}
-	}
-
-	/**
-	 *  Delete a contract line
-	 *
-	 *  @param	int		$idline		Id of line to delete
-	 *	@param  User	$user       User that delete
-	 *  @return int         		>0 if OK, <0 if KO
-	 */
-	function deleteline($idline, User $user)
-	{
-		global $conf, $langs;
-
-		$error=0;
-
-		if ($this->statut >= 0)
-		{
-
-		    // Call trigger
-		    $result=$this->call_trigger('LINECONTRACT_DELETE',$user);
-		    if ($result < 0) return -1;
-		    // End call triggers
-
-		    $this->db->begin();
-
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."contratdet";
-			$sql.= " WHERE rowid=".$idline;
-
-			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if (! $resql)
-			{
-				$this->error="Error ".$this->db->lasterror();
-				$error++;
-			}
-
-			if (empty($error)) {
-				// Remove extrafields
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-				{
-					$contractline = new ContratLigne($this->db);
-					$contractline->id= $idline;
-					$result=$contractline->deleteExtraFields();
-					if ($result < 0)
-					{
-						$error++;
-						$this->error="Error ".get_class($this)."::delete deleteExtraFields error -4 ".$contractline->error;
-					}
-				}
-			}
-
-			if (empty($error)) {
-				$this->db->commit();
-				return 1;
-			} else {
-				dol_syslog(get_class($this)."::delete ERROR:".$this->error, LOG_ERR);
-				$this->db->rollback();
-				return -1;
-			}
-		}
-		else
-		{
-			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
-			return -2;
-		}
-	}
+            if (empty($error)) {
+                $this->db->commit();
+                return 1;
+            } else {
+                dol_syslog(get_class($this)."::delete ERROR:".$this->error, LOG_ERR);
+                $this->db->rollback();
+                return -1;
+            }
+        }
+        else
+        {
+            $this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
+            return -2;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Update statut of contract according to services
-	 *
-	 *	@param	User	$user		Object user
-	 *	@return int     			<0 if KO, >0 if OK
-	 *  @deprecated					This function will never be used. Status of a contract is status of its lines.
-	 */
-	function update_statut($user)
-	{
+    /**
+     *  Update statut of contract according to services
+     *
+     *	@param	User	$user		Object user
+     *	@return int     			<0 if KO, >0 if OK
+     *  @deprecated					This function will never be used. Status of a contract is status of its lines.
+     */
+    function update_statut($user)
+    {
         // phpcs:enable
-		dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
+        dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
 
-		// If draft, we keep it (should not happen)
-		if ($this->statut == 0) return 1;
+        // If draft, we keep it (should not happen)
+        if ($this->statut == 0) return 1;
 
-		// Load $this->lines array
-		//		$this->fetch_lines();
+        // Load $this->lines array
+        //		$this->fetch_lines();
 
 //		$newstatut=1;
 //		foreach($this->lines as $key => $contractline)
@@ -1817,113 +1817,113 @@ 
 //			//			if ($contractline)         // Loop on each service
 //		}
 
-		return 1;
-	}
+        return 1;
+    }
 
 
-	/**
-	 *  Return label of a contract status
-	 *
-	 *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Long label of all services, 5=Libelle court + Picto, 6=Picto of all services, 7=Same than 6 with fixed length
-	 *  @return string      		Label
-	 */
-	function getLibStatut($mode)
-	{
-		return $this->LibStatut($this->statut,$mode);
-	}
+    /**
+     *  Return label of a contract status
+     *
+     *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Long label of all services, 5=Libelle court + Picto, 6=Picto of all services, 7=Same than 6 with fixed length
+     *  @return string      		Label
+     */
+    function getLibStatut($mode)
+    {
+        return $this->LibStatut($this->statut,$mode);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Renvoi label of a given contrat status
-	 *
-	 *  @param	int		$statut      	Status id
-	 *  @param  int		$mode          	0=Long label, 1=Short label, 2=Picto + Libelle court, 3=Picto, 4=Picto + Long label of all services, 5=Libelle court + Picto, 6=Picto of all services, 7=Same than 6 with fixed length
-	 *	@return string      			Label
-	 */
-	function LibStatut($statut,$mode)
-	{
+    /**
+     *  Renvoi label of a given contrat status
+     *
+     *  @param	int		$statut      	Status id
+     *  @param  int		$mode          	0=Long label, 1=Short label, 2=Picto + Libelle court, 3=Picto, 4=Picto + Long label of all services, 5=Libelle court + Picto, 6=Picto of all services, 7=Same than 6 with fixed length
+     *	@return string      			Label
+     */
+    function LibStatut($statut,$mode)
+    {
         // phpcs:enable
-		global $langs;
-		$langs->load("contracts");
-		if ($mode == 0)
-		{
-			if ($statut == 0) { return $langs->trans("ContractStatusDraft"); }
-			elseif ($statut == 1) { return $langs->trans("ContractStatusValidated"); }
-			elseif ($statut == 2) { return $langs->trans("ContractStatusClosed"); }
-		}
-		elseif ($mode == 1)
-		{
-			if ($statut == 0) { return $langs->trans("ContractStatusDraft"); }
-			elseif ($statut == 1) { return $langs->trans("ContractStatusValidated"); }
-			elseif ($statut == 2) { return $langs->trans("ContractStatusClosed"); }
-		}
-		elseif ($mode == 2)
-		{
-			if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'),'statut0').' '.$langs->trans("ContractStatusDraft"); }
-			elseif ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4').' '.$langs->trans("ContractStatusValidated"); }
-			elseif ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'),'statut6').' '.$langs->trans("ContractStatusClosed"); }
-		}
-		elseif ($mode == 3)
-		{
-			if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'),'statut0'); }
-			elseif ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4'); }
-			elseif ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'),'statut6'); }
-		}
-		elseif ($mode == 4 || $mode == 6 || $mode == 7)
-		{
-			$text='';
-			if ($mode == 4)
-			{
-				$text ='<span class="hideonsmartphone">';
-				$text.=($this->nbofserviceswait+$this->nbofservicesopened+$this->nbofservicesexpired+$this->nbofservicesclosed);
-				$text.=' '.$langs->trans("Services");
-				$text.=': &nbsp; &nbsp; ';
-				$text.='</span>';
-			}
-			$text.=($mode == 7?'<div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofserviceswait > 0) ? ($this->nbofserviceswait.ContratLigne::LibStatut(0,3,-1,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesopened || $this->nbofservicesexpired || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
-			$text.=($mode == 7?'</div><div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofservicesopened > 0) ? ($this->nbofservicesopened.ContratLigne::LibStatut(4,3,0,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesexpired || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
-			$text.=($mode == 7?'</div><div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofservicesexpired > 0) ? ($this->nbofservicesexpired.ContratLigne::LibStatut(4,3,1,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
-			$text.=($mode == 7?'</div><div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofservicesclosed > 0) ? ($this->nbofservicesclosed.ContratLigne::LibStatut(5,3,-1,'class="paddingleft2 inline-block valigntextbottom"')) : '';
-			$text.=($mode == 7?'</div>':'');
-			return $text;
-		}
-		elseif ($mode == 5)
-		{
-			if ($statut == 0) { return $langs->trans("ContractStatusDraft").' '.img_picto($langs->trans('ContractStatusDraft'),'statut0'); }
-			elseif ($statut == 1) { return $langs->trans("ContractStatusValidated").' '.img_picto($langs->trans('ContractStatusValidated'),'statut4'); }
-			elseif ($statut == 2) { return $langs->trans("ContractStatusClosed").' '.img_picto($langs->trans('ContractStatusClosed'),'statut6'); }
-		}
-	}
-
-
-	/**
-	 *	Return clicable name (with picto eventually)
-	 *
-	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
-	 *	@param	int		$maxlength					Max length of ref
+        global $langs;
+        $langs->load("contracts");
+        if ($mode == 0)
+        {
+            if ($statut == 0) { return $langs->trans("ContractStatusDraft"); }
+            elseif ($statut == 1) { return $langs->trans("ContractStatusValidated"); }
+            elseif ($statut == 2) { return $langs->trans("ContractStatusClosed"); }
+        }
+        elseif ($mode == 1)
+        {
+            if ($statut == 0) { return $langs->trans("ContractStatusDraft"); }
+            elseif ($statut == 1) { return $langs->trans("ContractStatusValidated"); }
+            elseif ($statut == 2) { return $langs->trans("ContractStatusClosed"); }
+        }
+        elseif ($mode == 2)
+        {
+            if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'),'statut0').' '.$langs->trans("ContractStatusDraft"); }
+            elseif ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4').' '.$langs->trans("ContractStatusValidated"); }
+            elseif ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'),'statut6').' '.$langs->trans("ContractStatusClosed"); }
+        }
+        elseif ($mode == 3)
+        {
+            if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'),'statut0'); }
+            elseif ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4'); }
+            elseif ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'),'statut6'); }
+        }
+        elseif ($mode == 4 || $mode == 6 || $mode == 7)
+        {
+            $text='';
+            if ($mode == 4)
+            {
+                $text ='<span class="hideonsmartphone">';
+                $text.=($this->nbofserviceswait+$this->nbofservicesopened+$this->nbofservicesexpired+$this->nbofservicesclosed);
+                $text.=' '.$langs->trans("Services");
+                $text.=': &nbsp; &nbsp; ';
+                $text.='</span>';
+            }
+            $text.=($mode == 7?'<div class="inline-block">':'');
+            $text.=($mode != 7 || $this->nbofserviceswait > 0) ? ($this->nbofserviceswait.ContratLigne::LibStatut(0,3,-1,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesopened || $this->nbofservicesexpired || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
+            $text.=($mode == 7?'</div><div class="inline-block">':'');
+            $text.=($mode != 7 || $this->nbofservicesopened > 0) ? ($this->nbofservicesopened.ContratLigne::LibStatut(4,3,0,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesexpired || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
+            $text.=($mode == 7?'</div><div class="inline-block">':'');
+            $text.=($mode != 7 || $this->nbofservicesexpired > 0) ? ($this->nbofservicesexpired.ContratLigne::LibStatut(4,3,1,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
+            $text.=($mode == 7?'</div><div class="inline-block">':'');
+            $text.=($mode != 7 || $this->nbofservicesclosed > 0) ? ($this->nbofservicesclosed.ContratLigne::LibStatut(5,3,-1,'class="paddingleft2 inline-block valigntextbottom"')) : '';
+            $text.=($mode == 7?'</div>':'');
+            return $text;
+        }
+        elseif ($mode == 5)
+        {
+            if ($statut == 0) { return $langs->trans("ContractStatusDraft").' '.img_picto($langs->trans('ContractStatusDraft'),'statut0'); }
+            elseif ($statut == 1) { return $langs->trans("ContractStatusValidated").' '.img_picto($langs->trans('ContractStatusValidated'),'statut4'); }
+            elseif ($statut == 2) { return $langs->trans("ContractStatusClosed").' '.img_picto($langs->trans('ContractStatusClosed'),'statut6'); }
+        }
+    }
+
+
+    /**
+     *	Return clicable name (with picto eventually)
+     *
+     *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
+     *	@param	int		$maxlength					Max length of ref
      *  @param	int     $notooltip					1=Disable tooltip
      *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-	 *	@return	string								Chaine avec URL
-	 */
-	function getNomUrl($withpicto=0, $maxlength=0, $notooltip=0, $save_lastsearch_value=-1)
-	{
-		global $conf, $langs, $user;
+     *	@return	string								Chaine avec URL
+     */
+    function getNomUrl($withpicto=0, $maxlength=0, $notooltip=0, $save_lastsearch_value=-1)
+    {
+        global $conf, $langs, $user;
 
-		$result='';
+        $result='';
 
-		$url = DOL_URL_ROOT.'/contrat/card.php?id='.$this->id;
+        $url = DOL_URL_ROOT.'/contrat/card.php?id='.$this->id;
 
-		//if ($option !== 'nolink')
-		//{
-			// Add param to save lastsearch_values or not
-			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
-		//}
+        //if ($option !== 'nolink')
+        //{
+            // Add param to save lastsearch_values or not
+            $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+            if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+            if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        //}
 
         $label = '';
 
@@ -1951,501 +1951,501 @@ 
                 $label=$langs->trans("ShowOrder");
                 $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip"';
+            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose.=' class="classfortooltip"';
+        }
+
+        $linkstart = '<a href="'.$url.'"';
+        $linkstart.=$linkclose.'>';
+        $linkend='</a>';
+
+        $result .= $linkstart;
+        if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+        if ($withpicto != 2) $result.= $this->ref;
+        $result .= $linkend;
+
+        return $result;
+    }
+
+    /**
+     *  Charge les informations d'ordre info dans l'objet contrat
+     *
+     *  @param  int		$id     id du contrat a charger
+     *  @return	void
+     */
+    function info($id)
+    {
+        $sql = "SELECT c.rowid, c.ref, c.datec, c.date_cloture,";
+        $sql.= " 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);
+
+                $this->id = $obj->rowid;
+
+                if ($obj->fk_user_author) {
+                    $cuser = new User($this->db);
+                    $cuser->fetch($obj->fk_user_author);
+                    $this->user_creation     = $cuser;
+                }
+
+                if ($obj->fk_user_cloture) {
+                    $cuser = new User($this->db);
+                    $cuser->fetch($obj->fk_user_cloture);
+                    $this->user_cloture = $cuser;
+                }
+                $this->ref			     = (! $obj->ref) ? $obj->rowid : $obj->ref;
+                $this->date_creation     = $this->db->jdate($obj->datec);
+                $this->date_modification = $this->db->jdate($obj->date_modification);
+                $this->date_cloture      = $this->db->jdate($obj->date_cloture);
+            }
+
+            $this->db->free($result);
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Return list of line rowid
+     *
+     *  @param	int		$statut     Status of lines to get
+     *  @return array       		Array of line's rowid
+     */
+    function array_detail($statut=-1)
+    {
+        // phpcs:enable
+        $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'";
+
+        dol_syslog(get_class($this)."::array_detail()", 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;
+        }
+    }
+
+    /**
+     *  Return list of other contracts for same company than current contract
+     *
+     *	@param	string		$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;
+
+        dol_syslog(get_class($this)."::getOtherContracts()", 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;
+        }
+    }
+
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+     *
+     *      @param	User	$user           Objet user
+     *      @param  string	$mode           "inactive" pour services a activer, "expired" pour services expires
+     *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+     */
+    function load_board($user,$mode)
+    {
+        // phpcs:enable
+        global $conf, $langs;
+
+        $this->from = " FROM ".MAIN_DB_PREFIX."contrat as c";
+        $this->from.= ", ".MAIN_DB_PREFIX."contratdet as cd";
+        $this->from.= ", ".MAIN_DB_PREFIX."societe as s";
+        if (!$user->rights->societe->client->voir && !$user->societe_id) $this->from.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+
+        if ($mode == 'inactives')
+        {
+            $sql = "SELECT cd.rowid, cd.date_ouverture_prevue as datefin";
+            $sql.= $this->from;
+            $sql.= " WHERE c.statut = 1";
+            $sql.= " AND c.rowid = cd.fk_contrat";
+            $sql.= " AND cd.statut = 0";
+        }
+        elseif ($mode == 'expired')
+        {
+            $sql = "SELECT cd.rowid, cd.date_fin_validite as datefin";
+            $sql.= $this->from;
+            $sql.= " WHERE c.statut = 1";
+            $sql.= " AND c.rowid = cd.fk_contrat";
+            $sql.= " AND cd.statut = 4";
+            $sql.= " AND cd.date_fin_validite < '".$this->db->idate(time())."'";
+        }
+        $sql.= " AND c.fk_soc = s.rowid";
+        $sql.= " AND c.entity = ".$conf->entity;
+        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)
+        {
+            $langs->load("contracts");
+            $now=dol_now();
+
+            if ($mode == 'inactives') {
+                $warning_delay = $conf->contrat->services->inactifs->warning_delay;
+                $label = $langs->trans("BoardNotActivatedServices");
+                $url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=0';
+            } else {
+                $warning_delay = $conf->contrat->services->expires->warning_delay;
+                $url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=4&amp;filter=expired';
+                $label = $langs->trans("BoardRunningServices");
+            }
+
+            $response = new WorkboardResponse();
+            $response->warning_delay = $warning_delay/60/60/24;
+            $response->label = $label;
+            $response->url = $url;
+            $response->img = img_object('',"contract");
+
+            while ($obj=$this->db->fetch_object($resql))
+            {
+                $response->nbtodo++;
+
+                if ($obj->datefin && $this->db->jdate($obj->datefin) < ($now - $warning_delay)) {
+                    $response->nbtodolate++;
+                }
+            }
+
+            return $response;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            $this->error=$this->db->error();
+            return -1;
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *   Charge indicateurs this->nb de tableau de bord
+     *
+     *   @return     int         <0 si ko, >0 si ok
+     */
+    function load_state_board()
+    {
+        // phpcs:enable
+        global $conf, $user;
+
+        $this->nb=array();
+        $clause = "WHERE";
+
+        $sql = "SELECT count(c.rowid) as nb";
+        $sql.= " FROM ".MAIN_DB_PREFIX."contrat as c";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
+        if (!$user->rights->societe->client->voir && !$user->societe_id)
+        {
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+            $sql.= " WHERE sc.fk_user = " .$user->id;
+            $clause = "AND";
+        }
+        $sql.= " ".$clause." c.entity = ".$conf->entity;
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            while ($obj=$this->db->fetch_object($resql))
+            {
+                $this->nb["Contracts"]=$obj->nb;
+            }
+            $this->db->free($resql);
+            return 1;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            $this->error=$this->db->error();
+            return -1;
+        }
+    }
+
+
+    /* gestion des contacts d'un contrat */
+
+    /**
+     *  Return id des contacts clients de facturation
+     *
+     *  @return     array       Liste des id contacts facturation
+     */
+    function getIdBillingContact()
+    {
+        return $this->getIdContact('external','BILLING');
+    }
+
+    /**
+     *  Return id des contacts clients de prestation
+     *
+     *  @return     array       Liste des id contacts prestation
+     */
+    function getIdServiceContact()
+    {
+        return $this->getIdContact('external','SERVICE');
+    }
+
+
+    /**
+     *  Initialise an instance with random values.
+     *  Used to build previews or test instances.
+     *	id must be 0 if object instance is a specimen.
+     *
+     *  @return	void
+     */
+    function initAsSpecimen()
+    {
+        global $user,$langs,$conf;
+
+        // Load array of products prodids
+        $num_prods = 0;
+        $prodids = array();
+        $sql = "SELECT rowid";
+        $sql.= " FROM ".MAIN_DB_PREFIX."product";
+        $sql.= " WHERE entity IN (".getEntity('product').")";
+        $sql.= " AND tosell = 1";
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num_prods = $this->db->num_rows($resql);
+            $i = 0;
+            while ($i < $num_prods)
+            {
+                $i++;
+                $row = $this->db->fetch_row($resql);
+                $prodids[$i] = $row[0];
+            }
+        }
+
+        // Initialise parametres
+        $this->id=0;
+        $this->specimen=1;
+
+        $this->ref = 'SPECIMEN';
+        $this->ref_customer = 'SPECIMENCUST';
+        $this->ref_supplier = 'SPECIMENSUPP';
+        $this->socid = 1;
+        $this->statut= 0;
+        $this->date_creation = (dol_now() - 3600 * 24 * 7);
+        $this->date_contrat = dol_now();
+        $this->commercial_signature_id = 1;
+        $this->commercial_suivi_id = 1;
+        $this->note_private='This is a comment (private)';
+        $this->note_public='This is a comment (public)';
+        $this->fk_projet = 0;
+        // Lines
+        $nbp = 5;
+        $xnbp = 0;
+        while ($xnbp < $nbp)
+        {
+            $line=new ContratLigne($this->db);
+            $line->qty=1;
+            $line->subprice=100;
+            $line->price=100;
+            $line->tva_tx=19.6;
+            $line->remise_percent=10;
+            $line->total_ht=90;
+            $line->total_ttc=107.64;	// 90 * 1.196
+            $line->total_tva=17.64;
+            $line->date_start = dol_now() - 500000;
+            $line->date_start_real = dol_now() - 200000;
+            $line->date_end = dol_now() + 500000;
+            $line->date_end_real = dol_now() - 100000;
+            if ($num_prods > 0)
+            {
+                $prodid = mt_rand(1, $num_prods);
+                $line->fk_product=$prodids[$prodid];
+            }
+            $this->lines[$xnbp]=$line;
+            $xnbp++;
+        }
+    }
+
+    /**
+     * 	Create an array of order lines
+     *
+     * 	@return int		>0 if OK, <0 if KO
+     */
+    function getLinesArray()
+    {
+        return $this->fetch_lines();
+    }
+
+
+    /**
+     *  Create a document onto disk according to template module.
+     *
+     * 	@param	    string		$modele			Force model to use ('' to not force)
+     * 	@param		Translate	$outputlangs	Object langs to use for output
+     *  @param      int			$hidedetails    Hide details of lines
+     *  @param      int			$hidedesc       Hide description
+     *  @param      int			$hideref        Hide ref
+     *  @param   null|array  $moreparams     Array to provide more information
+     * 	@return     int         				0 if KO, 1 if OK
+     */
+    public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null)
+    {
+        global $conf,$langs;
+
+        $langs->load("contracts");
+
+        if (! dol_strlen($modele)) {
+
+            $modele = 'strato';
+
+            if ($this->modelpdf) {
+                $modele = $this->modelpdf;
+            } elseif (! empty($conf->global->CONTRACT_ADDON_PDF)) {
+                $modele = $conf->global->CONTRACT_ADDON_PDF;
+            }
         }
 
-		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
-
-		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
-		$result .= $linkend;
-
-		return $result;
-	}
-
-	/**
-	 *  Charge les informations d'ordre info dans l'objet contrat
-	 *
-	 *  @param  int		$id     id du contrat a charger
-	 *  @return	void
-	 */
-	function info($id)
-	{
-		$sql = "SELECT c.rowid, c.ref, c.datec, c.date_cloture,";
-		$sql.= " 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);
-
-				$this->id = $obj->rowid;
-
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation     = $cuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cuser;
-				}
-				$this->ref			     = (! $obj->ref) ? $obj->rowid : $obj->ref;
-				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->date_modification);
-				$this->date_cloture      = $this->db->jdate($obj->date_cloture);
-			}
-
-			$this->db->free($result);
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-	}
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return list of line rowid
-	 *
-	 *  @param	int		$statut     Status of lines to get
-	 *  @return array       		Array of line's rowid
-	 */
-	function array_detail($statut=-1)
-	{
-        // phpcs:enable
-		$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'";
-
-		dol_syslog(get_class($this)."::array_detail()", 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;
-		}
-	}
-
-	/**
-	 *  Return list of other contracts for same company than current contract
-	 *
-	 *	@param	string		$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;
-
-		dol_syslog(get_class($this)."::getOtherContracts()", 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;
-		}
-	}
+        $modelpath = "core/modules/contract/doc/";
 
+        return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+    }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-     *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+    /**
+     * Function used to replace a thirdparty id with another one.
      *
-     *      @param	User	$user           Objet user
-     *      @param  string	$mode           "inactive" pour services a activer, "expired" pour services expires
-     *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
-	 */
-	function load_board($user,$mode)
-	{
-        // phpcs:enable
-		global $conf, $langs;
-
-		$this->from = " FROM ".MAIN_DB_PREFIX."contrat as c";
-		$this->from.= ", ".MAIN_DB_PREFIX."contratdet as cd";
-		$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$user->societe_id) $this->from.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-
-		if ($mode == 'inactives')
-		{
-			$sql = "SELECT cd.rowid, cd.date_ouverture_prevue as datefin";
-			$sql.= $this->from;
-			$sql.= " WHERE c.statut = 1";
-			$sql.= " AND c.rowid = cd.fk_contrat";
-			$sql.= " AND cd.statut = 0";
-		}
-		elseif ($mode == 'expired')
-		{
-			$sql = "SELECT cd.rowid, cd.date_fin_validite as datefin";
-			$sql.= $this->from;
-			$sql.= " WHERE c.statut = 1";
-			$sql.= " AND c.rowid = cd.fk_contrat";
-			$sql.= " AND cd.statut = 4";
-			$sql.= " AND cd.date_fin_validite < '".$this->db->idate(time())."'";
-		}
-		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity = ".$conf->entity;
-		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)
-		{
-			$langs->load("contracts");
-			$now=dol_now();
-
-			if ($mode == 'inactives') {
-				$warning_delay = $conf->contrat->services->inactifs->warning_delay;
-				$label = $langs->trans("BoardNotActivatedServices");
-				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=0';
-			} else {
-				$warning_delay = $conf->contrat->services->expires->warning_delay;
-				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=4&amp;filter=expired';
-				$label = $langs->trans("BoardRunningServices");
-			}
-
-			$response = new WorkboardResponse();
-			$response->warning_delay = $warning_delay/60/60/24;
-			$response->label = $label;
-			$response->url = $url;
-			$response->img = img_object('',"contract");
-
-			while ($obj=$this->db->fetch_object($resql))
-			{
-				$response->nbtodo++;
-
-				if ($obj->datefin && $this->db->jdate($obj->datefin) < ($now - $warning_delay)) {
-					$response->nbtodolate++;
-				}
-			}
-
-			return $response;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			$this->error=$this->db->error();
-			return -1;
-		}
-	}
+     * @param DoliDB $db Database handler
+     * @param int $origin_id Old thirdparty id
+     * @param int $dest_id New thirdparty id
+     * @return bool
+     */
+    public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+    {
+        $tables = array(
+            'contrat'
+        );
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *   Charge indicateurs this->nb de tableau de bord
-	 *
-	 *   @return     int         <0 si ko, >0 si ok
-	 */
-	function load_state_board()
-	{
-        // phpcs:enable
-		global $conf, $user;
-
-		$this->nb=array();
-		$clause = "WHERE";
-
-		$sql = "SELECT count(c.rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$user->societe_id)
-		{
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-			$sql.= " WHERE sc.fk_user = " .$user->id;
-			$clause = "AND";
-		}
-		$sql.= " ".$clause." c.entity = ".$conf->entity;
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj=$this->db->fetch_object($resql))
-			{
-				$this->nb["Contracts"]=$obj->nb;
-			}
-            $this->db->free($resql);
-			return 1;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			$this->error=$this->db->error();
-			return -1;
-		}
-	}
-
-
-	/* gestion des contacts d'un contrat */
-
-	/**
-	 *  Return id des contacts clients de facturation
-	 *
-	 *  @return     array       Liste des id contacts facturation
-	 */
-	function getIdBillingContact()
-	{
-		return $this->getIdContact('external','BILLING');
-	}
-
-	/**
-	 *  Return id des contacts clients de prestation
-	 *
-	 *  @return     array       Liste des id contacts prestation
-	 */
-	function getIdServiceContact()
-	{
-		return $this->getIdContact('external','SERVICE');
-	}
-
-
-	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-	 */
-	function initAsSpecimen()
-	{
-		global $user,$langs,$conf;
+        return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+    }
 
-        // Load array of products prodids
-		$num_prods = 0;
-		$prodids = array();
-		$sql = "SELECT rowid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product').")";
-		$sql.= " AND tosell = 1";
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num_prods = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num_prods)
-			{
-				$i++;
-				$row = $this->db->fetch_row($resql);
-				$prodids[$i] = $row[0];
-			}
-		}
-
-		// Initialise parametres
-		$this->id=0;
-		$this->specimen=1;
-
-		$this->ref = 'SPECIMEN';
-		$this->ref_customer = 'SPECIMENCUST';
-		$this->ref_supplier = 'SPECIMENSUPP';
-		$this->socid = 1;
-		$this->statut= 0;
-		$this->date_creation = (dol_now() - 3600 * 24 * 7);
-		$this->date_contrat = dol_now();
-		$this->commercial_signature_id = 1;
-		$this->commercial_suivi_id = 1;
-		$this->note_private='This is a comment (private)';
-		$this->note_public='This is a comment (public)';
-		$this->fk_projet = 0;
-		// Lines
-		$nbp = 5;
-		$xnbp = 0;
-		while ($xnbp < $nbp)
-		{
-			$line=new ContratLigne($this->db);
-			$line->qty=1;
-			$line->subprice=100;
-			$line->price=100;
-			$line->tva_tx=19.6;
-			$line->remise_percent=10;
-			$line->total_ht=90;
-			$line->total_ttc=107.64;	// 90 * 1.196
-			$line->total_tva=17.64;
-			$line->date_start = dol_now() - 500000;
-			$line->date_start_real = dol_now() - 200000;
-			$line->date_end = dol_now() + 500000;
-			$line->date_end_real = dol_now() - 100000;
-			if ($num_prods > 0)
-            {
-				$prodid = mt_rand(1, $num_prods);
-				$line->fk_product=$prodids[$prodid];
-            }
-			$this->lines[$xnbp]=$line;
-			$xnbp++;
-		}
-	}
-
-	/**
-	 * 	Create an array of order lines
-	 *
-	 * 	@return int		>0 if OK, <0 if KO
-	 */
-	function getLinesArray()
-	{
-		return $this->fetch_lines();
-	}
-
-
-	/**
-	 *  Create a document onto disk according to template module.
-	 *
-	 * 	@param	    string		$modele			Force model to use ('' to not force)
-	 * 	@param		Translate	$outputlangs	Object langs to use for output
-	 *  @param      int			$hidedetails    Hide details of lines
-	 *  @param      int			$hidedesc       Hide description
-	 *  @param      int			$hideref        Hide ref
-         *  @param   null|array  $moreparams     Array to provide more information
-	 * 	@return     int         				0 if KO, 1 if OK
-	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null)
-	{
-		global $conf,$langs;
-
-		$langs->load("contracts");
-
-		if (! dol_strlen($modele)) {
-
-			$modele = 'strato';
-
-			if ($this->modelpdf) {
-				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->CONTRACT_ADDON_PDF)) {
-				$modele = $conf->global->CONTRACT_ADDON_PDF;
-			}
-		}
-
-		$modelpath = "core/modules/contract/doc/";
-
-		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-	}
-
-	/**
-	 * Function used to replace a thirdparty id with another one.
-	 *
-	 * @param DoliDB $db Database handler
-	 * @param int $origin_id Old thirdparty id
-	 * @param int $dest_id New thirdparty id
-	 * @return bool
-	 */
-	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
-	{
-		$tables = array(
-			'contrat'
-		);
-
-		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
-	}
-
-	/**
-	 * Load an object from its id and create a new one in database
-	 *
-	 * @param int $socid Id of thirdparty
-	 * @param int $notrigger	1=Does not execute triggers, 0= execute triggers
-	 * @return int New id of clone
-	 */
+    /**
+     * Load an object from its id and create a new one in database
+     *
+     * @param int $socid Id of thirdparty
+     * @param int $notrigger	1=Does not execute triggers, 0= execute triggers
+     * @return int New id of clone
+     */
     function createFromClone($socid = 0, $notrigger=0)
     {
-		global $db, $user, $langs, $conf, $hookmanager, $extrafields;
+        global $db, $user, $langs, $conf, $hookmanager, $extrafields;
 
-		dol_include_once('/projet/class/project.class.php');
+        dol_include_once('/projet/class/project.class.php');
 
-		$this->context['createfromclone'] = 'createfromclone';
+        $this->context['createfromclone'] = 'createfromclone';
 
-		$error = 0;
+        $error = 0;
 
-		$this->fetch($this->id);
+        $this->fetch($this->id);
 
-		// Load dest object
-		$clonedObj = clone $this;
+        // Load dest object
+        $clonedObj = clone $this;
         $clonedObj->socid = $socid;
 
-		$this->db->begin();
-
-		$objsoc = new Societe($this->db);
-
-		$objsoc->fetch($clonedObj->socid);
-
-		// Clean data
-		$clonedObj->statut = 0;
-		// Clean extrafields
-		if (is_array($clonedObj->array_options) && count($clonedObj->array_options) > 0)
-		{
-			$extrafields->fetch_name_optionals_label($this->element);
-			foreach($clonedObj->array_options as $key => $option)
-			{
-				$shortkey = preg_replace('/options_/', '', $key);
-				//var_dump($shortkey); var_dump($extrafields->attributes[$this->element]['unique'][$shortkey]);
-				if (! empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
-				{
-					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
-					unset($clonedObj->array_options[$key]);
-				}
-			}
-		}
-
-		if (empty($conf->global->CONTRACT_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT . "/core/modules/contract/" . $conf->global->CONTRACT_ADDON . ".php")) {
-			$this->error = 'ErrorSetupNotComplete';
-			dol_syslog($this->error);
-			return - 1;
-		}
-
-		// Set ref
-		require_once DOL_DOCUMENT_ROOT . "/core/modules/contract/" . $conf->global->CONTRACT_ADDON . '.php';
-		$obj = $conf->global->CONTRACT_ADDON;
-		$modContract = new $obj();
-		$clonedObj->ref = $modContract->getNextValue($objsoc, $clonedObj);
-
-		// get extrafields so they will be clone
-		foreach ($this->lines as $line) {
-			$line->fetch_optionals($line->id);
-		}
-
-		// Create clone
-		$result = $clonedObj->create($user);
-		if ($result < 0) {
-			$error ++;
-			$this->error = $clonedObj->error;
-			$this->errors[] = $clonedObj->error;
-		} else {
+        $this->db->begin();
+
+        $objsoc = new Societe($this->db);
+
+        $objsoc->fetch($clonedObj->socid);
+
+        // Clean data
+        $clonedObj->statut = 0;
+        // Clean extrafields
+        if (is_array($clonedObj->array_options) && count($clonedObj->array_options) > 0)
+        {
+            $extrafields->fetch_name_optionals_label($this->element);
+            foreach($clonedObj->array_options as $key => $option)
+            {
+                $shortkey = preg_replace('/options_/', '', $key);
+                //var_dump($shortkey); var_dump($extrafields->attributes[$this->element]['unique'][$shortkey]);
+                if (! empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
+                {
+                    //var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+                    unset($clonedObj->array_options[$key]);
+                }
+            }
+        }
+
+        if (empty($conf->global->CONTRACT_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT . "/core/modules/contract/" . $conf->global->CONTRACT_ADDON . ".php")) {
+            $this->error = 'ErrorSetupNotComplete';
+            dol_syslog($this->error);
+            return - 1;
+        }
+
+        // Set ref
+        require_once DOL_DOCUMENT_ROOT . "/core/modules/contract/" . $conf->global->CONTRACT_ADDON . '.php';
+        $obj = $conf->global->CONTRACT_ADDON;
+        $modContract = new $obj();
+        $clonedObj->ref = $modContract->getNextValue($objsoc, $clonedObj);
+
+        // get extrafields so they will be clone
+        foreach ($this->lines as $line) {
+            $line->fetch_optionals($line->id);
+        }
+
+        // Create clone
+        $result = $clonedObj->create($user);
+        if ($result < 0) {
+            $error ++;
+            $this->error = $clonedObj->error;
+            $this->errors[] = $clonedObj->error;
+        } else {
             // copy external contacts if same company
             if ($this->socid == $clonedObj->socid) {
                 if ($clonedObj->copy_linked_contact($this, 'external') < 0) {
@@ -2454,42 +2454,42 @@ 
             }
         }
 
-		if (! $error) {
-			foreach ( $this->lines as $line ) {
-				$result = $clonedObj->addline($line->desc, $line->subprice, $line->qty, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, $line->date_ouverture, $line->date_cloture, 'HT', 0, $line->info_bits, $line->fk_fournprice, $line->pa_ht, $line->array_options, $line->fk_unit);
-				if ($result < 0) {
-					$error ++;
-					$this->error = $clonedObj->error;
-					$this->errors[] = $clonedObj->error;
-				}
-			}
-		}
-
-		if (! $error) {
-			// Hook of thirdparty module
-			if (is_object($hookmanager)) {
-				$parameters = array (
-						'objFrom' => $this,
-						'clonedObj' => $clonedObj
-				);
-				$action = '';
-				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $clonedObj, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-					$error ++;
-			}
-		}
-
-		unset($this->context['createfromclone']);
-
-		// End
-		if (! $error) {
-			$this->db->commit();
-			return $clonedObj->id;
-		} else {
-			$this->db->rollback();
-			return - 1;
-		}
-	}
+        if (! $error) {
+            foreach ( $this->lines as $line ) {
+                $result = $clonedObj->addline($line->desc, $line->subprice, $line->qty, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, $line->date_ouverture, $line->date_cloture, 'HT', 0, $line->info_bits, $line->fk_fournprice, $line->pa_ht, $line->array_options, $line->fk_unit);
+                if ($result < 0) {
+                    $error ++;
+                    $this->error = $clonedObj->error;
+                    $this->errors[] = $clonedObj->error;
+                }
+            }
+        }
+
+        if (! $error) {
+            // Hook of thirdparty module
+            if (is_object($hookmanager)) {
+                $parameters = array (
+                        'objFrom' => $this,
+                        'clonedObj' => $clonedObj
+                );
+                $action = '';
+                $reshook = $hookmanager->executeHooks('createFrom', $parameters, $clonedObj, $action); // Note that $action and $object may have been modified by some hooks
+                if ($reshook < 0)
+                    $error ++;
+            }
+        }
+
+        unset($this->context['createfromclone']);
+
+        // End
+        if (! $error) {
+            $this->db->commit();
+            return $clonedObj->id;
+        } else {
+            $this->db->rollback();
+            return - 1;
+        }
+    }
 }
 
 
@@ -2499,808 +2499,808 @@ 
 class ContratLigne extends CommonObjectLine
 {
     /**
-	 * @var string ID to identify managed object
-	 */
-	public $element='contratdet';
+     * @var string ID to identify managed object
+     */
+    public $element='contratdet';
 
     /**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element='contratdet';
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element='contratdet';
 
-	/**
-	 * @var int ID
-	 */
-	public $id;
+    /**
+     * @var int ID
+     */
+    public $id;
 
-	/**
-	 * @var string Ref
-	 */
-	public $ref;
+    /**
+     * @var string Ref
+     */
+    public $ref;
 
-	public $tms;
+    public $tms;
 
-	/**
+    /**
      * @var int ID
      */
-	public $fk_contrat;
+    public $fk_contrat;
 
-	/**
+    /**
      * @var int ID
      */
-	public $fk_product;
-
-	public $statut;					// 0 inactive, 4 active, 5 closed
-	public $type;						// 0 for product, 1 for service
-
-	/**
-	 * @var string
-	 * @deprecated
-	 */
-	public $label;
-
-	/**
-	 * @var string
-	 * @deprecated
-	 */
-	public $libelle;
-
-	/**
-	 * @var string description
-	 */
-	public $description;
-
-	public $product_ref;
-	public $product_label;
-
-	public $date_commande;
-
-	public $date_start;				// date start planned
-	public $date_start_real;			// date start real
-	public $date_end;					// date end planned
-	public $date_end_real;				// date end real
-	// For backward compatibility
-	public $date_ouverture_prevue;		// date start planned
-	public $date_ouverture;			// date start real
-	public $date_fin_validite;			// date end planned
-	public $date_cloture;				// date end real
-	public $tva_tx;
-	public $localtax1_tx;
-	public $localtax2_tx;
-	public $localtax1_type;	// Local tax 1 type
-	public $localtax2_type;	// Local tax 2 type
-	public $qty;
-	public $remise_percent;
-	public $remise;
-
-	/**
+    public $fk_product;
+
+    public $statut;					// 0 inactive, 4 active, 5 closed
+    public $type;						// 0 for product, 1 for service
+
+    /**
+     * @var string
+     * @deprecated
+     */
+    public $label;
+
+    /**
+     * @var string
+     * @deprecated
+     */
+    public $libelle;
+
+    /**
+     * @var string description
+     */
+    public $description;
+
+    public $product_ref;
+    public $product_label;
+
+    public $date_commande;
+
+    public $date_start;				// date start planned
+    public $date_start_real;			// date start real
+    public $date_end;					// date end planned
+    public $date_end_real;				// date end real
+    // For backward compatibility
+    public $date_ouverture_prevue;		// date start planned
+    public $date_ouverture;			// date start real
+    public $date_fin_validite;			// date end planned
+    public $date_cloture;				// date end real
+    public $tva_tx;
+    public $localtax1_tx;
+    public $localtax2_tx;
+    public $localtax1_type;	// Local tax 1 type
+    public $localtax2_type;	// Local tax 2 type
+    public $qty;
+    public $remise_percent;
+    public $remise;
+
+    /**
      * @var int ID
      */
-	public $fk_remise_except;
+    public $fk_remise_except;
 
-	public $subprice;					// Unit price HT
+    public $subprice;					// Unit price HT
 
-	/**
-	 * @var float
-	 * @deprecated Use $price_ht instead
-	 * @see $price_ht
-	 */
-	public $price;
+    /**
+     * @var float
+     * @deprecated Use $price_ht instead
+     * @see $price_ht
+     */
+    public $price;
 
-	public $price_ht;
+    public $price_ht;
 
-	public $total_ht;
-	public $total_tva;
-	public $total_localtax1;
-	public $total_localtax2;
-	public $total_ttc;
+    public $total_ht;
+    public $total_tva;
+    public $total_localtax1;
+    public $total_localtax2;
+    public $total_ttc;
 
-	/**
+    /**
      * @var int ID
      */
-	public $fk_fournprice;
+    public $fk_fournprice;
 
-	public $pa_ht;
+    public $pa_ht;
 
-	public $info_bits;
+    public $info_bits;
 
-	/**
+    /**
      * @var int ID
      */
-	public $fk_user_author;
+    public $fk_user_author;
 
-	/**
+    /**
      * @var int ID
      */
-	public $fk_user_ouverture;
+    public $fk_user_ouverture;
 
-	/**
+    /**
      * @var int ID
      */
-	public $fk_user_cloture;
+    public $fk_user_cloture;
 
-	public $commentaire;
+    public $commentaire;
 
-	const STATUS_INITIAL = 0;
-	const STATUS_OPEN = 4;
-	const STATUS_CLOSED = 5;
+    const STATUS_INITIAL = 0;
+    const STATUS_OPEN = 4;
+    const STATUS_CLOSED = 5;
 
 
 
-	/**
+    /**
      *  Constructor
      *
      *  @param      DoliDb		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-
-	/**
-	 *  Return label of this contract line status
-	 *
-	 *	@param	int		$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 $this->LibStatut($this->statut,$mode,((! empty($this->date_fin_validite))?($this->date_fin_validite < dol_now()?1:0):-1));
-	}
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+
+    /**
+     *  Return label of this contract line status
+     *
+     *	@param	int		$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 $this->LibStatut($this->statut,$mode,((! empty($this->date_fin_validite))?($this->date_fin_validite < dol_now()?1:0):-1));
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return label of a contract line status
-	 *
-	 *  @param	int		$statut     Id statut
-	 *	@param  int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *	@param	int		$expired	0=Not expired, 1=Expired, -1=Both or unknown
-	 *  @param	string	$moreatt	More attribute
-	 *  @return string      		Libelle
-	 */
-	static function LibStatut($statut,$mode,$expired=-1,$moreatt='')
-	{
+    /**
+     *  Return label of a contract line status
+     *
+     *  @param	int		$statut     Id statut
+     *	@param  int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+     *	@param	int		$expired	0=Not expired, 1=Expired, -1=Both or unknown
+     *  @param	string	$moreatt	More attribute
+     *  @return string      		Libelle
+     */
+    static function LibStatut($statut,$mode,$expired=-1,$moreatt='')
+    {
         // phpcs:enable
-		global $langs;
-		$langs->load("contracts");
-		if ($mode == 0)
-		{
-			if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return $langs->trans("ServiceStatusNotLate"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return $langs->trans("ServiceStatusLate"); }
-			elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed");  }
-		}
-		elseif ($mode == 1)
-		{
-			if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return $langs->trans("ServiceStatusNotLateShort"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return $langs->trans("ServiceStatusLateShort"); }
-			elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed");  }
-		}
-		elseif ($mode == 2)
-		{
-			if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0').' '.$langs->trans("ServiceStatusInitial"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4').' '.$langs->trans("ServiceStatusRunning"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return img_picto($langs->trans('ServiceStatusNotLate'),'statut4').' '.$langs->trans("ServiceStatusNotLateShort"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return img_picto($langs->trans('ServiceStatusLate'),'statut3').' '.$langs->trans("ServiceStatusLateShort"); }
-			elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6') .' '.$langs->trans("ServiceStatusClosed"); }
-		}
-		elseif ($mode == 3)
-		{
-			if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0',$moreatt); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4',$moreatt); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return img_picto($langs->trans('ServiceStatusNotLate'),'statut4',$moreatt); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return img_picto($langs->trans('ServiceStatusLate'),'statut3',$moreatt); }
-			elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6',$moreatt); }
-		}
-		elseif ($mode == 4)
-		{
-			if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0').' '.$langs->trans("ServiceStatusInitial"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4').' '.$langs->trans("ServiceStatusRunning"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return img_picto($langs->trans('ServiceStatusNotLate'),'statut4').' '.$langs->trans("ServiceStatusNotLate"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return img_picto($langs->trans('ServiceStatusLate'),'statut3').' '.$langs->trans("ServiceStatusLate"); }
-			elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6') .' '.$langs->trans("ServiceStatusClosed"); }
-		}
-		elseif ($mode == 5)
-		{
-			if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial").' '.img_picto($langs->trans('ServiceStatusInitial'),'statut0'); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning").' '.img_picto($langs->trans('ServiceStatusRunning'),'statut4'); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return $langs->trans("ServiceStatusNotLateShort").' '.img_picto($langs->trans('ServiceStatusNotLateShort'),'statut4'); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return $langs->trans("ServiceStatusLateShort").' '.img_picto($langs->trans('ServiceStatusLate'),'statut3'); }
-			elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed").' '.img_picto($langs->trans('ServiceStatusClosed'),'statut6'); }
-		}
-	}
-
-	/**
-	 *	Return clicable name (with picto eventually)
-	 *
-	 *  @param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-	 *  @param	int		$maxlength		Max length
-	 *  @return	string					Chaine avec URL
- 	 */
-	function getNomUrl($withpicto=0,$maxlength=0)
-	{
-		global $langs;
-
-		$result='';
+        global $langs;
+        $langs->load("contracts");
+        if ($mode == 0)
+        {
+            if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial"); }
+            elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning"); }
+            elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return $langs->trans("ServiceStatusNotLate"); }
+            elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return $langs->trans("ServiceStatusLate"); }
+            elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed");  }
+        }
+        elseif ($mode == 1)
+        {
+            if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial"); }
+            elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning"); }
+            elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return $langs->trans("ServiceStatusNotLateShort"); }
+            elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return $langs->trans("ServiceStatusLateShort"); }
+            elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed");  }
+        }
+        elseif ($mode == 2)
+        {
+            if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0').' '.$langs->trans("ServiceStatusInitial"); }
+            elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4').' '.$langs->trans("ServiceStatusRunning"); }
+            elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return img_picto($langs->trans('ServiceStatusNotLate'),'statut4').' '.$langs->trans("ServiceStatusNotLateShort"); }
+            elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return img_picto($langs->trans('ServiceStatusLate'),'statut3').' '.$langs->trans("ServiceStatusLateShort"); }
+            elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6') .' '.$langs->trans("ServiceStatusClosed"); }
+        }
+        elseif ($mode == 3)
+        {
+            if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0',$moreatt); }
+            elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4',$moreatt); }
+            elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return img_picto($langs->trans('ServiceStatusNotLate'),'statut4',$moreatt); }
+            elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return img_picto($langs->trans('ServiceStatusLate'),'statut3',$moreatt); }
+            elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6',$moreatt); }
+        }
+        elseif ($mode == 4)
+        {
+            if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0').' '.$langs->trans("ServiceStatusInitial"); }
+            elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4').' '.$langs->trans("ServiceStatusRunning"); }
+            elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return img_picto($langs->trans('ServiceStatusNotLate'),'statut4').' '.$langs->trans("ServiceStatusNotLate"); }
+            elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return img_picto($langs->trans('ServiceStatusLate'),'statut3').' '.$langs->trans("ServiceStatusLate"); }
+            elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6') .' '.$langs->trans("ServiceStatusClosed"); }
+        }
+        elseif ($mode == 5)
+        {
+            if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial").' '.img_picto($langs->trans('ServiceStatusInitial'),'statut0'); }
+            elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning").' '.img_picto($langs->trans('ServiceStatusRunning'),'statut4'); }
+            elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return $langs->trans("ServiceStatusNotLateShort").' '.img_picto($langs->trans('ServiceStatusNotLateShort'),'statut4'); }
+            elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return $langs->trans("ServiceStatusLateShort").' '.img_picto($langs->trans('ServiceStatusLate'),'statut3'); }
+            elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed").' '.img_picto($langs->trans('ServiceStatusClosed'),'statut6'); }
+        }
+    }
+
+    /**
+     *	Return clicable name (with picto eventually)
+     *
+     *  @param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
+     *  @param	int		$maxlength		Max length
+     *  @return	string					Chaine avec URL
+     */
+    function getNomUrl($withpicto=0,$maxlength=0)
+    {
+        global $langs;
+
+        $result='';
         $label=$langs->trans("ShowContractOfService").': '.$this->label;
         if (empty($label)) $label=$this->description;
 
         $link = '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$this->fk_contrat.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-		$linkend='</a>';
+        $linkend='</a>';
 
-		$picto='service';
-		if ($this->type == 0) $picto='product';
+        $picto='service';
+        if ($this->type == 0) $picto='product';
 
         if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		if ($withpicto != 2) $result.=$link.($this->product_ref?$this->product_ref.' ':'').($this->label?$this->label:$this->description).$linkend;
-		return $result;
-	}
-
-	/**
-	 *    	Load object in memory from database
-	 *
-	 *    	@param	int		$id         Id object
-	 * 		@param	string	$ref		Ref of contract
-	 *    	@return int         		<0 if KO, >0 if OK
-	 */
-	function fetch($id, $ref='')
-	{
-
-		// Check parameters
-		if (empty($id) && empty($ref)) return -1;
-
-		$sql = "SELECT";
-		$sql.= " t.rowid,";
-
-		$sql.= " t.tms,";
-		$sql.= " t.fk_contrat,";
-		$sql.= " t.fk_product,";
-		$sql.= " t.statut,";
-		$sql.= " t.label,";			// This field is not used. Only label of product
-		$sql.= " p.ref as product_ref,";
-		$sql.= " p.label as product_label,";
-		$sql.= " p.description as product_desc,";
-		$sql.= " p.fk_product_type as product_type,";
-		$sql.= " t.description,";
-		$sql.= " t.date_commande,";
-		$sql.= " t.date_ouverture_prevue as date_ouverture_prevue,";
-		$sql.= " t.date_ouverture as date_ouverture,";
-		$sql.= " t.date_fin_validite as date_fin_validite,";
-		$sql.= " t.date_cloture as date_cloture,";
-		$sql.= " t.tva_tx,";
-		$sql.= " t.vat_src_code,";
-		$sql.= " t.localtax1_tx,";
-		$sql.= " t.localtax2_tx,";
-		$sql.= " t.localtax1_type,";
-		$sql.= " t.localtax2_type,";
-		$sql.= " t.qty,";
-		$sql.= " t.remise_percent,";
-		$sql.= " t.remise,";
-		$sql.= " t.fk_remise_except,";
-		$sql.= " t.subprice,";
-		$sql.= " t.price_ht,";
-		$sql.= " t.total_ht,";
-		$sql.= " t.total_tva,";
-		$sql.= " t.total_localtax1,";
-		$sql.= " t.total_localtax2,";
-		$sql.= " t.total_ttc,";
-		$sql.= " t.fk_product_fournisseur_price as fk_fournprice,";
-		$sql.= " t.buy_price_ht as pa_ht,";
-		$sql.= " t.info_bits,";
-		$sql.= " t.fk_user_author,";
-		$sql.= " t.fk_user_ouverture,";
-		$sql.= " t.fk_user_cloture,";
-		$sql.= " t.commentaire,";
-		$sql.= " t.fk_unit";
-		$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as t LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = t.fk_product";
-		if ($id)  $sql.= " WHERE t.rowid = ".$id;
-		if ($ref) $sql.= " WHERE t.rowid = '".$this->db->escape($ref)."'";
-
-		dol_syslog(get_class($this)."::fetch", 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->ref   = $obj->rowid;
-
-				$this->tms = $this->db->jdate($obj->tms);
-				$this->fk_contrat = $obj->fk_contrat;
-				$this->fk_product = $obj->fk_product;
-				$this->statut = $obj->statut;
-				$this->product_ref = $obj->product_ref;
-				$this->product_label = $obj->product_label;
-				$this->product_description = $obj->product_description;
-				$this->product_type = $obj->product_type;
-				$this->label = $obj->label;					// deprecated. We do not use this field. Only ref and label of product, and description of contract line
-				$this->description = $obj->description;
-				$this->date_commande = $this->db->jdate($obj->date_commande);
-
-				$this->date_start = $this->db->jdate($obj->date_ouverture_prevue);
-				$this->date_start_real = $this->db->jdate($obj->date_ouverture);
-				$this->date_end = $this->db->jdate($obj->date_fin_validite);
-				$this->date_end_real = $this->db->jdate($obj->date_cloture);
-				// For backward compatibility
-				$this->date_ouverture_prevue = $this->db->jdate($obj->date_ouverture_prevue);
-				$this->date_ouverture = $this->db->jdate($obj->date_ouverture);
-				$this->date_fin_validite = $this->db->jdate($obj->date_fin_validite);
-				$this->date_cloture = $this->db->jdate($obj->date_cloture);
-
-				$this->tva_tx = $obj->tva_tx;
-				$this->vat_src_code = $obj->vat_src_code;
-				$this->localtax1_tx = $obj->localtax1_tx;
-				$this->localtax2_tx = $obj->localtax2_tx;
-				$this->localtax1_type = $obj->localtax1_type;
-				$this->localtax2_type = $obj->localtax2_type;
-				$this->qty = $obj->qty;
-				$this->remise_percent = $obj->remise_percent;
-				$this->remise = $obj->remise;
-				$this->fk_remise_except = $obj->fk_remise_except;
-				$this->subprice = $obj->subprice;
-				$this->price_ht = $obj->price_ht;
-				$this->total_ht = $obj->total_ht;
-				$this->total_tva = $obj->total_tva;
-				$this->total_localtax1 = $obj->total_localtax1;
-				$this->total_localtax2 = $obj->total_localtax2;
-				$this->total_ttc = $obj->total_ttc;
-				$this->info_bits = $obj->info_bits;
-				$this->fk_user_author = $obj->fk_user_author;
-				$this->fk_user_ouverture = $obj->fk_user_ouverture;
-				$this->fk_user_cloture = $obj->fk_user_cloture;
-				$this->commentaire = $obj->commentaire;
-				$this->fk_fournprice = $obj->fk_fournprice;
-				$marginInfos = getMarginInfos($obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, $this->fk_fournprice, $obj->pa_ht);
-				$this->pa_ht = $marginInfos[0];
-				$this->fk_unit     = $obj->fk_unit;
-			}
-			$this->db->free($resql);
-
-			return 1;
-		}
-		else
-		{
-			$this->error="Error ".$this->db->lasterror();
-			return -1;
-		}
-	}
-
-
-	/**
-	 *      Update database for contract line
-	 *
-	 *      @param	User	$user        	User that modify
-	 *      @param  int		$notrigger	    0=no, 1=yes (no update trigger)
-	 *      @return int         			<0 if KO, >0 if OK
-	 */
-	function update($user, $notrigger=0)
-	{
-		global $conf, $langs, $mysoc;
-
-		$error=0;
-
-		// Clean parameters
-		$this->fk_contrat = (int) $this->fk_contrat;
-		$this->fk_product = (int) $this->fk_product;
-		$this->statut = (int) $this->statut;
-		$this->label=trim($this->label);
-		$this->description=trim($this->description);
-		$this->vat_src_code=trim($this->vat_src_code);
-		$this->tva_tx=trim($this->tva_tx);
-		$this->localtax1_tx=trim($this->localtax1_tx);
-		$this->localtax2_tx=trim($this->localtax2_tx);
-		$this->qty=trim($this->qty);
-		$this->remise_percent=trim($this->remise_percent);
-		$this->remise=trim($this->remise);
-		$this->fk_remise_except = (int) $this->fk_remise_except;
-		$this->subprice=price2num($this->subprice);
-		$this->price_ht=price2num($this->price_ht);
-		$this->total_ht=trim($this->total_ht);
-		$this->total_tva=trim($this->total_tva);
-		$this->total_localtax1=trim($this->total_localtax1);
-		$this->total_localtax2=trim($this->total_localtax2);
-		$this->total_ttc=trim($this->total_ttc);
-		$this->info_bits=trim($this->info_bits);
-		$this->fk_user_author = (int) $this->fk_user_author;
-		$this->fk_user_ouverture = (int) $this->fk_user_ouverture;
-		$this->fk_user_cloture = (int) $this->fk_user_cloture;
-		$this->commentaire=trim($this->commentaire);
-		//if (empty($this->subprice)) $this->subprice = 0;
-		if (empty($this->price_ht)) $this->price_ht = 0;
-		if (empty($this->total_ht)) $this->total_ht = 0;
-		if (empty($this->total_tva)) $this->total_tva = 0;
-		if (empty($this->total_ttc)) $this->total_ttc = 0;
-		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-		if (empty($this->remise_percent)) $this->remise_percent = 0;
-		// For backward compatibility
-		if (empty($this->date_start))      $this->date_start=$this->date_ouverture_prevue;
-		if (empty($this->date_start_real)) $this->date_start=$this->date_ouverture;
-		if (empty($this->date_end))        $this->date_start=$this->date_fin_validite;
-		if (empty($this->date_end_real))   $this->date_start=$this->date_cloture;
-
-
-		// Check parameters
-		// Put here code to add control on parameters values
-
-		// 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
-		// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
-		$localtaxes_type = getLocalTaxesFromRate($this->txtva, 0, $this->societe, $mysoc);
-
-		$tabprice=calcul_price_total($this->qty, $this->price_ht, $this->remise_percent, $this->tva_tx, $this->localtax1_tx, $this->localtax2_tx, 0, 'HT', 0, 1, $mysoc, $localtaxes_type);
-		$this->total_ht  = $tabprice[0];
-		$this->total_tva = $tabprice[1];
-		$this->total_ttc = $tabprice[2];
-		$this->total_localtax1= $tabprice[9];
-		$this->total_localtax2= $tabprice[10];
-
-	    if (empty($this->pa_ht)) $this->pa_ht=0;
-
-		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0)
-		{
-			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
-			{
-				return $result;
-			}
-			else
-			{
-				$this->pa_ht = $result;
-			}
-		}
-
-
-		$this->db->begin();
-
-		$this->oldcopy = new ContratLigne($this->db);
-		$this->oldcopy->fetch($this->id);
-
-		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET";
-		$sql.= " fk_contrat=".$this->fk_contrat.",";
-		$sql.= " fk_product=".($this->fk_product?"'".$this->db->escape($this->fk_product)."'":'null').",";
-		$sql.= " statut=".$this->statut.",";
-		$sql.= " label='".$this->db->escape($this->label)."',";
-		$sql.= " description='".$this->db->escape($this->description)."',";
-		$sql.= " date_commande=".($this->date_commande!=''?"'".$this->db->idate($this->date_commande)."'":"null").",";
-		$sql.= " date_ouverture_prevue=".($this->date_ouverture_prevue!=''?"'".$this->db->idate($this->date_ouverture_prevue)."'":"null").",";
-		$sql.= " date_ouverture=".($this->date_ouverture!=''?"'".$this->db->idate($this->date_ouverture)."'":"null").",";
-		$sql.= " date_fin_validite=".($this->date_fin_validite!=''?"'".$this->db->idate($this->date_fin_validite)."'":"null").",";
-		$sql.= " date_cloture=".($this->date_cloture!=''?"'".$this->db->idate($this->date_cloture)."'":"null").",";
-		$sql.= " vat_src_code='".$this->db->escape($this->vat_src_code)."',";
-		$sql.= " tva_tx=".price2num($this->tva_tx).",";
-		$sql.= " localtax1_tx=".price2num($this->localtax1_tx).",";
-		$sql.= " localtax2_tx=".price2num($this->localtax2_tx).",";
-		$sql.= " qty=".price2num($this->qty).",";
-		$sql.= " remise_percent=".price2num($this->remise_percent).",";
-		$sql.= " remise=".($this->remise?price2num($this->remise):"null").",";
-		$sql.= " fk_remise_except=".($this->fk_remise_except > 0?$this->fk_remise_except:"null").",";
-		$sql.= " subprice=".($this->subprice != '' ? $this->subprice : "null").",";
-		$sql.= " price_ht=".($this->price_ht != '' ? $this->price_ht : "null").",";
-		$sql.= " total_ht=".$this->total_ht.",";
-		$sql.= " total_tva=".$this->total_tva.",";
-		$sql.= " total_localtax1=".$this->total_localtax1.",";
-		$sql.= " total_localtax2=".$this->total_localtax2.",";
-		$sql.= " total_ttc=".$this->total_ttc.",";
-		$sql.= " fk_product_fournisseur_price=".(!empty($this->fk_fournprice)?$this->fk_fournprice:"NULL").",";
-		$sql.= " buy_price_ht='".price2num($this->pa_ht)."',";
-		$sql.= " info_bits='".$this->db->escape($this->info_bits)."',";
-		$sql.= " fk_user_author=".($this->fk_user_author >= 0?$this->fk_user_author:"NULL").",";
-		$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='".$this->db->escape($this->commentaire)."',";
-		$sql.= " fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
-		$sql.= " WHERE rowid=".$this->id;
-
-		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql)
-		{
-			$this->error="Error ".$this->db->lasterror();
-			$error++;
-		}
-
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) // For avoid conflicts if trigger used
-		{
-			$result=$this->insertExtraFields();
-			if ($result < 0)
-			{
-				$error++;
-			}
-		}
-
-		// If we change a planned date (start or end), sync dates for all services
-		if (! $error && ! empty($conf->global->CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES))
-		{
-			if ($this->date_ouverture_prevue != $this->oldcopy->date_ouverture_prevue)
-			{
-				$sql ='UPDATE '.MAIN_DB_PREFIX.'contratdet SET';
-				$sql.= " date_ouverture_prevue = ".($this->date_ouverture_prevue!=''?"'".$this->db->idate($this->date_ouverture_prevue)."'":"null");
-				$sql.= " WHERE fk_contrat = ".$this->fk_contrat;
-
-				$resql = $this->db->query($sql);
-				if (! $resql)
-				{
-					$error++;
-					$this->error="Error ".$this->db->lasterror();
-				}
-			}
-			if ($this->date_fin_validite != $this->oldcopy->date_fin_validite)
-			{
-				$sql ='UPDATE '.MAIN_DB_PREFIX.'contratdet SET';
-				$sql.= " date_fin_validite = ".($this->date_fin_validite!=''?"'".$this->db->idate($this->date_fin_validite)."'":"null");
-				$sql.= " WHERE fk_contrat = ".$this->fk_contrat;
-
-				$resql = $this->db->query($sql);
-				if (! $resql)
-				{
-					$error++;
-					$this->error="Error ".$this->db->lasterror();
-				}
-			}
-		}
-
-		if (! $error && ! $notrigger) {
-	        // Call trigger
-	        $result=$this->call_trigger('LINECONTRACT_UPDATE', $user);
-	        if ($result < 0) {
+        if ($withpicto && $withpicto != 2) $result.=' ';
+        if ($withpicto != 2) $result.=$link.($this->product_ref?$this->product_ref.' ':'').($this->label?$this->label:$this->description).$linkend;
+        return $result;
+    }
+
+    /**
+     *    	Load object in memory from database
+     *
+     *    	@param	int		$id         Id object
+     * 		@param	string	$ref		Ref of contract
+     *    	@return int         		<0 if KO, >0 if OK
+     */
+    function fetch($id, $ref='')
+    {
+
+        // Check parameters
+        if (empty($id) && empty($ref)) return -1;
+
+        $sql = "SELECT";
+        $sql.= " t.rowid,";
+
+        $sql.= " t.tms,";
+        $sql.= " t.fk_contrat,";
+        $sql.= " t.fk_product,";
+        $sql.= " t.statut,";
+        $sql.= " t.label,";			// This field is not used. Only label of product
+        $sql.= " p.ref as product_ref,";
+        $sql.= " p.label as product_label,";
+        $sql.= " p.description as product_desc,";
+        $sql.= " p.fk_product_type as product_type,";
+        $sql.= " t.description,";
+        $sql.= " t.date_commande,";
+        $sql.= " t.date_ouverture_prevue as date_ouverture_prevue,";
+        $sql.= " t.date_ouverture as date_ouverture,";
+        $sql.= " t.date_fin_validite as date_fin_validite,";
+        $sql.= " t.date_cloture as date_cloture,";
+        $sql.= " t.tva_tx,";
+        $sql.= " t.vat_src_code,";
+        $sql.= " t.localtax1_tx,";
+        $sql.= " t.localtax2_tx,";
+        $sql.= " t.localtax1_type,";
+        $sql.= " t.localtax2_type,";
+        $sql.= " t.qty,";
+        $sql.= " t.remise_percent,";
+        $sql.= " t.remise,";
+        $sql.= " t.fk_remise_except,";
+        $sql.= " t.subprice,";
+        $sql.= " t.price_ht,";
+        $sql.= " t.total_ht,";
+        $sql.= " t.total_tva,";
+        $sql.= " t.total_localtax1,";
+        $sql.= " t.total_localtax2,";
+        $sql.= " t.total_ttc,";
+        $sql.= " t.fk_product_fournisseur_price as fk_fournprice,";
+        $sql.= " t.buy_price_ht as pa_ht,";
+        $sql.= " t.info_bits,";
+        $sql.= " t.fk_user_author,";
+        $sql.= " t.fk_user_ouverture,";
+        $sql.= " t.fk_user_cloture,";
+        $sql.= " t.commentaire,";
+        $sql.= " t.fk_unit";
+        $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as t LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = t.fk_product";
+        if ($id)  $sql.= " WHERE t.rowid = ".$id;
+        if ($ref) $sql.= " WHERE t.rowid = '".$this->db->escape($ref)."'";
+
+        dol_syslog(get_class($this)."::fetch", 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->ref   = $obj->rowid;
+
+                $this->tms = $this->db->jdate($obj->tms);
+                $this->fk_contrat = $obj->fk_contrat;
+                $this->fk_product = $obj->fk_product;
+                $this->statut = $obj->statut;
+                $this->product_ref = $obj->product_ref;
+                $this->product_label = $obj->product_label;
+                $this->product_description = $obj->product_description;
+                $this->product_type = $obj->product_type;
+                $this->label = $obj->label;					// deprecated. We do not use this field. Only ref and label of product, and description of contract line
+                $this->description = $obj->description;
+                $this->date_commande = $this->db->jdate($obj->date_commande);
+
+                $this->date_start = $this->db->jdate($obj->date_ouverture_prevue);
+                $this->date_start_real = $this->db->jdate($obj->date_ouverture);
+                $this->date_end = $this->db->jdate($obj->date_fin_validite);
+                $this->date_end_real = $this->db->jdate($obj->date_cloture);
+                // For backward compatibility
+                $this->date_ouverture_prevue = $this->db->jdate($obj->date_ouverture_prevue);
+                $this->date_ouverture = $this->db->jdate($obj->date_ouverture);
+                $this->date_fin_validite = $this->db->jdate($obj->date_fin_validite);
+                $this->date_cloture = $this->db->jdate($obj->date_cloture);
+
+                $this->tva_tx = $obj->tva_tx;
+                $this->vat_src_code = $obj->vat_src_code;
+                $this->localtax1_tx = $obj->localtax1_tx;
+                $this->localtax2_tx = $obj->localtax2_tx;
+                $this->localtax1_type = $obj->localtax1_type;
+                $this->localtax2_type = $obj->localtax2_type;
+                $this->qty = $obj->qty;
+                $this->remise_percent = $obj->remise_percent;
+                $this->remise = $obj->remise;
+                $this->fk_remise_except = $obj->fk_remise_except;
+                $this->subprice = $obj->subprice;
+                $this->price_ht = $obj->price_ht;
+                $this->total_ht = $obj->total_ht;
+                $this->total_tva = $obj->total_tva;
+                $this->total_localtax1 = $obj->total_localtax1;
+                $this->total_localtax2 = $obj->total_localtax2;
+                $this->total_ttc = $obj->total_ttc;
+                $this->info_bits = $obj->info_bits;
+                $this->fk_user_author = $obj->fk_user_author;
+                $this->fk_user_ouverture = $obj->fk_user_ouverture;
+                $this->fk_user_cloture = $obj->fk_user_cloture;
+                $this->commentaire = $obj->commentaire;
+                $this->fk_fournprice = $obj->fk_fournprice;
+                $marginInfos = getMarginInfos($obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, $this->fk_fournprice, $obj->pa_ht);
+                $this->pa_ht = $marginInfos[0];
+                $this->fk_unit     = $obj->fk_unit;
+            }
+            $this->db->free($resql);
+
+            return 1;
+        }
+        else
+        {
+            $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+    }
+
+
+    /**
+     *      Update database for contract line
+     *
+     *      @param	User	$user        	User that modify
+     *      @param  int		$notrigger	    0=no, 1=yes (no update trigger)
+     *      @return int         			<0 if KO, >0 if OK
+     */
+    function update($user, $notrigger=0)
+    {
+        global $conf, $langs, $mysoc;
+
+        $error=0;
+
+        // Clean parameters
+        $this->fk_contrat = (int) $this->fk_contrat;
+        $this->fk_product = (int) $this->fk_product;
+        $this->statut = (int) $this->statut;
+        $this->label=trim($this->label);
+        $this->description=trim($this->description);
+        $this->vat_src_code=trim($this->vat_src_code);
+        $this->tva_tx=trim($this->tva_tx);
+        $this->localtax1_tx=trim($this->localtax1_tx);
+        $this->localtax2_tx=trim($this->localtax2_tx);
+        $this->qty=trim($this->qty);
+        $this->remise_percent=trim($this->remise_percent);
+        $this->remise=trim($this->remise);
+        $this->fk_remise_except = (int) $this->fk_remise_except;
+        $this->subprice=price2num($this->subprice);
+        $this->price_ht=price2num($this->price_ht);
+        $this->total_ht=trim($this->total_ht);
+        $this->total_tva=trim($this->total_tva);
+        $this->total_localtax1=trim($this->total_localtax1);
+        $this->total_localtax2=trim($this->total_localtax2);
+        $this->total_ttc=trim($this->total_ttc);
+        $this->info_bits=trim($this->info_bits);
+        $this->fk_user_author = (int) $this->fk_user_author;
+        $this->fk_user_ouverture = (int) $this->fk_user_ouverture;
+        $this->fk_user_cloture = (int) $this->fk_user_cloture;
+        $this->commentaire=trim($this->commentaire);
+        //if (empty($this->subprice)) $this->subprice = 0;
+        if (empty($this->price_ht)) $this->price_ht = 0;
+        if (empty($this->total_ht)) $this->total_ht = 0;
+        if (empty($this->total_tva)) $this->total_tva = 0;
+        if (empty($this->total_ttc)) $this->total_ttc = 0;
+        if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
+        if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
+        if (empty($this->remise_percent)) $this->remise_percent = 0;
+        // For backward compatibility
+        if (empty($this->date_start))      $this->date_start=$this->date_ouverture_prevue;
+        if (empty($this->date_start_real)) $this->date_start=$this->date_ouverture;
+        if (empty($this->date_end))        $this->date_start=$this->date_fin_validite;
+        if (empty($this->date_end_real))   $this->date_start=$this->date_cloture;
+
+
+        // Check parameters
+        // Put here code to add control on parameters values
+
+        // 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
+        // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
+        $localtaxes_type = getLocalTaxesFromRate($this->txtva, 0, $this->societe, $mysoc);
+
+        $tabprice=calcul_price_total($this->qty, $this->price_ht, $this->remise_percent, $this->tva_tx, $this->localtax1_tx, $this->localtax2_tx, 0, 'HT', 0, 1, $mysoc, $localtaxes_type);
+        $this->total_ht  = $tabprice[0];
+        $this->total_tva = $tabprice[1];
+        $this->total_ttc = $tabprice[2];
+        $this->total_localtax1= $tabprice[9];
+        $this->total_localtax2= $tabprice[10];
+
+        if (empty($this->pa_ht)) $this->pa_ht=0;
+
+        // if buy price not defined, define buyprice as configured in margin admin
+        if ($this->pa_ht == 0)
+        {
+            if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
+            {
+                return $result;
+            }
+            else
+            {
+                $this->pa_ht = $result;
+            }
+        }
+
+
+        $this->db->begin();
+
+        $this->oldcopy = new ContratLigne($this->db);
+        $this->oldcopy->fetch($this->id);
+
+        // Update request
+        $sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET";
+        $sql.= " fk_contrat=".$this->fk_contrat.",";
+        $sql.= " fk_product=".($this->fk_product?"'".$this->db->escape($this->fk_product)."'":'null').",";
+        $sql.= " statut=".$this->statut.",";
+        $sql.= " label='".$this->db->escape($this->label)."',";
+        $sql.= " description='".$this->db->escape($this->description)."',";
+        $sql.= " date_commande=".($this->date_commande!=''?"'".$this->db->idate($this->date_commande)."'":"null").",";
+        $sql.= " date_ouverture_prevue=".($this->date_ouverture_prevue!=''?"'".$this->db->idate($this->date_ouverture_prevue)."'":"null").",";
+        $sql.= " date_ouverture=".($this->date_ouverture!=''?"'".$this->db->idate($this->date_ouverture)."'":"null").",";
+        $sql.= " date_fin_validite=".($this->date_fin_validite!=''?"'".$this->db->idate($this->date_fin_validite)."'":"null").",";
+        $sql.= " date_cloture=".($this->date_cloture!=''?"'".$this->db->idate($this->date_cloture)."'":"null").",";
+        $sql.= " vat_src_code='".$this->db->escape($this->vat_src_code)."',";
+        $sql.= " tva_tx=".price2num($this->tva_tx).",";
+        $sql.= " localtax1_tx=".price2num($this->localtax1_tx).",";
+        $sql.= " localtax2_tx=".price2num($this->localtax2_tx).",";
+        $sql.= " qty=".price2num($this->qty).",";
+        $sql.= " remise_percent=".price2num($this->remise_percent).",";
+        $sql.= " remise=".($this->remise?price2num($this->remise):"null").",";
+        $sql.= " fk_remise_except=".($this->fk_remise_except > 0?$this->fk_remise_except:"null").",";
+        $sql.= " subprice=".($this->subprice != '' ? $this->subprice : "null").",";
+        $sql.= " price_ht=".($this->price_ht != '' ? $this->price_ht : "null").",";
+        $sql.= " total_ht=".$this->total_ht.",";
+        $sql.= " total_tva=".$this->total_tva.",";
+        $sql.= " total_localtax1=".$this->total_localtax1.",";
+        $sql.= " total_localtax2=".$this->total_localtax2.",";
+        $sql.= " total_ttc=".$this->total_ttc.",";
+        $sql.= " fk_product_fournisseur_price=".(!empty($this->fk_fournprice)?$this->fk_fournprice:"NULL").",";
+        $sql.= " buy_price_ht='".price2num($this->pa_ht)."',";
+        $sql.= " info_bits='".$this->db->escape($this->info_bits)."',";
+        $sql.= " fk_user_author=".($this->fk_user_author >= 0?$this->fk_user_author:"NULL").",";
+        $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='".$this->db->escape($this->commentaire)."',";
+        $sql.= " fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+        $sql.= " WHERE rowid=".$this->id;
+
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (! $resql)
+        {
+            $this->error="Error ".$this->db->lasterror();
+            $error++;
+        }
+
+        if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) // For avoid conflicts if trigger used
+        {
+            $result=$this->insertExtraFields();
+            if ($result < 0)
+            {
+                $error++;
+            }
+        }
+
+        // If we change a planned date (start or end), sync dates for all services
+        if (! $error && ! empty($conf->global->CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES))
+        {
+            if ($this->date_ouverture_prevue != $this->oldcopy->date_ouverture_prevue)
+            {
+                $sql ='UPDATE '.MAIN_DB_PREFIX.'contratdet SET';
+                $sql.= " date_ouverture_prevue = ".($this->date_ouverture_prevue!=''?"'".$this->db->idate($this->date_ouverture_prevue)."'":"null");
+                $sql.= " WHERE fk_contrat = ".$this->fk_contrat;
+
+                $resql = $this->db->query($sql);
+                if (! $resql)
+                {
+                    $error++;
+                    $this->error="Error ".$this->db->lasterror();
+                }
+            }
+            if ($this->date_fin_validite != $this->oldcopy->date_fin_validite)
+            {
+                $sql ='UPDATE '.MAIN_DB_PREFIX.'contratdet SET';
+                $sql.= " date_fin_validite = ".($this->date_fin_validite!=''?"'".$this->db->idate($this->date_fin_validite)."'":"null");
+                $sql.= " WHERE fk_contrat = ".$this->fk_contrat;
+
+                $resql = $this->db->query($sql);
+                if (! $resql)
+                {
+                    $error++;
+                    $this->error="Error ".$this->db->lasterror();
+                }
+            }
+        }
+
+        if (! $error && ! $notrigger) {
+            // Call trigger
+            $result=$this->call_trigger('LINECONTRACT_UPDATE', $user);
+            if ($result < 0) {
                 $error++;
                 $this->db->rollback();
             }
-	        // End call triggers
-		}
+            // End call triggers
+        }
 
-		if (! $error)
-		{
-        	$this->db->commit();
-			return 1;
-		} else {
-			$this->db->rollback();
-			$this->errors[]=$this->error;
-			return -1;
-		}
-	}
+        if (! $error)
+        {
+            $this->db->commit();
+            return 1;
+        } else {
+            $this->db->rollback();
+            $this->errors[]=$this->error;
+            return -1;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Mise a jour en base des champs total_xxx de ligne
-	 *		Used by migration process
-	 *
-	 *		@return		int		<0 if KO, >0 if OK
-	 */
-	function update_total()
-	{
+    /**
+     *      Mise a jour en base des champs total_xxx de ligne
+     *		Used by migration process
+     *
+     *		@return		int		<0 if KO, >0 if OK
+     */
+    function update_total()
+    {
         // phpcs:enable
-		$this->db->begin();
-
-		// Mise a jour ligne en base
-		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET";
-		$sql.= " total_ht=".price2num($this->total_ht,'MT')."";
-		$sql.= ",total_tva=".price2num($this->total_tva,'MT')."";
-		$sql.= ",total_localtax1=".price2num($this->total_localtax1,'MT')."";
-		$sql.= ",total_localtax2=".price2num($this->total_localtax2,'MT')."";
-		$sql.= ",total_ttc=".price2num($this->total_ttc,'MT')."";
-		$sql.= " WHERE rowid = ".$this->id;
-
-		dol_syslog(get_class($this)."::update_total", LOG_DEBUG);
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->error();
-			$this->db->rollback();
-			return -2;
-		}
-	}
-
-
-	/**
-	 * Inserts a contrat line into database
-	 *
-	 * @param int $notrigger Set to 1 if you don't want triggers to be fired
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function insert($notrigger = 0)
-	{
-		global $conf, $user;
-
-		// Insertion dans la base
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."contratdet";
-		$sql.= " (fk_contrat, label, description, fk_product, qty, vat_src_code, tva_tx,";
-		$sql.= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice,";
-		$sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc,";
-		$sql.= " info_bits,";
-		$sql.= " price_ht, remise, fk_product_fournisseur_price, buy_price_ht";
-		if ($this->date_ouverture_prevue > 0) { $sql.= ",date_ouverture_prevue"; }
-		if ($this->date_fin_validite > 0)     { $sql.= ",date_fin_validite"; }
-		$sql.= ") VALUES ($this->fk_contrat, '', '" . $this->db->escape($this->description) . "',";
-		$sql.= ($this->fk_product>0 ? $this->fk_product : "null").",";
-		$sql.= " '".$this->db->escape($this->qty)."',";
-		$sql.= " '".$this->db->escape($this->vat_src_code)."',";
-		$sql.= " '".$this->db->escape($this->tva_tx)."',";
-		$sql.= " '".$this->db->escape($this->localtax1_tx)."',";
-		$sql.= " '".$this->db->escape($this->localtax2_tx)."',";
-		$sql.= " '".$this->db->escape($this->localtax1_type)."',";
-		$sql.= " '".$this->db->escape($this->localtax2_type)."',";
-		$sql.= " ".price2num($this->remise_percent).",".price2num($this->subprice).",";
-		$sql.= " ".price2num($this->total_ht).",".price2num($this->total_tva).",".price2num($this->total_localtax1).",".price2num($this->total_localtax2).",".price2num($this->total_ttc).",";
-		$sql.= " '".$this->db->escape($this->info_bits)."',";
-		$sql.= " ".price2num($this->price_ht).",".price2num($this->remise).",";
-		if ($this->fk_fournprice > 0) $sql.= ' '.$this->fk_fournprice.',';
-		else $sql.= ' null,';
-		if ($this->pa_ht > 0) $sql.= ' '.price2num($this->pa_ht);
-		else $sql.= ' null';
-		if ($this->date_ouverture > 0) { $sql.= ",'".$this->db->idate($this->date_ouverture)."'"; }
-		if ($this->date_cloture > 0)   { $sql.= ",'".$this->db->idate($this->date_cloture)."'"; }
-		$sql.= ")";
-
-		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'contratdet');
-
-			// Insert of extrafields
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) // For avoid conflicts if trigger used
-			{
-				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
-					$this->db->rollback();
-					return -1;
-				}
-			}
-
-			if (!$notrigger)
-			{
-				// Call trigger
-				$result = $this->call_trigger('LINECONTRACT_INSERT', $user);
-				if ($result < 0) {
-					$this->db->rollback();
-					return -1;
-				}
-				// End call triggers
-			}
-
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->db->rollback();
-			$this->error=$this->db->error()." sql=".$sql;
-			return -1;
-		}
-	}
+        $this->db->begin();
+
+        // Mise a jour ligne en base
+        $sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET";
+        $sql.= " total_ht=".price2num($this->total_ht,'MT')."";
+        $sql.= ",total_tva=".price2num($this->total_tva,'MT')."";
+        $sql.= ",total_localtax1=".price2num($this->total_localtax1,'MT')."";
+        $sql.= ",total_localtax2=".price2num($this->total_localtax2,'MT')."";
+        $sql.= ",total_ttc=".price2num($this->total_ttc,'MT')."";
+        $sql.= " WHERE rowid = ".$this->id;
+
+        dol_syslog(get_class($this)."::update_total", LOG_DEBUG);
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->error();
+            $this->db->rollback();
+            return -2;
+        }
+    }
+
+
+    /**
+     * Inserts a contrat line into database
+     *
+     * @param int $notrigger Set to 1 if you don't want triggers to be fired
+     * @return int <0 if KO, >0 if OK
+     */
+    public function insert($notrigger = 0)
+    {
+        global $conf, $user;
+
+        // Insertion dans la base
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."contratdet";
+        $sql.= " (fk_contrat, label, description, fk_product, qty, vat_src_code, tva_tx,";
+        $sql.= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice,";
+        $sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc,";
+        $sql.= " info_bits,";
+        $sql.= " price_ht, remise, fk_product_fournisseur_price, buy_price_ht";
+        if ($this->date_ouverture_prevue > 0) { $sql.= ",date_ouverture_prevue"; }
+        if ($this->date_fin_validite > 0)     { $sql.= ",date_fin_validite"; }
+        $sql.= ") VALUES ($this->fk_contrat, '', '" . $this->db->escape($this->description) . "',";
+        $sql.= ($this->fk_product>0 ? $this->fk_product : "null").",";
+        $sql.= " '".$this->db->escape($this->qty)."',";
+        $sql.= " '".$this->db->escape($this->vat_src_code)."',";
+        $sql.= " '".$this->db->escape($this->tva_tx)."',";
+        $sql.= " '".$this->db->escape($this->localtax1_tx)."',";
+        $sql.= " '".$this->db->escape($this->localtax2_tx)."',";
+        $sql.= " '".$this->db->escape($this->localtax1_type)."',";
+        $sql.= " '".$this->db->escape($this->localtax2_type)."',";
+        $sql.= " ".price2num($this->remise_percent).",".price2num($this->subprice).",";
+        $sql.= " ".price2num($this->total_ht).",".price2num($this->total_tva).",".price2num($this->total_localtax1).",".price2num($this->total_localtax2).",".price2num($this->total_ttc).",";
+        $sql.= " '".$this->db->escape($this->info_bits)."',";
+        $sql.= " ".price2num($this->price_ht).",".price2num($this->remise).",";
+        if ($this->fk_fournprice > 0) $sql.= ' '.$this->fk_fournprice.',';
+        else $sql.= ' null,';
+        if ($this->pa_ht > 0) $sql.= ' '.price2num($this->pa_ht);
+        else $sql.= ' null';
+        if ($this->date_ouverture > 0) { $sql.= ",'".$this->db->idate($this->date_ouverture)."'"; }
+        if ($this->date_cloture > 0)   { $sql.= ",'".$this->db->idate($this->date_cloture)."'"; }
+        $sql.= ")";
+
+        dol_syslog(get_class($this)."::insert", LOG_DEBUG);
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'contratdet');
+
+            // Insert of extrafields
+            if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) // For avoid conflicts if trigger used
+            {
+                $result = $this->insertExtraFields();
+                if ($result < 0)
+                {
+                    $this->db->rollback();
+                    return -1;
+                }
+            }
+
+            if (!$notrigger)
+            {
+                // Call trigger
+                $result = $this->call_trigger('LINECONTRACT_INSERT', $user);
+                if ($result < 0) {
+                    $this->db->rollback();
+                    return -1;
+                }
+                // End call triggers
+            }
+
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->db->rollback();
+            $this->error=$this->db->error()." sql=".$sql;
+            return -1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Activate a contract line
-	 *
-	 * @param   User 		$user 		Objet User who activate contract
-	 * @param  	int 		$date 		Date activation
-	 * @param  	int|string 	$date_end 	Date planned end. Use '-1' to keep it unchanged.
-	 * @param   string 		$comment 	A comment typed by user
-	 * @return 	int                    	<0 if KO, >0 if OK
-	 */
-	function active_line($user, $date, $date_end = '', $comment = '')
-	{
+    /**
+     *  Activate a contract line
+     *
+     * @param   User 		$user 		Objet User who activate contract
+     * @param  	int 		$date 		Date activation
+     * @param  	int|string 	$date_end 	Date planned end. Use '-1' to keep it unchanged.
+     * @param   string 		$comment 	A comment typed by user
+     * @return 	int                    	<0 if KO, >0 if OK
+     */
+    function active_line($user, $date, $date_end = '', $comment = '')
+    {
         // phpcs:enable
-		global $langs, $conf;
-
-		$error = 0;
-
-		$this->db->begin();
-
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "contratdet SET statut = ".ContratLigne::STATUS_OPEN.",";
-		$sql .= " date_ouverture = " . (dol_strlen($date) != 0 ? "'" . $this->db->idate($date) . "'" : "null") . ",";
-		if ($date_end >= 0) $sql .= " date_fin_validite = " . (dol_strlen($date_end) != 0 ? "'" . $this->db->idate($date_end) . "'" : "null") . ",";
-		$sql .= " fk_user_ouverture = " . $user->id . ",";
-		$sql .= " date_cloture = null,";
-		$sql .= " commentaire = '" . $this->db->escape($comment) . "'";
-		$sql .= " WHERE rowid = " . $this->id . " AND (statut = ".ContratLigne::STATUS_INITIAL." OR statut = ".ContratLigne::STATUS_CLOSED.")";
-
-		dol_syslog(get_class($this) . "::active_line", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			// Call trigger
-			$result = $this->call_trigger('LINECONTRACT_ACTIVATE', $user);
-			if ($result < 0) $error++;
-			// End call triggers
-
-			if (! $error)
-			{
-				$this->statut = ContratLigne::STATUS_OPEN;
-				$this->date_ouverture = $date;
-				$this->date_fin_validite = $date_end;
-				$this->fk_user_ouverture = $user->id;
-				$this->date_cloture = null;
-				$this->commentaire = $comment;
-
-				$this->db->commit();
-				return 1;
-			}
-			else
-			{
-				$this->db->rollback();
-				return -1;
-			}
-		} else {
-			$this->error = $this->db->lasterror();
-			$this->db->rollback();
-			return -1;
-		}
-	}
+        global $langs, $conf;
+
+        $error = 0;
+
+        $this->db->begin();
+
+        $sql = "UPDATE " . MAIN_DB_PREFIX . "contratdet SET statut = ".ContratLigne::STATUS_OPEN.",";
+        $sql .= " date_ouverture = " . (dol_strlen($date) != 0 ? "'" . $this->db->idate($date) . "'" : "null") . ",";
+        if ($date_end >= 0) $sql .= " date_fin_validite = " . (dol_strlen($date_end) != 0 ? "'" . $this->db->idate($date_end) . "'" : "null") . ",";
+        $sql .= " fk_user_ouverture = " . $user->id . ",";
+        $sql .= " date_cloture = null,";
+        $sql .= " commentaire = '" . $this->db->escape($comment) . "'";
+        $sql .= " WHERE rowid = " . $this->id . " AND (statut = ".ContratLigne::STATUS_INITIAL." OR statut = ".ContratLigne::STATUS_CLOSED.")";
+
+        dol_syslog(get_class($this) . "::active_line", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            // Call trigger
+            $result = $this->call_trigger('LINECONTRACT_ACTIVATE', $user);
+            if ($result < 0) $error++;
+            // End call triggers
+
+            if (! $error)
+            {
+                $this->statut = ContratLigne::STATUS_OPEN;
+                $this->date_ouverture = $date;
+                $this->date_fin_validite = $date_end;
+                $this->fk_user_ouverture = $user->id;
+                $this->date_cloture = null;
+                $this->commentaire = $comment;
+
+                $this->db->commit();
+                return 1;
+            }
+            else
+            {
+                $this->db->rollback();
+                return -1;
+            }
+        } else {
+            $this->error = $this->db->lasterror();
+            $this->db->rollback();
+            return -1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Close a contract line
-	 *
-	 * @param    User 	$user 			Objet User who close contract
-	 * @param  	 int 	$date_end 		Date end
-	 * @param    string $comment 		A comment typed by user
+    /**
+     *  Close a contract line
+     *
+     * @param    User 	$user 			Objet User who close contract
+     * @param  	 int 	$date_end 		Date end
+     * @param    string $comment 		A comment typed by user
      * @param    int	$notrigger		1=Does not execute triggers, 0=Execute triggers
-	 * @return int                    	<0 if KO, >0 if OK
-	 */
-	function close_line($user, $date_end, $comment = '', $notrigger=0)
-	{
+     * @return int                    	<0 if KO, >0 if OK
+     */
+    function close_line($user, $date_end, $comment = '', $notrigger=0)
+    {
         // phpcs:enable
-		global $langs, $conf;
-
-		// Update object
-		$this->date_cloture = $date_end;
-		$this->fk_user_cloture = $user->id;
-		$this->commentaire = $comment;
-
-		$error = 0;
-
-		// statut actif : 4
-
-		$this->db->begin();
-
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "contratdet SET statut = ".ContratLigne::STATUS_CLOSED.",";
-		$sql .= " date_cloture = '" . $this->db->idate($date_end) . "',";
-		$sql .= " fk_user_cloture = " . $user->id . ",";
-		$sql .= " commentaire = '" . $this->db->escape($comment) . "'";
-		$sql .= " WHERE rowid = " . $this->id . " AND statut = ".ContratLigne::STATUS_OPEN;
-
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if (! $notrigger)
-			{
-				// Call trigger
-				$result = $this->call_trigger('LINECONTRACT_CLOSE', $user);
-				if ($result < 0) {
-					$error++;
-					$this->db->rollback();
-					return -1;
-				}
-				// End call triggers
-			}
-
-			$this->db->commit();
-			return 1;
-		} else {
-			$this->error = $this->db->lasterror();
-			$this->db->rollback();
-			return -1;
-		}
-	}
+        global $langs, $conf;
+
+        // Update object
+        $this->date_cloture = $date_end;
+        $this->fk_user_cloture = $user->id;
+        $this->commentaire = $comment;
+
+        $error = 0;
+
+        // statut actif : 4
+
+        $this->db->begin();
+
+        $sql = "UPDATE " . MAIN_DB_PREFIX . "contratdet SET statut = ".ContratLigne::STATUS_CLOSED.",";
+        $sql .= " date_cloture = '" . $this->db->idate($date_end) . "',";
+        $sql .= " fk_user_cloture = " . $user->id . ",";
+        $sql .= " commentaire = '" . $this->db->escape($comment) . "'";
+        $sql .= " WHERE rowid = " . $this->id . " AND statut = ".ContratLigne::STATUS_OPEN;
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            if (! $notrigger)
+            {
+                // Call trigger
+                $result = $this->call_trigger('LINECONTRACT_CLOSE', $user);
+                if ($result < 0) {
+                    $error++;
+                    $this->db->rollback();
+                    return -1;
+                }
+                // End call triggers
+            }
+
+            $this->db->commit();
+            return 1;
+        } else {
+            $this->error = $this->db->lasterror();
+            $this->db->rollback();
+            return -1;
+        }
+    }
 }

Spacing +812 added lines, -812 removed lines

@@ -32,10 +32,10 @@ 
  *	\brief      File of class to manage contracts
  */
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT."/core/class/commonobjectline.class.php";
-require_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/margin/lib/margins.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
 
 /**
  *	Class to manage contracts
@@ -45,27 +45,27 @@ 
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='contrat';
+	public $element = 'contrat';
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='contrat';
+	public $table_element = 'contrat';
 
 	/**
 	 * @var int    Name of subtable line
 	 */
-	public $table_element_line='contratdet';
+	public $table_element_line = 'contratdet';
 
 	/**
 	 * @var int Field with ID of parent key if this field has a parent
 	 */
-	public $fk_element='fk_contrat';
+	public $fk_element = 'fk_contrat';
 
     /**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
-	public $picto='contract';
+	public $picto = 'contract';
 
     /**
      * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
@@ -102,13 +102,13 @@ 
 	 */
 	public $socid;
 
-	public $societe;		// Objet societe
+	public $societe; // Objet societe
 
 	/**
 	 * Status of the contract
 	 * @var int
 	 */
-	public $statut=0;		// 0=Draft,
+	public $statut = 0; // 0=Draft,
 
 	public $product;
 
@@ -169,18 +169,18 @@ 
 	 */
 	public $fk_projet;
 
-	public $extraparams=array();
+	public $extraparams = array();
 
 	/**
 	 * @var ContratLigne[]		Contract lines
 	 */
-	public $lines=array();
+	public $lines = array();
 
 	/**
 	 * Maps ContratLigne IDs to $this->lines indexes
 	 * @var int[]
 	 */
-	protected $lines_id_index_mapper=array();
+	protected $lines_id_index_mapper = array();
 
 
 	/**
@@ -219,26 +219,26 @@ 
 				$dir = dol_buildpath($reldir."core/modules/contract/");
 
 				// Load file with numbering class (if found)
-				$mybool|=@include_once $dir.$file;
+				$mybool |= @include_once $dir.$file;
 			}
 
-			if (! $mybool)
+			if (!$mybool)
 			{
-				dol_print_error('',"Failed to include file ".$file);
+				dol_print_error('', "Failed to include file ".$file);
 				return '';
 			}
 
 			$obj = new $classname();
-			$numref = $obj->getNextValue($soc,$this);
+			$numref = $obj->getNextValue($soc, $this);
 
-			if ( $numref != "")
+			if ($numref != "")
 			{
 				return $numref;
 			}
 			else
 			{
 				$this->error = $obj->error;
-				dol_print_error($db,get_class($this)."::getNextValue ".$obj->error);
+				dol_print_error($db, get_class($this)."::getNextValue ".$obj->error);
 				return "";
 			}
 		}
@@ -261,7 +261,7 @@ 
 	 * 	@param	string		$comment	A comment typed by user
 	 *  @return int         			<0 if KO, >0 if OK
 	 */
-	function active_line($user, $line_id, $date, $date_end='', $comment='')
+	function active_line($user, $line_id, $date, $date_end = '', $comment = '')
 	{
         // phpcs:enable
 		$result = $this->lines[$this->lines_id_index_mapper[$line_id]]->active_line($user, $date, $date_end, $comment);
@@ -284,10 +284,10 @@ 
 	 * 	@param	string		$comment	A comment typed by user
 	 *  @return int         			<0 if KO, >0 if OK
 	 */
-	function close_line($user, $line_id, $date_end, $comment='')
+	function close_line($user, $line_id, $date_end, $comment = '')
 	{
         // phpcs:enable
-		$result=$this->lines[$this->lines_id_index_mapper[$line_id]]->close_line($user, $date_end, $comment);
+		$result = $this->lines[$this->lines_id_index_mapper[$line_id]]->close_line($user, $date_end, $comment);
 		if ($result < 0)
 		{
 			$this->error = $this->lines[$this->lines_id_index_mapper[$line_id]]->error;
@@ -307,18 +307,18 @@ 
 	 *	@return	int							<0 if KO, >0 if OK
 	 *  @see closeAll
 	 */
-	function activateAll($user, $date_start='', $notrigger=0, $comment='')
+	function activateAll($user, $date_start = '', $notrigger = 0, $comment = '')
 	{
 		if (empty($date_start)) $date_start = dol_now();
 
 		$this->db->begin();
 
-		$error=0;
+		$error = 0;
 
 		// Load lines
 		$this->fetch_lines();
 
-		foreach($this->lines as $contratline)
+		foreach ($this->lines as $contratline)
 		{
 			// Open lines not already open
 			if ($contratline->statut != ContratLigne::STATUS_OPEN)
@@ -336,13 +336,13 @@ 
 			}
 		}
 
-		if (! $error && $this->statut == 0)
+		if (!$error && $this->statut == 0)
 		{
-			$result=$this->validate($user, '', $notrigger);
+			$result = $this->validate($user, '', $notrigger);
 			if ($result < 0) $error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
@@ -363,7 +363,7 @@ 
 	 * @return	int							<0 if KO, >0 if OK
 	 * @see activateAll
 	 */
-	function closeAll(User $user, $notrigger=0, $comment='')
+	function closeAll(User $user, $notrigger = 0, $comment = '')
 	{
 		$this->db->begin();
 
@@ -374,15 +374,15 @@ 
 
 		$error = 0;
 
-		foreach($this->lines as $contratline)
+		foreach ($this->lines as $contratline)
 		{
 			// Close lines not already closed
 			if ($contratline->statut != ContratLigne::STATUS_CLOSED)
 	        {
-				$contratline->date_cloture=$now;
-				$contratline->fk_user_cloture=$user->id;
-				$contratline->statut=ContratLigne::STATUS_CLOSED;
-				$result=$contratline->close_line($user, $now, $comment, $notrigger);
+				$contratline->date_cloture = $now;
+				$contratline->fk_user_cloture = $user->id;
+				$contratline->statut = ContratLigne::STATUS_CLOSED;
+				$result = $contratline->close_line($user, $now, $comment, $notrigger);
 				if ($result < 0)
 				{
 					$error++;
@@ -393,13 +393,13 @@ 
 	        }
 		}
 
-		if (! $error && $this->statut == 0)
+		if (!$error && $this->statut == 0)
 		{
-			$result=$this->validate($user, '', $notrigger);
+			$result = $this->validate($user, '', $notrigger);
 			if ($result < 0) $error++;
 		}
 
-        if (! $error)
+        if (!$error)
         {
             $this->db->commit();
             return 1;
@@ -419,14 +419,14 @@ 
      * @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 * @return	int						<0 if KO, >0 if OK
 	 */
-	function validate(User $user, $force_number='', $notrigger=0)
+	function validate(User $user, $force_number = '', $notrigger = 0)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		global $langs, $conf;
 
-		$now=dol_now();
+		$now = dol_now();
 
-		$error=0;
+		$error = 0;
 		dol_syslog(get_class($this).'::validate user='.$user->id.', force_number='.$force_number);
 
 
@@ -437,7 +437,7 @@ 
 		// A contract is validated so we can move thirdparty to status customer
 		if (empty($conf->global->CONTRACT_DISABLE_AUTOSET_AS_CLIENT_ON_CONTRACT_VALIDATION))
 		{
-			$result=$this->thirdparty->set_as_client();
+			$result = $this->thirdparty->set_as_client();
 		}
 
 		// Define new ref
@@ -445,7 +445,7 @@ 
 		{
 			$num = $force_number;
 		}
-		else if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+		else if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$num = $this->getNextNumRef($this->thirdparty);
 		}
@@ -459,27 +459,27 @@ 
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET ref = '".$num."', statut = 1";
 			//$sql.= ", fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
-			$sql .= " WHERE rowid = ".$this->id . " AND statut = 0";
+			$sql .= " WHERE rowid = ".$this->id." AND statut = 0";
 
 			dol_syslog(get_class($this)."::validate", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (! $resql)
+			if (!$resql)
 			{
 				dol_print_error($this->db);
 				$error++;
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 			}
 
 			// Trigger calls
-			if (! $error && ! $notrigger)
+			if (!$error && !$notrigger)
 			{
                 // Call trigger
-                $result=$this->call_trigger('CONTRACT_VALIDATE',$user);
+                $result = $this->call_trigger('CONTRACT_VALIDATE', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
 			}
 
-			if (! $error)
+			if (!$error)
 			{
             	$this->oldref = $this->ref;
 
@@ -500,13 +500,13 @@ 
 						{
 							dol_syslog("Rename ok");
 						    // Rename docs starting with $oldref with $newref
-            				$listoffiles=dol_dir_list($conf->contract->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-            				foreach($listoffiles as $fileentry)
+            				$listoffiles = dol_dir_list($conf->contract->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+            				foreach ($listoffiles as $fileentry)
             				{
-            					$dirsource=$fileentry['name'];
-            					$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-            					$dirsource=$fileentry['path'].'/'.$dirsource;
-            					$dirdest=$fileentry['path'].'/'.$dirdest;
+            					$dirsource = $fileentry['name'];
+            					$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+            					$dirsource = $fileentry['path'].'/'.$dirsource;
+            					$dirdest = $fileentry['path'].'/'.$dirdest;
             					@rename($dirsource, $dirdest);
             				}
 						}
@@ -515,7 +515,7 @@ 
 			}
 
 			// Set new ref and define current statut
-			if (! $error)
+			if (!$error)
 			{
 				$this->ref = $num;
 				$this->statut = 1;
@@ -528,7 +528,7 @@ 
 			$error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
@@ -547,14 +547,14 @@ 
      * @param	int		$notrigger		1=Does not execute triggers, 0=execute triggers
 	 * @return	int						<0 if KO, >0 if OK
 	 */
-	function reopen($user, $notrigger=0)
+	function reopen($user, $notrigger = 0)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		global $langs, $conf;
 
-		$now=dol_now();
+		$now = dol_now();
 
-		$error=0;
+		$error = 0;
 		dol_syslog(get_class($this).'::reopen user='.$user->id);
 
 		$this->db->begin();
@@ -563,22 +563,22 @@ 
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET statut = 0";
 		//$sql.= ", fk_user_valid = null, date_valid = null";
-		$sql .= " WHERE rowid = ".$this->id . " AND statut = 1";
+		$sql .= " WHERE rowid = ".$this->id." AND statut = 1";
 
 		dol_syslog(get_class($this)."::validate", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql)
+		if (!$resql)
 		{
 			dol_print_error($this->db);
 			$error++;
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 		}
 
 		// Trigger calls
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
 			// Call trigger
-			$result=$this->call_trigger('CONTRACT_REOPEN',$user);
+			$result = $this->call_trigger('CONTRACT_REOPEN', $user);
 			if ($result < 0) {
 				$error++;
 			}
@@ -586,14 +586,14 @@ 
 		}
 
 		// Set new ref and define current status
-		if (! $error)
+		if (!$error)
 		{
-			$this->statut=0;
-			$this->brouillon=1;
-			$this->date_validation=$now;
+			$this->statut = 0;
+			$this->brouillon = 1;
+			$this->date_validation = $now;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
@@ -614,30 +614,30 @@ 
 	 *    @param	string	$ref_supplier	Supplier ref
 	 *    @return   int     				<0 if KO, 0 if not found, Id of contract if OK
 	 */
-	function fetch($id, $ref='', $ref_customer='', $ref_supplier='')
+	function fetch($id, $ref = '', $ref_customer = '', $ref_supplier = '')
 	{
 		$sql = "SELECT rowid, statut, ref, fk_soc, mise_en_service as datemise,";
-		$sql.= " ref_supplier, ref_customer,";
-		$sql.= " ref_ext,";
-		$sql.= " fk_user_mise_en_service, date_contrat as datecontrat,";
-		$sql.= " fk_user_author, fin_validite, date_cloture,";
-		$sql.= " fk_projet,";
-		$sql.= " fk_commercial_signature, fk_commercial_suivi,";
-		$sql.= " note_private, note_public, model_pdf, extraparams";
-		$sql.= " FROM ".MAIN_DB_PREFIX."contrat";
-		if (! $id) $sql.=" WHERE entity IN (".getEntity('contract').")";
-		else $sql.= " WHERE rowid=".$id;
+		$sql .= " ref_supplier, ref_customer,";
+		$sql .= " ref_ext,";
+		$sql .= " fk_user_mise_en_service, date_contrat as datecontrat,";
+		$sql .= " fk_user_author, fin_validite, date_cloture,";
+		$sql .= " fk_projet,";
+		$sql .= " fk_commercial_signature, fk_commercial_suivi,";
+		$sql .= " note_private, note_public, model_pdf, extraparams";
+		$sql .= " FROM ".MAIN_DB_PREFIX."contrat";
+		if (!$id) $sql .= " WHERE entity IN (".getEntity('contract').")";
+		else $sql .= " WHERE rowid=".$id;
 		if ($ref_customer)
 		{
-			$sql.= " AND ref_customer = '".$this->db->escape($ref_customer)."'";
+			$sql .= " AND ref_customer = '".$this->db->escape($ref_customer)."'";
 		}
 		if ($ref_supplier)
 		{
-			$sql.= " AND ref_supplier = '".$this->db->escape($ref_supplier)."'";
+			$sql .= " AND ref_supplier = '".$this->db->escape($ref_supplier)."'";
 		}
 		if ($ref)
 		{
-			$sql.= " AND ref='".$this->db->escape($ref)."'";
+			$sql .= " AND ref='".$this->db->escape($ref)."'";
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -648,13 +648,13 @@ 
 
 			if ($obj)
 			{
-				$this->id						= $obj->rowid;
-				$this->ref						= (!isset($obj->ref) || !$obj->ref) ? $obj->rowid : $obj->ref;
+				$this->id = $obj->rowid;
+				$this->ref = (!isset($obj->ref) || !$obj->ref) ? $obj->rowid : $obj->ref;
 				$this->ref_customer				= $obj->ref_customer;
 				$this->ref_supplier				= $obj->ref_supplier;
-				$this->ref_ext					= $obj->ref_ext;
-				$this->statut					= $obj->statut;
-				$this->mise_en_service			= $this->db->jdate($obj->datemise);
+				$this->ref_ext = $obj->ref_ext;
+				$this->statut = $obj->statut;
+				$this->mise_en_service = $this->db->jdate($obj->datemise);
 
 				$this->date_contrat				= $this->db->jdate($obj->datecontrat);
 				$this->date_creation			= $this->db->jdate($obj->datecontrat);
@@ -663,22 +663,22 @@ 
 				$this->date_cloture				= $this->db->jdate($obj->date_cloture);
 
 
-				$this->user_author_id			= $obj->fk_user_author;
+				$this->user_author_id = $obj->fk_user_author;
 
-				$this->commercial_signature_id	= $obj->fk_commercial_signature;
-				$this->commercial_suivi_id		= $obj->fk_commercial_suivi;
+				$this->commercial_signature_id = $obj->fk_commercial_signature;
+				$this->commercial_suivi_id = $obj->fk_commercial_suivi;
 
-				$this->note_private				= $obj->note_private;
-				$this->note_public				= $obj->note_public;
+				$this->note_private = $obj->note_private;
+				$this->note_public = $obj->note_public;
 				$this->modelpdf					= $obj->model_pdf;
 
 				$this->fk_projet				= $obj->fk_projet; // deprecated
-				$this->fk_project				= $obj->fk_projet;
+				$this->fk_project = $obj->fk_projet;
 
-				$this->socid					= $obj->fk_soc;
-				$this->fk_soc					= $obj->fk_soc;
+				$this->socid = $obj->fk_soc;
+				$this->fk_soc = $obj->fk_soc;
 
-				$this->extraparams				= (array) json_decode($obj->extraparams, true);
+				$this->extraparams = (array) json_decode($obj->extraparams, true);
 
 				$this->db->free($resql);
 
@@ -687,10 +687,10 @@ 
 				$this->fetch_optionals();
 
 				// Lines
-				$result=$this->fetch_lines();
+				$result = $this->fetch_lines();
 				if ($result < 0)
 				{
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 					return -3;
 				}
 
@@ -699,14 +699,14 @@ 
 			else
 			{
 				dol_syslog(get_class($this)."::fetch Contract not found");
-				$this->error="Contract not found";
+				$this->error = "Contract not found";
 				return 0;
 			}
 		}
 		else
 		{
 			dol_syslog(get_class($this)."::fetch Error searching contract");
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -721,43 +721,43 @@ 
 	function fetch_lines()
 	{
         // phpcs:enable
-		$this->nbofserviceswait=0;
-		$this->nbofservicesopened=0;
-		$this->nbofservicesexpired=0;
-		$this->nbofservicesclosed=0;
+		$this->nbofserviceswait = 0;
+		$this->nbofservicesopened = 0;
+		$this->nbofservicesexpired = 0;
+		$this->nbofservicesclosed = 0;
 
-		$total_ttc=0;
-		$total_vat=0;
-		$total_ht=0;
+		$total_ttc = 0;
+		$total_vat = 0;
+		$total_ht = 0;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-		$extrafieldsline=new ExtraFields($this->db);
+		$extrafieldsline = new ExtraFields($this->db);
 		$line = new ContratLigne($this->db);
-		$extralabelsline=$extrafieldsline->fetch_name_optionals_label($line->table_element,true);
+		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($line->table_element, true);
 
-		$this->lines=array();
+		$this->lines = array();
         $pos = 0;
 
 		// Selects contract lines related to a product
 		$sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref,";
-		$sql.= " d.rowid, d.fk_contrat, d.statut, d.description, d.price_ht, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.remise_percent, d.subprice, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht,";
-		$sql.= " d.total_ht,";
-		$sql.= " d.total_tva,";
-		$sql.= " d.total_localtax1,";
-		$sql.= " d.total_localtax2,";
-		$sql.= " d.total_ttc,";
-		$sql.= " d.info_bits, d.fk_product,";
-		$sql.= " d.date_ouverture_prevue, d.date_ouverture,";
-		$sql.= " d.date_fin_validite, d.date_cloture,";
-		$sql.= " d.fk_user_author,";
-		$sql.= " d.fk_user_ouverture,";
-		$sql.= " d.fk_user_cloture,";
-		$sql.= " d.fk_unit";
-		$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as d LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
-		$sql.= " WHERE d.fk_contrat = ".$this->id;
-		$sql.= " ORDER by d.rowid ASC";
+		$sql .= " d.rowid, d.fk_contrat, d.statut, d.description, d.price_ht, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.remise_percent, d.subprice, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht,";
+		$sql .= " d.total_ht,";
+		$sql .= " d.total_tva,";
+		$sql .= " d.total_localtax1,";
+		$sql .= " d.total_localtax2,";
+		$sql .= " d.total_ttc,";
+		$sql .= " d.info_bits, d.fk_product,";
+		$sql .= " d.date_ouverture_prevue, d.date_ouverture,";
+		$sql .= " d.date_fin_validite, d.date_cloture,";
+		$sql .= " d.fk_user_author,";
+		$sql .= " d.fk_user_ouverture,";
+		$sql .= " d.fk_user_cloture,";
+		$sql .= " d.fk_unit";
+		$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as d LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
+		$sql .= " WHERE d.fk_contrat = ".$this->id;
+		$sql .= " ORDER by d.rowid ASC";
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -771,45 +771,45 @@ 
 				$objp					= $this->db->fetch_object($result);
 
 				$line					= new ContratLigne($this->db);
-				$line->id				= $objp->rowid;
+				$line->id = $objp->rowid;
 				$line->ref				= $objp->rowid;
-				$line->fk_contrat		= $objp->fk_contrat;
-				$line->desc				= $objp->description;  // Description line
+				$line->fk_contrat = $objp->fk_contrat;
+				$line->desc = $objp->description; // Description line
 				$line->qty				= $objp->qty;
-				$line->vat_src_code 	= $objp->vat_src_code ;
-				$line->tva_tx			= $objp->tva_tx;
+				$line->vat_src_code 	= $objp->vat_src_code;
+				$line->tva_tx = $objp->tva_tx;
 				$line->localtax1_tx		= $objp->localtax1_tx;
 				$line->localtax2_tx		= $objp->localtax2_tx;
 				$line->localtax1_type	= $objp->localtax1_type;
 				$line->localtax2_type	= $objp->localtax2_type;
 				$line->subprice			= $objp->subprice;
-				$line->statut			= $objp->statut;
+				$line->statut = $objp->statut;
 				$line->remise_percent	= $objp->remise_percent;
 				$line->price_ht			= $objp->price_ht;
-				$line->price			= $objp->price_ht;	// For backward compatibility
+				$line->price = $objp->price_ht; // For backward compatibility
 				$line->total_ht			= $objp->total_ht;
 				$line->total_tva		= $objp->total_tva;
 				$line->total_localtax1	= $objp->total_localtax1;
 				$line->total_localtax2	= $objp->total_localtax2;
 				$line->total_ttc		= $objp->total_ttc;
-				$line->fk_product		= (($objp->fk_product > 0)?$objp->fk_product:0);
+				$line->fk_product = (($objp->fk_product > 0) ? $objp->fk_product : 0);
 				$line->info_bits		= $objp->info_bits;
 
-				$line->fk_fournprice 	= $objp->fk_fournprice;
+				$line->fk_fournprice = $objp->fk_fournprice;
 				$marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
-				$line->pa_ht 			= $marginInfos[0];
+				$line->pa_ht = $marginInfos[0];
 
-				$line->fk_user_author	= $objp->fk_user_author;
-				$line->fk_user_ouverture= $objp->fk_user_ouverture;
+				$line->fk_user_author = $objp->fk_user_author;
+				$line->fk_user_ouverture = $objp->fk_user_ouverture;
 				$line->fk_user_cloture  = $objp->fk_user_cloture;
-				$line->fk_unit           = $objp->fk_unit;
+				$line->fk_unit = $objp->fk_unit;
 
-				$line->ref				= $objp->product_ref;	// deprecated
-				$line->product_ref		= $objp->product_ref;   // Product Ref
-				$line->product_desc		= $objp->product_desc;  // Product Description
+				$line->ref = $objp->product_ref; // deprecated
+				$line->product_ref = $objp->product_ref; // Product Ref
+				$line->product_desc		= $objp->product_desc; // Product Description
 				$line->product_label	= $objp->product_label; // Product Label
 
-				$line->description		= $objp->description;
+				$line->description = $objp->description;
 
 				$line->date_start            = $this->db->jdate($objp->date_ouverture_prevue);
 				$line->date_start_real       = $this->db->jdate($objp->date_ouverture);
@@ -829,7 +829,7 @@ 
 				// fetch optionals attributes and labels
 				$line->fetch_optionals();
 
-				$this->lines[$pos]			= $line;
+				$this->lines[$pos] = $line;
 				$this->lines_id_index_mapper[$line->id] = $pos;
 
 				//dol_syslog("1 ".$line->desc);
@@ -837,12 +837,12 @@ 
 
 				if ($line->statut == ContratLigne::STATUS_INITIAL) $this->nbofserviceswait++;
 				if ($line->statut == ContratLigne::STATUS_OPEN && (empty($line->date_fin_prevue) || $line->date_fin_prevue >= $now)) $this->nbofservicesopened++;
-				if ($line->statut == ContratLigne::STATUS_OPEN && (! empty($line->date_fin_prevue) && $line->date_fin_prevue < $now)) $this->nbofservicesexpired++;
+				if ($line->statut == ContratLigne::STATUS_OPEN && (!empty($line->date_fin_prevue) && $line->date_fin_prevue < $now)) $this->nbofservicesexpired++;
 				if ($line->statut == ContratLigne::STATUS_CLOSED) $this->nbofservicesclosed++;
 
-				$total_ttc+=$objp->total_ttc;   // TODO Not saved into database
-                $total_vat+=$objp->total_tva;
-                $total_ht+=$objp->total_ht;
+				$total_ttc += $objp->total_ttc; // TODO Not saved into database
+                $total_vat += $objp->total_tva;
+                $total_ht += $objp->total_ht;
 
 				$i++;
 				$pos++;
@@ -855,10 +855,10 @@ 
 			return -3;
 		}
 
-		$this->nbofservices=count($this->lines);
-        $this->total_ttc = price2num($total_ttc);   // TODO For the moment value is false as value is not stored in database for line linked to products
-        $this->total_vat = price2num($total_vat);   // TODO For the moment value is false as value is not stored in database for line linked to products
-        $this->total_ht = price2num($total_ht);     // TODO For the moment value is false as value is not stored in database for line linked to products
+		$this->nbofservices = count($this->lines);
+        $this->total_ttc = price2num($total_ttc); // TODO For the moment value is false as value is not stored in database for line linked to products
+        $this->total_vat = price2num($total_vat); // TODO For the moment value is false as value is not stored in database for line linked to products
+        $this->total_ht = price2num($total_ht); // TODO For the moment value is false as value is not stored in database for line linked to products
 
 		return $this->lines;
 	}
@@ -871,61 +871,61 @@ 
 	 */
 	function create($user)
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		// Check parameters
-		$paramsok=1;
+		$paramsok = 1;
 		if ($this->commercial_signature_id <= 0)
 		{
 			$langs->load("commercial");
-			$this->error.=$langs->trans("ErrorFieldRequired",$langs->trans("SalesRepresentativeSignature"));
-			$paramsok=0;
+			$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;
+			$this->error .= ($this->error ? "<br>" : '');
+			$this->error .= $langs->trans("ErrorFieldRequired", $langs->trans("SalesRepresentativeFollowUp"));
+			$paramsok = 0;
 		}
-		if (! $paramsok) return -1;
+		if (!$paramsok) return -1;
 
 
 		$this->db->begin();
 
-		$now=dol_now();
+		$now = dol_now();
 
 		// Insert contract
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."contrat (datec, fk_soc, fk_user_author, date_contrat,";
-		$sql.= " fk_commercial_signature, fk_commercial_suivi, fk_projet,";
-		$sql.= " ref, entity, note_private, note_public, ref_customer, ref_supplier, ref_ext)";
-		$sql.= " VALUES ('".$this->db->idate($now)."',".$this->socid.",".$user->id;
-		$sql.= ", ".(dol_strlen($this->date_contrat)!=0 ? "'".$this->db->idate($this->date_contrat)."'" : "NULL");
-		$sql.= ",".($this->commercial_signature_id>0?$this->commercial_signature_id:"NULL");
-		$sql.= ",".($this->commercial_suivi_id>0?$this->commercial_suivi_id:"NULL");
-		$sql.= ",".($this->fk_project>0?$this->fk_project:"NULL");
-		$sql.= ", ".(dol_strlen($this->ref)<=0 ? "null" : "'".$this->db->escape($this->ref)."'");
-		$sql.= ", ".$conf->entity;
-		$sql.= ", ".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL");
-		$sql.= ", ".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL");
-		$sql.= ", ".(!empty($this->ref_customer)?("'".$this->db->escape($this->ref_customer)."'"):"NULL");
-		$sql.= ", ".(!empty($this->ref_supplier)?("'".$this->db->escape($this->ref_supplier)."'"):"NULL");
-		$sql.= ", ".(!empty($this->ref_ext)?("'".$this->db->escape($this->ref_ext)."'"):"NULL");
-		$sql.= ")";
-		$resql=$this->db->query($sql);
+		$sql .= " fk_commercial_signature, fk_commercial_suivi, fk_projet,";
+		$sql .= " ref, entity, note_private, note_public, ref_customer, ref_supplier, ref_ext)";
+		$sql .= " VALUES ('".$this->db->idate($now)."',".$this->socid.",".$user->id;
+		$sql .= ", ".(dol_strlen($this->date_contrat) != 0 ? "'".$this->db->idate($this->date_contrat)."'" : "NULL");
+		$sql .= ",".($this->commercial_signature_id > 0 ? $this->commercial_signature_id : "NULL");
+		$sql .= ",".($this->commercial_suivi_id > 0 ? $this->commercial_suivi_id : "NULL");
+		$sql .= ",".($this->fk_project > 0 ? $this->fk_project : "NULL");
+		$sql .= ", ".(dol_strlen($this->ref) <= 0 ? "null" : "'".$this->db->escape($this->ref)."'");
+		$sql .= ", ".$conf->entity;
+		$sql .= ", ".(!empty($this->note_private) ? ("'".$this->db->escape($this->note_private)."'") : "NULL");
+		$sql .= ", ".(!empty($this->note_public) ? ("'".$this->db->escape($this->note_public)."'") : "NULL");
+		$sql .= ", ".(!empty($this->ref_customer) ? ("'".$this->db->escape($this->ref_customer)."'") : "NULL");
+		$sql .= ", ".(!empty($this->ref_supplier) ? ("'".$this->db->escape($this->ref_supplier)."'") : "NULL");
+		$sql .= ", ".(!empty($this->ref_ext) ? ("'".$this->db->escape($this->ref_ext)."'") : "NULL");
+		$sql .= ")";
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$error=0;
+			$error = 0;
 
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."contrat");
 
 			// Load object modContract
-			$module=(! empty($conf->global->CONTRACT_ADDON)?$conf->global->CONTRACT_ADDON:'mod_contract_serpis');
+			$module = (!empty($conf->global->CONTRACT_ADDON) ? $conf->global->CONTRACT_ADDON : 'mod_contract_serpis');
 			if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php')
 			{
-				$module = substr($module, 0, dol_strlen($module)-4);
+				$module = substr($module, 0, dol_strlen($module) - 4);
 			}
-			$result=dol_include_once('/core/modules/contract/'.$module.'.php');
+			$result = dol_include_once('/core/modules/contract/'.$module.'.php');
 			if ($result > 0)
 			{
 				$modCodeContract = new $module();
@@ -937,18 +937,18 @@ 
 					{
 						if ($this->id)
 						{
-							$this->ref="(PROV".$this->id.")";
+							$this->ref = "(PROV".$this->id.")";
 						}
 					}
 				} else {
 					$error++;
-					$this->error='Failed to get PROV number';
+					$this->error = 'Failed to get PROV number';
 				}
 			}
 
-			if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
+			if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
 			{
-				$result=$this->insertExtraFields();
+				$result = $this->insertExtraFields();
 				if ($result < 0)
 				{
 					$error++;
@@ -956,39 +956,39 @@ 
 			}
 
 			// Insert business contacts ('SALESREPSIGN','contrat')
-			if (! $error)
+			if (!$error)
 			{
-    			$result=$this->add_contact($this->commercial_signature_id,'SALESREPSIGN','internal');
+    			$result = $this->add_contact($this->commercial_signature_id, 'SALESREPSIGN', 'internal');
     			if ($result < 0) $error++;
 			}
 
 			// Insert business contacts ('SALESREPFOLL','contrat')
-			if (! $error)
+			if (!$error)
 			{
-                $result=$this->add_contact($this->commercial_suivi_id,'SALESREPFOLL','internal');
+                $result = $this->add_contact($this->commercial_suivi_id, 'SALESREPFOLL', 'internal');
 			    if ($result < 0) $error++;
 			}
 
-			if (! $error)
+			if (!$error)
 			{
-				if (! empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
+				if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
 				{
-					$this->linked_objects = $this->linkedObjectsIds;	// TODO Replace linked_objects with linkedObjectsIds
+					$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
 				}
 
 				// Add object linked
-    			if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
+    			if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
     			{
-    			    foreach($this->linked_objects as $origin => $tmp_origin_id)
+    			    foreach ($this->linked_objects as $origin => $tmp_origin_id)
     			    {
     			        if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
     			        {
-    			            foreach($tmp_origin_id as $origin_id)
+    			            foreach ($tmp_origin_id as $origin_id)
     			            {
     			                $ret = $this->add_object_linked($origin, $origin_id);
-    			                if (! $ret)
+    			                if (!$ret)
     			                {
-    			                    $this->error=$this->db->lasterror();
+    			                    $this->error = $this->db->lasterror();
     			                    $error++;
     			                }
     			            }
@@ -997,22 +997,22 @@ 
     			        {
     			            $origin_id = $tmp_origin_id;
     			            $ret = $this->add_object_linked($origin, $origin_id);
-    			            if (! $ret)
+    			            if (!$ret)
     			            {
-    			                $this->error=$this->db->lasterror();
+    			                $this->error = $this->db->lasterror();
     			                $error++;
     			            }
     			        }
     			    }
     			}
 
-    			if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id))   // Get contact from origin object
+    			if (!$error && $this->id && !empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && !empty($this->origin) && !empty($this->origin_id))   // Get contact from origin object
     			{
     			    $originforcontact = $this->origin;
     			    $originidforcontact = $this->origin_id;
     			    if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
     			    {
-    			        require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+    			        require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
     			        $exp = new Expedition($db);
     			        $exp->fetch($this->origin_id);
     			        $exp->fetchObjectLinked();
@@ -1028,31 +1028,31 @@ 
     			    }
 
     			    $sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
-    			    $sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
+    			    $sqlcontact .= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
 
     			    $resqlcontact = $this->db->query($sqlcontact);
     			    if ($resqlcontact)
     			    {
-    			        while($objcontact = $this->db->fetch_object($resqlcontact))
+    			        while ($objcontact = $this->db->fetch_object($resqlcontact))
     			        {
-    			            if ($objcontact->source == 'internal' && in_array($objcontact->code, array('SALESREPSIGN', 'SALESREPFOLL'))) continue;    // ignore this, already forced previously
+    			            if ($objcontact->source == 'internal' && in_array($objcontact->code, array('SALESREPSIGN', 'SALESREPFOLL'))) continue; // ignore this, already forced previously
 
     			            //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
-    			            $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source);    // May failed because of duplicate key or because code of contact type does not exists for new object
+    			            $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
     			        }
     			    }
     			    else dol_print_error($resqlcontact);
     			}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
                 // Call trigger
-                $result=$this->call_trigger('CONTRACT_CREATE',$user);
+                $result = $this->call_trigger('CONTRACT_CREATE', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
 
-				if (! $error)
+				if (!$error)
 				{
 					$this->db->commit();
 					return $this->id;
@@ -1066,7 +1066,7 @@ 
 			}
 			else
 			{
-				$this->error="Failed to add contract";
+				$this->error = "Failed to add contract";
 				dol_syslog(get_class($this)."::create - 20 - ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
@@ -1074,7 +1074,7 @@ 
 		}
 		else
 		{
-			$this->error=$langs->trans("UnknownError: ".$this->db->error()." -", LOG_DEBUG);
+			$this->error = $langs->trans("UnknownError: ".$this->db->error()." -", LOG_DEBUG);
 
 			$this->db->rollback();
 			return -1;
@@ -1091,18 +1091,18 @@ 
 	function delete($user)
 	{
 		global $conf, $langs;
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 	    // Call trigger
-	    $result=$this->call_trigger('CONTRACT_DELETE',$user);
+	    $result = $this->call_trigger('CONTRACT_DELETE', $user);
 	    if ($result < 0) { $error++; }
 	    // End call triggers
 
-		if (! $error)
+		if (!$error)
 		{
 			// Delete linked contacts
 			$res = $this->delete_linked_contact();
@@ -1113,14 +1113,14 @@ 
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
 			if ($res < 0) $error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			// Delete contratdet_log
 			/*
@@ -1129,73 +1129,73 @@ 
 			$sql.= " WHERE cdl.fk_contratdet=cd.rowid AND cd.fk_contrat=".$this->id;
 			*/
 			$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 .= " 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;
 
 			dol_syslog(get_class($this)."::delete contratdet_log", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				$error++;
 			}
-			$numressql=$this->db->num_rows($resql);
-			if (! $error && $numressql )
+			$numressql = $this->db->num_rows($resql);
+			if (!$error && $numressql)
 			{
-				$tab_resql=array();
-				for($i=0;$i<$numressql;$i++)
+				$tab_resql = array();
+				for ($i = 0; $i < $numressql; $i++)
 				{
-					$objresql=$this->db->fetch_object($resql);
-					$tab_resql[]= $objresql->cdlrowid;
+					$objresql = $this->db->fetch_object($resql);
+					$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).")";
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."contratdet_log ";
+				$sql .= " WHERE ".MAIN_DB_PREFIX."contratdet_log.rowid IN (".implode(",", $tab_resql).")";
 
 				dol_syslog(get_class($this)."::delete contratdet_log", LOG_DEBUG);
-				$resql=$this->db->query($sql);
-				if (! $resql)
+				$resql = $this->db->query($sql);
+				if (!$resql)
 				{
-					$this->error=$this->db->error();
+					$this->error = $this->db->error();
 					$error++;
 				}
 			}
 		}
 
-		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;
 
 			dol_syslog(get_class($this)."::delete contratdet", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
-				$this->error=$this->db->error();
+				$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;
 
 			dol_syslog(get_class($this)."::delete contrat", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				$error++;
 			}
 		}
 
 		// Removed extrafields
-		if (! $error) {
-			$result=$this->deleteExtraFields();
+		if (!$error) {
+			$result = $this->deleteExtraFields();
 			if ($result < 0)
 			{
 				$error++;
@@ -1203,33 +1203,33 @@ 
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			// We remove directory
 			$ref = dol_sanitizeFileName($this->ref);
 			if ($conf->contrat->dir_output)
 			{
-				$dir = $conf->contrat->dir_output . "/" . $ref;
+				$dir = $conf->contrat->dir_output."/".$ref;
 				if (file_exists($dir))
 				{
-					$res=@dol_delete_dir_recursive($dir);
-					if (! $res)
+					$res = @dol_delete_dir_recursive($dir);
+					if (!$res)
 					{
-						$this->error='ErrorFailToDeleteDir';
+						$this->error = 'ErrorFailToDeleteDir';
 						$error++;
 					}
 				}
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -1242,10 +1242,10 @@ 
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return int     		   	 <0 if KO, >0 if OK
 	 */
-	function update($user, $notrigger=0)
+	function update($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
 		if (empty($this->fk_commercial_signature) && $this->commercial_signature_id > 0) $this->fk_commercial_signature = $this->commercial_signature_id;
@@ -1253,20 +1253,20 @@ 
 		if (empty($this->fk_soc) && $this->socid > 0) $this->fk_soc = $this->socid;
 		if (empty($this->fk_project) && $this->projet > 0) $this->fk_project = $this->projet;
 
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-		if (isset($this->ref_customer)) $this->ref_customer=trim($this->ref_customer);
-		if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
-		if (isset($this->ref_ext)) $this->ref_ext=trim($this->ref_ext);
-		if (isset($this->entity)) $this->entity=trim($this->entity);
-		if (isset($this->statut)) $this->statut=(int) $this->statut;
-		if (isset($this->fk_soc)) $this->fk_soc=trim($this->fk_soc);
-		if (isset($this->fk_commercial_signature)) $this->fk_commercial_signature=trim($this->fk_commercial_signature);
-		if (isset($this->fk_commercial_suivi)) $this->fk_commercial_suivi=trim($this->fk_commercial_suivi);
-		if (isset($this->fk_user_mise_en_service)) $this->fk_user_mise_en_service=trim($this->fk_user_mise_en_service);
-		if (isset($this->fk_user_cloture)) $this->fk_user_cloture=trim($this->fk_user_cloture);
-		if (isset($this->note_private)) $this->note_private=trim($this->note_private);
-		if (isset($this->note_public)) $this->note_public=trim($this->note_public);
-		if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+		if (isset($this->ref)) $this->ref = trim($this->ref);
+		if (isset($this->ref_customer)) $this->ref_customer = trim($this->ref_customer);
+		if (isset($this->ref_supplier)) $this->ref_supplier = trim($this->ref_supplier);
+		if (isset($this->ref_ext)) $this->ref_ext = trim($this->ref_ext);
+		if (isset($this->entity)) $this->entity = trim($this->entity);
+		if (isset($this->statut)) $this->statut = (int) $this->statut;
+		if (isset($this->fk_soc)) $this->fk_soc = trim($this->fk_soc);
+		if (isset($this->fk_commercial_signature)) $this->fk_commercial_signature = trim($this->fk_commercial_signature);
+		if (isset($this->fk_commercial_suivi)) $this->fk_commercial_suivi = trim($this->fk_commercial_suivi);
+		if (isset($this->fk_user_mise_en_service)) $this->fk_user_mise_en_service = trim($this->fk_user_mise_en_service);
+		if (isset($this->fk_user_cloture)) $this->fk_user_cloture = trim($this->fk_user_cloture);
+		if (isset($this->note_private)) $this->note_private = trim($this->note_private);
+		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
+		if (isset($this->import_key)) $this->import_key = trim($this->import_key);
 		//if (isset($this->extraparams)) $this->extraparams=trim($this->extraparams);
 
 		// Check parameters
@@ -1274,46 +1274,46 @@ 
 
 		// Update request
     	$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET";
-		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
-		$sql.= " ref_customer=".(isset($this->ref_customer)?"'".$this->db->escape($this->ref_customer)."'":"null").",";
-		$sql.= " ref_supplier=".(isset($this->ref_supplier)?"'".$this->db->escape($this->ref_supplier)."'":"null").",";
-		$sql.= " ref_ext=".(isset($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null").",";
-		$sql.= " entity=".$conf->entity.",";
-		$sql.= " date_contrat=".(dol_strlen($this->date_contrat)!=0 ? "'".$this->db->idate($this->date_contrat)."'" : 'null').",";
-		$sql.= " statut=".(isset($this->statut)?$this->statut:"null").",";
-		$sql.= " mise_en_service=".(dol_strlen($this->mise_en_service)!=0 ? "'".$this->db->idate($this->mise_en_service)."'" : 'null').",";
-		$sql.= " fin_validite=".(dol_strlen($this->fin_validite)!=0 ? "'".$this->db->idate($this->fin_validite)."'" : 'null').",";
-		$sql.= " date_cloture=".(dol_strlen($this->date_cloture)!=0 ? "'".$this->db->idate($this->date_cloture)."'" : 'null').",";
-		$sql.= " fk_soc=".($this->fk_soc > 0 ? $this->fk_soc:"null").",";
-		$sql.= " fk_projet=".($this->fk_project > 0 ? $this->fk_project:"null").",";
-		$sql.= " fk_commercial_signature=".(isset($this->fk_commercial_signature)?$this->fk_commercial_signature:"null").",";
-		$sql.= " fk_commercial_suivi=".(isset($this->fk_commercial_suivi)?$this->fk_commercial_suivi:"null").",";
-		$sql.= " fk_user_mise_en_service=".(isset($this->fk_user_mise_en_service)?$this->fk_user_mise_en_service:"null").",";
-		$sql.= " fk_user_cloture=".(isset($this->fk_user_cloture)?$this->fk_user_cloture:"null").",";
-		$sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
-		$sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
-		$sql.= " import_key=".(isset($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null")."";
+		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
+		$sql .= " ref_customer=".(isset($this->ref_customer) ? "'".$this->db->escape($this->ref_customer)."'" : "null").",";
+		$sql .= " ref_supplier=".(isset($this->ref_supplier) ? "'".$this->db->escape($this->ref_supplier)."'" : "null").",";
+		$sql .= " ref_ext=".(isset($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null").",";
+		$sql .= " entity=".$conf->entity.",";
+		$sql .= " date_contrat=".(dol_strlen($this->date_contrat) != 0 ? "'".$this->db->idate($this->date_contrat)."'" : 'null').",";
+		$sql .= " statut=".(isset($this->statut) ? $this->statut : "null").",";
+		$sql .= " mise_en_service=".(dol_strlen($this->mise_en_service) != 0 ? "'".$this->db->idate($this->mise_en_service)."'" : 'null').",";
+		$sql .= " fin_validite=".(dol_strlen($this->fin_validite) != 0 ? "'".$this->db->idate($this->fin_validite)."'" : 'null').",";
+		$sql .= " date_cloture=".(dol_strlen($this->date_cloture) != 0 ? "'".$this->db->idate($this->date_cloture)."'" : 'null').",";
+		$sql .= " fk_soc=".($this->fk_soc > 0 ? $this->fk_soc : "null").",";
+		$sql .= " fk_projet=".($this->fk_project > 0 ? $this->fk_project : "null").",";
+		$sql .= " fk_commercial_signature=".(isset($this->fk_commercial_signature) ? $this->fk_commercial_signature : "null").",";
+		$sql .= " fk_commercial_suivi=".(isset($this->fk_commercial_suivi) ? $this->fk_commercial_suivi : "null").",";
+		$sql .= " fk_user_mise_en_service=".(isset($this->fk_user_mise_en_service) ? $this->fk_user_mise_en_service : "null").",";
+		$sql .= " fk_user_cloture=".(isset($this->fk_user_cloture) ? $this->fk_user_cloture : "null").",";
+		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
+		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
+		$sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null")."";
 		//$sql.= " extraparams=".(isset($this->extraparams)?"'".$this->db->escape($this->extraparams)."'":"null")."";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0)
+		if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0)
 		{
-			$result=$this->insertExtraFields();
+			$result = $this->insertExtraFields();
 			if ($result < 0)
 			{
 				$error++;
 			}
 		}
 
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
 			// Call triggers
-			$result=$this->call_trigger('CONTRACT_MODIFY',$user);
+			$result = $this->call_trigger('CONTRACT_MODIFY', $user);
 			if ($result < 0) { $error++; }
 			// End call triggers
 		}
@@ -1321,13 +1321,13 @@ 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -1360,17 +1360,17 @@ 
 	 * 	@param 	string		$rang 				Position
 	 *  @return int             				<0 if KO, >0 if OK
 	 */
-	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $fk_fournprice=null, $pa_ht = 0,$array_options=0, $fk_unit = null, $rang=0)
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type = 'HT', $pu_ttc = 0.0, $info_bits = 0, $fk_fournprice = null, $pa_ht = 0, $array_options = 0, $fk_unit = null, $rang = 0)
 	{
 		global $user, $langs, $conf, $mysoc;
-		$error=0;
+		$error = 0;
 
 		dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type, $pu_ttc, $info_bits, $rang");
 
 		// Check parameters
 		if ($fk_product <= 0 && empty($desc))
 		{
-			$this->error="ErrorDescRequiredForFreeProductLines";
+			$this->error = "ErrorDescRequiredForFreeProductLines";
 			return -1;
 		}
 
@@ -1379,44 +1379,44 @@ 
 			$this->db->begin();
 
 			// Clean parameters
-			$pu_ht=price2num($pu_ht);
-			$pu_ttc=price2num($pu_ttc);
-			$pa_ht=price2num($pa_ht);
+			$pu_ht = price2num($pu_ht);
+			$pu_ttc = price2num($pu_ttc);
+			$pa_ht = price2num($pa_ht);
 			if (!preg_match('/\((.*)\)/', $txtva)) {
-				$txtva = price2num($txtva);               // $txtva can have format '5.0(XXX)' or '5'
-			}
-			$txlocaltax1=price2num($txlocaltax1);
-			$txlocaltax2=price2num($txlocaltax2);
-			$remise_percent=price2num($remise_percent);
-			$qty=price2num($qty);
-			if (empty($qty)) $qty=1;
-			if (empty($info_bits)) $info_bits=0;
-			if (empty($pu_ht) || ! is_numeric($pu_ht))  $pu_ht=0;
-			if (empty($pu_ttc)) $pu_ttc=0;
-			if (empty($txtva) || ! is_numeric($txtva)) $txtva=0;
-			if (empty($txlocaltax1) || ! is_numeric($txlocaltax1)) $txlocaltax1=0;
-            if (empty($txlocaltax2) || ! is_numeric($txlocaltax2)) $txlocaltax2=0;
-
-			if ($price_base_type=='HT')
+				$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+			}
+			$txlocaltax1 = price2num($txlocaltax1);
+			$txlocaltax2 = price2num($txlocaltax2);
+			$remise_percent = price2num($remise_percent);
+			$qty = price2num($qty);
+			if (empty($qty)) $qty = 1;
+			if (empty($info_bits)) $info_bits = 0;
+			if (empty($pu_ht) || !is_numeric($pu_ht))  $pu_ht = 0;
+			if (empty($pu_ttc)) $pu_ttc = 0;
+			if (empty($txtva) || !is_numeric($txtva)) $txtva = 0;
+			if (empty($txlocaltax1) || !is_numeric($txlocaltax1)) $txlocaltax1 = 0;
+            if (empty($txlocaltax2) || !is_numeric($txlocaltax2)) $txlocaltax2 = 0;
+
+			if ($price_base_type == 'HT')
 			{
-				$pu=$pu_ht;
+				$pu = $pu_ht;
 			}
 			else
 			{
-				$pu=$pu_ttc;
+				$pu = $pu_ttc;
 			}
 
 			// Check parameters
-			if (empty($remise_percent)) $remise_percent=0;
+			if (empty($remise_percent)) $remise_percent = 0;
 
-			$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->societe, $mysoc);
+			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->societe, $mysoc);
 
 			// Clean vat code
-			$vat_src_code='';
+			$vat_src_code = '';
 			if (preg_match('/\((.*)\)/', $txtva, $reg))
 			{
 				$vat_src_code = $reg[1];
-				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
 
 			// Calcul du total TTC et de la TVA pour la ligne a partir de
@@ -1424,15 +1424,15 @@ 
 			// 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, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, 1,$mysoc, $localtaxes_type);
+			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, 1, $mysoc, $localtaxes_type);
 			$total_ht  = $tabprice[0];
 			$total_tva = $tabprice[1];
 			$total_ttc = $tabprice[2];
-			$total_localtax1= $tabprice[9];
-			$total_localtax2= $tabprice[10];
+			$total_localtax1 = $tabprice[9];
+			$total_localtax2 = $tabprice[10];
 
-			$localtax1_type=$localtaxes_type[0];
-			$localtax2_type=$localtaxes_type[2];
+			$localtax1_type = $localtaxes_type[0];
+			$localtax2_type = $localtaxes_type[2];
 
 			// TODO A virer
 			// Anciens indicateurs: $price, $remise (a ne plus utiliser)
@@ -1444,7 +1444,7 @@ 
 				$price = $pu_ht - $remise;
 			}
 
-		    if (empty($pa_ht)) $pa_ht=0;
+		    if (empty($pa_ht)) $pa_ht = 0;
 
 
 			// if buy price not defined, define buyprice as configured in margin admin
@@ -1462,59 +1462,59 @@ 
 
 			// Insertion dans la base
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."contratdet";
-			$sql.= " (fk_contrat, label, description, fk_product, qty, tva_tx, vat_src_code,";
-			$sql.= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice,";
-			$sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc,";
-			$sql.= " info_bits,";
-			$sql.= " price_ht, remise, fk_product_fournisseur_price, buy_price_ht";
-			if ($date_start > 0) { $sql.= ",date_ouverture_prevue"; }
-			if ($date_end > 0)   { $sql.= ",date_fin_validite"; }
-			$sql.= ", fk_unit";
-			$sql.= ") VALUES (";
-			$sql.= $this->id.", '', '" . $this->db->escape($desc) . "',";
-			$sql.= ($fk_product>0 ? $fk_product : "null").",";
-			$sql.= " ".$qty.",";
-			$sql.= " ".$txtva.",";
-			$sql.= " ".($vat_src_code?"'".$vat_src_code."'":"null").",";
-			$sql.= " ".$txlocaltax1.",";
-			$sql.= " ".$txlocaltax2.",";
-			$sql.= " '".$localtax1_type."',";
-			$sql.= " '".$localtax2_type."',";
-			$sql.= " ".price2num($remise_percent).",";
-			$sql.= " ".price2num($pu_ht).",";
-			$sql.= " ".price2num($total_ht).",".price2num($total_tva).",".price2num($total_localtax1).",".price2num($total_localtax2).",".price2num($total_ttc).",";
-			$sql.= " '".$info_bits."',";
-			$sql.= " ".price2num($price).",".price2num($remise).",";
-			if (isset($fk_fournprice)) $sql.= ' '.$fk_fournprice.',';
-			else $sql.= ' null,';
-			if (isset($pa_ht)) $sql.= ' '.price2num($pa_ht);
-			else $sql.= ' null';
-			if ($date_start > 0) { $sql.= ",'".$this->db->idate($date_start)."'"; }
-			if ($date_end > 0) { $sql.= ",'".$this->db->idate($date_end)."'"; }
-			$sql.= ", ".($fk_unit?"'".$this->db->escape($fk_unit)."'":"null");
-			$sql.= ")";
-
-			$resql=$this->db->query($sql);
+			$sql .= " (fk_contrat, label, description, fk_product, qty, tva_tx, vat_src_code,";
+			$sql .= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice,";
+			$sql .= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc,";
+			$sql .= " info_bits,";
+			$sql .= " price_ht, remise, fk_product_fournisseur_price, buy_price_ht";
+			if ($date_start > 0) { $sql .= ",date_ouverture_prevue"; }
+			if ($date_end > 0) { $sql .= ",date_fin_validite"; }
+			$sql .= ", fk_unit";
+			$sql .= ") VALUES (";
+			$sql .= $this->id.", '', '".$this->db->escape($desc)."',";
+			$sql .= ($fk_product > 0 ? $fk_product : "null").",";
+			$sql .= " ".$qty.",";
+			$sql .= " ".$txtva.",";
+			$sql .= " ".($vat_src_code ? "'".$vat_src_code."'" : "null").",";
+			$sql .= " ".$txlocaltax1.",";
+			$sql .= " ".$txlocaltax2.",";
+			$sql .= " '".$localtax1_type."',";
+			$sql .= " '".$localtax2_type."',";
+			$sql .= " ".price2num($remise_percent).",";
+			$sql .= " ".price2num($pu_ht).",";
+			$sql .= " ".price2num($total_ht).",".price2num($total_tva).",".price2num($total_localtax1).",".price2num($total_localtax2).",".price2num($total_ttc).",";
+			$sql .= " '".$info_bits."',";
+			$sql .= " ".price2num($price).",".price2num($remise).",";
+			if (isset($fk_fournprice)) $sql .= ' '.$fk_fournprice.',';
+			else $sql .= ' null,';
+			if (isset($pa_ht)) $sql .= ' '.price2num($pa_ht);
+			else $sql .= ' null';
+			if ($date_start > 0) { $sql .= ",'".$this->db->idate($date_start)."'"; }
+			if ($date_end > 0) { $sql .= ",'".$this->db->idate($date_end)."'"; }
+			$sql .= ", ".($fk_unit ? "'".$this->db->escape($fk_unit)."'" : "null");
+			$sql .= ")";
+
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$contractlineid = $this->db->last_insert_id(MAIN_DB_PREFIX."contratdet");
 
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
 				{
 					$contractline = new ContratLigne($this->db);
-					$contractline->array_options=$array_options;
-					$contractline->id=$contractlineid;
-					$result=$contractline->insertExtraFields();
+					$contractline->array_options = $array_options;
+					$contractline->id = $contractlineid;
+					$result = $contractline->insertExtraFields();
 					if ($result < 0)
 					{
-						$this->error[]=$contractline->error;
+						$this->error[] = $contractline->error;
 						$error++;
 					}
 				}
 
 				if (empty($error)) {
 				    // Call trigger
-				    $result=$this->call_trigger('LINECONTRACT_INSERT',$user);
+				    $result = $this->call_trigger('LINECONTRACT_INSERT', $user);
 				    if ($result < 0)
 				    {
 				    	$error++;
@@ -1536,7 +1536,7 @@ 
 			else
 			{
 				$this->db->rollback();
-				$this->error=$this->db->error()." sql=".$sql;
+				$this->error = $this->db->error()." sql=".$sql;
 				return -1;
 			}
 		}
@@ -1570,22 +1570,22 @@ 
 	 * 	@param 	string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 *  @return int              				< 0 si erreur, > 0 si ok
 	 */
-	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $tvatx, $localtax1tx=0.0, $localtax2tx=0.0, $date_debut_reel='', $date_fin_reel='', $price_base_type='HT', $info_bits=0, $fk_fournprice=null, $pa_ht = 0,$array_options=0, $fk_unit = null)
+	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $tvatx, $localtax1tx = 0.0, $localtax2tx = 0.0, $date_debut_reel = '', $date_fin_reel = '', $price_base_type = 'HT', $info_bits = 0, $fk_fournprice = null, $pa_ht = 0, $array_options = 0, $fk_unit = null)
 	{
 		global $user, $conf, $langs, $mysoc;
 
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		$qty=trim($qty);
-		$desc=trim($desc);
-		$desc=trim($desc);
+		$qty = trim($qty);
+		$desc = trim($desc);
+		$desc = trim($desc);
 		$price = price2num($pu);
 		$tvatx = price2num($tvatx);
 		$localtax1tx = price2num($localtax1tx);
 		$localtax2tx = price2num($localtax2tx);
-		$pa_ht=price2num($pa_ht);
-		if (empty($fk_fournprice)) $fk_fournprice=0;
+		$pa_ht = price2num($pa_ht);
+		if (empty($fk_fournprice)) $fk_fournprice = 0;
 
 		$subprice = $price;
 		$remise = 0;
@@ -1596,7 +1596,7 @@ 
 		}
 		else
 		{
-			$remise_percent=0;
+			$remise_percent = 0;
 		}
 
 		dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $date_debut_reel, $date_fin_reel, $tvatx, $localtax1tx, $localtax2tx, $price_base_type, $info_bits");
@@ -1608,18 +1608,18 @@ 
 		// 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.
 
-		$localtaxes_type=getLocalTaxesFromRate($tvatx, 0, $this->societe, $mysoc);
-		$tvatx = preg_replace('/\s*\(.*\)/','',$tvatx);  // Remove code into vatrate.
+		$localtaxes_type = getLocalTaxesFromRate($tvatx, 0, $this->societe, $mysoc);
+		$tvatx = preg_replace('/\s*\(.*\)/', '', $tvatx); // Remove code into vatrate.
 
-		$tabprice=calcul_price_total($qty, $pu, $remise_percent, $tvatx, $localtax1tx, $localtax2tx, 0, $price_base_type, $info_bits, 1, $mysoc, $localtaxes_type);
+		$tabprice = calcul_price_total($qty, $pu, $remise_percent, $tvatx, $localtax1tx, $localtax2tx, 0, $price_base_type, $info_bits, 1, $mysoc, $localtaxes_type);
 		$total_ht  = $tabprice[0];
 		$total_tva = $tabprice[1];
 		$total_ttc = $tabprice[2];
-		$total_localtax1= $tabprice[9];
-		$total_localtax2= $tabprice[10];
+		$total_localtax1 = $tabprice[9];
+		$total_localtax2 = $tabprice[10];
 
-		$localtax1_type=$localtaxes_type[0];
-		$localtax2_type=$localtaxes_type[2];
+		$localtax1_type = $localtaxes_type[0];
+		$localtax2_type = $localtaxes_type[2];
 
 		// TODO A virer
 		// Anciens indicateurs: $price, $remise (a ne plus utiliser)
@@ -1631,7 +1631,7 @@ 
 		    $price = $pu - $remise;
 		}
 
-	    if (empty($pa_ht)) $pa_ht=0;
+	    if (empty($pa_ht)) $pa_ht = 0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0)
@@ -1647,58 +1647,58 @@ 
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet set description='".$this->db->escape($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)."'";
-		$sql.= ",localtax1_tx='".  price2num($localtax1tx)."'";
-		$sql.= ",localtax2_tx='".  price2num($localtax2tx)."'";
-		$sql.= ",localtax1_type='".$localtax1_type."'";
-		$sql.= ",localtax2_type='".$localtax2_type."'";
-		$sql.= ", total_ht='".     price2num($total_ht)."'";
-		$sql.= ", total_tva='".    price2num($total_tva)."'";
-		$sql.= ", total_localtax1='".price2num($total_localtax1)."'";
-		$sql.= ", total_localtax2='".price2num($total_localtax2)."'";
-		$sql.= ", total_ttc='".      price2num($total_ttc)."'";
-		$sql.= ", fk_product_fournisseur_price=".($fk_fournprice > 0 ? $fk_fournprice : "null");
-		$sql.= ", buy_price_ht='".price2num($pa_ht)."'";
-		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 .= ", fk_unit=".($fk_unit?"'".$this->db->escape($fk_unit)."'":"null");
+		$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)."'";
+		$sql .= ",localtax1_tx='".price2num($localtax1tx)."'";
+		$sql .= ",localtax2_tx='".price2num($localtax2tx)."'";
+		$sql .= ",localtax1_type='".$localtax1_type."'";
+		$sql .= ",localtax2_type='".$localtax2_type."'";
+		$sql .= ", total_ht='".price2num($total_ht)."'";
+		$sql .= ", total_tva='".price2num($total_tva)."'";
+		$sql .= ", total_localtax1='".price2num($total_localtax1)."'";
+		$sql .= ", total_localtax2='".price2num($total_localtax2)."'";
+		$sql .= ", total_ttc='".price2num($total_ttc)."'";
+		$sql .= ", fk_product_fournisseur_price=".($fk_fournprice > 0 ? $fk_fournprice : "null");
+		$sql .= ", buy_price_ht='".price2num($pa_ht)."'";
+		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 .= ", fk_unit=".($fk_unit ? "'".$this->db->escape($fk_unit)."'" : "null");
 		$sql .= " WHERE rowid = ".$rowid;
 
 		dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
-			$result=$this->update_statut($user);
+			$result = $this->update_statut($user);
 			if ($result >= 0)
 			{
 
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
 				{
 					$contractline = new ContratLigne($this->db);
-					$contractline->array_options=$array_options;
-					$contractline->id= $rowid;
-					$result=$contractline->insertExtraFields();
+					$contractline->array_options = $array_options;
+					$contractline->id = $rowid;
+					$result = $contractline->insertExtraFields();
 					if ($result < 0)
 					{
-						$this->error[]=$contractline->error;
+						$this->error[] = $contractline->error;
 						$error++;
 					}
 				}
 
 				if (empty($error)) {
 			        // Call trigger
-			        $result=$this->call_trigger('LINECONTRACT_UPDATE',$user);
+			        $result = $this->call_trigger('LINECONTRACT_UPDATE', $user);
 			        if ($result < 0)
 			        {
 			            $this->db->rollback();
@@ -1720,7 +1720,7 @@ 
 		else
 		{
 			$this->db->rollback();
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			dol_syslog(get_class($this)."::updateline Erreur -1");
 			return -1;
 		}
@@ -1737,26 +1737,26 @@ 
 	{
 		global $conf, $langs;
 
-		$error=0;
+		$error = 0;
 
 		if ($this->statut >= 0)
 		{
 
 		    // Call trigger
-		    $result=$this->call_trigger('LINECONTRACT_DELETE',$user);
+		    $result = $this->call_trigger('LINECONTRACT_DELETE', $user);
 		    if ($result < 0) return -1;
 		    // End call triggers
 
 		    $this->db->begin();
 
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."contratdet";
-			$sql.= " WHERE rowid=".$idline;
+			$sql .= " WHERE rowid=".$idline;
 
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (! $resql)
+			if (!$resql)
 			{
-				$this->error="Error ".$this->db->lasterror();
+				$this->error = "Error ".$this->db->lasterror();
 				$error++;
 			}
 
@@ -1765,12 +1765,12 @@ 
 				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 				{
 					$contractline = new ContratLigne($this->db);
-					$contractline->id= $idline;
-					$result=$contractline->deleteExtraFields();
+					$contractline->id = $idline;
+					$result = $contractline->deleteExtraFields();
 					if ($result < 0)
 					{
 						$error++;
-						$this->error="Error ".get_class($this)."::delete deleteExtraFields error -4 ".$contractline->error;
+						$this->error = "Error ".get_class($this)."::delete deleteExtraFields error -4 ".$contractline->error;
 					}
 				}
 			}
@@ -1803,7 +1803,7 @@ 
 	function update_statut($user)
 	{
         // phpcs:enable
-		dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
+		dol_syslog(__METHOD__." is deprecated", LOG_WARNING);
 
 		// If draft, we keep it (should not happen)
 		if ($this->statut == 0) return 1;
@@ -1829,7 +1829,7 @@ 
 	 */
 	function getLibStatut($mode)
 	{
-		return $this->LibStatut($this->statut,$mode);
+		return $this->LibStatut($this->statut, $mode);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -1840,7 +1840,7 @@ 
 	 *  @param  int		$mode          	0=Long label, 1=Short label, 2=Picto + Libelle court, 3=Picto, 4=Picto + Long label of all services, 5=Libelle court + Picto, 6=Picto of all services, 7=Same than 6 with fixed length
 	 *	@return string      			Label
 	 */
-	function LibStatut($statut,$mode)
+	function LibStatut($statut, $mode)
 	{
         // phpcs:enable
 		global $langs;
@@ -1859,43 +1859,43 @@ 
 		}
 		elseif ($mode == 2)
 		{
-			if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'),'statut0').' '.$langs->trans("ContractStatusDraft"); }
-			elseif ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4').' '.$langs->trans("ContractStatusValidated"); }
-			elseif ($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"); }
+			elseif ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'), 'statut4').' '.$langs->trans("ContractStatusValidated"); }
+			elseif ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'), 'statut6').' '.$langs->trans("ContractStatusClosed"); }
 		}
 		elseif ($mode == 3)
 		{
-			if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'),'statut0'); }
-			elseif ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4'); }
-			elseif ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'),'statut6'); }
+			if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'), 'statut0'); }
+			elseif ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'), 'statut4'); }
+			elseif ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'), 'statut6'); }
 		}
 		elseif ($mode == 4 || $mode == 6 || $mode == 7)
 		{
-			$text='';
+			$text = '';
 			if ($mode == 4)
 			{
-				$text ='<span class="hideonsmartphone">';
-				$text.=($this->nbofserviceswait+$this->nbofservicesopened+$this->nbofservicesexpired+$this->nbofservicesclosed);
-				$text.=' '.$langs->trans("Services");
-				$text.=': &nbsp; &nbsp; ';
-				$text.='</span>';
-			}
-			$text.=($mode == 7?'<div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofserviceswait > 0) ? ($this->nbofserviceswait.ContratLigne::LibStatut(0,3,-1,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesopened || $this->nbofservicesexpired || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
-			$text.=($mode == 7?'</div><div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofservicesopened > 0) ? ($this->nbofservicesopened.ContratLigne::LibStatut(4,3,0,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesexpired || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
-			$text.=($mode == 7?'</div><div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofservicesexpired > 0) ? ($this->nbofservicesexpired.ContratLigne::LibStatut(4,3,1,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
-			$text.=($mode == 7?'</div><div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofservicesclosed > 0) ? ($this->nbofservicesclosed.ContratLigne::LibStatut(5,3,-1,'class="paddingleft2 inline-block valigntextbottom"')) : '';
-			$text.=($mode == 7?'</div>':'');
+				$text = '<span class="hideonsmartphone">';
+				$text .= ($this->nbofserviceswait + $this->nbofservicesopened + $this->nbofservicesexpired + $this->nbofservicesclosed);
+				$text .= ' '.$langs->trans("Services");
+				$text .= ': &nbsp; &nbsp; ';
+				$text .= '</span>';
+			}
+			$text .= ($mode == 7 ? '<div class="inline-block">' : '');
+			$text .= ($mode != 7 || $this->nbofserviceswait > 0) ? ($this->nbofserviceswait.ContratLigne::LibStatut(0, 3, -1, 'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesopened || $this->nbofservicesexpired || $this->nbofservicesclosed) ? ' &nbsp; ' : '') : '';
+			$text .= ($mode == 7 ? '</div><div class="inline-block">' : '');
+			$text .= ($mode != 7 || $this->nbofservicesopened > 0) ? ($this->nbofservicesopened.ContratLigne::LibStatut(4, 3, 0, 'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesexpired || $this->nbofservicesclosed) ? ' &nbsp; ' : '') : '';
+			$text .= ($mode == 7 ? '</div><div class="inline-block">' : '');
+			$text .= ($mode != 7 || $this->nbofservicesexpired > 0) ? ($this->nbofservicesexpired.ContratLigne::LibStatut(4, 3, 1, 'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesclosed) ? ' &nbsp; ' : '') : '';
+			$text .= ($mode == 7 ? '</div><div class="inline-block">' : '');
+			$text .= ($mode != 7 || $this->nbofservicesclosed > 0) ? ($this->nbofservicesclosed.ContratLigne::LibStatut(5, 3, -1, 'class="paddingleft2 inline-block valigntextbottom"')) : '';
+			$text .= ($mode == 7 ? '</div>' : '');
 			return $text;
 		}
 		elseif ($mode == 5)
 		{
-			if ($statut == 0) { return $langs->trans("ContractStatusDraft").' '.img_picto($langs->trans('ContractStatusDraft'),'statut0'); }
-			elseif ($statut == 1) { return $langs->trans("ContractStatusValidated").' '.img_picto($langs->trans('ContractStatusValidated'),'statut4'); }
-			elseif ($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'); }
+			elseif ($statut == 1) { return $langs->trans("ContractStatusValidated").' '.img_picto($langs->trans('ContractStatusValidated'), 'statut4'); }
+			elseif ($statut == 2) { return $langs->trans("ContractStatusClosed").' '.img_picto($langs->trans('ContractStatusClosed'), 'statut6'); }
 		}
 	}
 
@@ -1909,20 +1909,20 @@ 
      *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								Chaine avec URL
 	 */
-	function getNomUrl($withpicto=0, $maxlength=0, $notooltip=0, $save_lastsearch_value=-1)
+	function getNomUrl($withpicto = 0, $maxlength = 0, $notooltip = 0, $save_lastsearch_value = -1)
 	{
 		global $conf, $langs, $user;
 
-		$result='';
+		$result = '';
 
 		$url = DOL_URL_ROOT.'/contrat/card.php?id='.$this->id;
 
 		//if ($option !== 'nolink')
 		//{
 			// Add param to save lastsearch_values or not
-			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
 		//}
 
         $label = '';
@@ -1936,32 +1936,32 @@ 
                 $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
             }
             if (!empty($this->total_tva)) {
-                $label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1,	$conf->currency);
+                $label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
             }
             if (!empty($this->total_ttc)) {
                 $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
             }
         }
 
-        $linkclose='';
+        $linkclose = '';
         if (empty($notooltip) && $user->rights->contrat->lire)
         {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
             {
-                $label=$langs->trans("ShowOrder");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+                $label = $langs->trans("ShowOrder");
+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip"';
+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose .= ' class="classfortooltip"';
         }
 
 		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
 		$result .= $linkend;
 
 		return $result;
@@ -1976,12 +1976,12 @@ 
 	function info($id)
 	{
 		$sql = "SELECT c.rowid, c.ref, c.datec, c.date_cloture,";
-		$sql.= " 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;
+		$sql .= " 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);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			if ($this->db->num_rows($result))
@@ -1993,7 +1993,7 @@ 
 				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation     = $cuser;
+					$this->user_creation = $cuser;
 				}
 
 				if ($obj->fk_user_cloture) {
@@ -2001,7 +2001,7 @@ 
 					$cuser->fetch($obj->fk_user_cloture);
 					$this->user_cloture = $cuser;
 				}
-				$this->ref			     = (! $obj->ref) ? $obj->rowid : $obj->ref;
+				$this->ref = (!$obj->ref) ? $obj->rowid : $obj->ref;
 				$this->date_creation     = $this->db->jdate($obj->datec);
 				$this->date_modification = $this->db->jdate($obj->date_modification);
 				$this->date_cloture      = $this->db->jdate($obj->date_cloture);
@@ -2022,33 +2022,33 @@ 
 	 *  @param	int		$statut     Status of lines to get
 	 *  @return array       		Array of line's rowid
 	 */
-	function array_detail($statut=-1)
+	function array_detail($statut = -1)
 	{
         // phpcs:enable
-		$tab=array();
+		$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'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
+		$sql .= " WHERE fk_contrat =".$this->id;
+		if ($statut >= 0) $sql .= " AND statut = '$statut'";
 
 		dol_syslog(get_class($this)."::array_detail()", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$num=$this->db->num_rows($resql);
-			$i=0;
+			$num = $this->db->num_rows($resql);
+			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
-				$tab[$i]=$obj->rowid;
+				$tab[$i] = $obj->rowid;
 				$i++;
 			}
 			return $tab;
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -2059,34 +2059,34 @@ 
 	 *	@param	string		$option		'all' or 'others'
 	 *  @return array   				Array of contracts id
 	 */
-	function getListOfContracts($option='all')
+	function getListOfContracts($option = 'all')
 	{
-		$tab=array();
+		$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;
+		$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c";
+		$sql .= " WHERE fk_soc =".$this->socid;
+		if ($option == 'others') $sql .= " AND c.rowid != ".$this->id;
 
 		dol_syslog(get_class($this)."::getOtherContracts()", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$num=$this->db->num_rows($resql);
-			$i=0;
+			$num = $this->db->num_rows($resql);
+			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
-				$contrat=new Contrat($this->db);
+				$contrat = new Contrat($this->db);
 				$contrat->fetch($obj->rowid);
-				$tab[]=$contrat;
+				$tab[] = $contrat;
 				$i++;
 			}
 			return $tab;
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -2100,42 +2100,42 @@ 
      *      @param  string	$mode           "inactive" pour services a activer, "expired" pour services expires
      *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
 	 */
-	function load_board($user,$mode)
+	function load_board($user, $mode)
 	{
         // phpcs:enable
 		global $conf, $langs;
 
 		$this->from = " FROM ".MAIN_DB_PREFIX."contrat as c";
-		$this->from.= ", ".MAIN_DB_PREFIX."contratdet as cd";
-		$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$user->societe_id) $this->from.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$this->from .= ", ".MAIN_DB_PREFIX."contratdet as cd";
+		$this->from .= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$user->societe_id) $this->from .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 
 		if ($mode == 'inactives')
 		{
 			$sql = "SELECT cd.rowid, cd.date_ouverture_prevue as datefin";
-			$sql.= $this->from;
-			$sql.= " WHERE c.statut = 1";
-			$sql.= " AND c.rowid = cd.fk_contrat";
-			$sql.= " AND cd.statut = 0";
+			$sql .= $this->from;
+			$sql .= " WHERE c.statut = 1";
+			$sql .= " AND c.rowid = cd.fk_contrat";
+			$sql .= " AND cd.statut = 0";
 		}
 		elseif ($mode == 'expired')
 		{
 			$sql = "SELECT cd.rowid, cd.date_fin_validite as datefin";
-			$sql.= $this->from;
-			$sql.= " WHERE c.statut = 1";
-			$sql.= " AND c.rowid = cd.fk_contrat";
-			$sql.= " AND cd.statut = 4";
-			$sql.= " AND cd.date_fin_validite < '".$this->db->idate(time())."'";
-		}
-		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity = ".$conf->entity;
-		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);
+			$sql .= $this->from;
+			$sql .= " WHERE c.statut = 1";
+			$sql .= " AND c.rowid = cd.fk_contrat";
+			$sql .= " AND cd.statut = 4";
+			$sql .= " AND cd.date_fin_validite < '".$this->db->idate(time())."'";
+		}
+		$sql .= " AND c.fk_soc = s.rowid";
+		$sql .= " AND c.entity = ".$conf->entity;
+		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)
 		{
 			$langs->load("contracts");
-			$now=dol_now();
+			$now = dol_now();
 
 			if ($mode == 'inactives') {
 				$warning_delay = $conf->contrat->services->inactifs->warning_delay;
@@ -2148,12 +2148,12 @@ 
 			}
 
 			$response = new WorkboardResponse();
-			$response->warning_delay = $warning_delay/60/60/24;
+			$response->warning_delay = $warning_delay / 60 / 60 / 24;
 			$response->label = $label;
 			$response->url = $url;
-			$response->img = img_object('',"contract");
+			$response->img = img_object('', "contract");
 
-			while ($obj=$this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
 				$response->nbtodo++;
 
@@ -2167,7 +2167,7 @@ 
 		else
 		{
 			dol_print_error($this->db);
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -2183,26 +2183,26 @@ 
         // phpcs:enable
 		global $conf, $user;
 
-		$this->nb=array();
+		$this->nb = array();
 		$clause = "WHERE";
 
 		$sql = "SELECT count(c.rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
 		if (!$user->rights->societe->client->voir && !$user->societe_id)
 		{
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-			$sql.= " WHERE sc.fk_user = " .$user->id;
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = "AND";
 		}
-		$sql.= " ".$clause." c.entity = ".$conf->entity;
+		$sql .= " ".$clause." c.entity = ".$conf->entity;
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while ($obj=$this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
-				$this->nb["Contracts"]=$obj->nb;
+				$this->nb["Contracts"] = $obj->nb;
 			}
             $this->db->free($resql);
 			return 1;
@@ -2210,7 +2210,7 @@ 
 		else
 		{
 			dol_print_error($this->db);
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -2225,7 +2225,7 @@ 
 	 */
 	function getIdBillingContact()
 	{
-		return $this->getIdContact('external','BILLING');
+		return $this->getIdContact('external', 'BILLING');
 	}
 
 	/**
@@ -2235,7 +2235,7 @@ 
 	 */
 	function getIdServiceContact()
 	{
-		return $this->getIdContact('external','SERVICE');
+		return $this->getIdContact('external', 'SERVICE');
 	}
 
 
@@ -2248,15 +2248,15 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		global $user,$langs,$conf;
+		global $user, $langs, $conf;
 
         // Load array of products prodids
 		$num_prods = 0;
 		$prodids = array();
 		$sql = "SELECT rowid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product').")";
-		$sql.= " AND tosell = 1";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product";
+		$sql .= " WHERE entity IN (".getEntity('product').")";
+		$sql .= " AND tosell = 1";
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -2271,35 +2271,35 @@ 
 		}
 
 		// Initialise parametres
-		$this->id=0;
-		$this->specimen=1;
+		$this->id = 0;
+		$this->specimen = 1;
 
 		$this->ref = 'SPECIMEN';
 		$this->ref_customer = 'SPECIMENCUST';
 		$this->ref_supplier = 'SPECIMENSUPP';
 		$this->socid = 1;
-		$this->statut= 0;
+		$this->statut = 0;
 		$this->date_creation = (dol_now() - 3600 * 24 * 7);
 		$this->date_contrat = dol_now();
 		$this->commercial_signature_id = 1;
 		$this->commercial_suivi_id = 1;
-		$this->note_private='This is a comment (private)';
-		$this->note_public='This is a comment (public)';
+		$this->note_private = 'This is a comment (private)';
+		$this->note_public = 'This is a comment (public)';
 		$this->fk_projet = 0;
 		// Lines
 		$nbp = 5;
 		$xnbp = 0;
 		while ($xnbp < $nbp)
 		{
-			$line=new ContratLigne($this->db);
-			$line->qty=1;
-			$line->subprice=100;
-			$line->price=100;
-			$line->tva_tx=19.6;
-			$line->remise_percent=10;
-			$line->total_ht=90;
-			$line->total_ttc=107.64;	// 90 * 1.196
-			$line->total_tva=17.64;
+			$line = new ContratLigne($this->db);
+			$line->qty = 1;
+			$line->subprice = 100;
+			$line->price = 100;
+			$line->tva_tx = 19.6;
+			$line->remise_percent = 10;
+			$line->total_ht = 90;
+			$line->total_ttc = 107.64; // 90 * 1.196
+			$line->total_tva = 17.64;
 			$line->date_start = dol_now() - 500000;
 			$line->date_start_real = dol_now() - 200000;
 			$line->date_end = dol_now() + 500000;
@@ -2307,9 +2307,9 @@ 
 			if ($num_prods > 0)
             {
 				$prodid = mt_rand(1, $num_prods);
-				$line->fk_product=$prodids[$prodid];
+				$line->fk_product = $prodids[$prodid];
             }
-			$this->lines[$xnbp]=$line;
+			$this->lines[$xnbp] = $line;
 			$xnbp++;
 		}
 	}
@@ -2336,19 +2336,19 @@ 
          *  @param   null|array  $moreparams     Array to provide more information
 	 * 	@return     int         				0 if KO, 1 if OK
 	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$langs->load("contracts");
 
-		if (! dol_strlen($modele)) {
+		if (!dol_strlen($modele)) {
 
 			$modele = 'strato';
 
 			if ($this->modelpdf) {
 				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->CONTRACT_ADDON_PDF)) {
+			} elseif (!empty($conf->global->CONTRACT_ADDON_PDF)) {
 				$modele = $conf->global->CONTRACT_ADDON_PDF;
 			}
 		}
@@ -2382,7 +2382,7 @@ 
 	 * @param int $notrigger	1=Does not execute triggers, 0= execute triggers
 	 * @return int New id of clone
 	 */
-    function createFromClone($socid = 0, $notrigger=0)
+    function createFromClone($socid = 0, $notrigger = 0)
     {
 		global $db, $user, $langs, $conf, $hookmanager, $extrafields;
 
@@ -2410,11 +2410,11 @@ 
 		if (is_array($clonedObj->array_options) && count($clonedObj->array_options) > 0)
 		{
 			$extrafields->fetch_name_optionals_label($this->element);
-			foreach($clonedObj->array_options as $key => $option)
+			foreach ($clonedObj->array_options as $key => $option)
 			{
 				$shortkey = preg_replace('/options_/', '', $key);
 				//var_dump($shortkey); var_dump($extrafields->attributes[$this->element]['unique'][$shortkey]);
-				if (! empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
+				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
 				{
 					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
 					unset($clonedObj->array_options[$key]);
@@ -2422,14 +2422,14 @@ 
 			}
 		}
 
-		if (empty($conf->global->CONTRACT_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT . "/core/modules/contract/" . $conf->global->CONTRACT_ADDON . ".php")) {
+		if (empty($conf->global->CONTRACT_ADDON) || !is_readable(DOL_DOCUMENT_ROOT."/core/modules/contract/".$conf->global->CONTRACT_ADDON.".php")) {
 			$this->error = 'ErrorSetupNotComplete';
 			dol_syslog($this->error);
-			return - 1;
+			return -1;
 		}
 
 		// Set ref
-		require_once DOL_DOCUMENT_ROOT . "/core/modules/contract/" . $conf->global->CONTRACT_ADDON . '.php';
+		require_once DOL_DOCUMENT_ROOT."/core/modules/contract/".$conf->global->CONTRACT_ADDON.'.php';
 		$obj = $conf->global->CONTRACT_ADDON;
 		$modContract = new $obj();
 		$clonedObj->ref = $modContract->getNextValue($objsoc, $clonedObj);
@@ -2442,7 +2442,7 @@ 
 		// Create clone
 		$result = $clonedObj->create($user);
 		if ($result < 0) {
-			$error ++;
+			$error++;
 			$this->error = $clonedObj->error;
 			$this->errors[] = $clonedObj->error;
 		} else {
@@ -2454,40 +2454,40 @@ 
             }
         }
 
-		if (! $error) {
-			foreach ( $this->lines as $line ) {
+		if (!$error) {
+			foreach ($this->lines as $line) {
 				$result = $clonedObj->addline($line->desc, $line->subprice, $line->qty, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, $line->date_ouverture, $line->date_cloture, 'HT', 0, $line->info_bits, $line->fk_fournprice, $line->pa_ht, $line->array_options, $line->fk_unit);
 				if ($result < 0) {
-					$error ++;
+					$error++;
 					$this->error = $clonedObj->error;
 					$this->errors[] = $clonedObj->error;
 				}
 			}
 		}
 
-		if (! $error) {
+		if (!$error) {
 			// Hook of thirdparty module
 			if (is_object($hookmanager)) {
-				$parameters = array (
+				$parameters = array(
 						'objFrom' => $this,
 						'clonedObj' => $clonedObj
 				);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $clonedObj, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0)
-					$error ++;
+					$error++;
 			}
 		}
 
 		unset($this->context['createfromclone']);
 
 		// End
-		if (! $error) {
+		if (!$error) {
 			$this->db->commit();
 			return $clonedObj->id;
 		} else {
 			$this->db->rollback();
-			return - 1;
+			return -1;
 		}
 	}
 }
@@ -2501,12 +2501,12 @@ 
     /**
 	 * @var string ID to identify managed object
 	 */
-	public $element='contratdet';
+	public $element = 'contratdet';
 
     /**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='contratdet';
+	public $table_element = 'contratdet';
 
 	/**
 	 * @var int ID
@@ -2530,8 +2530,8 @@ 
      */
 	public $fk_product;
 
-	public $statut;					// 0 inactive, 4 active, 5 closed
-	public $type;						// 0 for product, 1 for service
+	public $statut; // 0 inactive, 4 active, 5 closed
+	public $type; // 0 for product, 1 for service
 
 	/**
 	 * @var string
@@ -2555,20 +2555,20 @@ 
 
 	public $date_commande;
 
-	public $date_start;				// date start planned
-	public $date_start_real;			// date start real
-	public $date_end;					// date end planned
-	public $date_end_real;				// date end real
+	public $date_start; // date start planned
+	public $date_start_real; // date start real
+	public $date_end; // date end planned
+	public $date_end_real; // date end real
 	// For backward compatibility
-	public $date_ouverture_prevue;		// date start planned
-	public $date_ouverture;			// date start real
-	public $date_fin_validite;			// date end planned
-	public $date_cloture;				// date end real
+	public $date_ouverture_prevue; // date start planned
+	public $date_ouverture; // date start real
+	public $date_fin_validite; // date end planned
+	public $date_cloture; // date end real
 	public $tva_tx;
 	public $localtax1_tx;
 	public $localtax2_tx;
-	public $localtax1_type;	// Local tax 1 type
-	public $localtax2_type;	// Local tax 2 type
+	public $localtax1_type; // Local tax 1 type
+	public $localtax2_type; // Local tax 2 type
 	public $qty;
 	public $remise_percent;
 	public $remise;
@@ -2578,7 +2578,7 @@ 
      */
 	public $fk_remise_except;
 
-	public $subprice;					// Unit price HT
+	public $subprice; // Unit price HT
 
 	/**
 	 * @var float
@@ -2646,7 +2646,7 @@ 
 	 */
 	function getLibStatut($mode)
 	{
-		return $this->LibStatut($this->statut,$mode,((! empty($this->date_fin_validite))?($this->date_fin_validite < dol_now()?1:0):-1));
+		return $this->LibStatut($this->statut, $mode, ((!empty($this->date_fin_validite)) ? ($this->date_fin_validite < dol_now() ? 1 : 0) : -1));
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -2659,7 +2659,7 @@ 
 	 *  @param	string	$moreatt	More attribute
 	 *  @return string      		Libelle
 	 */
-	static function LibStatut($statut,$mode,$expired=-1,$moreatt='')
+	static function LibStatut($statut, $mode, $expired = -1, $moreatt = '')
 	{
         // phpcs:enable
 		global $langs;
@@ -2668,49 +2668,49 @@ 
 		{
 			if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial"); }
 			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return $langs->trans("ServiceStatusNotLate"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return $langs->trans("ServiceStatusLate"); }
-			elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed");  }
+			elseif ($statut == self::STATUS_OPEN && $expired == 0) { return $langs->trans("ServiceStatusNotLate"); }
+			elseif ($statut == self::STATUS_OPEN && $expired == 1) { return $langs->trans("ServiceStatusLate"); }
+			elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed"); }
 		}
 		elseif ($mode == 1)
 		{
 			if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial"); }
 			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return $langs->trans("ServiceStatusNotLateShort"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return $langs->trans("ServiceStatusLateShort"); }
-			elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed");  }
+			elseif ($statut == self::STATUS_OPEN && $expired == 0) { return $langs->trans("ServiceStatusNotLateShort"); }
+			elseif ($statut == self::STATUS_OPEN && $expired == 1) { return $langs->trans("ServiceStatusLateShort"); }
+			elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed"); }
 		}
 		elseif ($mode == 2)
 		{
-			if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0').' '.$langs->trans("ServiceStatusInitial"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4').' '.$langs->trans("ServiceStatusRunning"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return img_picto($langs->trans('ServiceStatusNotLate'),'statut4').' '.$langs->trans("ServiceStatusNotLateShort"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return img_picto($langs->trans('ServiceStatusLate'),'statut3').' '.$langs->trans("ServiceStatusLateShort"); }
-			elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6') .' '.$langs->trans("ServiceStatusClosed"); }
+			if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'), 'statut0').' '.$langs->trans("ServiceStatusInitial"); }
+			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'), 'statut4').' '.$langs->trans("ServiceStatusRunning"); }
+			elseif ($statut == self::STATUS_OPEN && $expired == 0) { return img_picto($langs->trans('ServiceStatusNotLate'), 'statut4').' '.$langs->trans("ServiceStatusNotLateShort"); }
+			elseif ($statut == self::STATUS_OPEN && $expired == 1) { return img_picto($langs->trans('ServiceStatusLate'), 'statut3').' '.$langs->trans("ServiceStatusLateShort"); }
+			elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'), 'statut6').' '.$langs->trans("ServiceStatusClosed"); }
 		}
 		elseif ($mode == 3)
 		{
-			if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0',$moreatt); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4',$moreatt); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return img_picto($langs->trans('ServiceStatusNotLate'),'statut4',$moreatt); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return img_picto($langs->trans('ServiceStatusLate'),'statut3',$moreatt); }
-			elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6',$moreatt); }
+			if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'), 'statut0', $moreatt); }
+			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'), 'statut4', $moreatt); }
+			elseif ($statut == self::STATUS_OPEN && $expired == 0) { return img_picto($langs->trans('ServiceStatusNotLate'), 'statut4', $moreatt); }
+			elseif ($statut == self::STATUS_OPEN && $expired == 1) { return img_picto($langs->trans('ServiceStatusLate'), 'statut3', $moreatt); }
+			elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'), 'statut6', $moreatt); }
 		}
 		elseif ($mode == 4)
 		{
-			if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0').' '.$langs->trans("ServiceStatusInitial"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4').' '.$langs->trans("ServiceStatusRunning"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return img_picto($langs->trans('ServiceStatusNotLate'),'statut4').' '.$langs->trans("ServiceStatusNotLate"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return img_picto($langs->trans('ServiceStatusLate'),'statut3').' '.$langs->trans("ServiceStatusLate"); }
-			elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6') .' '.$langs->trans("ServiceStatusClosed"); }
+			if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'), 'statut0').' '.$langs->trans("ServiceStatusInitial"); }
+			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'), 'statut4').' '.$langs->trans("ServiceStatusRunning"); }
+			elseif ($statut == self::STATUS_OPEN && $expired == 0) { return img_picto($langs->trans('ServiceStatusNotLate'), 'statut4').' '.$langs->trans("ServiceStatusNotLate"); }
+			elseif ($statut == self::STATUS_OPEN && $expired == 1) { return img_picto($langs->trans('ServiceStatusLate'), 'statut3').' '.$langs->trans("ServiceStatusLate"); }
+			elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'), 'statut6').' '.$langs->trans("ServiceStatusClosed"); }
 		}
 		elseif ($mode == 5)
 		{
-			if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial").' '.img_picto($langs->trans('ServiceStatusInitial'),'statut0'); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning").' '.img_picto($langs->trans('ServiceStatusRunning'),'statut4'); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return $langs->trans("ServiceStatusNotLateShort").' '.img_picto($langs->trans('ServiceStatusNotLateShort'),'statut4'); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return $langs->trans("ServiceStatusLateShort").' '.img_picto($langs->trans('ServiceStatusLate'),'statut3'); }
-			elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed").' '.img_picto($langs->trans('ServiceStatusClosed'),'statut6'); }
+			if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial").' '.img_picto($langs->trans('ServiceStatusInitial'), 'statut0'); }
+			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning").' '.img_picto($langs->trans('ServiceStatusRunning'), 'statut4'); }
+			elseif ($statut == self::STATUS_OPEN && $expired == 0) { return $langs->trans("ServiceStatusNotLateShort").' '.img_picto($langs->trans('ServiceStatusNotLateShort'), 'statut4'); }
+			elseif ($statut == self::STATUS_OPEN && $expired == 1) { return $langs->trans("ServiceStatusLateShort").' '.img_picto($langs->trans('ServiceStatusLate'), 'statut3'); }
+			elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed").' '.img_picto($langs->trans('ServiceStatusClosed'), 'statut6'); }
 		}
 	}
 
@@ -2721,23 +2721,23 @@ 
 	 *  @param	int		$maxlength		Max length
 	 *  @return	string					Chaine avec URL
  	 */
-	function getNomUrl($withpicto=0,$maxlength=0)
+	function getNomUrl($withpicto = 0, $maxlength = 0)
 	{
 		global $langs;
 
-		$result='';
-        $label=$langs->trans("ShowContractOfService").': '.$this->label;
-        if (empty($label)) $label=$this->description;
+		$result = '';
+        $label = $langs->trans("ShowContractOfService").': '.$this->label;
+        if (empty($label)) $label = $this->description;
 
         $link = '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$this->fk_contrat.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-		$linkend='</a>';
+		$linkend = '</a>';
 
-		$picto='service';
-		if ($this->type == 0) $picto='product';
+		$picto = 'service';
+		if ($this->type == 0) $picto = 'product';
 
-        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		if ($withpicto != 2) $result.=$link.($this->product_ref?$this->product_ref.' ':'').($this->label?$this->label:$this->description).$linkend;
+        if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		if ($withpicto && $withpicto != 2) $result .= ' ';
+		if ($withpicto != 2) $result .= $link.($this->product_ref ? $this->product_ref.' ' : '').($this->label ? $this->label : $this->description).$linkend;
 		return $result;
 	}
 
@@ -2748,61 +2748,61 @@ 
 	 * 		@param	string	$ref		Ref of contract
 	 *    	@return int         		<0 if KO, >0 if OK
 	 */
-	function fetch($id, $ref='')
+	function fetch($id, $ref = '')
 	{
 
 		// Check parameters
 		if (empty($id) && empty($ref)) return -1;
 
 		$sql = "SELECT";
-		$sql.= " t.rowid,";
-
-		$sql.= " t.tms,";
-		$sql.= " t.fk_contrat,";
-		$sql.= " t.fk_product,";
-		$sql.= " t.statut,";
-		$sql.= " t.label,";			// This field is not used. Only label of product
-		$sql.= " p.ref as product_ref,";
-		$sql.= " p.label as product_label,";
-		$sql.= " p.description as product_desc,";
-		$sql.= " p.fk_product_type as product_type,";
-		$sql.= " t.description,";
-		$sql.= " t.date_commande,";
-		$sql.= " t.date_ouverture_prevue as date_ouverture_prevue,";
-		$sql.= " t.date_ouverture as date_ouverture,";
-		$sql.= " t.date_fin_validite as date_fin_validite,";
-		$sql.= " t.date_cloture as date_cloture,";
-		$sql.= " t.tva_tx,";
-		$sql.= " t.vat_src_code,";
-		$sql.= " t.localtax1_tx,";
-		$sql.= " t.localtax2_tx,";
-		$sql.= " t.localtax1_type,";
-		$sql.= " t.localtax2_type,";
-		$sql.= " t.qty,";
-		$sql.= " t.remise_percent,";
-		$sql.= " t.remise,";
-		$sql.= " t.fk_remise_except,";
-		$sql.= " t.subprice,";
-		$sql.= " t.price_ht,";
-		$sql.= " t.total_ht,";
-		$sql.= " t.total_tva,";
-		$sql.= " t.total_localtax1,";
-		$sql.= " t.total_localtax2,";
-		$sql.= " t.total_ttc,";
-		$sql.= " t.fk_product_fournisseur_price as fk_fournprice,";
-		$sql.= " t.buy_price_ht as pa_ht,";
-		$sql.= " t.info_bits,";
-		$sql.= " t.fk_user_author,";
-		$sql.= " t.fk_user_ouverture,";
-		$sql.= " t.fk_user_cloture,";
-		$sql.= " t.commentaire,";
-		$sql.= " t.fk_unit";
-		$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as t LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = t.fk_product";
-		if ($id)  $sql.= " WHERE t.rowid = ".$id;
-		if ($ref) $sql.= " WHERE t.rowid = '".$this->db->escape($ref)."'";
+		$sql .= " t.rowid,";
+
+		$sql .= " t.tms,";
+		$sql .= " t.fk_contrat,";
+		$sql .= " t.fk_product,";
+		$sql .= " t.statut,";
+		$sql .= " t.label,"; // This field is not used. Only label of product
+		$sql .= " p.ref as product_ref,";
+		$sql .= " p.label as product_label,";
+		$sql .= " p.description as product_desc,";
+		$sql .= " p.fk_product_type as product_type,";
+		$sql .= " t.description,";
+		$sql .= " t.date_commande,";
+		$sql .= " t.date_ouverture_prevue as date_ouverture_prevue,";
+		$sql .= " t.date_ouverture as date_ouverture,";
+		$sql .= " t.date_fin_validite as date_fin_validite,";
+		$sql .= " t.date_cloture as date_cloture,";
+		$sql .= " t.tva_tx,";
+		$sql .= " t.vat_src_code,";
+		$sql .= " t.localtax1_tx,";
+		$sql .= " t.localtax2_tx,";
+		$sql .= " t.localtax1_type,";
+		$sql .= " t.localtax2_type,";
+		$sql .= " t.qty,";
+		$sql .= " t.remise_percent,";
+		$sql .= " t.remise,";
+		$sql .= " t.fk_remise_except,";
+		$sql .= " t.subprice,";
+		$sql .= " t.price_ht,";
+		$sql .= " t.total_ht,";
+		$sql .= " t.total_tva,";
+		$sql .= " t.total_localtax1,";
+		$sql .= " t.total_localtax2,";
+		$sql .= " t.total_ttc,";
+		$sql .= " t.fk_product_fournisseur_price as fk_fournprice,";
+		$sql .= " t.buy_price_ht as pa_ht,";
+		$sql .= " t.info_bits,";
+		$sql .= " t.fk_user_author,";
+		$sql .= " t.fk_user_ouverture,";
+		$sql .= " t.fk_user_cloture,";
+		$sql .= " t.commentaire,";
+		$sql .= " t.fk_unit";
+		$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as t LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = t.fk_product";
+		if ($id)  $sql .= " WHERE t.rowid = ".$id;
+		if ($ref) $sql .= " WHERE t.rowid = '".$this->db->escape($ref)."'";
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
@@ -2820,7 +2820,7 @@ 
 				$this->product_label = $obj->product_label;
 				$this->product_description = $obj->product_description;
 				$this->product_type = $obj->product_type;
-				$this->label = $obj->label;					// deprecated. We do not use this field. Only ref and label of product, and description of contract line
+				$this->label = $obj->label; // deprecated. We do not use this field. Only ref and label of product, and description of contract line
 				$this->description = $obj->description;
 				$this->date_commande = $this->db->jdate($obj->date_commande);
 
@@ -2859,7 +2859,7 @@ 
 				$this->fk_fournprice = $obj->fk_fournprice;
 				$marginInfos = getMarginInfos($obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, $this->fk_fournprice, $obj->pa_ht);
 				$this->pa_ht = $marginInfos[0];
-				$this->fk_unit     = $obj->fk_unit;
+				$this->fk_unit = $obj->fk_unit;
 			}
 			$this->db->free($resql);
 
@@ -2867,7 +2867,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -2880,38 +2880,38 @@ 
 	 *      @param  int		$notrigger	    0=no, 1=yes (no update trigger)
 	 *      @return int         			<0 if KO, >0 if OK
 	 */
-	function update($user, $notrigger=0)
+	function update($user, $notrigger = 0)
 	{
 		global $conf, $langs, $mysoc;
 
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
 		$this->fk_contrat = (int) $this->fk_contrat;
 		$this->fk_product = (int) $this->fk_product;
 		$this->statut = (int) $this->statut;
-		$this->label=trim($this->label);
-		$this->description=trim($this->description);
-		$this->vat_src_code=trim($this->vat_src_code);
-		$this->tva_tx=trim($this->tva_tx);
-		$this->localtax1_tx=trim($this->localtax1_tx);
-		$this->localtax2_tx=trim($this->localtax2_tx);
-		$this->qty=trim($this->qty);
-		$this->remise_percent=trim($this->remise_percent);
-		$this->remise=trim($this->remise);
+		$this->label = trim($this->label);
+		$this->description = trim($this->description);
+		$this->vat_src_code = trim($this->vat_src_code);
+		$this->tva_tx = trim($this->tva_tx);
+		$this->localtax1_tx = trim($this->localtax1_tx);
+		$this->localtax2_tx = trim($this->localtax2_tx);
+		$this->qty = trim($this->qty);
+		$this->remise_percent = trim($this->remise_percent);
+		$this->remise = trim($this->remise);
 		$this->fk_remise_except = (int) $this->fk_remise_except;
-		$this->subprice=price2num($this->subprice);
-		$this->price_ht=price2num($this->price_ht);
-		$this->total_ht=trim($this->total_ht);
-		$this->total_tva=trim($this->total_tva);
-		$this->total_localtax1=trim($this->total_localtax1);
-		$this->total_localtax2=trim($this->total_localtax2);
-		$this->total_ttc=trim($this->total_ttc);
-		$this->info_bits=trim($this->info_bits);
+		$this->subprice = price2num($this->subprice);
+		$this->price_ht = price2num($this->price_ht);
+		$this->total_ht = trim($this->total_ht);
+		$this->total_tva = trim($this->total_tva);
+		$this->total_localtax1 = trim($this->total_localtax1);
+		$this->total_localtax2 = trim($this->total_localtax2);
+		$this->total_ttc = trim($this->total_ttc);
+		$this->info_bits = trim($this->info_bits);
 		$this->fk_user_author = (int) $this->fk_user_author;
 		$this->fk_user_ouverture = (int) $this->fk_user_ouverture;
 		$this->fk_user_cloture = (int) $this->fk_user_cloture;
-		$this->commentaire=trim($this->commentaire);
+		$this->commentaire = trim($this->commentaire);
 		//if (empty($this->subprice)) $this->subprice = 0;
 		if (empty($this->price_ht)) $this->price_ht = 0;
 		if (empty($this->total_ht)) $this->total_ht = 0;
@@ -2921,10 +2921,10 @@ 
 		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
 		if (empty($this->remise_percent)) $this->remise_percent = 0;
 		// For backward compatibility
-		if (empty($this->date_start))      $this->date_start=$this->date_ouverture_prevue;
-		if (empty($this->date_start_real)) $this->date_start=$this->date_ouverture;
-		if (empty($this->date_end))        $this->date_start=$this->date_fin_validite;
-		if (empty($this->date_end_real))   $this->date_start=$this->date_cloture;
+		if (empty($this->date_start))      $this->date_start = $this->date_ouverture_prevue;
+		if (empty($this->date_start_real)) $this->date_start = $this->date_ouverture;
+		if (empty($this->date_end))        $this->date_start = $this->date_fin_validite;
+		if (empty($this->date_end_real))   $this->date_start = $this->date_cloture;
 
 
 		// Check parameters
@@ -2936,14 +2936,14 @@ 
 		// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 		$localtaxes_type = getLocalTaxesFromRate($this->txtva, 0, $this->societe, $mysoc);
 
-		$tabprice=calcul_price_total($this->qty, $this->price_ht, $this->remise_percent, $this->tva_tx, $this->localtax1_tx, $this->localtax2_tx, 0, 'HT', 0, 1, $mysoc, $localtaxes_type);
+		$tabprice = calcul_price_total($this->qty, $this->price_ht, $this->remise_percent, $this->tva_tx, $this->localtax1_tx, $this->localtax2_tx, 0, 'HT', 0, 1, $mysoc, $localtaxes_type);
 		$this->total_ht  = $tabprice[0];
 		$this->total_tva = $tabprice[1];
 		$this->total_ttc = $tabprice[2];
-		$this->total_localtax1= $tabprice[9];
-		$this->total_localtax2= $tabprice[10];
+		$this->total_localtax1 = $tabprice[9];
+		$this->total_localtax2 = $tabprice[10];
 
-	    if (empty($this->pa_ht)) $this->pa_ht=0;
+	    if (empty($this->pa_ht)) $this->pa_ht = 0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0)
@@ -2966,52 +2966,52 @@ 
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET";
-		$sql.= " fk_contrat=".$this->fk_contrat.",";
-		$sql.= " fk_product=".($this->fk_product?"'".$this->db->escape($this->fk_product)."'":'null').",";
-		$sql.= " statut=".$this->statut.",";
-		$sql.= " label='".$this->db->escape($this->label)."',";
-		$sql.= " description='".$this->db->escape($this->description)."',";
-		$sql.= " date_commande=".($this->date_commande!=''?"'".$this->db->idate($this->date_commande)."'":"null").",";
-		$sql.= " date_ouverture_prevue=".($this->date_ouverture_prevue!=''?"'".$this->db->idate($this->date_ouverture_prevue)."'":"null").",";
-		$sql.= " date_ouverture=".($this->date_ouverture!=''?"'".$this->db->idate($this->date_ouverture)."'":"null").",";
-		$sql.= " date_fin_validite=".($this->date_fin_validite!=''?"'".$this->db->idate($this->date_fin_validite)."'":"null").",";
-		$sql.= " date_cloture=".($this->date_cloture!=''?"'".$this->db->idate($this->date_cloture)."'":"null").",";
-		$sql.= " vat_src_code='".$this->db->escape($this->vat_src_code)."',";
-		$sql.= " tva_tx=".price2num($this->tva_tx).",";
-		$sql.= " localtax1_tx=".price2num($this->localtax1_tx).",";
-		$sql.= " localtax2_tx=".price2num($this->localtax2_tx).",";
-		$sql.= " qty=".price2num($this->qty).",";
-		$sql.= " remise_percent=".price2num($this->remise_percent).",";
-		$sql.= " remise=".($this->remise?price2num($this->remise):"null").",";
-		$sql.= " fk_remise_except=".($this->fk_remise_except > 0?$this->fk_remise_except:"null").",";
-		$sql.= " subprice=".($this->subprice != '' ? $this->subprice : "null").",";
-		$sql.= " price_ht=".($this->price_ht != '' ? $this->price_ht : "null").",";
-		$sql.= " total_ht=".$this->total_ht.",";
-		$sql.= " total_tva=".$this->total_tva.",";
-		$sql.= " total_localtax1=".$this->total_localtax1.",";
-		$sql.= " total_localtax2=".$this->total_localtax2.",";
-		$sql.= " total_ttc=".$this->total_ttc.",";
-		$sql.= " fk_product_fournisseur_price=".(!empty($this->fk_fournprice)?$this->fk_fournprice:"NULL").",";
-		$sql.= " buy_price_ht='".price2num($this->pa_ht)."',";
-		$sql.= " info_bits='".$this->db->escape($this->info_bits)."',";
-		$sql.= " fk_user_author=".($this->fk_user_author >= 0?$this->fk_user_author:"NULL").",";
-		$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='".$this->db->escape($this->commentaire)."',";
-		$sql.= " fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " fk_contrat=".$this->fk_contrat.",";
+		$sql .= " fk_product=".($this->fk_product ? "'".$this->db->escape($this->fk_product)."'" : 'null').",";
+		$sql .= " statut=".$this->statut.",";
+		$sql .= " label='".$this->db->escape($this->label)."',";
+		$sql .= " description='".$this->db->escape($this->description)."',";
+		$sql .= " date_commande=".($this->date_commande != '' ? "'".$this->db->idate($this->date_commande)."'" : "null").",";
+		$sql .= " date_ouverture_prevue=".($this->date_ouverture_prevue != '' ? "'".$this->db->idate($this->date_ouverture_prevue)."'" : "null").",";
+		$sql .= " date_ouverture=".($this->date_ouverture != '' ? "'".$this->db->idate($this->date_ouverture)."'" : "null").",";
+		$sql .= " date_fin_validite=".($this->date_fin_validite != '' ? "'".$this->db->idate($this->date_fin_validite)."'" : "null").",";
+		$sql .= " date_cloture=".($this->date_cloture != '' ? "'".$this->db->idate($this->date_cloture)."'" : "null").",";
+		$sql .= " vat_src_code='".$this->db->escape($this->vat_src_code)."',";
+		$sql .= " tva_tx=".price2num($this->tva_tx).",";
+		$sql .= " localtax1_tx=".price2num($this->localtax1_tx).",";
+		$sql .= " localtax2_tx=".price2num($this->localtax2_tx).",";
+		$sql .= " qty=".price2num($this->qty).",";
+		$sql .= " remise_percent=".price2num($this->remise_percent).",";
+		$sql .= " remise=".($this->remise ?price2num($this->remise) : "null").",";
+		$sql .= " fk_remise_except=".($this->fk_remise_except > 0 ? $this->fk_remise_except : "null").",";
+		$sql .= " subprice=".($this->subprice != '' ? $this->subprice : "null").",";
+		$sql .= " price_ht=".($this->price_ht != '' ? $this->price_ht : "null").",";
+		$sql .= " total_ht=".$this->total_ht.",";
+		$sql .= " total_tva=".$this->total_tva.",";
+		$sql .= " total_localtax1=".$this->total_localtax1.",";
+		$sql .= " total_localtax2=".$this->total_localtax2.",";
+		$sql .= " total_ttc=".$this->total_ttc.",";
+		$sql .= " fk_product_fournisseur_price=".(!empty($this->fk_fournprice) ? $this->fk_fournprice : "NULL").",";
+		$sql .= " buy_price_ht='".price2num($this->pa_ht)."',";
+		$sql .= " info_bits='".$this->db->escape($this->info_bits)."',";
+		$sql .= " fk_user_author=".($this->fk_user_author >= 0 ? $this->fk_user_author : "NULL").",";
+		$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='".$this->db->escape($this->commentaire)."',";
+		$sql .= " fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+		$sql .= " WHERE rowid=".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql)
+		if (!$resql)
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			$error++;
 		}
 
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) // For avoid conflicts if trigger used
+		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0) // For avoid conflicts if trigger used
 		{
-			$result=$this->insertExtraFields();
+			$result = $this->insertExtraFields();
 			if ($result < 0)
 			{
 				$error++;
@@ -3019,39 +3019,39 @@ 
 		}
 
 		// If we change a planned date (start or end), sync dates for all services
-		if (! $error && ! empty($conf->global->CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES))
+		if (!$error && !empty($conf->global->CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES))
 		{
 			if ($this->date_ouverture_prevue != $this->oldcopy->date_ouverture_prevue)
 			{
-				$sql ='UPDATE '.MAIN_DB_PREFIX.'contratdet SET';
-				$sql.= " date_ouverture_prevue = ".($this->date_ouverture_prevue!=''?"'".$this->db->idate($this->date_ouverture_prevue)."'":"null");
-				$sql.= " WHERE fk_contrat = ".$this->fk_contrat;
+				$sql = 'UPDATE '.MAIN_DB_PREFIX.'contratdet SET';
+				$sql .= " date_ouverture_prevue = ".($this->date_ouverture_prevue != '' ? "'".$this->db->idate($this->date_ouverture_prevue)."'" : "null");
+				$sql .= " WHERE fk_contrat = ".$this->fk_contrat;
 
 				$resql = $this->db->query($sql);
-				if (! $resql)
+				if (!$resql)
 				{
 					$error++;
-					$this->error="Error ".$this->db->lasterror();
+					$this->error = "Error ".$this->db->lasterror();
 				}
 			}
 			if ($this->date_fin_validite != $this->oldcopy->date_fin_validite)
 			{
-				$sql ='UPDATE '.MAIN_DB_PREFIX.'contratdet SET';
-				$sql.= " date_fin_validite = ".($this->date_fin_validite!=''?"'".$this->db->idate($this->date_fin_validite)."'":"null");
-				$sql.= " WHERE fk_contrat = ".$this->fk_contrat;
+				$sql = 'UPDATE '.MAIN_DB_PREFIX.'contratdet SET';
+				$sql .= " date_fin_validite = ".($this->date_fin_validite != '' ? "'".$this->db->idate($this->date_fin_validite)."'" : "null");
+				$sql .= " WHERE fk_contrat = ".$this->fk_contrat;
 
 				$resql = $this->db->query($sql);
-				if (! $resql)
+				if (!$resql)
 				{
 					$error++;
-					$this->error="Error ".$this->db->lasterror();
+					$this->error = "Error ".$this->db->lasterror();
 				}
 			}
 		}
 
-		if (! $error && ! $notrigger) {
+		if (!$error && !$notrigger) {
 	        // Call trigger
-	        $result=$this->call_trigger('LINECONTRACT_UPDATE', $user);
+	        $result = $this->call_trigger('LINECONTRACT_UPDATE', $user);
 	        if ($result < 0) {
                 $error++;
                 $this->db->rollback();
@@ -3059,13 +3059,13 @@ 
 	        // End call triggers
 		}
 
-		if (! $error)
+		if (!$error)
 		{
         	$this->db->commit();
 			return 1;
 		} else {
 			$this->db->rollback();
-			$this->errors[]=$this->error;
+			$this->errors[] = $this->error;
 			return -1;
 		}
 	}
@@ -3085,16 +3085,16 @@ 
 
 		// Mise a jour ligne en base
 		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET";
-		$sql.= " total_ht=".price2num($this->total_ht,'MT')."";
-		$sql.= ",total_tva=".price2num($this->total_tva,'MT')."";
-		$sql.= ",total_localtax1=".price2num($this->total_localtax1,'MT')."";
-		$sql.= ",total_localtax2=".price2num($this->total_localtax2,'MT')."";
-		$sql.= ",total_ttc=".price2num($this->total_ttc,'MT')."";
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " total_ht=".price2num($this->total_ht, 'MT')."";
+		$sql .= ",total_tva=".price2num($this->total_tva, 'MT')."";
+		$sql .= ",total_localtax1=".price2num($this->total_localtax1, 'MT')."";
+		$sql .= ",total_localtax2=".price2num($this->total_localtax2, 'MT')."";
+		$sql .= ",total_ttc=".price2num($this->total_ttc, 'MT')."";
+		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update_total", LOG_DEBUG);
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$this->db->commit();
@@ -3102,7 +3102,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
 		}
@@ -3121,43 +3121,43 @@ 
 
 		// Insertion dans la base
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."contratdet";
-		$sql.= " (fk_contrat, label, description, fk_product, qty, vat_src_code, tva_tx,";
-		$sql.= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice,";
-		$sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc,";
-		$sql.= " info_bits,";
-		$sql.= " price_ht, remise, fk_product_fournisseur_price, buy_price_ht";
-		if ($this->date_ouverture_prevue > 0) { $sql.= ",date_ouverture_prevue"; }
-		if ($this->date_fin_validite > 0)     { $sql.= ",date_fin_validite"; }
-		$sql.= ") VALUES ($this->fk_contrat, '', '" . $this->db->escape($this->description) . "',";
-		$sql.= ($this->fk_product>0 ? $this->fk_product : "null").",";
-		$sql.= " '".$this->db->escape($this->qty)."',";
-		$sql.= " '".$this->db->escape($this->vat_src_code)."',";
-		$sql.= " '".$this->db->escape($this->tva_tx)."',";
-		$sql.= " '".$this->db->escape($this->localtax1_tx)."',";
-		$sql.= " '".$this->db->escape($this->localtax2_tx)."',";
-		$sql.= " '".$this->db->escape($this->localtax1_type)."',";
-		$sql.= " '".$this->db->escape($this->localtax2_type)."',";
-		$sql.= " ".price2num($this->remise_percent).",".price2num($this->subprice).",";
-		$sql.= " ".price2num($this->total_ht).",".price2num($this->total_tva).",".price2num($this->total_localtax1).",".price2num($this->total_localtax2).",".price2num($this->total_ttc).",";
-		$sql.= " '".$this->db->escape($this->info_bits)."',";
-		$sql.= " ".price2num($this->price_ht).",".price2num($this->remise).",";
-		if ($this->fk_fournprice > 0) $sql.= ' '.$this->fk_fournprice.',';
-		else $sql.= ' null,';
-		if ($this->pa_ht > 0) $sql.= ' '.price2num($this->pa_ht);
-		else $sql.= ' null';
-		if ($this->date_ouverture > 0) { $sql.= ",'".$this->db->idate($this->date_ouverture)."'"; }
-		if ($this->date_cloture > 0)   { $sql.= ",'".$this->db->idate($this->date_cloture)."'"; }
-		$sql.= ")";
+		$sql .= " (fk_contrat, label, description, fk_product, qty, vat_src_code, tva_tx,";
+		$sql .= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice,";
+		$sql .= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc,";
+		$sql .= " info_bits,";
+		$sql .= " price_ht, remise, fk_product_fournisseur_price, buy_price_ht";
+		if ($this->date_ouverture_prevue > 0) { $sql .= ",date_ouverture_prevue"; }
+		if ($this->date_fin_validite > 0) { $sql .= ",date_fin_validite"; }
+		$sql .= ") VALUES ($this->fk_contrat, '', '".$this->db->escape($this->description)."',";
+		$sql .= ($this->fk_product > 0 ? $this->fk_product : "null").",";
+		$sql .= " '".$this->db->escape($this->qty)."',";
+		$sql .= " '".$this->db->escape($this->vat_src_code)."',";
+		$sql .= " '".$this->db->escape($this->tva_tx)."',";
+		$sql .= " '".$this->db->escape($this->localtax1_tx)."',";
+		$sql .= " '".$this->db->escape($this->localtax2_tx)."',";
+		$sql .= " '".$this->db->escape($this->localtax1_type)."',";
+		$sql .= " '".$this->db->escape($this->localtax2_type)."',";
+		$sql .= " ".price2num($this->remise_percent).",".price2num($this->subprice).",";
+		$sql .= " ".price2num($this->total_ht).",".price2num($this->total_tva).",".price2num($this->total_localtax1).",".price2num($this->total_localtax2).",".price2num($this->total_ttc).",";
+		$sql .= " '".$this->db->escape($this->info_bits)."',";
+		$sql .= " ".price2num($this->price_ht).",".price2num($this->remise).",";
+		if ($this->fk_fournprice > 0) $sql .= ' '.$this->fk_fournprice.',';
+		else $sql .= ' null,';
+		if ($this->pa_ht > 0) $sql .= ' '.price2num($this->pa_ht);
+		else $sql .= ' null';
+		if ($this->date_ouverture > 0) { $sql .= ",'".$this->db->idate($this->date_ouverture)."'"; }
+		if ($this->date_cloture > 0) { $sql .= ",'".$this->db->idate($this->date_cloture)."'"; }
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'contratdet');
 
 			// Insert of extrafields
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) // For avoid conflicts if trigger used
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0) // For avoid conflicts if trigger used
 			{
 				$result = $this->insertExtraFields();
 				if ($result < 0)
@@ -3184,7 +3184,7 @@ 
 		else
 		{
 			$this->db->rollback();
-			$this->error=$this->db->error()." sql=".$sql;
+			$this->error = $this->db->error()." sql=".$sql;
 			return -1;
 		}
 	}
@@ -3208,15 +3208,15 @@ 
 
 		$this->db->begin();
 
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "contratdet SET statut = ".ContratLigne::STATUS_OPEN.",";
-		$sql .= " date_ouverture = " . (dol_strlen($date) != 0 ? "'" . $this->db->idate($date) . "'" : "null") . ",";
-		if ($date_end >= 0) $sql .= " date_fin_validite = " . (dol_strlen($date_end) != 0 ? "'" . $this->db->idate($date_end) . "'" : "null") . ",";
-		$sql .= " fk_user_ouverture = " . $user->id . ",";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET statut = ".ContratLigne::STATUS_OPEN.",";
+		$sql .= " date_ouverture = ".(dol_strlen($date) != 0 ? "'".$this->db->idate($date)."'" : "null").",";
+		if ($date_end >= 0) $sql .= " date_fin_validite = ".(dol_strlen($date_end) != 0 ? "'".$this->db->idate($date_end)."'" : "null").",";
+		$sql .= " fk_user_ouverture = ".$user->id.",";
 		$sql .= " date_cloture = null,";
-		$sql .= " commentaire = '" . $this->db->escape($comment) . "'";
-		$sql .= " WHERE rowid = " . $this->id . " AND (statut = ".ContratLigne::STATUS_INITIAL." OR statut = ".ContratLigne::STATUS_CLOSED.")";
+		$sql .= " commentaire = '".$this->db->escape($comment)."'";
+		$sql .= " WHERE rowid = ".$this->id." AND (statut = ".ContratLigne::STATUS_INITIAL." OR statut = ".ContratLigne::STATUS_CLOSED.")";
 
-		dol_syslog(get_class($this) . "::active_line", LOG_DEBUG);
+		dol_syslog(get_class($this)."::active_line", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			// Call trigger
@@ -3224,7 +3224,7 @@ 
 			if ($result < 0) $error++;
 			// End call triggers
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->statut = ContratLigne::STATUS_OPEN;
 				$this->date_ouverture = $date;
@@ -3258,7 +3258,7 @@ 
      * @param    int	$notrigger		1=Does not execute triggers, 0=Execute triggers
 	 * @return int                    	<0 if KO, >0 if OK
 	 */
-	function close_line($user, $date_end, $comment = '', $notrigger=0)
+	function close_line($user, $date_end, $comment = '', $notrigger = 0)
 	{
         // phpcs:enable
 		global $langs, $conf;
@@ -3274,16 +3274,16 @@ 
 
 		$this->db->begin();
 
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "contratdet SET statut = ".ContratLigne::STATUS_CLOSED.",";
-		$sql .= " date_cloture = '" . $this->db->idate($date_end) . "',";
-		$sql .= " fk_user_cloture = " . $user->id . ",";
-		$sql .= " commentaire = '" . $this->db->escape($comment) . "'";
-		$sql .= " WHERE rowid = " . $this->id . " AND statut = ".ContratLigne::STATUS_OPEN;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET statut = ".ContratLigne::STATUS_CLOSED.",";
+		$sql .= " date_cloture = '".$this->db->idate($date_end)."',";
+		$sql .= " fk_user_cloture = ".$user->id.",";
+		$sql .= " commentaire = '".$this->db->escape($comment)."'";
+		$sql .= " WHERE rowid = ".$this->id." AND statut = ".ContratLigne::STATUS_OPEN;
 
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Call trigger
 				$result = $this->call_trigger('LINECONTRACT_CLOSE', $user);

Braces +348 added lines, -248 removed lines

@@ -234,15 +234,13 @@ 
 			if ( $numref != "")
 			{
 				return $numref;
-			}
-			else
+			} else
 			{
 				$this->error = $obj->error;
 				dol_print_error($db,get_class($this)."::getNextValue ".$obj->error);
 				return "";
 			}
-		}
-		else
+		} else
 		{
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
@@ -309,7 +307,9 @@ 
 	 */
 	function activateAll($user, $date_start='', $notrigger=0, $comment='')
 	{
-		if (empty($date_start)) $date_start = dol_now();
+		if (empty($date_start)) {
+		    $date_start = dol_now();
+		}
 
 		$this->db->begin();
 
@@ -339,15 +339,16 @@ 
 		if (! $error && $this->statut == 0)
 		{
 			$result=$this->validate($user, '', $notrigger);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+			    $error++;
+			}
 		}
 
 		if (! $error)
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -396,15 +397,16 @@ 
 		if (! $error && $this->statut == 0)
 		{
 			$result=$this->validate($user, '', $notrigger);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+			    $error++;
+			}
 		}
 
         if (! $error)
         {
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -444,12 +446,12 @@ 
 		if ($force_number)
 		{
 			$num = $force_number;
-		}
-		else if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+		} else if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) {
+		    // empty should not happened, but when it occurs, the test save life
 		{
 			$num = $this->getNextNumRef($this->thirdparty);
 		}
-		else
+		} else
 		{
 			$num = $this->ref;
 		}
@@ -522,8 +524,7 @@ 
 				$this->brouillon = 0;
 				$this->date_validation = $now;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 		}
@@ -532,8 +533,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -597,8 +597,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -625,8 +624,11 @@ 
 		$sql.= " fk_commercial_signature, fk_commercial_suivi,";
 		$sql.= " note_private, note_public, model_pdf, extraparams";
 		$sql.= " FROM ".MAIN_DB_PREFIX."contrat";
-		if (! $id) $sql.=" WHERE entity IN (".getEntity('contract').")";
-		else $sql.= " WHERE rowid=".$id;
+		if (! $id) {
+		    $sql.=" WHERE entity IN (".getEntity('contract').")";
+		} else {
+		    $sql.= " WHERE rowid=".$id;
+		}
 		if ($ref_customer)
 		{
 			$sql.= " AND ref_customer = '".$this->db->escape($ref_customer)."'";
@@ -695,15 +697,13 @@ 
 				}
 
 				return $this->id;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this)."::fetch Contract not found");
 				$this->error="Contract not found";
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this)."::fetch Error searching contract");
 			$this->error=$this->db->error();
@@ -835,10 +835,18 @@ 
 				//dol_syslog("1 ".$line->desc);
 				//dol_syslog("2 ".$line->product_desc);
 
-				if ($line->statut == ContratLigne::STATUS_INITIAL) $this->nbofserviceswait++;
-				if ($line->statut == ContratLigne::STATUS_OPEN && (empty($line->date_fin_prevue) || $line->date_fin_prevue >= $now)) $this->nbofservicesopened++;
-				if ($line->statut == ContratLigne::STATUS_OPEN && (! empty($line->date_fin_prevue) && $line->date_fin_prevue < $now)) $this->nbofservicesexpired++;
-				if ($line->statut == ContratLigne::STATUS_CLOSED) $this->nbofservicesclosed++;
+				if ($line->statut == ContratLigne::STATUS_INITIAL) {
+				    $this->nbofserviceswait++;
+				}
+				if ($line->statut == ContratLigne::STATUS_OPEN && (empty($line->date_fin_prevue) || $line->date_fin_prevue >= $now)) {
+				    $this->nbofservicesopened++;
+				}
+				if ($line->statut == ContratLigne::STATUS_OPEN && (! empty($line->date_fin_prevue) && $line->date_fin_prevue < $now)) {
+				    $this->nbofservicesexpired++;
+				}
+				if ($line->statut == ContratLigne::STATUS_CLOSED) {
+				    $this->nbofservicesclosed++;
+				}
 
 				$total_ttc+=$objp->total_ttc;   // TODO Not saved into database
                 $total_vat+=$objp->total_tva;
@@ -848,8 +856,7 @@ 
 				$pos++;
 			}
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this)."::Fetch Erreur lecture des lignes de contrats liees aux produits");
 			return -3;
@@ -888,7 +895,9 @@ 
 			$this->error.=$langs->trans("ErrorFieldRequired",$langs->trans("SalesRepresentativeFollowUp"));
 			$paramsok=0;
 		}
-		if (! $paramsok) return -1;
+		if (! $paramsok) {
+		    return -1;
+		}
 
 
 		$this->db->begin();
@@ -959,21 +968,28 @@ 
 			if (! $error)
 			{
     			$result=$this->add_contact($this->commercial_signature_id,'SALESREPSIGN','internal');
-    			if ($result < 0) $error++;
+    			if ($result < 0) {
+    			    $error++;
+    			}
 			}
 
 			// Insert business contacts ('SALESREPFOLL','contrat')
 			if (! $error)
 			{
                 $result=$this->add_contact($this->commercial_suivi_id,'SALESREPFOLL','internal');
-			    if ($result < 0) $error++;
+			    if ($result < 0) {
+			        $error++;
+			    }
 			}
 
 			if (! $error)
 			{
-				if (! empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
+				if (! empty($this->linkedObjectsIds) && empty($this->linked_objects)) {
+				    // To use new linkedObjectsIds instead of old linked_objects
 				{
-					$this->linked_objects = $this->linkedObjectsIds;	// TODO Replace linked_objects with linkedObjectsIds
+					$this->linked_objects = $this->linkedObjectsIds;
+				}
+				// TODO Replace linked_objects with linkedObjectsIds
 				}
 
 				// Add object linked
@@ -981,19 +997,20 @@ 
     			{
     			    foreach($this->linked_objects as $origin => $tmp_origin_id)
     			    {
-    			        if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+    			        if (is_array($tmp_origin_id)) {
+    			            // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
     			        {
     			            foreach($tmp_origin_id as $origin_id)
     			            {
     			                $ret = $this->add_object_linked($origin, $origin_id);
+    			        }
     			                if (! $ret)
     			                {
     			                    $this->error=$this->db->lasterror();
     			                    $error++;
     			                }
     			            }
-    			        }
-    			        else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+    			        } else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
     			        {
     			            $origin_id = $tmp_origin_id;
     			            $ret = $this->add_object_linked($origin, $origin_id);
@@ -1006,13 +1023,17 @@ 
     			    }
     			}
 
-    			if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id))   // Get contact from origin object
+    			if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id)) {
+    			    // Get contact from origin object
     			{
     			    $originforcontact = $this->origin;
+    			}
     			    $originidforcontact = $this->origin_id;
-    			    if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
+    			    if ($originforcontact == 'shipping') {
+    			        // shipment and order share the same contacts. If creating from shipment we take data of order
     			    {
     			        require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+    			    }
     			        $exp = new Expedition($db);
     			        $exp->fetch($this->origin_id);
     			        $exp->fetchObjectLinked();
@@ -1035,13 +1056,17 @@ 
     			    {
     			        while($objcontact = $this->db->fetch_object($resqlcontact))
     			        {
-    			            if ($objcontact->source == 'internal' && in_array($objcontact->code, array('SALESREPSIGN', 'SALESREPFOLL'))) continue;    // ignore this, already forced previously
+    			            if ($objcontact->source == 'internal' && in_array($objcontact->code, array('SALESREPSIGN', 'SALESREPFOLL'))) {
+    			                continue;
+    			            }
+    			            // ignore this, already forced previously
 
     			            //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
     			            $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source);    // May failed because of duplicate key or because code of contact type does not exists for new object
     			        }
+    			    } else {
+    			        dol_print_error($resqlcontact);
     			    }
-    			    else dol_print_error($resqlcontact);
     			}
 			}
 
@@ -1056,23 +1081,20 @@ 
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else
+				} else
 				{
 					dol_syslog(get_class($this)."::create - 30 - ".$this->error, LOG_ERR);
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
+			} else
 			{
 				$this->error="Failed to add contract";
 				dol_syslog(get_class($this)."::create - 20 - ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$langs->trans("UnknownError: ".$this->db->error()." -", LOG_DEBUG);
 
@@ -1117,7 +1139,9 @@ 
 		{
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+			    $error++;
+			}
 		}
 
 		if (! $error)
@@ -1226,8 +1250,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -1248,25 +1271,61 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (empty($this->fk_commercial_signature) && $this->commercial_signature_id > 0) $this->fk_commercial_signature = $this->commercial_signature_id;
-		if (empty($this->fk_commercial_suivi) && $this->commercial_suivi_id > 0) $this->fk_commercial_suivi = $this->commercial_suivi_id;
-		if (empty($this->fk_soc) && $this->socid > 0) $this->fk_soc = $this->socid;
-		if (empty($this->fk_project) && $this->projet > 0) $this->fk_project = $this->projet;
-
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-		if (isset($this->ref_customer)) $this->ref_customer=trim($this->ref_customer);
-		if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
-		if (isset($this->ref_ext)) $this->ref_ext=trim($this->ref_ext);
-		if (isset($this->entity)) $this->entity=trim($this->entity);
-		if (isset($this->statut)) $this->statut=(int) $this->statut;
-		if (isset($this->fk_soc)) $this->fk_soc=trim($this->fk_soc);
-		if (isset($this->fk_commercial_signature)) $this->fk_commercial_signature=trim($this->fk_commercial_signature);
-		if (isset($this->fk_commercial_suivi)) $this->fk_commercial_suivi=trim($this->fk_commercial_suivi);
-		if (isset($this->fk_user_mise_en_service)) $this->fk_user_mise_en_service=trim($this->fk_user_mise_en_service);
-		if (isset($this->fk_user_cloture)) $this->fk_user_cloture=trim($this->fk_user_cloture);
-		if (isset($this->note_private)) $this->note_private=trim($this->note_private);
-		if (isset($this->note_public)) $this->note_public=trim($this->note_public);
-		if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+		if (empty($this->fk_commercial_signature) && $this->commercial_signature_id > 0) {
+		    $this->fk_commercial_signature = $this->commercial_signature_id;
+		}
+		if (empty($this->fk_commercial_suivi) && $this->commercial_suivi_id > 0) {
+		    $this->fk_commercial_suivi = $this->commercial_suivi_id;
+		}
+		if (empty($this->fk_soc) && $this->socid > 0) {
+		    $this->fk_soc = $this->socid;
+		}
+		if (empty($this->fk_project) && $this->projet > 0) {
+		    $this->fk_project = $this->projet;
+		}
+
+		if (isset($this->ref)) {
+		    $this->ref=trim($this->ref);
+		}
+		if (isset($this->ref_customer)) {
+		    $this->ref_customer=trim($this->ref_customer);
+		}
+		if (isset($this->ref_supplier)) {
+		    $this->ref_supplier=trim($this->ref_supplier);
+		}
+		if (isset($this->ref_ext)) {
+		    $this->ref_ext=trim($this->ref_ext);
+		}
+		if (isset($this->entity)) {
+		    $this->entity=trim($this->entity);
+		}
+		if (isset($this->statut)) {
+		    $this->statut=(int) $this->statut;
+		}
+		if (isset($this->fk_soc)) {
+		    $this->fk_soc=trim($this->fk_soc);
+		}
+		if (isset($this->fk_commercial_signature)) {
+		    $this->fk_commercial_signature=trim($this->fk_commercial_signature);
+		}
+		if (isset($this->fk_commercial_suivi)) {
+		    $this->fk_commercial_suivi=trim($this->fk_commercial_suivi);
+		}
+		if (isset($this->fk_user_mise_en_service)) {
+		    $this->fk_user_mise_en_service=trim($this->fk_user_mise_en_service);
+		}
+		if (isset($this->fk_user_cloture)) {
+		    $this->fk_user_cloture=trim($this->fk_user_cloture);
+		}
+		if (isset($this->note_private)) {
+		    $this->note_private=trim($this->note_private);
+		}
+		if (isset($this->note_public)) {
+		    $this->note_public=trim($this->note_public);
+		}
+		if (isset($this->import_key)) {
+		    $this->import_key=trim($this->import_key);
+		}
 		//if (isset($this->extraparams)) $this->extraparams=trim($this->extraparams);
 
 		// Check parameters
@@ -1328,8 +1387,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -1389,25 +1447,40 @@ 
 			$txlocaltax2=price2num($txlocaltax2);
 			$remise_percent=price2num($remise_percent);
 			$qty=price2num($qty);
-			if (empty($qty)) $qty=1;
-			if (empty($info_bits)) $info_bits=0;
-			if (empty($pu_ht) || ! is_numeric($pu_ht))  $pu_ht=0;
-			if (empty($pu_ttc)) $pu_ttc=0;
-			if (empty($txtva) || ! is_numeric($txtva)) $txtva=0;
-			if (empty($txlocaltax1) || ! is_numeric($txlocaltax1)) $txlocaltax1=0;
-            if (empty($txlocaltax2) || ! is_numeric($txlocaltax2)) $txlocaltax2=0;
+			if (empty($qty)) {
+			    $qty=1;
+			}
+			if (empty($info_bits)) {
+			    $info_bits=0;
+			}
+			if (empty($pu_ht) || ! is_numeric($pu_ht)) {
+			    $pu_ht=0;
+			}
+			if (empty($pu_ttc)) {
+			    $pu_ttc=0;
+			}
+			if (empty($txtva) || ! is_numeric($txtva)) {
+			    $txtva=0;
+			}
+			if (empty($txlocaltax1) || ! is_numeric($txlocaltax1)) {
+			    $txlocaltax1=0;
+			}
+            if (empty($txlocaltax2) || ! is_numeric($txlocaltax2)) {
+                $txlocaltax2=0;
+            }
 
 			if ($price_base_type=='HT')
 			{
 				$pu=$pu_ht;
-			}
-			else
+			} else
 			{
 				$pu=$pu_ttc;
 			}
 
 			// Check parameters
-			if (empty($remise_percent)) $remise_percent=0;
+			if (empty($remise_percent)) {
+			    $remise_percent=0;
+			}
 
 			$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->societe, $mysoc);
 
@@ -1444,7 +1517,9 @@ 
 				$price = $pu_ht - $remise;
 			}
 
-		    if (empty($pa_ht)) $pa_ht=0;
+		    if (empty($pa_ht)) {
+		        $pa_ht=0;
+		    }
 
 
 			// if buy price not defined, define buyprice as configured in margin admin
@@ -1453,8 +1528,7 @@ 
 				if (($result = $this->defineBuyPrice($pu_ht, $remise_percent, $fk_product)) < 0)
 				{
 					return $result;
-				}
-				else
+				} else
 				{
 					$pa_ht = $result;
 				}
@@ -1485,10 +1559,16 @@ 
 			$sql.= " ".price2num($total_ht).",".price2num($total_tva).",".price2num($total_localtax1).",".price2num($total_localtax2).",".price2num($total_ttc).",";
 			$sql.= " '".$info_bits."',";
 			$sql.= " ".price2num($price).",".price2num($remise).",";
-			if (isset($fk_fournprice)) $sql.= ' '.$fk_fournprice.',';
-			else $sql.= ' null,';
-			if (isset($pa_ht)) $sql.= ' '.price2num($pa_ht);
-			else $sql.= ' null';
+			if (isset($fk_fournprice)) {
+			    $sql.= ' '.$fk_fournprice.',';
+			} else {
+			    $sql.= ' null,';
+			}
+			if (isset($pa_ht)) {
+			    $sql.= ' '.price2num($pa_ht);
+			} else {
+			    $sql.= ' null';
+			}
 			if ($date_start > 0) { $sql.= ",'".$this->db->idate($date_start)."'"; }
 			if ($date_end > 0) { $sql.= ",'".$this->db->idate($date_end)."'"; }
 			$sql.= ", ".($fk_unit?"'".$this->db->escape($fk_unit)."'":"null");
@@ -1499,9 +1579,11 @@ 
 			{
 				$contractlineid = $this->db->last_insert_id(MAIN_DB_PREFIX."contratdet");
 
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) {
+				    // For avoid conflicts if trigger used
 				{
 					$contractline = new ContratLigne($this->db);
+				}
 					$contractline->array_options=$array_options;
 					$contractline->id=$contractlineid;
 					$result=$contractline->insertExtraFields();
@@ -1526,21 +1608,18 @@ 
 				{
 					$this->db->rollback();
 					return -1;
-				}
-				else
+				} else
 				{
 					$this->db->commit();
 					return $contractlineid;
 				}
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				$this->error=$this->db->error()." sql=".$sql;
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this)."::addline ErrorTryToAddLineOnValidatedContract", LOG_ERR);
 			return -2;
@@ -1585,7 +1664,9 @@ 
 		$localtax1tx = price2num($localtax1tx);
 		$localtax2tx = price2num($localtax2tx);
 		$pa_ht=price2num($pa_ht);
-		if (empty($fk_fournprice)) $fk_fournprice=0;
+		if (empty($fk_fournprice)) {
+		    $fk_fournprice=0;
+		}
 
 		$subprice = $price;
 		$remise = 0;
@@ -1593,8 +1674,7 @@ 
 		{
 			$remise = round(($pu * $remise_percent / 100), 2);
 			$price = $pu - $remise;
-		}
-		else
+		} else
 		{
 			$remise_percent=0;
 		}
@@ -1631,7 +1711,9 @@ 
 		    $price = $pu - $remise;
 		}
 
-	    if (empty($pa_ht)) $pa_ht=0;
+	    if (empty($pa_ht)) {
+	        $pa_ht=0;
+	    }
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0)
@@ -1639,8 +1721,7 @@ 
 			if (($result = $this->defineBuyPrice($pu_ht, $remise_percent)) < 0)
 			{
 				return $result;
-			}
-			else
+			} else
 			{
 				$pa_ht = $result;
 			}
@@ -1664,14 +1745,10 @@ 
 		$sql.= ", total_ttc='".      price2num($total_ttc)."'";
 		$sql.= ", fk_product_fournisseur_price=".($fk_fournprice > 0 ? $fk_fournprice : "null");
 		$sql.= ", buy_price_ht='".price2num($pa_ht)."'";
-		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"; }
+		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 .= ", fk_unit=".($fk_unit?"'".$this->db->escape($fk_unit)."'":"null");
 		$sql .= " WHERE rowid = ".$rowid;
 
@@ -1683,9 +1760,11 @@ 
 			if ($result >= 0)
 			{
 
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) {
+				    // For avoid conflicts if trigger used
 				{
 					$contractline = new ContratLigne($this->db);
+				}
 					$contractline->array_options=$array_options;
 					$contractline->id= $rowid;
 					$result=$contractline->insertExtraFields();
@@ -1709,15 +1788,13 @@ 
 					$this->db->commit();
 					return 1;
 				}
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::updateline Erreur -2");
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			$this->error=$this->db->error();
@@ -1744,7 +1821,9 @@ 
 
 		    // Call trigger
 		    $result=$this->call_trigger('LINECONTRACT_DELETE',$user);
-		    if ($result < 0) return -1;
+		    if ($result < 0) {
+		        return -1;
+		    }
 		    // End call triggers
 
 		    $this->db->begin();
@@ -1762,9 +1841,11 @@ 
 
 			if (empty($error)) {
 				// Remove extrafields
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+				    // For avoid conflicts if trigger used
 				{
 					$contractline = new ContratLigne($this->db);
+				}
 					$contractline->id= $idline;
 					$result=$contractline->deleteExtraFields();
 					if ($result < 0)
@@ -1783,8 +1864,7 @@ 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
@@ -1806,7 +1886,9 @@ 
 		dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
 
 		// If draft, we keep it (should not happen)
-		if ($this->statut == 0) return 1;
+		if ($this->statut == 0) {
+		    return 1;
+		}
 
 		// Load $this->lines array
 		//		$this->fetch_lines();
@@ -1847,29 +1929,17 @@ 
 		$langs->load("contracts");
 		if ($mode == 0)
 		{
-			if ($statut == 0) { return $langs->trans("ContractStatusDraft"); }
-			elseif ($statut == 1) { return $langs->trans("ContractStatusValidated"); }
-			elseif ($statut == 2) { return $langs->trans("ContractStatusClosed"); }
-		}
-		elseif ($mode == 1)
+			if ($statut == 0) { return $langs->trans("ContractStatusDraft"); } elseif ($statut == 1) { return $langs->trans("ContractStatusValidated"); } elseif ($statut == 2) { return $langs->trans("ContractStatusClosed"); }
+		} elseif ($mode == 1)
 		{
-			if ($statut == 0) { return $langs->trans("ContractStatusDraft"); }
-			elseif ($statut == 1) { return $langs->trans("ContractStatusValidated"); }
-			elseif ($statut == 2) { return $langs->trans("ContractStatusClosed"); }
-		}
-		elseif ($mode == 2)
+			if ($statut == 0) { return $langs->trans("ContractStatusDraft"); } elseif ($statut == 1) { return $langs->trans("ContractStatusValidated"); } elseif ($statut == 2) { return $langs->trans("ContractStatusClosed"); }
+		} elseif ($mode == 2)
 		{
-			if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'),'statut0').' '.$langs->trans("ContractStatusDraft"); }
-			elseif ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4').' '.$langs->trans("ContractStatusValidated"); }
-			elseif ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'),'statut6').' '.$langs->trans("ContractStatusClosed"); }
-		}
-		elseif ($mode == 3)
+			if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'),'statut0').' '.$langs->trans("ContractStatusDraft"); } elseif ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4').' '.$langs->trans("ContractStatusValidated"); } elseif ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'),'statut6').' '.$langs->trans("ContractStatusClosed"); }
+		} elseif ($mode == 3)
 		{
-			if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'),'statut0'); }
-			elseif ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4'); }
-			elseif ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'),'statut6'); }
-		}
-		elseif ($mode == 4 || $mode == 6 || $mode == 7)
+			if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'),'statut0'); } elseif ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4'); } elseif ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'),'statut6'); }
+		} elseif ($mode == 4 || $mode == 6 || $mode == 7)
 		{
 			$text='';
 			if ($mode == 4)
@@ -1890,12 +1960,9 @@ 
 			$text.=($mode != 7 || $this->nbofservicesclosed > 0) ? ($this->nbofservicesclosed.ContratLigne::LibStatut(5,3,-1,'class="paddingleft2 inline-block valigntextbottom"')) : '';
 			$text.=($mode == 7?'</div>':'');
 			return $text;
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
-			if ($statut == 0) { return $langs->trans("ContractStatusDraft").' '.img_picto($langs->trans('ContractStatusDraft'),'statut0'); }
-			elseif ($statut == 1) { return $langs->trans("ContractStatusValidated").' '.img_picto($langs->trans('ContractStatusValidated'),'statut4'); }
-			elseif ($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'); } elseif ($statut == 1) { return $langs->trans("ContractStatusValidated").' '.img_picto($langs->trans('ContractStatusValidated'),'statut4'); } elseif ($statut == 2) { return $langs->trans("ContractStatusClosed").' '.img_picto($langs->trans('ContractStatusClosed'),'statut6'); }
 		}
 	}
 
@@ -1921,8 +1988,12 @@ 
 		//{
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) {
+			    $add_save_lastsearch_values=1;
+			}
+			if ($add_save_lastsearch_values) {
+			    $url.='&save_lastsearch_values=1';
+			}
 		//}
 
         $label = '';
@@ -1960,8 +2031,12 @@ 
 		$linkend='</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
+		if ($withpicto) {
+		    $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		}
+		if ($withpicto != 2) {
+		    $result.= $this->ref;
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -2008,8 +2083,7 @@ 
 			}
 
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2030,7 +2104,9 @@ 
 		$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'";
+		if ($statut >= 0) {
+		    $sql.= " AND statut = '$statut'";
+		}
 
 		dol_syslog(get_class($this)."::array_detail()", LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -2045,8 +2121,7 @@ 
 				$i++;
 			}
 			return $tab;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -2066,7 +2141,9 @@ 
 		$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;
+		if ($option == 'others') {
+		    $sql.= " AND c.rowid != ".$this->id;
+		}
 
 		dol_syslog(get_class($this)."::getOtherContracts()", LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -2083,8 +2160,7 @@ 
 				$i++;
 			}
 			return $tab;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -2108,7 +2184,9 @@ 
 		$this->from = " FROM ".MAIN_DB_PREFIX."contrat as c";
 		$this->from.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 		$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$user->societe_id) $this->from.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$user->societe_id) {
+		    $this->from.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 
 		if ($mode == 'inactives')
 		{
@@ -2117,8 +2195,7 @@ 
 			$sql.= " WHERE c.statut = 1";
 			$sql.= " AND c.rowid = cd.fk_contrat";
 			$sql.= " AND cd.statut = 0";
-		}
-		elseif ($mode == 'expired')
+		} elseif ($mode == 'expired')
 		{
 			$sql = "SELECT cd.rowid, cd.date_fin_validite as datefin";
 			$sql.= $this->from;
@@ -2129,8 +2206,12 @@ 
 		}
 		$sql.= " AND c.fk_soc = s.rowid";
 		$sql.= " AND c.entity = ".$conf->entity;
-		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;
+		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)
 		{
@@ -2163,8 +2244,7 @@ 
 			}
 
 			return $response;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			$this->error=$this->db->error();
@@ -2206,8 +2286,7 @@ 
 			}
             $this->db->free($resql);
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			$this->error=$this->db->error();
@@ -2474,8 +2553,9 @@ 
 				);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $clonedObj, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-					$error ++;
+				if ($reshook < 0) {
+									$error ++;
+				}
 			}
 		}
 
@@ -2666,51 +2746,22 @@ 
 		$langs->load("contracts");
 		if ($mode == 0)
 		{
-			if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return $langs->trans("ServiceStatusNotLate"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return $langs->trans("ServiceStatusLate"); }
-			elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed");  }
-		}
-		elseif ($mode == 1)
+			if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial"); } elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning"); } elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return $langs->trans("ServiceStatusNotLate"); } elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return $langs->trans("ServiceStatusLate"); } elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed");  }
+		} elseif ($mode == 1)
 		{
-			if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return $langs->trans("ServiceStatusNotLateShort"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return $langs->trans("ServiceStatusLateShort"); }
-			elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed");  }
-		}
-		elseif ($mode == 2)
+			if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial"); } elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning"); } elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return $langs->trans("ServiceStatusNotLateShort"); } elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return $langs->trans("ServiceStatusLateShort"); } elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed");  }
+		} elseif ($mode == 2)
 		{
-			if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0').' '.$langs->trans("ServiceStatusInitial"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4').' '.$langs->trans("ServiceStatusRunning"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return img_picto($langs->trans('ServiceStatusNotLate'),'statut4').' '.$langs->trans("ServiceStatusNotLateShort"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return img_picto($langs->trans('ServiceStatusLate'),'statut3').' '.$langs->trans("ServiceStatusLateShort"); }
-			elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6') .' '.$langs->trans("ServiceStatusClosed"); }
-		}
-		elseif ($mode == 3)
+			if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0').' '.$langs->trans("ServiceStatusInitial"); } elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4').' '.$langs->trans("ServiceStatusRunning"); } elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return img_picto($langs->trans('ServiceStatusNotLate'),'statut4').' '.$langs->trans("ServiceStatusNotLateShort"); } elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return img_picto($langs->trans('ServiceStatusLate'),'statut3').' '.$langs->trans("ServiceStatusLateShort"); } elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6') .' '.$langs->trans("ServiceStatusClosed"); }
+		} elseif ($mode == 3)
 		{
-			if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0',$moreatt); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4',$moreatt); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return img_picto($langs->trans('ServiceStatusNotLate'),'statut4',$moreatt); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return img_picto($langs->trans('ServiceStatusLate'),'statut3',$moreatt); }
-			elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6',$moreatt); }
-		}
-		elseif ($mode == 4)
+			if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0',$moreatt); } elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4',$moreatt); } elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return img_picto($langs->trans('ServiceStatusNotLate'),'statut4',$moreatt); } elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return img_picto($langs->trans('ServiceStatusLate'),'statut3',$moreatt); } elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6',$moreatt); }
+		} elseif ($mode == 4)
 		{
-			if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0').' '.$langs->trans("ServiceStatusInitial"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4').' '.$langs->trans("ServiceStatusRunning"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return img_picto($langs->trans('ServiceStatusNotLate'),'statut4').' '.$langs->trans("ServiceStatusNotLate"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return img_picto($langs->trans('ServiceStatusLate'),'statut3').' '.$langs->trans("ServiceStatusLate"); }
-			elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6') .' '.$langs->trans("ServiceStatusClosed"); }
-		}
-		elseif ($mode == 5)
+			if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'),'statut0').' '.$langs->trans("ServiceStatusInitial"); } elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'),'statut4').' '.$langs->trans("ServiceStatusRunning"); } elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return img_picto($langs->trans('ServiceStatusNotLate'),'statut4').' '.$langs->trans("ServiceStatusNotLate"); } elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return img_picto($langs->trans('ServiceStatusLate'),'statut3').' '.$langs->trans("ServiceStatusLate"); } elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'),'statut6') .' '.$langs->trans("ServiceStatusClosed"); }
+		} elseif ($mode == 5)
 		{
-			if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial").' '.img_picto($langs->trans('ServiceStatusInitial'),'statut0'); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning").' '.img_picto($langs->trans('ServiceStatusRunning'),'statut4'); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return $langs->trans("ServiceStatusNotLateShort").' '.img_picto($langs->trans('ServiceStatusNotLateShort'),'statut4'); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return $langs->trans("ServiceStatusLateShort").' '.img_picto($langs->trans('ServiceStatusLate'),'statut3'); }
-			elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed").' '.img_picto($langs->trans('ServiceStatusClosed'),'statut6'); }
+			if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial").' '.img_picto($langs->trans('ServiceStatusInitial'),'statut0'); } elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning").' '.img_picto($langs->trans('ServiceStatusRunning'),'statut4'); } elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return $langs->trans("ServiceStatusNotLateShort").' '.img_picto($langs->trans('ServiceStatusNotLateShort'),'statut4'); } elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return $langs->trans("ServiceStatusLateShort").' '.img_picto($langs->trans('ServiceStatusLate'),'statut3'); } elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed").' '.img_picto($langs->trans('ServiceStatusClosed'),'statut6'); }
 		}
 	}
 
@@ -2727,17 +2778,27 @@ 
 
 		$result='';
         $label=$langs->trans("ShowContractOfService").': '.$this->label;
-        if (empty($label)) $label=$this->description;
+        if (empty($label)) {
+            $label=$this->description;
+        }
 
         $link = '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$this->fk_contrat.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend='</a>';
 
 		$picto='service';
-		if ($this->type == 0) $picto='product';
+		if ($this->type == 0) {
+		    $picto='product';
+		}
 
-        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		if ($withpicto != 2) $result.=$link.($this->product_ref?$this->product_ref.' ':'').($this->label?$this->label:$this->description).$linkend;
+        if ($withpicto) {
+            $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+        }
+		if ($withpicto && $withpicto != 2) {
+		    $result.=' ';
+		}
+		if ($withpicto != 2) {
+		    $result.=$link.($this->product_ref?$this->product_ref.' ':'').($this->label?$this->label:$this->description).$linkend;
+		}
 		return $result;
 	}
 
@@ -2752,7 +2813,9 @@ 
 	{
 
 		// Check parameters
-		if (empty($id) && empty($ref)) return -1;
+		if (empty($id) && empty($ref)) {
+		    return -1;
+		}
 
 		$sql = "SELECT";
 		$sql.= " t.rowid,";
@@ -2798,8 +2861,12 @@ 
 		$sql.= " t.commentaire,";
 		$sql.= " t.fk_unit";
 		$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as t LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = t.fk_product";
-		if ($id)  $sql.= " WHERE t.rowid = ".$id;
-		if ($ref) $sql.= " WHERE t.rowid = '".$this->db->escape($ref)."'";
+		if ($id) {
+		    $sql.= " WHERE t.rowid = ".$id;
+		}
+		if ($ref) {
+		    $sql.= " WHERE t.rowid = '".$this->db->escape($ref)."'";
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -2864,8 +2931,7 @@ 
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			return -1;
@@ -2913,18 +2979,40 @@ 
 		$this->fk_user_cloture = (int) $this->fk_user_cloture;
 		$this->commentaire=trim($this->commentaire);
 		//if (empty($this->subprice)) $this->subprice = 0;
-		if (empty($this->price_ht)) $this->price_ht = 0;
-		if (empty($this->total_ht)) $this->total_ht = 0;
-		if (empty($this->total_tva)) $this->total_tva = 0;
-		if (empty($this->total_ttc)) $this->total_ttc = 0;
-		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-		if (empty($this->remise_percent)) $this->remise_percent = 0;
+		if (empty($this->price_ht)) {
+		    $this->price_ht = 0;
+		}
+		if (empty($this->total_ht)) {
+		    $this->total_ht = 0;
+		}
+		if (empty($this->total_tva)) {
+		    $this->total_tva = 0;
+		}
+		if (empty($this->total_ttc)) {
+		    $this->total_ttc = 0;
+		}
+		if (empty($this->localtax1_tx)) {
+		    $this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+		    $this->localtax2_tx = 0;
+		}
+		if (empty($this->remise_percent)) {
+		    $this->remise_percent = 0;
+		}
 		// For backward compatibility
-		if (empty($this->date_start))      $this->date_start=$this->date_ouverture_prevue;
-		if (empty($this->date_start_real)) $this->date_start=$this->date_ouverture;
-		if (empty($this->date_end))        $this->date_start=$this->date_fin_validite;
-		if (empty($this->date_end_real))   $this->date_start=$this->date_cloture;
+		if (empty($this->date_start)) {
+		    $this->date_start=$this->date_ouverture_prevue;
+		}
+		if (empty($this->date_start_real)) {
+		    $this->date_start=$this->date_ouverture;
+		}
+		if (empty($this->date_end)) {
+		    $this->date_start=$this->date_fin_validite;
+		}
+		if (empty($this->date_end_real)) {
+		    $this->date_start=$this->date_cloture;
+		}
 
 
 		// Check parameters
@@ -2943,7 +3031,9 @@ 
 		$this->total_localtax1= $tabprice[9];
 		$this->total_localtax2= $tabprice[10];
 
-	    if (empty($this->pa_ht)) $this->pa_ht=0;
+	    if (empty($this->pa_ht)) {
+	        $this->pa_ht=0;
+	    }
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0)
@@ -2951,8 +3041,7 @@ 
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->pa_ht = $result;
 			}
@@ -3009,9 +3098,11 @@ 
 			$error++;
 		}
 
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) // For avoid conflicts if trigger used
+		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) {
+		    // For avoid conflicts if trigger used
 		{
 			$result=$this->insertExtraFields();
+		}
 			if ($result < 0)
 			{
 				$error++;
@@ -3099,8 +3190,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -3141,10 +3231,16 @@ 
 		$sql.= " ".price2num($this->total_ht).",".price2num($this->total_tva).",".price2num($this->total_localtax1).",".price2num($this->total_localtax2).",".price2num($this->total_ttc).",";
 		$sql.= " '".$this->db->escape($this->info_bits)."',";
 		$sql.= " ".price2num($this->price_ht).",".price2num($this->remise).",";
-		if ($this->fk_fournprice > 0) $sql.= ' '.$this->fk_fournprice.',';
-		else $sql.= ' null,';
-		if ($this->pa_ht > 0) $sql.= ' '.price2num($this->pa_ht);
-		else $sql.= ' null';
+		if ($this->fk_fournprice > 0) {
+		    $sql.= ' '.$this->fk_fournprice.',';
+		} else {
+		    $sql.= ' null,';
+		}
+		if ($this->pa_ht > 0) {
+		    $sql.= ' '.price2num($this->pa_ht);
+		} else {
+		    $sql.= ' null';
+		}
 		if ($this->date_ouverture > 0) { $sql.= ",'".$this->db->idate($this->date_ouverture)."'"; }
 		if ($this->date_cloture > 0)   { $sql.= ",'".$this->db->idate($this->date_cloture)."'"; }
 		$sql.= ")";
@@ -3157,9 +3253,11 @@ 
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'contratdet');
 
 			// Insert of extrafields
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) // For avoid conflicts if trigger used
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) {
+			    // For avoid conflicts if trigger used
 			{
 				$result = $this->insertExtraFields();
+			}
 				if ($result < 0)
 				{
 					$this->db->rollback();
@@ -3180,8 +3278,7 @@ 
 
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			$this->error=$this->db->error()." sql=".$sql;
@@ -3210,7 +3307,9 @@ 
 
 		$sql = "UPDATE " . MAIN_DB_PREFIX . "contratdet SET statut = ".ContratLigne::STATUS_OPEN.",";
 		$sql .= " date_ouverture = " . (dol_strlen($date) != 0 ? "'" . $this->db->idate($date) . "'" : "null") . ",";
-		if ($date_end >= 0) $sql .= " date_fin_validite = " . (dol_strlen($date_end) != 0 ? "'" . $this->db->idate($date_end) . "'" : "null") . ",";
+		if ($date_end >= 0) {
+		    $sql .= " date_fin_validite = " . (dol_strlen($date_end) != 0 ? "'" . $this->db->idate($date_end) . "'" : "null") . ",";
+		}
 		$sql .= " fk_user_ouverture = " . $user->id . ",";
 		$sql .= " date_cloture = null,";
 		$sql .= " commentaire = '" . $this->db->escape($comment) . "'";
@@ -3221,7 +3320,9 @@ 
 		if ($resql) {
 			// Call trigger
 			$result = $this->call_trigger('LINECONTRACT_ACTIVATE', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+			    $error++;
+			}
 			// End call triggers
 
 			if (! $error)
@@ -3235,8 +3336,7 @@ 
 
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				return -1;

dolibarr/htdocs/contrat/card.php

Indentation +1957 added lines, -1957 removed lines

@@ -42,8 +42,8 @@ 
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 if (! empty($conf->propal->enabled))  require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
 
@@ -73,11 +73,11 @@ 
 
 // Load object
 if ($id > 0 || ! empty($ref) && $action!='add') {
-	$ret = $object->fetch($id, $ref);
-	if ($ret > 0)
-		$ret = $object->fetch_thirdparty();
-	if ($ret < 0)
-		dol_print_error('', $object->error);
+    $ret = $object->fetch($id, $ref);
+    if ($ret > 0)
+        $ret = $object->fetch_thirdparty();
+    if ($ret < 0)
+        dol_print_error('', $object->error);
 }
 
 // fetch optionals attributes and labels
@@ -101,989 +101,989 @@ 
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 if (empty($reshook))
 {
-	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
-
-	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
-
-	if ($action == 'confirm_active' && $confirm == 'yes' && $user->rights->contrat->activer)
-	{
-		$result = $object->active_line($user, GETPOST('ligne'), GETPOST('date'), GETPOST('dateend'), GETPOST('comment'));
-
-		if ($result > 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-			exit;
-		}
-		else {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
+    include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
 
-	else if ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->contrat->activer)
-	{
-		if (! GETPOST('dateend'))
-		{
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd")), null, 'errors');
-		}
-		if (! $error)
-		{
-			$result = $object->close_line($user, GETPOST('ligne'), GETPOST('dateend'), urldecode(GETPOST('comment')));
-			if ($result > 0)
-			{
-				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-				exit;
-			}
-			else
-			{
-				setEventMessages($object->error, $object->errors, 'errors');
-			}
-		}
-	}
+    include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
 
-	// Si ajout champ produit predefini
-	if (GETPOST('mode')=='predefined')
-	{
-		$date_start='';
-		$date_end='';
-		if (GETPOST('date_startmonth') && GETPOST('date_startday') && GETPOST('date_startyear'))
-		{
-			$date_start=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
-		}
-		if (GETPOST('date_endmonth') && GETPOST('date_endday') && GETPOST('date_endyear'))
-		{
-			$date_end=dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
-		}
-	}
+    if ($action == 'confirm_active' && $confirm == 'yes' && $user->rights->contrat->activer)
+    {
+        $result = $object->active_line($user, GETPOST('ligne'), GETPOST('date'), GETPOST('dateend'), GETPOST('comment'));
 
-	// Si ajout champ produit libre
-	if (GETPOST('mode')=='libre')
-	{
-		$date_start_sl='';
-		$date_end_sl='';
-		if (GETPOST('date_start_slmonth') && GETPOST('date_start_slday') && GETPOST('date_start_slyear'))
-		{
-			$date_start_sl=dol_mktime(GETPOST('date_start_slhour'), GETPOST('date_start_slmin'), 0, GETPOST('date_start_slmonth'), GETPOST('date_start_slday'), GETPOST('date_start_slyear'));
-		}
-		if (GETPOST('date_end_slmonth') && GETPOST('date_end_slday') && GETPOST('date_end_slyear'))
-		{
-			$date_end_sl=dol_mktime(GETPOST('date_end_slhour'), GETPOST('date_end_slmin'), 0, GETPOST('date_end_slmonth'), GETPOST('date_end_slday'), GETPOST('date_end_slyear'));
-		}
-	}
+        if ($result > 0)
+        {
+            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+            exit;
+        }
+        else {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
 
-	// Param dates
-	$date_contrat='';
-	$date_start_update='';
-	$date_end_update='';
-	$date_start_real_update='';
-	$date_end_real_update='';
-	if (GETPOST('date_start_updatemonth') && GETPOST('date_start_updateday') && GETPOST('date_start_updateyear'))
-	{
-		$date_start_update=dol_mktime(GETPOST('date_start_updatehour'), GETPOST('date_start_updatemin'), 0, GETPOST('date_start_updatemonth'), GETPOST('date_start_updateday'), GETPOST('date_start_updateyear'));
-	}
-	if (GETPOST('date_end_updatemonth') && GETPOST('date_end_updateday') && GETPOST('date_end_updateyear'))
-	{
-		$date_end_update=dol_mktime(GETPOST('date_end_updatehour'), GETPOST('date_end_updatemin'), 0, GETPOST('date_end_updatemonth'), GETPOST('date_end_updateday'), GETPOST('date_end_updateyear'));
-	}
-	if (GETPOST('date_start_real_updatemonth') && GETPOST('date_start_real_updateday') && GETPOST('date_start_real_updateyear'))
-	{
-		$date_start_real_update=dol_mktime(GETPOST('date_start_real_updatehour'), GETPOST('date_start_real_updatemin'), 0, GETPOST('date_start_real_updatemonth'), GETPOST('date_start_real_updateday'), GETPOST('date_start_real_updateyear'));
-	}
-	if (GETPOST('date_end_real_updatemonth') && GETPOST('date_end_real_updateday') && GETPOST('date_end_real_updateyear'))
-	{
-		$date_end_real_update=dol_mktime(GETPOST('date_end_real_updatehour'), GETPOST('date_end_real_updatemin'), 0, GETPOST('date_end_real_updatemonth'), GETPOST('date_end_real_updateday'), GETPOST('date_end_real_updateyear'));
-	}
-	if (GETPOST('remonth') && GETPOST('reday') && GETPOST('reyear'))
-	{
-		$datecontrat = dol_mktime(GETPOST('rehour'), GETPOST('remin'), 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-	}
+    else if ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->contrat->activer)
+    {
+        if (! GETPOST('dateend'))
+        {
+            $error++;
+            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd")), null, 'errors');
+        }
+        if (! $error)
+        {
+            $result = $object->close_line($user, GETPOST('ligne'), GETPOST('dateend'), urldecode(GETPOST('comment')));
+            if ($result > 0)
+            {
+                header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+                exit;
+            }
+            else
+            {
+                setEventMessages($object->error, $object->errors, 'errors');
+            }
+        }
+    }
 
-	// Add contract
-	if ($action == 'add' && $user->rights->contrat->creer)
-	{
-		// Check
-		if (empty($datecontrat))
-		{
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-			$action='create';
-		}
-
-		if ($socid<1)
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
-			$action='create';
-			$error++;
-		}
-
-		// Fill array 'array_options' with data from add form
-		$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-		if ($ret < 0) {
-			$error ++;
-			$action = 'create';
-		}
-
-		if (! $error)
-		{
-			$object->socid						= $socid;
-			$object->date_contrat				= $datecontrat;
-
-			$object->commercial_suivi_id		= GETPOST('commercial_suivi_id','int');
-			$object->commercial_signature_id	= GETPOST('commercial_signature_id','int');
-
-			$object->note_private				= GETPOST('note_private','alpha');
-			$object->note_public				= GETPOST('note_public','alpha');
-			$object->fk_project					= GETPOST('projectid','int');
-			$object->remise_percent				= GETPOST('remise_percent','alpha');
-			$object->ref						= GETPOST('ref','alpha');
-			$object->ref_customer				= GETPOST('ref_customer','alpha');
-			$object->ref_supplier				= GETPOST('ref_supplier','alpha');
-
-			// If creation from another object of another module (Example: origin=propal, originid=1)
-			if (! empty($origin) && ! empty($originid))
-			{
-				// Parse element/subelement (ex: project_task)
-				$element = $subelement = $origin;
-				if (preg_match('/^([^_]+)_([^_]+)/i',$origin,$regs))
-				{
-					$element = $regs[1];
-					$subelement = $regs[2];
-				}
-
-				// For compatibility
-				if ($element == 'order')    { $element = $subelement = 'commande'; }
-				if ($element == 'propal')   { $element = 'comm/propal'; $subelement = 'propal'; }
-
-				$object->origin    = $origin;
-				$object->origin_id = $originid;
-
-				// Possibility to add external linked objects with hooks
-				$object->linked_objects[$object->origin] = $object->origin_id;
-				if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects']))
-				{
-					$object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']);
-				}
-
-				$id = $object->create($user);
-				if ($id < 0) {
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-
-				if ($id > 0)
-				{
-					dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
-
-					$classname = ucfirst($subelement);
-					$srcobject = new $classname($db);
-
-					dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
-					$result=$srcobject->fetch($object->origin_id);
-					if ($result > 0)
-					{
-						$srcobject->fetch_thirdparty();
-						$lines = $srcobject->lines;
-						if (empty($lines) && method_exists($srcobject,'fetch_lines'))
-						{
-							$srcobject->fetch_lines();
-							$lines = $srcobject->lines;
-						}
-
-						$fk_parent_line=0;
-						$num=count($lines);
-
-						for ($i=0;$i<$num;$i++)
-						{
-							$product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
-
-							if ($product_type == 1 || (! empty($conf->global->CONTRACT_SUPPORT_PRODUCTS) && in_array($product_type, array(0,1)))) { 	// TODO Exclude also deee
-								// service prédéfini
-								if ($lines[$i]->fk_product > 0)
-								{
-									$product_static = new Product($db);
-
-									// Define output language
-									if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-									{
-										$prod = new Product($db);
-										$prod->id=$lines[$i]->fk_product;
-										$prod->getMultiLangs();
-
-										$outputlangs = $langs;
-										$newlang='';
-										if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-										if (empty($newlang)) $newlang=$srcobject->thirdparty->default_lang;
-										if (! empty($newlang))
-										{
-											$outputlangs = new Translate("",$conf);
-											$outputlangs->setDefaultLang($newlang);
-										}
-
-										$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
-									}
-									else
-									{
-										$label = $lines[$i]->product_label;
-									}
-									$desc = ($lines[$i]->desc && $lines[$i]->desc!=$lines[$i]->libelle)?dol_htmlentitiesbr($lines[$i]->desc):'';
-								}
-								else {
-									$desc = dol_htmlentitiesbr($lines[$i]->desc);
-								}
-
-								// Extrafields
-								$array_options = array();
-								if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) 							// For avoid conflicts if
-								// trigger used
-								{
-									$lines[$i]->fetch_optionals($lines[$i]->rowid);
-									$array_options = $lines[$i]->array_options;
-								}
-
-								$txtva = $lines[$i]->vat_src_code ? $lines[$i]->tva_tx . ' (' .  $lines[$i]->vat_src_code . ')' : $lines[$i]->tva_tx;
-
-								// View third's localtaxes for now
-								$localtax1_tx = get_localtax($txtva, 1, $object->thirdparty);
-								$localtax2_tx = get_localtax($txtva, 2, $object->thirdparty);
-
-								$result = $object->addline(
-									$desc,
-									$lines[$i]->subprice,
-									$lines[$i]->qty,
-									$txtva,
-									$localtax1_tx,
-									$localtax2_tx,
-									$lines[$i]->fk_product,
-									$lines[$i]->remise_percent,
-									$lines[$i]->date_start,
-									$lines[$i]->date_end,
-									'HT',
-									0,
-									$lines[$i]->info_bits,
-									$lines[$i]->fk_fournprice,
-									$lines[$i]->pa_ht,
-									$array_options,
-									$lines[$i]->fk_unit
-								);
-
-								if ($result < 0)
-								{
-									$error++;
-									break;
-								}
-							}
-						}
-					}
-					else
-					{
-						setEventMessages($srcobject->error, $srcobject->errors, 'errors');
-						$error++;
-					}
-
-					// Hooks
-					$parameters = array('objFrom' => $srcobject);
-					$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
-					// modified by hook
-					if ($reshook < 0)
-						$error++;
-				}
-				else
-				{
-					setEventMessages($object->error, $object->errors, 'errors');
-					$error++;
-				}
-			}
-			else
-			{
-				$result = $object->create($user);
-				if ($result > 0)
-				{
-					header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-					exit;
-				}
-				else {
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-				$action='create';
-			}
-		}
-	}
+    // Si ajout champ produit predefini
+    if (GETPOST('mode')=='predefined')
+    {
+        $date_start='';
+        $date_end='';
+        if (GETPOST('date_startmonth') && GETPOST('date_startday') && GETPOST('date_startyear'))
+        {
+            $date_start=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
+        }
+        if (GETPOST('date_endmonth') && GETPOST('date_endday') && GETPOST('date_endyear'))
+        {
+            $date_end=dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
+        }
+    }
 
-	else if ($action == 'classin' && $user->rights->contrat->creer)
-	{
-		$object->setProject(GETPOST('projectid'));
-	}
+    // Si ajout champ produit libre
+    if (GETPOST('mode')=='libre')
+    {
+        $date_start_sl='';
+        $date_end_sl='';
+        if (GETPOST('date_start_slmonth') && GETPOST('date_start_slday') && GETPOST('date_start_slyear'))
+        {
+            $date_start_sl=dol_mktime(GETPOST('date_start_slhour'), GETPOST('date_start_slmin'), 0, GETPOST('date_start_slmonth'), GETPOST('date_start_slday'), GETPOST('date_start_slyear'));
+        }
+        if (GETPOST('date_end_slmonth') && GETPOST('date_end_slday') && GETPOST('date_end_slyear'))
+        {
+            $date_end_sl=dol_mktime(GETPOST('date_end_slhour'), GETPOST('date_end_slmin'), 0, GETPOST('date_end_slmonth'), GETPOST('date_end_slday'), GETPOST('date_end_slyear'));
+        }
+    }
 
-	// Add a new line
-	else if ($action == 'addline' && $user->rights->contrat->creer)
-	{
-		// Set if we used free entry or predefined product
-		$predef='';
-		$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
-		$price_ht = GETPOST('price_ht');
-		$price_ht_devise = GETPOST('multicurrency_price_ht');
-		if (GETPOST('prod_entry_mode') == 'free')
-		{
-			$idprod=0;
-			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else
-		{
-			$idprod=GETPOST('idprod', 'int');
-			$tva_tx = '';
-		}
-
-		$qty = GETPOST('qty'.$predef);
-		$remise_percent = GETPOST('remise_percent'.$predef);
-
-		if ($qty == '')
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Qty")), null, 'errors');
-			$error++;
-		}
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc))
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description")), null, 'errors');
-			$error++;
-		}
-
-	  $date_start = dol_mktime(GETPOST('date_start' . $predef . 'hour'), GETPOST('date_start' . $predef . 'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start' . $predef . 'month'), GETPOST('date_start' . $predef . 'day'), GETPOST('date_start' . $predef . 'year'));
-	  $date_end = dol_mktime(GETPOST('date_end' . $predef . 'hour'), GETPOST('date_end' . $predef . 'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end' . $predef . 'month'), GETPOST('date_end' . $predef . 'day'), GETPOST('date_end' . $predef . 'year'));
-	  if (!empty($date_start) && !empty($date_end) && $date_start > $date_end)
-	  {
-		  setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors');
-		  $error++;
-	  }
-
-		// Extrafields
-		$extrafieldsline = new ExtraFields($db);
-		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
-		// Unset extrafield
-		if (is_array($extralabelsline)) {
-			// Get extra fields
-			foreach ($extralabelsline as $key => $value) {
-				unset($_POST["options_" . $key]);
-			}
-		}
-
-		if (! $error)
-		{
-			// Clean parameters
-			$date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
-			$date_end=dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
-			$price_base_type = (GETPOST('price_base_type', 'alpha')?GETPOST('price_base_type', 'alpha'):'HT');
-
-			// Ecrase $pu par celui du produit
-			// Ecrase $desc par celui du produit
-			// Ecrase $tva_tx par celui du produit
-			// Ecrase $base_price_type par celui du produit
-			if ($idprod > 0)
-			{
-				$prod = new Product($db);
-				$prod->fetch($idprod);
-
-				// Update if prices fields are defined
-				$tva_tx = get_default_tva($mysoc,$object->thirdparty,$prod->id);
-				$tva_npr = get_default_npr($mysoc,$object->thirdparty,$prod->id);
-				if (empty($tva_tx)) $tva_npr=0;
-
-				$pu_ht = $prod->price;
-				$pu_ttc = $prod->price_ttc;
-				$price_min = $prod->price_min;
-				$price_base_type = $prod->price_base_type;
-
-				// On defini prix unitaire
-				if ($conf->global->PRODUIT_MULTIPRICES && $object->thirdparty->price_level)
-				{
-					$pu_ht = $prod->multiprices[$object->thirdparty->price_level];
-					$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
-					$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
-					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
-				}
-				elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
-				{
-					require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
-
-					$prodcustprice = new Productcustomerprice($db);
-
-					$filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->thirdparty->id);
-
-					$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-					if ($result) {
-						if (count($prodcustprice->lines) > 0) {
-							$pu_ht = price($prodcustprice->lines [0]->price);
-							$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
-							$price_base_type = $prodcustprice->lines [0]->price_base_type;
-							$tva_tx = $prodcustprice->lines [0]->tva_tx;
-							if ($prodcustprice->lines[0]->default_vat_code && ! preg_match('/\(.*\)/', $tva_tx)) $tva_tx.= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
-							$tva_npr = $prodcustprice->lines[0]->recuperableonly;
-							if (empty($tva_tx)) $tva_npr=0;
-						}
-					}
-				}
-
-				$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
-				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
-
-				// On reevalue prix selon taux tva car taux tva transaction peut etre different
-				// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
-				if ($tmpvat != $tmpprodvat)
-				{
-					if ($price_base_type != 'HT')
-					{
-						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat/100)), 'MU');
-					}
-					else
-				  {
-						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat/100)), 'MU');
-					}
-				}
-
-			   	$desc=$prod->description;
-			   	$desc=dol_concatdesc($desc,$product_desc, '', !empty($conf->global->CHANGE_ORDER_CONCAT_DESCRIPTION));
-				$fk_unit = $prod->fk_unit;
-			}
-			else
-			{
-				$pu_ht=GETPOST('price_ht');
-				$price_base_type = 'HT';
-				$tva_tx=GETPOST('tva_tx')?str_replace('*','',GETPOST('tva_tx')):0;		// tva_tx field may be disabled, so we use vat rate 0
-				$tva_npr=preg_match('/\*/',GETPOST('tva_tx'))?1:0;
-				$desc=$product_desc;
-				$fk_unit= GETPOST('units', 'alpha');
-			}
-
-			$localtax1_tx=get_localtax($tva_tx,1,$object->thirdparty,$mysoc,$tva_npr);
-			$localtax2_tx=get_localtax($tva_tx,2,$object->thirdparty,$mysoc,$tva_npr);
-
-			// ajout prix achat
-			$fk_fournprice = $_POST['fournprice'];
-			if ( ! empty($_POST['buying_price']) )
-			  $pa_ht = $_POST['buying_price'];
-			else
-			  $pa_ht = null;
-
-			$info_bits=0;
-			if ($tva_npr) $info_bits |= 0x01;
-
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS) )&& ($price_min && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min))))
-			{
-				$object->error = $langs->trans("CantBeLessThanMinPrice",price(price2num($price_min,'MU'),0,$langs,0,0,-1,$conf->currency));
-				$result = -1 ;
-			}
-			else
-			{
-				// Insert line
-				$result = $object->addline(
-					$desc,
-					$pu_ht,
-					$qty,
-					$tva_tx,
-					$localtax1_tx,
-					$localtax2_tx,
-					$idprod,
-					$remise_percent,
-					$date_start,
-					$date_end,
-					$price_base_type,
-					$pu_ttc,
-					$info_bits,
-		  			$fk_fournprice,
-		  			$pa_ht,
-					$array_options,
-					$fk_unit
-				);
-			}
-
-			if ($result > 0)
-			{
-				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && ! empty($conf->global->CONTRACT_ADDON_PDF))    // No generation if default type not defined
-				{
-					$outputlangs = $langs;
-					$newlang = '';
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-					if (! empty($newlang)) {
-						$outputlangs = new Translate("", $conf);
-						$outputlangs->setDefaultLang($newlang);
-					}
-
-					$ret = $object->fetch($id); // Reload to get new records
-
-					$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				}
-
-				unset($_POST ['prod_entry_mode']);
-
-				unset($_POST['qty']);
-				unset($_POST['type']);
-				unset($_POST['remise_percent']);
-				unset($_POST['price_ht']);
-				unset($_POST['multicurrency_price_ht']);
-				unset($_POST['price_ttc']);
-				unset($_POST['tva_tx']);
-				unset($_POST['product_ref']);
-				unset($_POST['product_label']);
-				unset($_POST['product_desc']);
-				unset($_POST['fournprice']);
-				unset($_POST['buying_price']);
-				unset($_POST ['np_marginRate']);
-				unset($_POST ['np_markRate']);
-				unset($_POST['dp_desc']);
-				unset($_POST['idprod']);
-
-				unset($_POST['date_starthour']);
-				unset($_POST['date_startmin']);
-				unset($_POST['date_startsec']);
-				unset($_POST['date_startday']);
-				unset($_POST['date_startmonth']);
-				unset($_POST['date_startyear']);
-				unset($_POST['date_endhour']);
-				unset($_POST['date_endmin']);
-				unset($_POST['date_endsec']);
-				unset($_POST['date_endday']);
-				unset($_POST['date_endmonth']);
-				unset($_POST['date_endyear']);
-			}
-			else
-			{
-				setEventMessages($object->error, $object->errors, 'errors');
-			}
-		}
-	}
+    // Param dates
+    $date_contrat='';
+    $date_start_update='';
+    $date_end_update='';
+    $date_start_real_update='';
+    $date_end_real_update='';
+    if (GETPOST('date_start_updatemonth') && GETPOST('date_start_updateday') && GETPOST('date_start_updateyear'))
+    {
+        $date_start_update=dol_mktime(GETPOST('date_start_updatehour'), GETPOST('date_start_updatemin'), 0, GETPOST('date_start_updatemonth'), GETPOST('date_start_updateday'), GETPOST('date_start_updateyear'));
+    }
+    if (GETPOST('date_end_updatemonth') && GETPOST('date_end_updateday') && GETPOST('date_end_updateyear'))
+    {
+        $date_end_update=dol_mktime(GETPOST('date_end_updatehour'), GETPOST('date_end_updatemin'), 0, GETPOST('date_end_updatemonth'), GETPOST('date_end_updateday'), GETPOST('date_end_updateyear'));
+    }
+    if (GETPOST('date_start_real_updatemonth') && GETPOST('date_start_real_updateday') && GETPOST('date_start_real_updateyear'))
+    {
+        $date_start_real_update=dol_mktime(GETPOST('date_start_real_updatehour'), GETPOST('date_start_real_updatemin'), 0, GETPOST('date_start_real_updatemonth'), GETPOST('date_start_real_updateday'), GETPOST('date_start_real_updateyear'));
+    }
+    if (GETPOST('date_end_real_updatemonth') && GETPOST('date_end_real_updateday') && GETPOST('date_end_real_updateyear'))
+    {
+        $date_end_real_update=dol_mktime(GETPOST('date_end_real_updatehour'), GETPOST('date_end_real_updatemin'), 0, GETPOST('date_end_real_updatemonth'), GETPOST('date_end_real_updateday'), GETPOST('date_end_real_updateyear'));
+    }
+    if (GETPOST('remonth') && GETPOST('reday') && GETPOST('reyear'))
+    {
+        $datecontrat = dol_mktime(GETPOST('rehour'), GETPOST('remin'), 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+    }
 
-	else if ($action == 'updateline' && $user->rights->contrat->creer && ! GETPOST('cancel','alpha'))
-	{
-		$error = 0;
-
-		if (!empty($date_start_update) && !empty($date_end_update) && $date_start_update > $date_end_update)
-		{
-			setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors');
-			$action = 'editline';
-			$_GET['rowid'] = GETPOST('elrowid');
-			$error++;
-		}
-
-		if (! $error)
-		{
-			$objectline = new ContratLigne($db);
-			if ($objectline->fetch(GETPOST('elrowid')) < 0)
-			{
-				setEventMessages($objectline->error, $objectline->errors, 'errors');
-				$error++;
-			}
-		}
-
-		$db->begin();
-
-		if (! $error)
-		{
-			if ($date_start_real_update == '') $date_start_real_update=$objectline->date_ouverture;
-			if ($date_end_real_update == '')   $date_end_real_update=$objectline->date_cloture;
-
-			$vat_rate = GETPOST('eltva_tx');
-			// Define info_bits
-			$info_bits = 0;
-			if (preg_match('/\*/', $vat_rate))
-				  $info_bits |= 0x01;
-
-			// Define vat_rate
-			$vat_rate = str_replace('*', '', $vat_rate);
-			$localtax1_tx=get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
-			$localtax2_tx=get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
-
-			$txtva = $vat_rate;
-
-			// Clean vat code
-			$vat_src_code='';
-			if (preg_match('/\((.*)\)/', $txtva, $reg))
-			{
-				  $vat_src_code = $reg[1];
-				  $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
-			}
-
-			// ajout prix d'achat
-			$fk_fournprice = $_POST['fournprice'];
-			if ( ! empty($_POST['buying_price']) )
-			  $pa_ht = $_POST['buying_price'];
-			else
-			  $pa_ht = null;
-
-			$fk_unit = GETPOST('unit', 'alpha');
-
-			$objectline->description=GETPOST('product_desc','none');
-			$objectline->price_ht=GETPOST('elprice');
-			$objectline->subprice=GETPOST('elprice');
-			$objectline->qty=GETPOST('elqty');
-			$objectline->remise_percent=GETPOST('elremise_percent');
-			$objectline->tva_tx=($txtva?$txtva:0);	// Field may be disabled, so we use vat rate 0
-			$objectline->vat_src_code=$vat_src_code;
-			$objectline->localtax1_tx=is_numeric($localtax1_tx)?$localtax1_tx:0;
-			$objectline->localtax2_tx=is_numeric($localtax2_tx)?$localtax2_tx:0;
-			$objectline->date_ouverture_prevue=$date_start_update;
-			$objectline->date_ouverture=$date_start_real_update;
-			$objectline->date_fin_validite=$date_end_update;
-			$objectline->date_cloture=$date_end_real_update;
-			$objectline->fk_user_cloture=$user->id;
-			$objectline->fk_fournprice=$fk_fournprice;
-			$objectline->pa_ht=$pa_ht;
-
-			if ($fk_unit > 0) {
-			  $objectline->fk_unit = GETPOST('unit');
-			} else {
-			  $objectline->fk_unit = null;
-			}
-
-			// Extrafields
-			$extrafieldsline = new ExtraFields($db);
-			$extralabelsline = $extrafieldsline->fetch_name_optionals_label($objectline->table_element);
-			$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
-			$objectline->array_options=$array_options;
-
-			// TODO verifier price_min si fk_product et multiprix
-
-			$result=$objectline->update($user);
-			if ($result < 0)
-			{
-				$error++;
-				setEventMessages($objectline->error, $objectline->errors, 'errors');
-			}
-		}
-
-		if (! $error)
-		{
-			$db->commit();
-		}
-		else
-		{
-			$db->rollback();
-		}
-	}
+    // Add contract
+    if ($action == 'add' && $user->rights->contrat->creer)
+    {
+        // Check
+        if (empty($datecontrat))
+        {
+            $error++;
+            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+            $action='create';
+        }
 
-	else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->contrat->creer)
-	{
-		$result = $object->deleteline(GETPOST('lineid'),$user);
-
-		if ($result >= 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-			exit;
-		}
-		else
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
+        if ($socid<1)
+        {
+            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
+            $action='create';
+            $error++;
+        }
 
-	else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contrat->creer)
-	{
-		$result = $object->validate($user);
-
-		if ($result > 0)
-		{
-			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
-				$outputlangs = $langs;
-				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-				if (! empty($newlang)) {
-					$outputlangs = new Translate("", $conf);
-					$outputlangs->setDefaultLang($newlang);
-				}
-				$model=$object->modelpdf;
-				$ret = $object->fetch($id); // Reload to get new records
-
-				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			}
-		}
-		else
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
+        // Fill array 'array_options' with data from add form
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+        if ($ret < 0) {
+            $error ++;
+            $action = 'create';
+        }
 
-	else if ($action == 'reopen' && $user->rights->contrat->creer)
-	{
-		$result = $object->reopen($user);
-		if ($result < 0)
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
+        if (! $error)
+        {
+            $object->socid						= $socid;
+            $object->date_contrat				= $datecontrat;
+
+            $object->commercial_suivi_id		= GETPOST('commercial_suivi_id','int');
+            $object->commercial_signature_id	= GETPOST('commercial_signature_id','int');
+
+            $object->note_private				= GETPOST('note_private','alpha');
+            $object->note_public				= GETPOST('note_public','alpha');
+            $object->fk_project					= GETPOST('projectid','int');
+            $object->remise_percent				= GETPOST('remise_percent','alpha');
+            $object->ref						= GETPOST('ref','alpha');
+            $object->ref_customer				= GETPOST('ref_customer','alpha');
+            $object->ref_supplier				= GETPOST('ref_supplier','alpha');
+
+            // If creation from another object of another module (Example: origin=propal, originid=1)
+            if (! empty($origin) && ! empty($originid))
+            {
+                // Parse element/subelement (ex: project_task)
+                $element = $subelement = $origin;
+                if (preg_match('/^([^_]+)_([^_]+)/i',$origin,$regs))
+                {
+                    $element = $regs[1];
+                    $subelement = $regs[2];
+                }
+
+                // For compatibility
+                if ($element == 'order')    { $element = $subelement = 'commande'; }
+                if ($element == 'propal')   { $element = 'comm/propal'; $subelement = 'propal'; }
+
+                $object->origin    = $origin;
+                $object->origin_id = $originid;
+
+                // Possibility to add external linked objects with hooks
+                $object->linked_objects[$object->origin] = $object->origin_id;
+                if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects']))
+                {
+                    $object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']);
+                }
+
+                $id = $object->create($user);
+                if ($id < 0) {
+                    setEventMessages($object->error, $object->errors, 'errors');
+                }
+
+                if ($id > 0)
+                {
+                    dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
+
+                    $classname = ucfirst($subelement);
+                    $srcobject = new $classname($db);
+
+                    dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
+                    $result=$srcobject->fetch($object->origin_id);
+                    if ($result > 0)
+                    {
+                        $srcobject->fetch_thirdparty();
+                        $lines = $srcobject->lines;
+                        if (empty($lines) && method_exists($srcobject,'fetch_lines'))
+                        {
+                            $srcobject->fetch_lines();
+                            $lines = $srcobject->lines;
+                        }
+
+                        $fk_parent_line=0;
+                        $num=count($lines);
+
+                        for ($i=0;$i<$num;$i++)
+                        {
+                            $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
+
+                            if ($product_type == 1 || (! empty($conf->global->CONTRACT_SUPPORT_PRODUCTS) && in_array($product_type, array(0,1)))) { 	// TODO Exclude also deee
+                                // service prédéfini
+                                if ($lines[$i]->fk_product > 0)
+                                {
+                                    $product_static = new Product($db);
+
+                                    // Define output language
+                                    if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+                                    {
+                                        $prod = new Product($db);
+                                        $prod->id=$lines[$i]->fk_product;
+                                        $prod->getMultiLangs();
+
+                                        $outputlangs = $langs;
+                                        $newlang='';
+                                        if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
+                                        if (empty($newlang)) $newlang=$srcobject->thirdparty->default_lang;
+                                        if (! empty($newlang))
+                                        {
+                                            $outputlangs = new Translate("",$conf);
+                                            $outputlangs->setDefaultLang($newlang);
+                                        }
+
+                                        $label = (! empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
+                                    }
+                                    else
+                                    {
+                                        $label = $lines[$i]->product_label;
+                                    }
+                                    $desc = ($lines[$i]->desc && $lines[$i]->desc!=$lines[$i]->libelle)?dol_htmlentitiesbr($lines[$i]->desc):'';
+                                }
+                                else {
+                                    $desc = dol_htmlentitiesbr($lines[$i]->desc);
+                                }
+
+                                // Extrafields
+                                $array_options = array();
+                                if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) 							// For avoid conflicts if
+                                // trigger used
+                                {
+                                    $lines[$i]->fetch_optionals($lines[$i]->rowid);
+                                    $array_options = $lines[$i]->array_options;
+                                }
+
+                                $txtva = $lines[$i]->vat_src_code ? $lines[$i]->tva_tx . ' (' .  $lines[$i]->vat_src_code . ')' : $lines[$i]->tva_tx;
+
+                                // View third's localtaxes for now
+                                $localtax1_tx = get_localtax($txtva, 1, $object->thirdparty);
+                                $localtax2_tx = get_localtax($txtva, 2, $object->thirdparty);
+
+                                $result = $object->addline(
+                                    $desc,
+                                    $lines[$i]->subprice,
+                                    $lines[$i]->qty,
+                                    $txtva,
+                                    $localtax1_tx,
+                                    $localtax2_tx,
+                                    $lines[$i]->fk_product,
+                                    $lines[$i]->remise_percent,
+                                    $lines[$i]->date_start,
+                                    $lines[$i]->date_end,
+                                    'HT',
+                                    0,
+                                    $lines[$i]->info_bits,
+                                    $lines[$i]->fk_fournprice,
+                                    $lines[$i]->pa_ht,
+                                    $array_options,
+                                    $lines[$i]->fk_unit
+                                );
+
+                                if ($result < 0)
+                                {
+                                    $error++;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        setEventMessages($srcobject->error, $srcobject->errors, 'errors');
+                        $error++;
+                    }
+
+                    // Hooks
+                    $parameters = array('objFrom' => $srcobject);
+                    $reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
+                    // modified by hook
+                    if ($reshook < 0)
+                        $error++;
+                }
+                else
+                {
+                    setEventMessages($object->error, $object->errors, 'errors');
+                    $error++;
+                }
+            }
+            else
+            {
+                $result = $object->create($user);
+                if ($result > 0)
+                {
+                    header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+                    exit;
+                }
+                else {
+                    setEventMessages($object->error, $object->errors, 'errors');
+                }
+                $action='create';
+            }
+        }
+    }
 
-	// Close all lines
-	else if ($action == 'confirm_close' && $confirm == 'yes' && $user->rights->contrat->creer)
-	{
-		$result = $object->closeAll($user);
-		if ($result < 0)
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
+    else if ($action == 'classin' && $user->rights->contrat->creer)
+    {
+        $object->setProject(GETPOST('projectid'));
+    }
 
-	// Close all lines
-	else if ($action == 'confirm_activate' && $confirm == 'yes' && $user->rights->contrat->creer)
-	{
-		$result = $object->activateAll($user);
-		if ($result < 0)
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
+    // Add a new line
+    else if ($action == 'addline' && $user->rights->contrat->creer)
+    {
+        // Set if we used free entry or predefined product
+        $predef='';
+        $product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+        $price_ht = GETPOST('price_ht');
+        $price_ht_devise = GETPOST('multicurrency_price_ht');
+        if (GETPOST('prod_entry_mode') == 'free')
+        {
+            $idprod=0;
+            $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
+        }
+        else
+        {
+            $idprod=GETPOST('idprod', 'int');
+            $tva_tx = '';
+        }
 
-	else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
-	{
-		$result=$object->delete($user);
-		if ($result >= 0)
-		{
-			header("Location: list.php?restore_lastsearch_values=1");
-			return;
-		}
-		else
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
+        $qty = GETPOST('qty'.$predef);
+        $remise_percent = GETPOST('remise_percent'.$predef);
 
-	else if ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contrat->creer)
-	{
-		if (GETPOST('newcid') > 0)
-		{
-			$contractline = new ContratLigne($db);
-			$result=$contractline->fetch(GETPOST('lineid'));
-			$contractline->fk_contrat = GETPOST('newcid');
-			$result=$contractline->update($user,1);
-			if ($result >= 0)
-			{
-				header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-				return;
-			}
-			else
-			{
-				setEventMessages($object->error, $object->errors, 'errors');
-			}
-		}
-		else
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("RefNewContract")), null, 'errors');
-		}
-	}
-	else if ($action == 'update_extras')
-	{
-		$object->oldcopy = dol_clone($object);
-
-		// Fill array 'array_options' with data from update form
-		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
-		if ($ret < 0) $error++;
-
-		if (! $error) {
-			$result = $object->insertExtraFields('CONTRACT_MODIFY');
-			if ($result < 0)
-			{
-				setEventMessages($object->error, $object->errors, 'errors');
-				$error++;
-			}
-		}
-
-		if ($error) {
-			$action = 'edit_extras';
-		}
-	}
-	elseif ($action=='setref_supplier')
-	{
-		$cancelbutton = GETPOST('cancel','alpha');
-		if (!$cancelbutton) {
-
-			$object->oldcopy = dol_clone($object);
-
-			$result = $object->setValueFrom('ref_supplier', GETPOST('ref_supplier','alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
-			if ($result < 0) {
-				setEventMessages($object->error, $object->errors, 'errors');
-				$action = 'editref_supplier';
-			} else {
-				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-				exit;
-			}
-		}
-		else {
-			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
-			exit;
-		}
-	}
-	elseif ($action=='setref_customer')
-	{
-		$cancelbutton = GETPOST('cancel','alpha');
-
-		if (!$cancelbutton)
-		{
-			$object->oldcopy = dol_clone($object);
-
-			$result = $object->setValueFrom('ref_customer', GETPOST('ref_customer','alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
-			if ($result < 0) {
-				setEventMessages($object->error, $object->errors, 'errors');
-				$action = 'editref_customer';
-			} else {
-				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-				exit;
-			}
-		}
-		else {
-			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
-			exit;
-		}
-	}
-	elseif ($action=='setref')
-	{
-		$cancelbutton = GETPOST('cancel','alpha');
-
-		if (!$cancelbutton) {
-			$result = $object->fetch($id);
-			if ($result < 0) {
-				setEventMessages($object->error, $object->errors, 'errors');
-			}
-
-			$old_ref = $object->ref;
-
-	        $result = $object->setValueFrom('ref', GETPOST('ref','alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
-	        if ($result < 0) {
-	            setEventMessages($object->error, $object->errors, 'errors');
-	            $action = 'editref';
-	        } else {
-				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-				$old_filedir = $conf->contrat->dir_output . '/' . dol_sanitizeFileName($old_ref);
-				$new_filedir = $conf->contrat->dir_output . '/' . dol_sanitizeFileName($object->ref);
-
-				$files = dol_dir_list($old_filedir);
-				if (!empty($files))
-				{
-					if (!is_dir($new_filedir)) dol_mkdir($new_filedir);
-					foreach ($files as $file)
-					{
-						dol_move($file['fullname'], $new_filedir.'/'.$file['name']);
-					}
-				}
-
-	            header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
-	            exit;
-	        }
-	    }
-	    else {
-	        header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
-	        exit;
-	    }
-	}
-	elseif ($action=='setdate_contrat')
-	{
-		$cancelbutton = GETPOST('cancel','alpha');
-
-		if (!$cancelbutton) {
-			$result = $object->fetch($id);
-			if ($result < 0) {
-				setEventMessages($object->error, $object->errors, 'errors');
-			}
-			$datacontrat=dol_mktime(GETPOST('date_contrathour'), GETPOST('date_contratmin'), 0, GETPOST('date_contratmonth'), GETPOST('date_contratday'), GETPOST('date_contratyear'));
-			$result = $object->setValueFrom('date_contrat', $datacontrat, '', null, 'date', '', $user, 'CONTRACT_MODIFY');
-			if ($result < 0) {
-				setEventMessages($object->error, $object->errors, 'errors');
-				$action = 'editdate_contrat';
-			} else {
-				header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
-				exit;
-			}
-		}
-		else {
-			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
-			exit;
-		}
-	}
+        if ($qty == '')
+        {
+            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Qty")), null, 'errors');
+            $error++;
+        }
+        if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc))
+        {
+            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description")), null, 'errors');
+            $error++;
+        }
 
+        $date_start = dol_mktime(GETPOST('date_start' . $predef . 'hour'), GETPOST('date_start' . $predef . 'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start' . $predef . 'month'), GETPOST('date_start' . $predef . 'day'), GETPOST('date_start' . $predef . 'year'));
+        $date_end = dol_mktime(GETPOST('date_end' . $predef . 'hour'), GETPOST('date_end' . $predef . 'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end' . $predef . 'month'), GETPOST('date_end' . $predef . 'day'), GETPOST('date_end' . $predef . 'year'));
+        if (!empty($date_start) && !empty($date_end) && $date_start > $date_end)
+        {
+            setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors');
+            $error++;
+        }
 
-	// Actions to build doc
-	$upload_dir = $conf->contrat->dir_output;
-	$permissioncreate = $user->rights->contrat->creer;
-	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-
-	// Actions to send emails
-	$trigger_name='CONTRACT_SENTBYMAIL';
-	$paramname='id';
-	$mode='emailfromcontract';
-	$trackid='con'.$object->id;
-	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
-
-
-	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->contrat->creer)
-	{
-		if ($action == 'addcontact')
-		{
-			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-			$result = $object->add_contact($contactid, GETPOST('type'), GETPOST('source'));
-
-			if ($result >= 0)
-			{
-				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-				exit;
-			}
-			else
-			{
-				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				{
-					$langs->load("errors");
-					setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-				}
-				else
-				{
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-			}
-		}
-
-		// bascule du statut d'un contact
-		else if ($action == 'swapstatut')
-		{
-			$result=$object->swapContactStatus(GETPOST('ligne'));
-		}
-
-		// Efface un contact
-		else if ($action == 'deletecontact')
-		{
-			$result = $object->delete_contact(GETPOST('lineid'));
-
-			if ($result >= 0)
-			{
-				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-				exit;
-			}
-			else {
-				setEventMessages($object->error, $object->errors, 'errors');
-			}
-		}
-	}
+        // Extrafields
+        $extrafieldsline = new ExtraFields($db);
+        $extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+        $array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+        // Unset extrafield
+        if (is_array($extralabelsline)) {
+            // Get extra fields
+            foreach ($extralabelsline as $key => $value) {
+                unset($_POST["options_" . $key]);
+            }
+        }
 
-	// Action clone object
-	if ($action == 'confirm_clone' && $confirm == 'yes')
-	{
-		if (! GETPOST('socid', 3))
-		{
-			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else
-		{
-			if ($object->id > 0) {
-				$result = $object->createFromClone($socid);
-				if ($result > 0) {
-					header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $result);
-					exit();
-				} else {
-					if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
-					$action = '';
-				}
-			}
-		}
-	}
+        if (! $error)
+        {
+            // Clean parameters
+            $date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
+            $date_end=dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
+            $price_base_type = (GETPOST('price_base_type', 'alpha')?GETPOST('price_base_type', 'alpha'):'HT');
+
+            // Ecrase $pu par celui du produit
+            // Ecrase $desc par celui du produit
+            // Ecrase $tva_tx par celui du produit
+            // Ecrase $base_price_type par celui du produit
+            if ($idprod > 0)
+            {
+                $prod = new Product($db);
+                $prod->fetch($idprod);
+
+                // Update if prices fields are defined
+                $tva_tx = get_default_tva($mysoc,$object->thirdparty,$prod->id);
+                $tva_npr = get_default_npr($mysoc,$object->thirdparty,$prod->id);
+                if (empty($tva_tx)) $tva_npr=0;
+
+                $pu_ht = $prod->price;
+                $pu_ttc = $prod->price_ttc;
+                $price_min = $prod->price_min;
+                $price_base_type = $prod->price_base_type;
+
+                // On defini prix unitaire
+                if ($conf->global->PRODUIT_MULTIPRICES && $object->thirdparty->price_level)
+                {
+                    $pu_ht = $prod->multiprices[$object->thirdparty->price_level];
+                    $pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
+                    $price_min = $prod->multiprices_min[$object->thirdparty->price_level];
+                    $price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
+                }
+                elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+                {
+                    require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+
+                    $prodcustprice = new Productcustomerprice($db);
+
+                    $filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->thirdparty->id);
+
+                    $result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+                    if ($result) {
+                        if (count($prodcustprice->lines) > 0) {
+                            $pu_ht = price($prodcustprice->lines [0]->price);
+                            $pu_ttc = price($prodcustprice->lines [0]->price_ttc);
+                            $price_base_type = $prodcustprice->lines [0]->price_base_type;
+                            $tva_tx = $prodcustprice->lines [0]->tva_tx;
+                            if ($prodcustprice->lines[0]->default_vat_code && ! preg_match('/\(.*\)/', $tva_tx)) $tva_tx.= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+                            $tva_npr = $prodcustprice->lines[0]->recuperableonly;
+                            if (empty($tva_tx)) $tva_npr=0;
+                        }
+                    }
+                }
+
+                $tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
+                $tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
+
+                // On reevalue prix selon taux tva car taux tva transaction peut etre different
+                // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
+                if ($tmpvat != $tmpprodvat)
+                {
+                    if ($price_base_type != 'HT')
+                    {
+                        $pu_ht = price2num($pu_ttc / (1 + ($tmpvat/100)), 'MU');
+                    }
+                    else
+                    {
+                        $pu_ttc = price2num($pu_ht * (1 + ($tmpvat/100)), 'MU');
+                    }
+                }
+
+                    $desc=$prod->description;
+                    $desc=dol_concatdesc($desc,$product_desc, '', !empty($conf->global->CHANGE_ORDER_CONCAT_DESCRIPTION));
+                $fk_unit = $prod->fk_unit;
+            }
+            else
+            {
+                $pu_ht=GETPOST('price_ht');
+                $price_base_type = 'HT';
+                $tva_tx=GETPOST('tva_tx')?str_replace('*','',GETPOST('tva_tx')):0;		// tva_tx field may be disabled, so we use vat rate 0
+                $tva_npr=preg_match('/\*/',GETPOST('tva_tx'))?1:0;
+                $desc=$product_desc;
+                $fk_unit= GETPOST('units', 'alpha');
+            }
+
+            $localtax1_tx=get_localtax($tva_tx,1,$object->thirdparty,$mysoc,$tva_npr);
+            $localtax2_tx=get_localtax($tva_tx,2,$object->thirdparty,$mysoc,$tva_npr);
+
+            // ajout prix achat
+            $fk_fournprice = $_POST['fournprice'];
+            if ( ! empty($_POST['buying_price']) )
+                $pa_ht = $_POST['buying_price'];
+            else
+                $pa_ht = null;
+
+            $info_bits=0;
+            if ($tva_npr) $info_bits |= 0x01;
+
+            if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS) )&& ($price_min && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min))))
+            {
+                $object->error = $langs->trans("CantBeLessThanMinPrice",price(price2num($price_min,'MU'),0,$langs,0,0,-1,$conf->currency));
+                $result = -1 ;
+            }
+            else
+            {
+                // Insert line
+                $result = $object->addline(
+                    $desc,
+                    $pu_ht,
+                    $qty,
+                    $tva_tx,
+                    $localtax1_tx,
+                    $localtax2_tx,
+                    $idprod,
+                    $remise_percent,
+                    $date_start,
+                    $date_end,
+                    $price_base_type,
+                    $pu_ttc,
+                    $info_bits,
+                        $fk_fournprice,
+                        $pa_ht,
+                    $array_options,
+                    $fk_unit
+                );
+            }
+
+            if ($result > 0)
+            {
+                // Define output language
+                if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && ! empty($conf->global->CONTRACT_ADDON_PDF))    // No generation if default type not defined
+                {
+                    $outputlangs = $langs;
+                    $newlang = '';
+                    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+                    if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+                    if (! empty($newlang)) {
+                        $outputlangs = new Translate("", $conf);
+                        $outputlangs->setDefaultLang($newlang);
+                    }
+
+                    $ret = $object->fetch($id); // Reload to get new records
+
+                    $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+                }
+
+                unset($_POST ['prod_entry_mode']);
+
+                unset($_POST['qty']);
+                unset($_POST['type']);
+                unset($_POST['remise_percent']);
+                unset($_POST['price_ht']);
+                unset($_POST['multicurrency_price_ht']);
+                unset($_POST['price_ttc']);
+                unset($_POST['tva_tx']);
+                unset($_POST['product_ref']);
+                unset($_POST['product_label']);
+                unset($_POST['product_desc']);
+                unset($_POST['fournprice']);
+                unset($_POST['buying_price']);
+                unset($_POST ['np_marginRate']);
+                unset($_POST ['np_markRate']);
+                unset($_POST['dp_desc']);
+                unset($_POST['idprod']);
+
+                unset($_POST['date_starthour']);
+                unset($_POST['date_startmin']);
+                unset($_POST['date_startsec']);
+                unset($_POST['date_startday']);
+                unset($_POST['date_startmonth']);
+                unset($_POST['date_startyear']);
+                unset($_POST['date_endhour']);
+                unset($_POST['date_endmin']);
+                unset($_POST['date_endsec']);
+                unset($_POST['date_endday']);
+                unset($_POST['date_endmonth']);
+                unset($_POST['date_endyear']);
+            }
+            else
+            {
+                setEventMessages($object->error, $object->errors, 'errors');
+            }
+        }
+    }
+
+    else if ($action == 'updateline' && $user->rights->contrat->creer && ! GETPOST('cancel','alpha'))
+    {
+        $error = 0;
+
+        if (!empty($date_start_update) && !empty($date_end_update) && $date_start_update > $date_end_update)
+        {
+            setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors');
+            $action = 'editline';
+            $_GET['rowid'] = GETPOST('elrowid');
+            $error++;
+        }
+
+        if (! $error)
+        {
+            $objectline = new ContratLigne($db);
+            if ($objectline->fetch(GETPOST('elrowid')) < 0)
+            {
+                setEventMessages($objectline->error, $objectline->errors, 'errors');
+                $error++;
+            }
+        }
+
+        $db->begin();
+
+        if (! $error)
+        {
+            if ($date_start_real_update == '') $date_start_real_update=$objectline->date_ouverture;
+            if ($date_end_real_update == '')   $date_end_real_update=$objectline->date_cloture;
+
+            $vat_rate = GETPOST('eltva_tx');
+            // Define info_bits
+            $info_bits = 0;
+            if (preg_match('/\*/', $vat_rate))
+                    $info_bits |= 0x01;
+
+            // Define vat_rate
+            $vat_rate = str_replace('*', '', $vat_rate);
+            $localtax1_tx=get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
+            $localtax2_tx=get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
+
+            $txtva = $vat_rate;
+
+            // Clean vat code
+            $vat_src_code='';
+            if (preg_match('/\((.*)\)/', $txtva, $reg))
+            {
+                    $vat_src_code = $reg[1];
+                    $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+            }
+
+            // ajout prix d'achat
+            $fk_fournprice = $_POST['fournprice'];
+            if ( ! empty($_POST['buying_price']) )
+                $pa_ht = $_POST['buying_price'];
+            else
+                $pa_ht = null;
+
+            $fk_unit = GETPOST('unit', 'alpha');
+
+            $objectline->description=GETPOST('product_desc','none');
+            $objectline->price_ht=GETPOST('elprice');
+            $objectline->subprice=GETPOST('elprice');
+            $objectline->qty=GETPOST('elqty');
+            $objectline->remise_percent=GETPOST('elremise_percent');
+            $objectline->tva_tx=($txtva?$txtva:0);	// Field may be disabled, so we use vat rate 0
+            $objectline->vat_src_code=$vat_src_code;
+            $objectline->localtax1_tx=is_numeric($localtax1_tx)?$localtax1_tx:0;
+            $objectline->localtax2_tx=is_numeric($localtax2_tx)?$localtax2_tx:0;
+            $objectline->date_ouverture_prevue=$date_start_update;
+            $objectline->date_ouverture=$date_start_real_update;
+            $objectline->date_fin_validite=$date_end_update;
+            $objectline->date_cloture=$date_end_real_update;
+            $objectline->fk_user_cloture=$user->id;
+            $objectline->fk_fournprice=$fk_fournprice;
+            $objectline->pa_ht=$pa_ht;
+
+            if ($fk_unit > 0) {
+                $objectline->fk_unit = GETPOST('unit');
+            } else {
+                $objectline->fk_unit = null;
+            }
+
+            // Extrafields
+            $extrafieldsline = new ExtraFields($db);
+            $extralabelsline = $extrafieldsline->fetch_name_optionals_label($objectline->table_element);
+            $array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+            $objectline->array_options=$array_options;
+
+            // TODO verifier price_min si fk_product et multiprix
+
+            $result=$objectline->update($user);
+            if ($result < 0)
+            {
+                $error++;
+                setEventMessages($objectline->error, $objectline->errors, 'errors');
+            }
+        }
+
+        if (! $error)
+        {
+            $db->commit();
+        }
+        else
+        {
+            $db->rollback();
+        }
+    }
+
+    else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->contrat->creer)
+    {
+        $result = $object->deleteline(GETPOST('lineid'),$user);
+
+        if ($result >= 0)
+        {
+            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+            exit;
+        }
+        else
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
+
+    else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contrat->creer)
+    {
+        $result = $object->validate($user);
+
+        if ($result > 0)
+        {
+            // Define output language
+            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+            {
+                $outputlangs = $langs;
+                $newlang = '';
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+                if (! empty($newlang)) {
+                    $outputlangs = new Translate("", $conf);
+                    $outputlangs->setDefaultLang($newlang);
+                }
+                $model=$object->modelpdf;
+                $ret = $object->fetch($id); // Reload to get new records
+
+                $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            }
+        }
+        else
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
+
+    else if ($action == 'reopen' && $user->rights->contrat->creer)
+    {
+        $result = $object->reopen($user);
+        if ($result < 0)
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
+
+    // Close all lines
+    else if ($action == 'confirm_close' && $confirm == 'yes' && $user->rights->contrat->creer)
+    {
+        $result = $object->closeAll($user);
+        if ($result < 0)
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
+
+    // Close all lines
+    else if ($action == 'confirm_activate' && $confirm == 'yes' && $user->rights->contrat->creer)
+    {
+        $result = $object->activateAll($user);
+        if ($result < 0)
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
+
+    else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
+    {
+        $result=$object->delete($user);
+        if ($result >= 0)
+        {
+            header("Location: list.php?restore_lastsearch_values=1");
+            return;
+        }
+        else
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
+
+    else if ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contrat->creer)
+    {
+        if (GETPOST('newcid') > 0)
+        {
+            $contractline = new ContratLigne($db);
+            $result=$contractline->fetch(GETPOST('lineid'));
+            $contractline->fk_contrat = GETPOST('newcid');
+            $result=$contractline->update($user,1);
+            if ($result >= 0)
+            {
+                header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+                return;
+            }
+            else
+            {
+                setEventMessages($object->error, $object->errors, 'errors');
+            }
+        }
+        else
+        {
+            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("RefNewContract")), null, 'errors');
+        }
+    }
+    else if ($action == 'update_extras')
+    {
+        $object->oldcopy = dol_clone($object);
+
+        // Fill array 'array_options' with data from update form
+        $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
+        if ($ret < 0) $error++;
+
+        if (! $error) {
+            $result = $object->insertExtraFields('CONTRACT_MODIFY');
+            if ($result < 0)
+            {
+                setEventMessages($object->error, $object->errors, 'errors');
+                $error++;
+            }
+        }
+
+        if ($error) {
+            $action = 'edit_extras';
+        }
+    }
+    elseif ($action=='setref_supplier')
+    {
+        $cancelbutton = GETPOST('cancel','alpha');
+        if (!$cancelbutton) {
+
+            $object->oldcopy = dol_clone($object);
+
+            $result = $object->setValueFrom('ref_supplier', GETPOST('ref_supplier','alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
+            if ($result < 0) {
+                setEventMessages($object->error, $object->errors, 'errors');
+                $action = 'editref_supplier';
+            } else {
+                header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+                exit;
+            }
+        }
+        else {
+            header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
+            exit;
+        }
+    }
+    elseif ($action=='setref_customer')
+    {
+        $cancelbutton = GETPOST('cancel','alpha');
+
+        if (!$cancelbutton)
+        {
+            $object->oldcopy = dol_clone($object);
+
+            $result = $object->setValueFrom('ref_customer', GETPOST('ref_customer','alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
+            if ($result < 0) {
+                setEventMessages($object->error, $object->errors, 'errors');
+                $action = 'editref_customer';
+            } else {
+                header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+                exit;
+            }
+        }
+        else {
+            header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
+            exit;
+        }
+    }
+    elseif ($action=='setref')
+    {
+        $cancelbutton = GETPOST('cancel','alpha');
+
+        if (!$cancelbutton) {
+            $result = $object->fetch($id);
+            if ($result < 0) {
+                setEventMessages($object->error, $object->errors, 'errors');
+            }
+
+            $old_ref = $object->ref;
+
+            $result = $object->setValueFrom('ref', GETPOST('ref','alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
+            if ($result < 0) {
+                setEventMessages($object->error, $object->errors, 'errors');
+                $action = 'editref';
+            } else {
+                require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+                $old_filedir = $conf->contrat->dir_output . '/' . dol_sanitizeFileName($old_ref);
+                $new_filedir = $conf->contrat->dir_output . '/' . dol_sanitizeFileName($object->ref);
+
+                $files = dol_dir_list($old_filedir);
+                if (!empty($files))
+                {
+                    if (!is_dir($new_filedir)) dol_mkdir($new_filedir);
+                    foreach ($files as $file)
+                    {
+                        dol_move($file['fullname'], $new_filedir.'/'.$file['name']);
+                    }
+                }
+
+                header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
+                exit;
+            }
+        }
+        else {
+            header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
+            exit;
+        }
+    }
+    elseif ($action=='setdate_contrat')
+    {
+        $cancelbutton = GETPOST('cancel','alpha');
+
+        if (!$cancelbutton) {
+            $result = $object->fetch($id);
+            if ($result < 0) {
+                setEventMessages($object->error, $object->errors, 'errors');
+            }
+            $datacontrat=dol_mktime(GETPOST('date_contrathour'), GETPOST('date_contratmin'), 0, GETPOST('date_contratmonth'), GETPOST('date_contratday'), GETPOST('date_contratyear'));
+            $result = $object->setValueFrom('date_contrat', $datacontrat, '', null, 'date', '', $user, 'CONTRACT_MODIFY');
+            if ($result < 0) {
+                setEventMessages($object->error, $object->errors, 'errors');
+                $action = 'editdate_contrat';
+            } else {
+                header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
+                exit;
+            }
+        }
+        else {
+            header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
+            exit;
+        }
+    }
+
+
+    // Actions to build doc
+    $upload_dir = $conf->contrat->dir_output;
+    $permissioncreate = $user->rights->contrat->creer;
+    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+    // Actions to send emails
+    $trigger_name='CONTRACT_SENTBYMAIL';
+    $paramname='id';
+    $mode='emailfromcontract';
+    $trackid='con'.$object->id;
+    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+
+
+    if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->contrat->creer)
+    {
+        if ($action == 'addcontact')
+        {
+            $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+            $result = $object->add_contact($contactid, GETPOST('type'), GETPOST('source'));
+
+            if ($result >= 0)
+            {
+                header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+                exit;
+            }
+            else
+            {
+                if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+                {
+                    $langs->load("errors");
+                    setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+                }
+                else
+                {
+                    setEventMessages($object->error, $object->errors, 'errors');
+                }
+            }
+        }
+
+        // bascule du statut d'un contact
+        else if ($action == 'swapstatut')
+        {
+            $result=$object->swapContactStatus(GETPOST('ligne'));
+        }
+
+        // Efface un contact
+        else if ($action == 'deletecontact')
+        {
+            $result = $object->delete_contact(GETPOST('lineid'));
+
+            if ($result >= 0)
+            {
+                header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+                exit;
+            }
+            else {
+                setEventMessages($object->error, $object->errors, 'errors');
+            }
+        }
+    }
+
+    // Action clone object
+    if ($action == 'confirm_clone' && $confirm == 'yes')
+    {
+        if (! GETPOST('socid', 3))
+        {
+            setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
+        }
+        else
+        {
+            if ($object->id > 0) {
+                $result = $object->createFromClone($socid);
+                if ($result > 0) {
+                    header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $result);
+                    exit();
+                } else {
+                    if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
+                    $action = '';
+                }
+            }
+        }
+    }
 }
 
 
@@ -1103,207 +1103,207 @@ 
 $module=(! empty($conf->global->CONTRACT_ADDON)?$conf->global->CONTRACT_ADDON:'mod_contract_serpis');
 if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php')
 {
-	$module = substr($module, 0, dol_strlen($module)-4);
+    $module = substr($module, 0, dol_strlen($module)-4);
 }
 $result=dol_include_once('/core/modules/contract/'.$module.'.php');
 if ($result > 0)
 {
-	$modCodeContract = new $module();
+    $modCodeContract = new $module();
 }
 
 // Create
 if ($action == 'create')
 {
-	print load_fiche_titre($langs->trans('AddContract'),'','title_commercial.png');
-
-	$soc = new Societe($db);
-	if ($socid>0) $soc->fetch($socid);
-
-	if (GETPOST('origin') && GETPOST('originid'))
-	{
-		// Parse element/subelement (ex: project_task)
-		$element = $subelement = GETPOST('origin');
-		if (preg_match('/^([^_]+)_([^_]+)/i',GETPOST('origin'),$regs))
-		{
-			$element = $regs[1];
-			$subelement = $regs[2];
-		}
-
-		if ($element == 'project')
-		{
-			$projectid=GETPOST('originid');
-		}
-		else
-		{
-			// For compatibility
-			if ($element == 'order' || $element == 'commande')    { $element = $subelement = 'commande'; }
-			if ($element == 'propal')   { $element = 'comm/propal'; $subelement = 'propal'; }
-
-			dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
-
-			$classname = ucfirst($subelement);
-			$objectsrc = new $classname($db);
-			$objectsrc->fetch(GETPOST('originid'));
-			if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines'))  $objectsrc->fetch_lines();
-			$objectsrc->fetch_thirdparty();
-
-			// Replicate extrafields
-			$objectsrc->fetch_optionals($originid);
-			$object->array_options = $objectsrc->array_options;
-
-			$projectid          = (!empty($objectsrc->fk_project)?$objectsrc->fk_project:'');
-
-			$soc = $objectsrc->thirdparty;
-
-			$note_private		= (! empty($objectsrc->note_private) ? $objectsrc->note_private : '');
-			$note_public		= (! empty($objectsrc->note_public) ? $objectsrc->note_public : '');
-
-			// Object source contacts list
-			$srccontactslist = $objectsrc->liste_contact(-1,'external',1);
-		}
-	}
-	else {
-		$projectid = GETPOST('projectid','int');
-		$note_private = GETPOST("note_private");
-		$note_public = GETPOST("note_public");
-	}
+    print load_fiche_titre($langs->trans('AddContract'),'','title_commercial.png');
+
+    $soc = new Societe($db);
+    if ($socid>0) $soc->fetch($socid);
+
+    if (GETPOST('origin') && GETPOST('originid'))
+    {
+        // Parse element/subelement (ex: project_task)
+        $element = $subelement = GETPOST('origin');
+        if (preg_match('/^([^_]+)_([^_]+)/i',GETPOST('origin'),$regs))
+        {
+            $element = $regs[1];
+            $subelement = $regs[2];
+        }
 
-	$object->date_contrat = dol_now();
+        if ($element == 'project')
+        {
+            $projectid=GETPOST('originid');
+        }
+        else
+        {
+            // For compatibility
+            if ($element == 'order' || $element == 'commande')    { $element = $subelement = 'commande'; }
+            if ($element == 'propal')   { $element = 'comm/propal'; $subelement = 'propal'; }
 
-	print '<form name="form_contract" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 
-	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="socid" value="'.$soc->id.'">'."\n";
-	print '<input type="hidden" name="remise_percent" value="0">';
+            $classname = ucfirst($subelement);
+            $objectsrc = new $classname($db);
+            $objectsrc->fetch(GETPOST('originid'));
+            if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines'))  $objectsrc->fetch_lines();
+            $objectsrc->fetch_thirdparty();
 
-	dol_fiche_head();
+            // Replicate extrafields
+            $objectsrc->fetch_optionals($originid);
+            $object->array_options = $objectsrc->array_options;
 
-	print '<table class="border" width="100%">';
+            $projectid          = (!empty($objectsrc->fk_project)?$objectsrc->fk_project:'');
 
-	// Ref
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Ref').'</td><td>';
-	if (! empty($modCodeContract->code_auto)) {
-		$tmpcode=$langs->trans("Draft");
-	} else {
-		$tmpcode='<input name="ref" class="maxwidth100" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
-	}
-	print $tmpcode;
-	print '</td></tr>';
-
-	// Ref customer
-	print '<tr><td>'.$langs->trans('RefCustomer').'</td>';
-	print '<td><input type="text" class="maxwidth150" name="ref_customer" id="ref_customer" value="'.dol_escape_htmltag(GETPOST('ref_customer','alpha')).'"></td></tr>';
-
-	// Ref supplier
-	print '<tr><td>'.$langs->trans('RefSupplier').'</td>';
-	print '<td><input type="text" class="maxwidth150" name="ref_supplier" id="ref_supplier" value="'.dol_escape_htmltag(GETPOST('ref_supplier','alpha')).'"></td></tr>';
-
-	// Thirdparty
-	print '<tr>';
-	print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
-	if ($socid>0)
-	{
-		print '<td>';
-		print $soc->getNomUrl(1);
-		print '<input type="hidden" name="socid" value="'.$soc->id.'">';
-		print '</td>';
-	}
-	else
-	{
-		print '<td>';
-		print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300');
-		print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'">'.$langs->trans("AddThirdParty").'</a>';
-		print '</td>';
-	}
-	print '</tr>'."\n";
-
-	if($socid>0)
-	{
-		// Ligne info remises tiers
-		print '<tr><td>'.$langs->trans('Discounts').'</td><td>';
-		if ($soc->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_percent);
-		else print $langs->trans("CompanyHasNoRelativeDiscount");
-		print '. ';
-		$absolute_discount=$soc->getAvailableDiscounts();
-		if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
-		else print $langs->trans("CompanyHasNoAbsoluteDiscount");
-		print '.';
-		print '</td></tr>';
-	}
+            $soc = $objectsrc->thirdparty;
 
-	// Commercial suivi
-	print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPFOLL").'</span></td><td>';
-	print $form->select_dolusers(GETPOST("commercial_suivi_id")?GETPOST("commercial_suivi_id"):$user->id,'commercial_suivi_id',1,'');
-	print '</td></tr>';
+            $note_private		= (! empty($objectsrc->note_private) ? $objectsrc->note_private : '');
+            $note_public		= (! empty($objectsrc->note_public) ? $objectsrc->note_public : '');
 
-	// Commercial signature
-	print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPSIGN").'</span></td><td>';
-	print $form->select_dolusers(GETPOST("commercial_signature_id")?GETPOST("commercial_signature_id"):$user->id,'commercial_signature_id',1,'');
-	print '</td></tr>';
+            // Object source contacts list
+            $srccontactslist = $objectsrc->liste_contact(-1,'external',1);
+        }
+    }
+    else {
+        $projectid = GETPOST('projectid','int');
+        $note_private = GETPOST("note_private");
+        $note_public = GETPOST("note_public");
+    }
 
-	print '<tr><td><span class="fieldrequired">'.$langs->trans("Date").'</span></td><td>';
-	print $form->selectDate($datecontrat, '', 0, 0, '', "contrat");
-	print "</td></tr>";
+    $object->date_contrat = dol_now();
 
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-		$langs->load('projects');
+    print '<form name="form_contract" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-		$formproject=new FormProjets($db);
+    print '<input type="hidden" name="action" value="add">';
+    print '<input type="hidden" name="socid" value="'.$soc->id.'">'."\n";
+    print '<input type="hidden" name="remise_percent" value="0">';
 
-		print '<tr><td>'.$langs->trans("Project").'</td><td>';
-		$formproject->select_projects(($soc->id>0?$soc->id:-1),$projectid,"projectid",0,0,1,1);
-		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">' . $langs->trans("AddProject") . '</a>';
-		print "</td></tr>";
-	}
+    dol_fiche_head();
 
-	print '<tr><td>'.$langs->trans("NotePublic").'</td><td class="tdtop">';
-	$doleditor=new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
-	print $doleditor->Create(1);
-	print '</td></tr>';
-
-	if (empty($user->societe_id))
-	{
-		print '<tr><td>'.$langs->trans("NotePrivate").'</td><td class="tdtop">';
-		$doleditor=new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
-		print $doleditor->Create(1);
-		print '</td></tr>';
-	}
+    print '<table class="border" width="100%">';
 
-	// Other attributes
-	$parameters=array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"', 'cols'=>3);
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
+    // Ref
+    print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Ref').'</td><td>';
+    if (! empty($modCodeContract->code_auto)) {
+        $tmpcode=$langs->trans("Draft");
+    } else {
+        $tmpcode='<input name="ref" class="maxwidth100" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
+    }
+    print $tmpcode;
+    print '</td></tr>';
+
+    // Ref customer
+    print '<tr><td>'.$langs->trans('RefCustomer').'</td>';
+    print '<td><input type="text" class="maxwidth150" name="ref_customer" id="ref_customer" value="'.dol_escape_htmltag(GETPOST('ref_customer','alpha')).'"></td></tr>';
+
+    // Ref supplier
+    print '<tr><td>'.$langs->trans('RefSupplier').'</td>';
+    print '<td><input type="text" class="maxwidth150" name="ref_supplier" id="ref_supplier" value="'.dol_escape_htmltag(GETPOST('ref_supplier','alpha')).'"></td></tr>';
+
+    // Thirdparty
+    print '<tr>';
+    print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
+    if ($socid>0)
+    {
+        print '<td>';
+        print $soc->getNomUrl(1);
+        print '<input type="hidden" name="socid" value="'.$soc->id.'">';
+        print '</td>';
+    }
+    else
+    {
+        print '<td>';
+        print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300');
+        print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'">'.$langs->trans("AddThirdParty").'</a>';
+        print '</td>';
+    }
+    print '</tr>'."\n";
+
+    if($socid>0)
+    {
+        // Ligne info remises tiers
+        print '<tr><td>'.$langs->trans('Discounts').'</td><td>';
+        if ($soc->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_percent);
+        else print $langs->trans("CompanyHasNoRelativeDiscount");
+        print '. ';
+        $absolute_discount=$soc->getAvailableDiscounts();
+        if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
+        else print $langs->trans("CompanyHasNoAbsoluteDiscount");
+        print '.';
+        print '</td></tr>';
+    }
 
-	// Other attributes
-	if (empty($reshook)) {
-		print $object->showOptionals($extrafields, 'edit');
-	}
+    // Commercial suivi
+    print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPFOLL").'</span></td><td>';
+    print $form->select_dolusers(GETPOST("commercial_suivi_id")?GETPOST("commercial_suivi_id"):$user->id,'commercial_suivi_id',1,'');
+    print '</td></tr>';
 
-	print "</table>\n";
+    // Commercial signature
+    print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPSIGN").'</span></td><td>';
+    print $form->select_dolusers(GETPOST("commercial_signature_id")?GETPOST("commercial_signature_id"):$user->id,'commercial_signature_id',1,'');
+    print '</td></tr>';
 
-	dol_fiche_end();
+    print '<tr><td><span class="fieldrequired">'.$langs->trans("Date").'</span></td><td>';
+    print $form->selectDate($datecontrat, '', 0, 0, '', "contrat");
+    print "</td></tr>";
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
-	print '</div>';
+    // Project
+    if (! empty($conf->projet->enabled))
+    {
+        $langs->load('projects');
 
-	if (is_object($objectsrc))
-	{
-		print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
-		print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
+        $formproject=new FormProjets($db);
 
-		if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))
-		{
-			print '<br>'.$langs->trans("Note").': '.$langs->trans("OnlyLinesWithTypeServiceAreUsed");
-		}
-	}
+        print '<tr><td>'.$langs->trans("Project").'</td><td>';
+        $formproject->select_projects(($soc->id>0?$soc->id:-1),$projectid,"projectid",0,0,1,1);
+        print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">' . $langs->trans("AddProject") . '</a>';
+        print "</td></tr>";
+    }
+
+    print '<tr><td>'.$langs->trans("NotePublic").'</td><td class="tdtop">';
+    $doleditor=new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
+    print $doleditor->Create(1);
+    print '</td></tr>';
+
+    if (empty($user->societe_id))
+    {
+        print '<tr><td>'.$langs->trans("NotePrivate").'</td><td class="tdtop">';
+        $doleditor=new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
+        print $doleditor->Create(1);
+        print '</td></tr>';
+    }
+
+    // Other attributes
+    $parameters=array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"', 'cols'=>3);
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+
+    // Other attributes
+    if (empty($reshook)) {
+        print $object->showOptionals($extrafields, 'edit');
+    }
+
+    print "</table>\n";
+
+    dol_fiche_end();
+
+    print '<div class="center">';
+    print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
+    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+    print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
+    print '</div>';
+
+    if (is_object($objectsrc))
+    {
+        print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
+        print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
+
+        if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))
+        {
+            print '<br>'.$langs->trans("Note").': '.$langs->trans("OnlyLinesWithTypeServiceAreUsed");
+        }
+    }
 
-	print "</form>\n";
+    print "</form>\n";
 }
 else
 /* *************************************************************************** */
@@ -1312,29 +1312,29 @@ 
 /*                                                                             */
 /* *************************************************************************** */
 {
-	$now=dol_now();
+    $now=dol_now();
 
-	if ($object->id > 0)
-	{
-		$object->fetch_thirdparty();
+    if ($object->id > 0)
+    {
+        $object->fetch_thirdparty();
 
-		$result=$object->fetch_lines(); // This also init $this->nbofserviceswait, $this->nbofservicesopened, $this->nbofservicesexpired=, $this->nbofservicesclosed
-		if ($result < 0) {
+        $result=$object->fetch_lines(); // This also init $this->nbofserviceswait, $this->nbofservicesopened, $this->nbofservicesexpired=, $this->nbofservicesclosed
+        if ($result < 0) {
             dol_print_error($db,$object->error);
         }
 
-		$nbofservices=count($object->lines);
+        $nbofservices=count($object->lines);
 
-		$author = new User($db);
-		$author->fetch($object->user_author_id);
+        $author = new User($db);
+        $author->fetch($object->user_author_id);
 
-		$commercial_signature = new User($db);
-		$commercial_signature->fetch($object->commercial_signature_id);
+        $commercial_signature = new User($db);
+        $commercial_signature->fetch($object->commercial_signature_id);
 
-		$commercial_suivi = new User($db);
-		$commercial_suivi->fetch($object->commercial_suivi_id);
+        $commercial_suivi = new User($db);
+        $commercial_suivi->fetch($object->commercial_suivi_id);
 
-		$head = contract_prepare_head($object);
+        $head = contract_prepare_head($object);
 
         $hselected = 0;
         $formconfirm = '';
@@ -1386,847 +1386,847 @@ 
         /*
          *   Contrat
          */
-		if (! empty($object->brouillon) && $user->rights->contrat->creer)
-		{
-			print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="action" value="setremise">';
-		}
-
-		// Contract card
-
-		$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(! empty($socid)?'&socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-
-
-		$morehtmlref='';
-		if (! empty($modCodeContract->code_auto)) {
-			$morehtmlref.=$object->ref;
-		} else {
-			$morehtmlref.=$form->editfieldkey("",'ref',$object->ref,$object,$user->rights->contrat->creer,'string','',0,3);
-			$morehtmlref.=$form->editfieldval("",'ref',$object->ref,$object,$user->rights->contrat->creer,'string','',0,2);
-		}
-
-		$morehtmlref.='<div class="refidno">';
-		// Ref customer
-		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->contrat->creer, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->contrat->creer, 'string', '', null, null, '', 1);
-		// Ref supplier
-		$morehtmlref.='<br>';
-		$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->contrat->creer, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->contrat->creer, 'string', '', null, null, '', 1);
-		// Thirdparty
-		$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref.=' (<a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->thirdparty->id.'&search_name='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherContracts").'</a>)';
-		// Project
-		if (! empty($conf->projet->enabled))
-		{
-			$langs->load("projects");
-			$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-			if ($user->rights->contrat->creer)
-			{
-				if ($action != 'classify')
-					$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-					if ($action == 'classify') {
-						//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-						$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-						$morehtmlref.='<input type="hidden" name="action" value="classin">';
-						$morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-						$morehtmlref.=$formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-						$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-						$morehtmlref.='</form>';
-					} else {
-						$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
-					}
-			} else {
-				if (! empty($object->fk_project)) {
-					$proj = new Project($db);
-					$proj->fetch($object->fk_project);
-					$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-					$morehtmlref.=$proj->ref;
-					$morehtmlref.='</a>';
-				} else {
-					$morehtmlref.='';
-				}
-			}
-		}
-		$morehtmlref.='</div>';
-
-
-		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
-
-
-		print '<div class="fichecenter">';
-		print '<div class="underbanner clearboth"></div>';
-
-
-		print '<table class="border" width="100%">';
-
-		// Ligne info remises tiers
-		print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
-		if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent);
-		else print $langs->trans("CompanyHasNoRelativeDiscount");
-		$absolute_discount=$object->thirdparty->getAvailableDiscounts();
-		print '. ';
-		if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
-		else print $langs->trans("CompanyHasNoAbsoluteDiscount");
-		print '.';
-		print '</td></tr>';
-
-		// Date
-		print '<tr>';
-		print '<td class="titlefield">';
-		print $form->editfieldkey("Date",'date_contrat',$object->date_contrat,$object,$user->rights->contrat->creer);
-		print '</td><td>';
-		print $form->editfieldval("Date",'date_contrat',$object->date_contrat,$object,$user->rights->contrat->creer,'datehourpicker');
-		print '</td>';
-		print '</tr>';
-
-		// Other attributes
-		$cols = 3;
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-
-		print "</table>";
-
-		print '</div>';
-
-		if (! empty($object->brouillon) && $user->rights->contrat->creer)
-		{
-			print '</form>';
-		}
-
-		echo '<br>';
-
-		if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-		{
-			$blocname = 'contacts';
-			$title = $langs->trans('ContactsAddresses');
-			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
-		}
-
-		if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-		{
-			$blocname = 'notes';
-			$title = $langs->trans('Notes');
-			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
-		}
-
-
-		$colorb = '666666';
-
-		$arrayothercontracts=$object->getListOfContracts('others');
-
-		/*
+        if (! empty($object->brouillon) && $user->rights->contrat->creer)
+        {
+            print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="setremise">';
+        }
+
+        // Contract card
+
+        $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(! empty($socid)?'&socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+
+
+        $morehtmlref='';
+        if (! empty($modCodeContract->code_auto)) {
+            $morehtmlref.=$object->ref;
+        } else {
+            $morehtmlref.=$form->editfieldkey("",'ref',$object->ref,$object,$user->rights->contrat->creer,'string','',0,3);
+            $morehtmlref.=$form->editfieldval("",'ref',$object->ref,$object,$user->rights->contrat->creer,'string','',0,2);
+        }
+
+        $morehtmlref.='<div class="refidno">';
+        // Ref customer
+        $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->contrat->creer, 'string', '', 0, 1);
+        $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->contrat->creer, 'string', '', null, null, '', 1);
+        // Ref supplier
+        $morehtmlref.='<br>';
+        $morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->contrat->creer, 'string', '', 0, 1);
+        $morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->contrat->creer, 'string', '', null, null, '', 1);
+        // Thirdparty
+        $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+        if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref.=' (<a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->thirdparty->id.'&search_name='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherContracts").'</a>)';
+        // Project
+        if (! empty($conf->projet->enabled))
+        {
+            $langs->load("projects");
+            $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+            if ($user->rights->contrat->creer)
+            {
+                if ($action != 'classify')
+                    $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                    if ($action == 'classify') {
+                        //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+                        $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+                        $morehtmlref.='<input type="hidden" name="action" value="classin">';
+                        $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                        $morehtmlref.=$formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                        $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+                        $morehtmlref.='</form>';
+                    } else {
+                        $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+                    }
+            } else {
+                if (! empty($object->fk_project)) {
+                    $proj = new Project($db);
+                    $proj->fetch($object->fk_project);
+                    $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+                    $morehtmlref.=$proj->ref;
+                    $morehtmlref.='</a>';
+                } else {
+                    $morehtmlref.='';
+                }
+            }
+        }
+        $morehtmlref.='</div>';
+
+
+        dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
+
+
+        print '<div class="fichecenter">';
+        print '<div class="underbanner clearboth"></div>';
+
+
+        print '<table class="border" width="100%">';
+
+        // Ligne info remises tiers
+        print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
+        if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent);
+        else print $langs->trans("CompanyHasNoRelativeDiscount");
+        $absolute_discount=$object->thirdparty->getAvailableDiscounts();
+        print '. ';
+        if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
+        else print $langs->trans("CompanyHasNoAbsoluteDiscount");
+        print '.';
+        print '</td></tr>';
+
+        // Date
+        print '<tr>';
+        print '<td class="titlefield">';
+        print $form->editfieldkey("Date",'date_contrat',$object->date_contrat,$object,$user->rights->contrat->creer);
+        print '</td><td>';
+        print $form->editfieldval("Date",'date_contrat',$object->date_contrat,$object,$user->rights->contrat->creer,'datehourpicker');
+        print '</td>';
+        print '</tr>';
+
+        // Other attributes
+        $cols = 3;
+        include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
+        print "</table>";
+
+        print '</div>';
+
+        if (! empty($object->brouillon) && $user->rights->contrat->creer)
+        {
+            print '</form>';
+        }
+
+        echo '<br>';
+
+        if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+        {
+            $blocname = 'contacts';
+            $title = $langs->trans('ContactsAddresses');
+            include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+        }
+
+        if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+        {
+            $blocname = 'notes';
+            $title = $langs->trans('Notes');
+            include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+        }
+
+
+        $colorb = '666666';
+
+        $arrayothercontracts=$object->getListOfContracts('others');
+
+        /*
          * Lines of contracts
          */
 
-		$productstatic=new Product($db);
-
-		$usemargins=0;
-		if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
-
-		$var=false;
-
-		// Title line for service
-		$cursorline=1;
-		print '<div id="contrat-lines-container" data-contractid="'.$object->id.'"  data-element="'.$object->element.'" >';
-		while ($cursorline <= $nbofservices)
-		{
-			print '<div id="contrat-line-container'.$object->lines[$cursorline-1]->id.'" data-contratlineid = "'.$object->lines[$cursorline-1]->id.'" data-element="'.$object->lines[$cursorline-1]->element.'" >';
-			print '<form name="update" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="action" value="updateline">';
-			print '<input type="hidden" name="elrowid" value="'.$object->lines[$cursorline-1]->id.'">';
-			print '<input type="hidden" name="idprod" value="'.(!empty($object->lines[$cursorline-1]->fk_product) ? $object->lines[$cursorline-1]->fk_product : 0).'">';
-			print '<input type="hidden" name="fournprice" value="'.(!empty($object->lines[$cursorline-1]->fk_fournprice) ? $object->lines[$cursorline-1]->fk_fournprice : 0).'">';
-
-			// Area with common detail of line
-			print '<div class="div-table-responsive-no-min">';
-			print '<table class="notopnoleftnoright allwidth tableforservicepart1" width="100%">';
-
-			$sql = "SELECT cd.rowid, cd.statut, cd.label as label_det, cd.fk_product, cd.product_type, cd.description, cd.price_ht, cd.qty,";
-			$sql.= " cd.tva_tx, cd.vat_src_code, cd.remise_percent, cd.info_bits, cd.subprice, cd.multicurrency_subprice,";
-			$sql.= " cd.date_ouverture_prevue as date_debut, cd.date_ouverture as date_debut_reelle,";
-			$sql.= " cd.date_fin_validite as date_fin, cd.date_cloture as date_fin_reelle,";
-			$sql.= " cd.commentaire as comment, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht,";
-			$sql.= " cd.fk_unit,";
-			$sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
-			$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-			$sql.= " WHERE cd.rowid = ".$object->lines[$cursorline-1]->id;
-
-			$result = $db->query($sql);
-			if ($result)
-			{
-				$total = 0;
-
-				print '<tr class="liste_titre'.($cursorline?' liste_titre_add':'').'">';
-				print '<td>'.$langs->trans("ServiceNb",$cursorline).'</td>';
-				print '<td width="80" align="center">'.$langs->trans("VAT").'</td>';
-				print '<td width="80" align="right">'.$langs->trans("PriceUHT").'</td>';
-				if (!empty($conf->multicurrency->enabled)) {
-					print '<td width="80" align="right">'.$langs->trans("PriceUHTCurrency").'</td>';
-				}
-				print '<td width="30" align="center">'.$langs->trans("Qty").'</td>';
-				if ($conf->global->PRODUCT_USE_UNITS) print '<td width="30" align="left">'.$langs->trans("Unit").'</td>';
-				print '<td width="50" align="right">'.$langs->trans("ReductionShort").'</td>';
-				if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print '<td width="50" align="right">'.$langs->trans("BuyingPrice").'</td>';
-				print '<td width="30">&nbsp;</td>';
-				print "</tr>\n";
-
-				$objp = $db->fetch_object($result);
-
-				//
-
-				if ($action != 'editline' || GETPOST('rowid') != $objp->rowid)
-				{
-					print '<tr class="tdtop oddeven">';
-					// Label
-					if ($objp->fk_product > 0)
-					{
-						print '<td>';
-						$productstatic->id=$objp->fk_product;
-						$productstatic->type=$objp->ptype;
-						$productstatic->ref=$objp->pref;
-						$productstatic->entity=$objp->pentity;
-						$productstatic->label=$objp->plabel;
-						$text = $productstatic->getNomUrl(1,'',32);
-						if ($objp->plabel)
-						{
-							$text .= ' - ';
-							$text .= $objp->plabel;
-						}
-						$description = $objp->description;
-
-						// Add description in form
-						if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
-						{
-							$text .= (! empty($objp->description) && $objp->description!=$objp->plabel)?'<br>'.dol_htmlentitiesbr($objp->description):'';
-							$description = '';	// Already added into main visible desc
-						}
-
-						echo $form->textwithtooltip($text,$description,3,'','',$cursorline,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
-
-						print '</td>';
-					}
-					else
-					{
-						print '<td>'.img_object($langs->trans("ShowProductOrService"), ($objp->product_type ? 'service' : 'product')).' '.dol_htmlentitiesbr($objp->description)."</td>\n";
-					}
-					// TVA
-					print '<td align="center">';
-					print vatrate($objp->tva_tx.($objp->vat_src_code?(' ('.$objp->vat_src_code.')'):''), '%', $objp->info_bits);
-					print '</td>';
-					// Price
-					print '<td align="right">'.($objp->subprice != '' ? price($objp->subprice) : '')."</td>\n";
-					// Price multicurrency
-					if (!empty($conf->multicurrency->enabled)) {
-						print '<td align="right" class="linecoluht_currency nowrap">'.price($objp->multicurrency_subprice).'</td>';
-					}
-					// Quantite
-					print '<td align="center">'.$objp->qty.'</td>';
-					// Unit
-					if($conf->global->PRODUCT_USE_UNITS) print '<td align="left">'.$langs->trans($object->lines[$cursorline-1]->getLabelOfUnit()).'</td>';
-					// Remise
-					if ($objp->remise_percent > 0)
-					{
-						print '<td align="right">'.$objp->remise_percent."%</td>\n";
-					}
-					else
-					{
-						print '<td>&nbsp;</td>';
-					}
-
-					// Margin
-					if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print '<td align="right" class="nowrap">'.price($objp->pa_ht).'</td>';
-
-					// Icon move, update et delete (statut contrat 0=brouillon,1=valide,2=ferme)
-					print '<td align="right" class="nowrap">';
-					if ($user->rights->contrat->creer && count($arrayothercontracts) && ($object->statut >= 0))
-					{
-						print '<!-- link to move service line into another contract -->';
-						print '<a class="reposition" style="padding-left: 5px;" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=move&amp;rowid='.$objp->rowid.'">';
-						print img_picto($langs->trans("MoveToAnotherContract"),'uparrow');
-						print '</a>';
-					}
-					if ($user->rights->contrat->creer && ($object->statut >= 0))
-					{
-						print '<a class="reposition" style="padding-left: 5px;" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=editline&amp;rowid='.$objp->rowid.'">';
-						print img_edit();
-						print '</a>';
-					}
-					if ( $user->rights->contrat->creer && ($object->statut >= 0))
-					{
-						print '<a style="padding-left: 5px;" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=deleteline&amp;rowid='.$objp->rowid.'">';
-						print img_delete();
-						print '</a>';
-					}
-					print '</td>';
-
-					print "</tr>\n";
-
-					// Dates of service planed and real
-					if ($objp->subprice >= 0)
-					{
-						$colspan = 6;
-
-						if ($conf->margin->enabled && $conf->global->PRODUCT_USE_UNITS) {
-							$colspan = 8;
-						} elseif ($conf->margin->enabled || $conf->global->PRODUCT_USE_UNITS) {
-							$colspan = 7;
-						}
-
-						print '<tr class="oddeven">';
-						print '<td colspan="'.$colspan.'">';
-
-						// Date planned
-						print $langs->trans("DateStartPlanned").': ';
-						if ($objp->date_debut)
-						{
-							print dol_print_date($db->jdate($objp->date_debut), 'day');
-							// Warning si date prevu passee et pas en service
-							if ($objp->statut == 0 && $db->jdate($objp->date_debut) < ($now - $conf->contrat->services->inactifs->warning_delay)) {
-								$warning_delay=$conf->contrat->services->inactifs->warning_delay / 3600 / 24;
-								$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
-								print " ".img_warning($textlate);
-							}
-						}
-						else print $langs->trans("Unknown");
-						print ' &nbsp;-&nbsp; ';
-						print $langs->trans("DateEndPlanned").': ';
-						if ($objp->date_fin)
-						{
-							print dol_print_date($db->jdate($objp->date_fin), 'day');
-							if ($objp->statut == 4 && $db->jdate($objp->date_fin) < ($now - $conf->contrat->services->expires->warning_delay)) {
-								$warning_delay=$conf->contrat->services->expires->warning_delay / 3600 / 24;
-								$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
-								print " ".img_warning($textlate);
-							}
-						}
-						else print $langs->trans("Unknown");
-
-						print '</td>';
-						print '</tr>';
-					}
-
-					// Display lines extrafields
-					if (is_array($extralabelslines) && count($extralabelslines)>0) {
-						$line = new ContratLigne($db);
-						$line->fetch_optionals($objp->rowid);
-						print $line->showOptionals($extrafieldsline, 'view', array('style'=>'class="oddeven"', 'colspan'=>$colspan), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
-					}
-				}
-				// Ligne en mode update
-				else
-				{
-					// Ligne carac
-					print '<tr class="oddeven">';
-					print '<td>';
-					if ($objp->fk_product)
-					{
-						$productstatic->id=$objp->fk_product;
-						$productstatic->type=$objp->ptype;
-						$productstatic->ref=$objp->pref;
-						$productstatic->entity=$objp->pentity;
-						print $productstatic->getNomUrl(1,'',32);
-						print $objp->label?' - '.dol_trunc($objp->label,32):'';
-						print '<br>';
-					}
-					else
-					{
-						print $objp->label?$objp->label.'<br>':'';
-					}
-
-					// editeur wysiwyg
-					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-					$nbrows=ROWS_2;
-					if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-					$enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
-					$doleditor=new DolEditor('product_desc',$objp->description,'',92,'dolibarr_details','',false,true,$enable,$nbrows,'90%');
-					$doleditor->Create();
-
-					print '</td>';
-					print '<td align="right">';
-					print $form->load_tva("eltva_tx", $objp->tva_tx.($objp->vat_src_code?(' ('.$objp->vat_src_code.')'):''), $mysoc, $object->thirdparty, $objp->fk_product, $objp->info_bits, $objp->product_type, 0, 1);
-					print '</td>';
-					print '<td align="right"><input size="5" type="text" name="elprice" value="'.price($objp->subprice).'"></td>';
-					print '<td align="center"><input size="2" type="text" name="elqty" value="'.$objp->qty.'"></td>';
-					if ($conf->global->PRODUCT_USE_UNITS)
-					{
-						print '<td align="left">';
-						print $form->selectUnits($objp->fk_unit, "unit");
-						print '</td>';
-					}
-					print '<td align="right" class="nowrap"><input size="1" type="text" name="elremise_percent" value="'.$objp->remise_percent.'">%</td>';
-					if (! empty($usemargins))
-					{
-						print '<td align="right">';
-						if ($objp->fk_product) print '<select id="fournprice" name="fournprice"></select>';
-						print '<input id="buying_price" type="text" size="5" name="buying_price" value="'.price($objp->pa_ht,0,'',0).'"></td>';
-					}
-					print '<td align="center">';
-					print '<input type="submit" class="button" name="save" value="'.$langs->trans("Modify").'">';
-					print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-					print '</td>';
-					print '</tr>';
-
-					$colspan=6;
-					if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) $colspan++;
-					if($conf->global->PRODUCT_USE_UNITS) $colspan++;
-
-					// Ligne dates prevues
-					print '<tr class="oddeven">';
-					print '<td colspan="'.$colspan.'">';
-					print $langs->trans("DateStartPlanned").' ';
-					print $form->selectDate($db->jdate($objp->date_debut), "date_start_update", $usehm, $usehm, ($db->jdate($objp->date_debut)>0?0:1), "update");
-					print ' &nbsp;&nbsp;'.$langs->trans("DateEndPlanned").' ';
-					print $form->selectDate($db->jdate($objp->date_fin), "date_end_update", $usehm, $usehm, ($db->jdate($objp->date_fin)>0?0:1), "update");
-					print '</td>';
-					print '</tr>';
-
-					if (is_array($extralabelslines) && count($extralabelslines)>0) {
-						$line = new ContratLigne($db);
-						$line->fetch_optionals($objp->rowid);
-						print $line->showOptionals($extrafieldsline, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
-					}
-				}
-
-				$db->free($result);
-			}
-			else
-			{
-				dol_print_error($db);
-			}
-
-			if ($object->statut > 0)
-			{
-				print '<tr class="oddeven">';
-				print '<td class="tdhrthin" colspan="'.($conf->margin->enabled?7:6).'"><hr class="opacitymedium tdhrthin"></td>';
-				print "</tr>\n";
-			}
-
-			print "</table>";
-			print '</div>';
-
-			print "</form>\n";
-
-
-			/*
+        $productstatic=new Product($db);
+
+        $usemargins=0;
+        if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
+
+        $var=false;
+
+        // Title line for service
+        $cursorline=1;
+        print '<div id="contrat-lines-container" data-contractid="'.$object->id.'"  data-element="'.$object->element.'" >';
+        while ($cursorline <= $nbofservices)
+        {
+            print '<div id="contrat-line-container'.$object->lines[$cursorline-1]->id.'" data-contratlineid = "'.$object->lines[$cursorline-1]->id.'" data-element="'.$object->lines[$cursorline-1]->element.'" >';
+            print '<form name="update" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="updateline">';
+            print '<input type="hidden" name="elrowid" value="'.$object->lines[$cursorline-1]->id.'">';
+            print '<input type="hidden" name="idprod" value="'.(!empty($object->lines[$cursorline-1]->fk_product) ? $object->lines[$cursorline-1]->fk_product : 0).'">';
+            print '<input type="hidden" name="fournprice" value="'.(!empty($object->lines[$cursorline-1]->fk_fournprice) ? $object->lines[$cursorline-1]->fk_fournprice : 0).'">';
+
+            // Area with common detail of line
+            print '<div class="div-table-responsive-no-min">';
+            print '<table class="notopnoleftnoright allwidth tableforservicepart1" width="100%">';
+
+            $sql = "SELECT cd.rowid, cd.statut, cd.label as label_det, cd.fk_product, cd.product_type, cd.description, cd.price_ht, cd.qty,";
+            $sql.= " cd.tva_tx, cd.vat_src_code, cd.remise_percent, cd.info_bits, cd.subprice, cd.multicurrency_subprice,";
+            $sql.= " cd.date_ouverture_prevue as date_debut, cd.date_ouverture as date_debut_reelle,";
+            $sql.= " cd.date_fin_validite as date_fin, cd.date_cloture as date_fin_reelle,";
+            $sql.= " cd.commentaire as comment, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht,";
+            $sql.= " cd.fk_unit,";
+            $sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
+            $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
+            $sql.= " WHERE cd.rowid = ".$object->lines[$cursorline-1]->id;
+
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $total = 0;
+
+                print '<tr class="liste_titre'.($cursorline?' liste_titre_add':'').'">';
+                print '<td>'.$langs->trans("ServiceNb",$cursorline).'</td>';
+                print '<td width="80" align="center">'.$langs->trans("VAT").'</td>';
+                print '<td width="80" align="right">'.$langs->trans("PriceUHT").'</td>';
+                if (!empty($conf->multicurrency->enabled)) {
+                    print '<td width="80" align="right">'.$langs->trans("PriceUHTCurrency").'</td>';
+                }
+                print '<td width="30" align="center">'.$langs->trans("Qty").'</td>';
+                if ($conf->global->PRODUCT_USE_UNITS) print '<td width="30" align="left">'.$langs->trans("Unit").'</td>';
+                print '<td width="50" align="right">'.$langs->trans("ReductionShort").'</td>';
+                if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print '<td width="50" align="right">'.$langs->trans("BuyingPrice").'</td>';
+                print '<td width="30">&nbsp;</td>';
+                print "</tr>\n";
+
+                $objp = $db->fetch_object($result);
+
+                //
+
+                if ($action != 'editline' || GETPOST('rowid') != $objp->rowid)
+                {
+                    print '<tr class="tdtop oddeven">';
+                    // Label
+                    if ($objp->fk_product > 0)
+                    {
+                        print '<td>';
+                        $productstatic->id=$objp->fk_product;
+                        $productstatic->type=$objp->ptype;
+                        $productstatic->ref=$objp->pref;
+                        $productstatic->entity=$objp->pentity;
+                        $productstatic->label=$objp->plabel;
+                        $text = $productstatic->getNomUrl(1,'',32);
+                        if ($objp->plabel)
+                        {
+                            $text .= ' - ';
+                            $text .= $objp->plabel;
+                        }
+                        $description = $objp->description;
+
+                        // Add description in form
+                        if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+                        {
+                            $text .= (! empty($objp->description) && $objp->description!=$objp->plabel)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+                            $description = '';	// Already added into main visible desc
+                        }
+
+                        echo $form->textwithtooltip($text,$description,3,'','',$cursorline,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
+
+                        print '</td>';
+                    }
+                    else
+                    {
+                        print '<td>'.img_object($langs->trans("ShowProductOrService"), ($objp->product_type ? 'service' : 'product')).' '.dol_htmlentitiesbr($objp->description)."</td>\n";
+                    }
+                    // TVA
+                    print '<td align="center">';
+                    print vatrate($objp->tva_tx.($objp->vat_src_code?(' ('.$objp->vat_src_code.')'):''), '%', $objp->info_bits);
+                    print '</td>';
+                    // Price
+                    print '<td align="right">'.($objp->subprice != '' ? price($objp->subprice) : '')."</td>\n";
+                    // Price multicurrency
+                    if (!empty($conf->multicurrency->enabled)) {
+                        print '<td align="right" class="linecoluht_currency nowrap">'.price($objp->multicurrency_subprice).'</td>';
+                    }
+                    // Quantite
+                    print '<td align="center">'.$objp->qty.'</td>';
+                    // Unit
+                    if($conf->global->PRODUCT_USE_UNITS) print '<td align="left">'.$langs->trans($object->lines[$cursorline-1]->getLabelOfUnit()).'</td>';
+                    // Remise
+                    if ($objp->remise_percent > 0)
+                    {
+                        print '<td align="right">'.$objp->remise_percent."%</td>\n";
+                    }
+                    else
+                    {
+                        print '<td>&nbsp;</td>';
+                    }
+
+                    // Margin
+                    if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print '<td align="right" class="nowrap">'.price($objp->pa_ht).'</td>';
+
+                    // Icon move, update et delete (statut contrat 0=brouillon,1=valide,2=ferme)
+                    print '<td align="right" class="nowrap">';
+                    if ($user->rights->contrat->creer && count($arrayothercontracts) && ($object->statut >= 0))
+                    {
+                        print '<!-- link to move service line into another contract -->';
+                        print '<a class="reposition" style="padding-left: 5px;" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=move&amp;rowid='.$objp->rowid.'">';
+                        print img_picto($langs->trans("MoveToAnotherContract"),'uparrow');
+                        print '</a>';
+                    }
+                    if ($user->rights->contrat->creer && ($object->statut >= 0))
+                    {
+                        print '<a class="reposition" style="padding-left: 5px;" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=editline&amp;rowid='.$objp->rowid.'">';
+                        print img_edit();
+                        print '</a>';
+                    }
+                    if ( $user->rights->contrat->creer && ($object->statut >= 0))
+                    {
+                        print '<a style="padding-left: 5px;" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=deleteline&amp;rowid='.$objp->rowid.'">';
+                        print img_delete();
+                        print '</a>';
+                    }
+                    print '</td>';
+
+                    print "</tr>\n";
+
+                    // Dates of service planed and real
+                    if ($objp->subprice >= 0)
+                    {
+                        $colspan = 6;
+
+                        if ($conf->margin->enabled && $conf->global->PRODUCT_USE_UNITS) {
+                            $colspan = 8;
+                        } elseif ($conf->margin->enabled || $conf->global->PRODUCT_USE_UNITS) {
+                            $colspan = 7;
+                        }
+
+                        print '<tr class="oddeven">';
+                        print '<td colspan="'.$colspan.'">';
+
+                        // Date planned
+                        print $langs->trans("DateStartPlanned").': ';
+                        if ($objp->date_debut)
+                        {
+                            print dol_print_date($db->jdate($objp->date_debut), 'day');
+                            // Warning si date prevu passee et pas en service
+                            if ($objp->statut == 0 && $db->jdate($objp->date_debut) < ($now - $conf->contrat->services->inactifs->warning_delay)) {
+                                $warning_delay=$conf->contrat->services->inactifs->warning_delay / 3600 / 24;
+                                $textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
+                                print " ".img_warning($textlate);
+                            }
+                        }
+                        else print $langs->trans("Unknown");
+                        print ' &nbsp;-&nbsp; ';
+                        print $langs->trans("DateEndPlanned").': ';
+                        if ($objp->date_fin)
+                        {
+                            print dol_print_date($db->jdate($objp->date_fin), 'day');
+                            if ($objp->statut == 4 && $db->jdate($objp->date_fin) < ($now - $conf->contrat->services->expires->warning_delay)) {
+                                $warning_delay=$conf->contrat->services->expires->warning_delay / 3600 / 24;
+                                $textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
+                                print " ".img_warning($textlate);
+                            }
+                        }
+                        else print $langs->trans("Unknown");
+
+                        print '</td>';
+                        print '</tr>';
+                    }
+
+                    // Display lines extrafields
+                    if (is_array($extralabelslines) && count($extralabelslines)>0) {
+                        $line = new ContratLigne($db);
+                        $line->fetch_optionals($objp->rowid);
+                        print $line->showOptionals($extrafieldsline, 'view', array('style'=>'class="oddeven"', 'colspan'=>$colspan), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+                    }
+                }
+                // Ligne en mode update
+                else
+                {
+                    // Ligne carac
+                    print '<tr class="oddeven">';
+                    print '<td>';
+                    if ($objp->fk_product)
+                    {
+                        $productstatic->id=$objp->fk_product;
+                        $productstatic->type=$objp->ptype;
+                        $productstatic->ref=$objp->pref;
+                        $productstatic->entity=$objp->pentity;
+                        print $productstatic->getNomUrl(1,'',32);
+                        print $objp->label?' - '.dol_trunc($objp->label,32):'';
+                        print '<br>';
+                    }
+                    else
+                    {
+                        print $objp->label?$objp->label.'<br>':'';
+                    }
+
+                    // editeur wysiwyg
+                    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                    $nbrows=ROWS_2;
+                    if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+                    $enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
+                    $doleditor=new DolEditor('product_desc',$objp->description,'',92,'dolibarr_details','',false,true,$enable,$nbrows,'90%');
+                    $doleditor->Create();
+
+                    print '</td>';
+                    print '<td align="right">';
+                    print $form->load_tva("eltva_tx", $objp->tva_tx.($objp->vat_src_code?(' ('.$objp->vat_src_code.')'):''), $mysoc, $object->thirdparty, $objp->fk_product, $objp->info_bits, $objp->product_type, 0, 1);
+                    print '</td>';
+                    print '<td align="right"><input size="5" type="text" name="elprice" value="'.price($objp->subprice).'"></td>';
+                    print '<td align="center"><input size="2" type="text" name="elqty" value="'.$objp->qty.'"></td>';
+                    if ($conf->global->PRODUCT_USE_UNITS)
+                    {
+                        print '<td align="left">';
+                        print $form->selectUnits($objp->fk_unit, "unit");
+                        print '</td>';
+                    }
+                    print '<td align="right" class="nowrap"><input size="1" type="text" name="elremise_percent" value="'.$objp->remise_percent.'">%</td>';
+                    if (! empty($usemargins))
+                    {
+                        print '<td align="right">';
+                        if ($objp->fk_product) print '<select id="fournprice" name="fournprice"></select>';
+                        print '<input id="buying_price" type="text" size="5" name="buying_price" value="'.price($objp->pa_ht,0,'',0).'"></td>';
+                    }
+                    print '<td align="center">';
+                    print '<input type="submit" class="button" name="save" value="'.$langs->trans("Modify").'">';
+                    print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+                    print '</td>';
+                    print '</tr>';
+
+                    $colspan=6;
+                    if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) $colspan++;
+                    if($conf->global->PRODUCT_USE_UNITS) $colspan++;
+
+                    // Ligne dates prevues
+                    print '<tr class="oddeven">';
+                    print '<td colspan="'.$colspan.'">';
+                    print $langs->trans("DateStartPlanned").' ';
+                    print $form->selectDate($db->jdate($objp->date_debut), "date_start_update", $usehm, $usehm, ($db->jdate($objp->date_debut)>0?0:1), "update");
+                    print ' &nbsp;&nbsp;'.$langs->trans("DateEndPlanned").' ';
+                    print $form->selectDate($db->jdate($objp->date_fin), "date_end_update", $usehm, $usehm, ($db->jdate($objp->date_fin)>0?0:1), "update");
+                    print '</td>';
+                    print '</tr>';
+
+                    if (is_array($extralabelslines) && count($extralabelslines)>0) {
+                        $line = new ContratLigne($db);
+                        $line->fetch_optionals($objp->rowid);
+                        print $line->showOptionals($extrafieldsline, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+                    }
+                }
+
+                $db->free($result);
+            }
+            else
+            {
+                dol_print_error($db);
+            }
+
+            if ($object->statut > 0)
+            {
+                print '<tr class="oddeven">';
+                print '<td class="tdhrthin" colspan="'.($conf->margin->enabled?7:6).'"><hr class="opacitymedium tdhrthin"></td>';
+                print "</tr>\n";
+            }
+
+            print "</table>";
+            print '</div>';
+
+            print "</form>\n";
+
+
+            /*
              * Confirmation to delete service line of contract
              */
-			if ($action == 'deleteline' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline-1]->id == GETPOST('rowid'))
-			{
-				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("DeleteContractLine"),$langs->trans("ConfirmDeleteContractLine"),"confirm_deleteline",'',0,1);
-				if ($ret == 'html') print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
-			}
+            if ($action == 'deleteline' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline-1]->id == GETPOST('rowid'))
+            {
+                print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("DeleteContractLine"),$langs->trans("ConfirmDeleteContractLine"),"confirm_deleteline",'',0,1);
+                if ($ret == 'html') print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
+            }
 
-			/*
+            /*
              * Confirmation to move service toward another contract
              */
-			if ($action == 'move' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline-1]->id == GETPOST('rowid'))
-			{
-				$arraycontractid=array();
-				foreach($arrayothercontracts as $contractcursor)
-				{
-					$arraycontractid[$contractcursor->id]=$contractcursor->ref;
-				}
-				//var_dump($arraycontractid);
-				// Cree un tableau formulaire
-				$formquestion=array(
-				'text' => $langs->trans("ConfirmMoveToAnotherContractQuestion"),
-				array('type' => 'select', 'name' => 'newcid', 'values' => $arraycontractid));
-
-				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("MoveToAnotherContract"),$langs->trans("ConfirmMoveToAnotherContract"),"confirm_move",$formquestion);
-				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
-			}
-
-			/*
+            if ($action == 'move' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline-1]->id == GETPOST('rowid'))
+            {
+                $arraycontractid=array();
+                foreach($arrayothercontracts as $contractcursor)
+                {
+                    $arraycontractid[$contractcursor->id]=$contractcursor->ref;
+                }
+                //var_dump($arraycontractid);
+                // Cree un tableau formulaire
+                $formquestion=array(
+                'text' => $langs->trans("ConfirmMoveToAnotherContractQuestion"),
+                array('type' => 'select', 'name' => 'newcid', 'values' => $arraycontractid));
+
+                print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("MoveToAnotherContract"),$langs->trans("ConfirmMoveToAnotherContract"),"confirm_move",$formquestion);
+                print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
+            }
+
+            /*
              * Confirmation de la validation activation
              */
-			if ($action == 'active' && ! $_REQUEST["cancel"] && $user->rights->contrat->activer && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
-			{
-				$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-				$dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-				$comment      = GETPOST('comment','alpha');
-				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment),$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",dol_print_date($dateactstart,"%A %d %B %Y")),"confirm_active", '', 0, 1);
-				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
-			}
-
-			/*
+            if ($action == 'active' && ! $_REQUEST["cancel"] && $user->rights->contrat->activer && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
+            {
+                $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+                $dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+                $comment      = GETPOST('comment','alpha');
+                print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment),$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",dol_print_date($dateactstart,"%A %d %B %Y")),"confirm_active", '', 0, 1);
+                print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
+            }
+
+            /*
              * Confirmation de la validation fermeture
              */
-			if ($action == 'closeline' && ! $_REQUEST["cancel"] && $user->rights->contrat->activer && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
-			{
-				$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-				$dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-				$comment      = GETPOST('comment','alpha');
-
-				if (empty($dateactend))
-				{
-					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEndReal")), null, 'errors');
-				}
-				else
-				{
-					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne','int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1);
-				}
-				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
-			}
-
-
-			// Area with status and activation info of line
-			if ($object->statut > 0)
-			{
-				print '<table class="notopnoleftnoright tableforservicepart2'.($cursorline < $nbofservices ?' boxtablenobottom':'').'" width="100%">';
-
-				print '<tr class="oddeven">';
-				print '<td>'.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).'</td>';
-				print '<td width="30" align="right">';
-				if ($user->societe_id == 0)
-				{
-					if ($object->statut > 0 && $action != 'activateline' && $action != 'unactivateline')
-					{
-						$tmpaction='activateline';
-						$tmpactionpicto='play';
-						$tmpactiontext=$langs->trans("Activate");
-						if ($objp->statut == 4)
-						{
-							$tmpaction='unactivateline';
-							$tmpactionpicto='playstop';
-							$tmpactiontext=$langs->trans("Disable");
-						}
-						if (($tmpaction=='activateline' && $user->rights->contrat->activer) || ($tmpaction=='unactivateline' && $user->rights->contrat->desactiver))
-						{
-							print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;ligne=' . $object->lines[$cursorline - 1]->id . '&amp;action=' . $tmpaction . '">';
-							print img_picto($tmpactiontext, $tmpactionpicto);
-							print '</a>';
-						}
-					}
-				}
-				print '</td>';
-				print "</tr>\n";
-
-				print '<tr class="oddeven">';
-
-				print '<td>';
-				// Si pas encore active
-				if (! $objp->date_debut_reelle) {
-					print $langs->trans("DateStartReal").': ';
-					if ($objp->date_debut_reelle) print dol_print_date($objp->date_debut_reelle, 'day');
-					else print $langs->trans("ContractStatusNotRunning");
-				}
-				// Si active et en cours
-				if ($objp->date_debut_reelle && ! $objp->date_fin_reelle) {
-					print $langs->trans("DateStartReal").': ';
-					print dol_print_date($objp->date_debut_reelle, 'day');
-				}
-				// Si desactive
-				if ($objp->date_debut_reelle && $objp->date_fin_reelle) {
-					print $langs->trans("DateStartReal").': ';
-					print dol_print_date($objp->date_debut_reelle, 'day');
-					print ' &nbsp;-&nbsp; ';
-					print $langs->trans("DateEndReal").': ';
-					print dol_print_date($objp->date_fin_reelle, 'day');
-				}
-				if (! empty($objp->comment)) print " &nbsp;-&nbsp; ".$objp->comment;
-				print '</td>';
-
-				print '<td align="center">&nbsp;</td>';
-
-				print '</tr>';
-				print '</table>';
-			}
-
-			// Form to activate line
-			if ($user->rights->contrat->activer && $action == 'activateline' && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
-			{
-				print '<form name="active" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.GETPOST('ligne').'&amp;action=active" method="post">';
-				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-				print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ?' boxtablenobottom':'').'" width="100%">';
-
-				// Definie date debut et fin par defaut
-				$dateactstart = $objp->date_debut;
-				if (GETPOST('remonth')) $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-				elseif (! $dateactstart) $dateactstart = time();
-
-				$dateactend = $objp->date_fin;
-				if (GETPOST('endmonth')) $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-				elseif (! $dateactend)
-				{
-					if ($objp->fk_product > 0)
-					{
-						$product=new Product($db);
-						$product->fetch($objp->fk_product);
-						$dateactend = dol_time_plus_duree(time(), $product->duration_value, $product->duration_unit);
-					}
-				}
-
-				print '<tr class="oddeven">';
-				print '<td class="nohover">'.$langs->trans("DateServiceActivate").'</td><td class="nohover">';
-				print $form->selectDate($dateactstart, '', $usehm, $usehm, '', "active", 1, 0);
-				print '</td>';
-				print '<td class="nohover">'.$langs->trans("DateEndPlanned").'</td><td class="nohover">';
-				print $form->selectDate($dateactend, "end", $usehm, $usehm, '', "active", 1, 0);
-				print '</td>';
-				print '<td class="center nohover">';
-				print '</td>';
-
-				print '</tr>';
-
-				print '<tr class="oddeven">';
-				print '<td class="nohover">'.$langs->trans("Comment").'</td><td colspan="3" class="nohover" colspan="'.($conf->margin->enabled?4:3).'"><input size="80" type="text" name="comment" value="'.$_POST["comment"].'"></td>';
-				print '<td class="nohover right">';
-				print '<input type="submit" class="button" name="activate" value="'.$langs->trans("Activate").'"> &nbsp; ';
-				print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-				print '</td>';
-				print '</tr>';
-
-				print '</table>';
-
-				print '</form>';
-			}
-
-			if ($user->rights->contrat->activer && $action == 'unactivateline' && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
-			{
-				/**
-				 * Disable a contract line
-				 */
-				print '<!-- Form to disabled a line -->'."\n";
-				print '<form name="closeline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline-1]->id.'" method="post">';
-
-				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-				print '<input type="hidden" name="action" value="closeline">';
-
-				print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ?' boxtablenobottom':'').'" width="100%">';
-
-				// Definie date debut et fin par defaut
-				$dateactstart = $objp->date_debut_reelle;
-				if (GETPOST('remonth')) $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-				elseif (! $dateactstart) $dateactstart = time();
-
-				$dateactend = $objp->date_fin_reelle;
-				if (GETPOST('endmonth')) $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-				elseif (! $dateactend)
-				{
-					if ($objp->fk_product > 0)
-					{
-						$product=new Product($db);
-						$product->fetch($objp->fk_product);
-						$dateactend = dol_time_plus_duree(time(), $product->duration_value, $product->duration_unit);
-					}
-				}
-				$now=dol_now();
-				if ($dateactend > $now) $dateactend=$now;
-
-				print '<tr class="oddeven"><td colspan="2" class="nohover">';
-				if ($objp->statut >= 4)
-				{
-					if ($objp->statut == 4)
-					{
-						print $langs->trans("DateEndReal").' ';
-						print $form->selectDate($dateactend, "end", $usehm, $usehm, ($objp->date_fin_reelle>0?0:1), "closeline", 1, 1);
-					}
-				}
-				print '</td>';
-				print '<td class="center nohover">';
-				print '</td></tr>';
-
-				print '<tr class="oddeven">';
-				print '<td class="nohover">'.$langs->trans("Comment").'</td><td class="nohover"><input size="70" type="text" class="flat" name="comment" value="'.dol_escape_htmltag(GETPOST('comment', 'alpha')).'"></td>';
-				print '<td class="nohover right">';
-				print '<input type="submit" class="button" name="close" value="'.$langs->trans("Disable").'"> &nbsp; ';
-				print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-				print '</td>';
-				print '</tr>';
-
-				print '</table>';
-
-				print '</form>';
-			}
-			print '</div>';
-			$cursorline++;
-		}
-		print '</div>';
-
-		// Form to add new line
-		if ($user->rights->contrat->creer && ($object->statut == 0))
-		{
-			$dateSelector=1;
-
-			print "\n";
-			print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline')?'#add':'#line_'.GETPOST('lineid')).'" method="POST">
+            if ($action == 'closeline' && ! $_REQUEST["cancel"] && $user->rights->contrat->activer && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
+            {
+                $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+                $dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+                $comment      = GETPOST('comment','alpha');
+
+                if (empty($dateactend))
+                {
+                    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEndReal")), null, 'errors');
+                }
+                else
+                {
+                    print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne','int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1);
+                }
+                print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
+            }
+
+
+            // Area with status and activation info of line
+            if ($object->statut > 0)
+            {
+                print '<table class="notopnoleftnoright tableforservicepart2'.($cursorline < $nbofservices ?' boxtablenobottom':'').'" width="100%">';
+
+                print '<tr class="oddeven">';
+                print '<td>'.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).'</td>';
+                print '<td width="30" align="right">';
+                if ($user->societe_id == 0)
+                {
+                    if ($object->statut > 0 && $action != 'activateline' && $action != 'unactivateline')
+                    {
+                        $tmpaction='activateline';
+                        $tmpactionpicto='play';
+                        $tmpactiontext=$langs->trans("Activate");
+                        if ($objp->statut == 4)
+                        {
+                            $tmpaction='unactivateline';
+                            $tmpactionpicto='playstop';
+                            $tmpactiontext=$langs->trans("Disable");
+                        }
+                        if (($tmpaction=='activateline' && $user->rights->contrat->activer) || ($tmpaction=='unactivateline' && $user->rights->contrat->desactiver))
+                        {
+                            print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;ligne=' . $object->lines[$cursorline - 1]->id . '&amp;action=' . $tmpaction . '">';
+                            print img_picto($tmpactiontext, $tmpactionpicto);
+                            print '</a>';
+                        }
+                    }
+                }
+                print '</td>';
+                print "</tr>\n";
+
+                print '<tr class="oddeven">';
+
+                print '<td>';
+                // Si pas encore active
+                if (! $objp->date_debut_reelle) {
+                    print $langs->trans("DateStartReal").': ';
+                    if ($objp->date_debut_reelle) print dol_print_date($objp->date_debut_reelle, 'day');
+                    else print $langs->trans("ContractStatusNotRunning");
+                }
+                // Si active et en cours
+                if ($objp->date_debut_reelle && ! $objp->date_fin_reelle) {
+                    print $langs->trans("DateStartReal").': ';
+                    print dol_print_date($objp->date_debut_reelle, 'day');
+                }
+                // Si desactive
+                if ($objp->date_debut_reelle && $objp->date_fin_reelle) {
+                    print $langs->trans("DateStartReal").': ';
+                    print dol_print_date($objp->date_debut_reelle, 'day');
+                    print ' &nbsp;-&nbsp; ';
+                    print $langs->trans("DateEndReal").': ';
+                    print dol_print_date($objp->date_fin_reelle, 'day');
+                }
+                if (! empty($objp->comment)) print " &nbsp;-&nbsp; ".$objp->comment;
+                print '</td>';
+
+                print '<td align="center">&nbsp;</td>';
+
+                print '</tr>';
+                print '</table>';
+            }
+
+            // Form to activate line
+            if ($user->rights->contrat->activer && $action == 'activateline' && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
+            {
+                print '<form name="active" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.GETPOST('ligne').'&amp;action=active" method="post">';
+                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+                print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ?' boxtablenobottom':'').'" width="100%">';
+
+                // Definie date debut et fin par defaut
+                $dateactstart = $objp->date_debut;
+                if (GETPOST('remonth')) $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+                elseif (! $dateactstart) $dateactstart = time();
+
+                $dateactend = $objp->date_fin;
+                if (GETPOST('endmonth')) $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+                elseif (! $dateactend)
+                {
+                    if ($objp->fk_product > 0)
+                    {
+                        $product=new Product($db);
+                        $product->fetch($objp->fk_product);
+                        $dateactend = dol_time_plus_duree(time(), $product->duration_value, $product->duration_unit);
+                    }
+                }
+
+                print '<tr class="oddeven">';
+                print '<td class="nohover">'.$langs->trans("DateServiceActivate").'</td><td class="nohover">';
+                print $form->selectDate($dateactstart, '', $usehm, $usehm, '', "active", 1, 0);
+                print '</td>';
+                print '<td class="nohover">'.$langs->trans("DateEndPlanned").'</td><td class="nohover">';
+                print $form->selectDate($dateactend, "end", $usehm, $usehm, '', "active", 1, 0);
+                print '</td>';
+                print '<td class="center nohover">';
+                print '</td>';
+
+                print '</tr>';
+
+                print '<tr class="oddeven">';
+                print '<td class="nohover">'.$langs->trans("Comment").'</td><td colspan="3" class="nohover" colspan="'.($conf->margin->enabled?4:3).'"><input size="80" type="text" name="comment" value="'.$_POST["comment"].'"></td>';
+                print '<td class="nohover right">';
+                print '<input type="submit" class="button" name="activate" value="'.$langs->trans("Activate").'"> &nbsp; ';
+                print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+                print '</td>';
+                print '</tr>';
+
+                print '</table>';
+
+                print '</form>';
+            }
+
+            if ($user->rights->contrat->activer && $action == 'unactivateline' && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
+            {
+                /**
+                 * Disable a contract line
+                 */
+                print '<!-- Form to disabled a line -->'."\n";
+                print '<form name="closeline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline-1]->id.'" method="post">';
+
+                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                print '<input type="hidden" name="action" value="closeline">';
+
+                print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ?' boxtablenobottom':'').'" width="100%">';
+
+                // Definie date debut et fin par defaut
+                $dateactstart = $objp->date_debut_reelle;
+                if (GETPOST('remonth')) $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+                elseif (! $dateactstart) $dateactstart = time();
+
+                $dateactend = $objp->date_fin_reelle;
+                if (GETPOST('endmonth')) $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+                elseif (! $dateactend)
+                {
+                    if ($objp->fk_product > 0)
+                    {
+                        $product=new Product($db);
+                        $product->fetch($objp->fk_product);
+                        $dateactend = dol_time_plus_duree(time(), $product->duration_value, $product->duration_unit);
+                    }
+                }
+                $now=dol_now();
+                if ($dateactend > $now) $dateactend=$now;
+
+                print '<tr class="oddeven"><td colspan="2" class="nohover">';
+                if ($objp->statut >= 4)
+                {
+                    if ($objp->statut == 4)
+                    {
+                        print $langs->trans("DateEndReal").' ';
+                        print $form->selectDate($dateactend, "end", $usehm, $usehm, ($objp->date_fin_reelle>0?0:1), "closeline", 1, 1);
+                    }
+                }
+                print '</td>';
+                print '<td class="center nohover">';
+                print '</td></tr>';
+
+                print '<tr class="oddeven">';
+                print '<td class="nohover">'.$langs->trans("Comment").'</td><td class="nohover"><input size="70" type="text" class="flat" name="comment" value="'.dol_escape_htmltag(GETPOST('comment', 'alpha')).'"></td>';
+                print '<td class="nohover right">';
+                print '<input type="submit" class="button" name="close" value="'.$langs->trans("Disable").'"> &nbsp; ';
+                print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+                print '</td>';
+                print '</tr>';
+
+                print '</table>';
+
+                print '</form>';
+            }
+            print '</div>';
+            $cursorline++;
+        }
+        print '</div>';
+
+        // Form to add new line
+        if ($user->rights->contrat->creer && ($object->statut == 0))
+        {
+            $dateSelector=1;
+
+            print "\n";
+            print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline')?'#add':'#line_'.GETPOST('lineid')).'" method="POST">
 			<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">
 			<input type="hidden" name="action" value="'.(($action != 'editline')?'addline':'updateline').'">
 			<input type="hidden" name="mode" value="">
 			<input type="hidden" name="id" value="'.$object->id.'">
 			';
 
-			print '<div class="div-table-responsive-no-min">';
-			print '<table id="tablelines" class="noborder noshadow" width="100%">';	// Array with (n*2)+1 lines
+            print '<div class="div-table-responsive-no-min">';
+            print '<table id="tablelines" class="noborder noshadow" width="100%">';	// Array with (n*2)+1 lines
 
-			// Form to add new line
-	   		if ($action != 'editline')
-			{
-				$forcetoshowtitlelines=1;
+            // Form to add new line
+                if ($action != 'editline')
+            {
+                $forcetoshowtitlelines=1;
 
-				// Add free products/services
-				$object->formAddObjectLine(1, $mysoc, $soc);
+                // Add free products/services
+                $object->formAddObjectLine(1, $mysoc, $soc);
 
-				$parameters = array();
-				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			}
+                $parameters = array();
+                $reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+            }
 
-			print '</table>';
-			print '</div>';
-			print '</form>';
-		}
+            print '</table>';
+            print '</div>';
+            print '</form>';
+        }
 
-		dol_fiche_end();
+        dol_fiche_end();
 
 
-		/*
+        /*
          * Buttons
          */
 
-		if ($user->societe_id == 0)
-		{
-			print '<div class="tabsAction">';
-
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-
-			if (empty($reshook))
-			{
-				// Send
-				if ($object->statut == 1) {
-					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a></div>';
-					} else
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans('SendMail') . '</a></div>';
-				}
-
-				if ($object->statut == 0 && $nbofservices)
-				{
-					if ($user->rights->contrat->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a></div>';
-					else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Validate").'</a></div>';
-				}
-				if ($object->statut == 1)
-				{
-					if ($user->rights->contrat->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Modify").'</a></div>';
-					else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Modify").'</a></div>';
-				}
-
-				if (! empty($conf->facture->enabled) && $object->statut > 0)
-				{
-					$langs->load("bills");
-					if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateBill").'</a></div>';
-					else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateBill").'</a></div>';
-				}
-
-				if (! empty($conf->commande->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices)
-				{
-					$langs->load("orders");
-					if ($user->rights->commande->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateOrder").'</a></div>';
-					else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateOrder").'</a></div>';
-				}
-
-				// Clone
-				if ($user->rights->contrat->creer) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=' . $object->element . '">' . $langs->trans("ToClone") . '</a></div>';
-				}
-
-				if ($object->nbofservicesclosed > 0 || $object->nbofserviceswait > 0)
-				{
-					if ($user->rights->contrat->activer)
-					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=activate">'.$langs->trans("ActivateAllContracts").'</a></div>';
-					}
-					else
-					{
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("ActivateAllContracts").'</a></div>';
-					}
-				}
-				if ($object->nbofservicesclosed < $nbofservices)
-				{
-					if ($user->rights->contrat->desactiver)
-					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=close">'.$langs->trans("CloseAllContracts").'</a></div>';
-					}
-					else
-					{
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CloseAllContracts").'</a></div>';
-					}
-
-					//if (! $numactive)
-					//{
-					//}
-					//else
-					//{
-					//	print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("CloseRefusedBecauseOneServiceActive").'">'.$langs->trans("Close").'</a></div>';
-					//}
-				}
-
-				// On peut supprimer entite si
-				// - Droit de creer + mode brouillon (erreur creation)
-				// - Droit de supprimer
-				if (($user->rights->contrat->creer && $object->statut == 0) || $user->rights->contrat->supprimer)
-				{
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a></div>';
-				}
-				else
-				{
-					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Delete").'</a></div>';
-				}
-			}
-
-			print "</div>";
-		}
-
-		// Select mail models is same action as presend
-		if (GETPOST('modelselected')) {
-			$action = 'presend';
-		}
-
-		if ($action != 'presend')
-		{
-			print '<div class="fichecenter"><div class="fichehalfleft">';
-
-			/*
+        if ($user->societe_id == 0)
+        {
+            print '<div class="tabsAction">';
+
+            $parameters=array();
+            $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+
+            if (empty($reshook))
+            {
+                // Send
+                if ($object->statut == 1) {
+                    if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
+                        print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a></div>';
+                    } else
+                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans('SendMail') . '</a></div>';
+                }
+
+                if ($object->statut == 0 && $nbofservices)
+                {
+                    if ($user->rights->contrat->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a></div>';
+                    else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Validate").'</a></div>';
+                }
+                if ($object->statut == 1)
+                {
+                    if ($user->rights->contrat->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Modify").'</a></div>';
+                    else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Modify").'</a></div>';
+                }
+
+                if (! empty($conf->facture->enabled) && $object->statut > 0)
+                {
+                    $langs->load("bills");
+                    if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateBill").'</a></div>';
+                    else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateBill").'</a></div>';
+                }
+
+                if (! empty($conf->commande->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices)
+                {
+                    $langs->load("orders");
+                    if ($user->rights->commande->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateOrder").'</a></div>';
+                    else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateOrder").'</a></div>';
+                }
+
+                // Clone
+                if ($user->rights->contrat->creer) {
+                    print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=' . $object->element . '">' . $langs->trans("ToClone") . '</a></div>';
+                }
+
+                if ($object->nbofservicesclosed > 0 || $object->nbofserviceswait > 0)
+                {
+                    if ($user->rights->contrat->activer)
+                    {
+                        print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=activate">'.$langs->trans("ActivateAllContracts").'</a></div>';
+                    }
+                    else
+                    {
+                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("ActivateAllContracts").'</a></div>';
+                    }
+                }
+                if ($object->nbofservicesclosed < $nbofservices)
+                {
+                    if ($user->rights->contrat->desactiver)
+                    {
+                        print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=close">'.$langs->trans("CloseAllContracts").'</a></div>';
+                    }
+                    else
+                    {
+                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CloseAllContracts").'</a></div>';
+                    }
+
+                    //if (! $numactive)
+                    //{
+                    //}
+                    //else
+                    //{
+                    //	print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("CloseRefusedBecauseOneServiceActive").'">'.$langs->trans("Close").'</a></div>';
+                    //}
+                }
+
+                // On peut supprimer entite si
+                // - Droit de creer + mode brouillon (erreur creation)
+                // - Droit de supprimer
+                if (($user->rights->contrat->creer && $object->statut == 0) || $user->rights->contrat->supprimer)
+                {
+                    print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a></div>';
+                }
+                else
+                {
+                    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Delete").'</a></div>';
+                }
+            }
+
+            print "</div>";
+        }
+
+        // Select mail models is same action as presend
+        if (GETPOST('modelselected')) {
+            $action = 'presend';
+        }
+
+        if ($action != 'presend')
+        {
+            print '<div class="fichecenter"><div class="fichehalfleft">';
+
+            /*
     		 * Documents generes
     		*/
-			$filename = dol_sanitizeFileName($object->ref);
-			$filedir = $conf->contrat->dir_output . "/" . dol_sanitizeFileName($object->ref);
-			$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-			$genallowed = $user->rights->contrat->lire;
-			$delallowed = $user->rights->contrat->creer;
+            $filename = dol_sanitizeFileName($object->ref);
+            $filedir = $conf->contrat->dir_output . "/" . dol_sanitizeFileName($object->ref);
+            $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+            $genallowed = $user->rights->contrat->lire;
+            $delallowed = $user->rights->contrat->creer;
 
 
-			print $formfile->showdocuments('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
+            print $formfile->showdocuments('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
 
 
-			// Show links to link elements
-			$linktoelem = $form->showLinkToObjectBlock($object, null, array('contrat'));
-			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+            // Show links to link elements
+            $linktoelem = $form->showLinkToObjectBlock($object, null, array('contrat'));
+            $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+            print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-			// List of actions on element
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-			$formactions = new FormActions($db);
-			$somethingshown = $formactions->showactions($object, 'contract', $socid, 1);
+            // List of actions on element
+            include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+            $formactions = new FormActions($db);
+            $somethingshown = $formactions->showactions($object, 'contract', $socid, 1);
 
 
-			print '</div></div></div>';
-		}
+            print '</div></div></div>';
+        }
 
-		// Presend form
-		$modelmail='contract';
-		$defaulttopic='SendContractRef';
-		$diroutput = $conf->contrat->dir_output;
-		$trackid = 'con'.$object->id;
+        // Presend form
+        $modelmail='contract';
+        $defaulttopic='SendContractRef';
+        $diroutput = $conf->contrat->dir_output;
+        $trackid = 'con'.$object->id;
 
-		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
-	}
+        include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+    }
 }
 
 

Spacing +399 added lines, -399 removed lines

@@ -40,39 +40,39 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (! empty($conf->propal->enabled))  require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->projet->enabled)) {
+if (!empty($conf->propal->enabled))  require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("contracts","orders","companies","bills","products",'compta'));
+$langs->loadLangs(array("contracts", "orders", "companies", "bills", "products", 'compta'));
 
-$action=GETPOST('action','alpha');
-$confirm=GETPOST('confirm','alpha');
-$socid = GETPOST('socid','int');
-$id = GETPOST('id','int');
-$ref=GETPOST('ref','alpha');
-$origin=GETPOST('origin','alpha');
-$originid=GETPOST('originid','int');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$socid = GETPOST('socid', 'int');
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$origin = GETPOST('origin', 'alpha');
+$originid = GETPOST('originid', 'int');
 
-$datecontrat='';
-$usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:0);
+$datecontrat = '';
+$usehm = (!empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE : 0);
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result=restrictedArea($user,'contrat',$id);
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'contrat', $id);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('contractcard','globalcard'));
+$hookmanager->initHooks(array('contractcard', 'globalcard'));
 
 $object = new Contrat($db);
 $extrafields = new ExtraFields($db);
 
 // Load object
-if ($id > 0 || ! empty($ref) && $action!='add') {
+if ($id > 0 || !empty($ref) && $action != 'add') {
 	$ret = $object->fetch($id, $ref);
 	if ($ret > 0)
 		$ret = $object->fetch_thirdparty();
@@ -85,10 +85,10 @@ 
 
 // fetch optionals attributes lines and labels
 $extrafieldsline = new ExtraFields($db);
-$extralabelslines=$extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+$extralabelslines = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
 
-$permissionnote=$user->rights->contrat->creer;	// Used by the include of actions_setnotes.inc.php
-$permissiondellink=$user->rights->contrat->creer;	// Used by the include of actions_dellink.inc.php
+$permissionnote = $user->rights->contrat->creer; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->contrat->creer; // Used by the include of actions_dellink.inc.php
 
 
 
@@ -101,9 +101,9 @@ 
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 if (empty($reshook))
 {
-	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
-	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
 
 	if ($action == 'confirm_active' && $confirm == 'yes' && $user->rights->contrat->activer)
 	{
@@ -121,12 +121,12 @@ 
 
 	else if ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->contrat->activer)
 	{
-		if (! GETPOST('dateend'))
+		if (!GETPOST('dateend'))
 		{
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd")), null, 'errors');
 		}
-		if (! $error)
+		if (!$error)
 		{
 			$result = $object->close_line($user, GETPOST('ligne'), GETPOST('dateend'), urldecode(GETPOST('comment')));
 			if ($result > 0)
@@ -142,56 +142,56 @@ 
 	}
 
 	// Si ajout champ produit predefini
-	if (GETPOST('mode')=='predefined')
+	if (GETPOST('mode') == 'predefined')
 	{
-		$date_start='';
-		$date_end='';
+		$date_start = '';
+		$date_end = '';
 		if (GETPOST('date_startmonth') && GETPOST('date_startday') && GETPOST('date_startyear'))
 		{
-			$date_start=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
+			$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
 		}
 		if (GETPOST('date_endmonth') && GETPOST('date_endday') && GETPOST('date_endyear'))
 		{
-			$date_end=dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
+			$date_end = dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
 		}
 	}
 
 	// Si ajout champ produit libre
-	if (GETPOST('mode')=='libre')
+	if (GETPOST('mode') == 'libre')
 	{
-		$date_start_sl='';
-		$date_end_sl='';
+		$date_start_sl = '';
+		$date_end_sl = '';
 		if (GETPOST('date_start_slmonth') && GETPOST('date_start_slday') && GETPOST('date_start_slyear'))
 		{
-			$date_start_sl=dol_mktime(GETPOST('date_start_slhour'), GETPOST('date_start_slmin'), 0, GETPOST('date_start_slmonth'), GETPOST('date_start_slday'), GETPOST('date_start_slyear'));
+			$date_start_sl = dol_mktime(GETPOST('date_start_slhour'), GETPOST('date_start_slmin'), 0, GETPOST('date_start_slmonth'), GETPOST('date_start_slday'), GETPOST('date_start_slyear'));
 		}
 		if (GETPOST('date_end_slmonth') && GETPOST('date_end_slday') && GETPOST('date_end_slyear'))
 		{
-			$date_end_sl=dol_mktime(GETPOST('date_end_slhour'), GETPOST('date_end_slmin'), 0, GETPOST('date_end_slmonth'), GETPOST('date_end_slday'), GETPOST('date_end_slyear'));
+			$date_end_sl = dol_mktime(GETPOST('date_end_slhour'), GETPOST('date_end_slmin'), 0, GETPOST('date_end_slmonth'), GETPOST('date_end_slday'), GETPOST('date_end_slyear'));
 		}
 	}
 
 	// Param dates
-	$date_contrat='';
-	$date_start_update='';
-	$date_end_update='';
-	$date_start_real_update='';
-	$date_end_real_update='';
+	$date_contrat = '';
+	$date_start_update = '';
+	$date_end_update = '';
+	$date_start_real_update = '';
+	$date_end_real_update = '';
 	if (GETPOST('date_start_updatemonth') && GETPOST('date_start_updateday') && GETPOST('date_start_updateyear'))
 	{
-		$date_start_update=dol_mktime(GETPOST('date_start_updatehour'), GETPOST('date_start_updatemin'), 0, GETPOST('date_start_updatemonth'), GETPOST('date_start_updateday'), GETPOST('date_start_updateyear'));
+		$date_start_update = dol_mktime(GETPOST('date_start_updatehour'), GETPOST('date_start_updatemin'), 0, GETPOST('date_start_updatemonth'), GETPOST('date_start_updateday'), GETPOST('date_start_updateyear'));
 	}
 	if (GETPOST('date_end_updatemonth') && GETPOST('date_end_updateday') && GETPOST('date_end_updateyear'))
 	{
-		$date_end_update=dol_mktime(GETPOST('date_end_updatehour'), GETPOST('date_end_updatemin'), 0, GETPOST('date_end_updatemonth'), GETPOST('date_end_updateday'), GETPOST('date_end_updateyear'));
+		$date_end_update = dol_mktime(GETPOST('date_end_updatehour'), GETPOST('date_end_updatemin'), 0, GETPOST('date_end_updatemonth'), GETPOST('date_end_updateday'), GETPOST('date_end_updateyear'));
 	}
 	if (GETPOST('date_start_real_updatemonth') && GETPOST('date_start_real_updateday') && GETPOST('date_start_real_updateyear'))
 	{
-		$date_start_real_update=dol_mktime(GETPOST('date_start_real_updatehour'), GETPOST('date_start_real_updatemin'), 0, GETPOST('date_start_real_updatemonth'), GETPOST('date_start_real_updateday'), GETPOST('date_start_real_updateyear'));
+		$date_start_real_update = dol_mktime(GETPOST('date_start_real_updatehour'), GETPOST('date_start_real_updatemin'), 0, GETPOST('date_start_real_updatemonth'), GETPOST('date_start_real_updateday'), GETPOST('date_start_real_updateyear'));
 	}
 	if (GETPOST('date_end_real_updatemonth') && GETPOST('date_end_real_updateday') && GETPOST('date_end_real_updateyear'))
 	{
-		$date_end_real_update=dol_mktime(GETPOST('date_end_real_updatehour'), GETPOST('date_end_real_updatemin'), 0, GETPOST('date_end_real_updatemonth'), GETPOST('date_end_real_updateday'), GETPOST('date_end_real_updateyear'));
+		$date_end_real_update = dol_mktime(GETPOST('date_end_real_updatehour'), GETPOST('date_end_real_updatemin'), 0, GETPOST('date_end_real_updatemonth'), GETPOST('date_end_real_updateday'), GETPOST('date_end_real_updateyear'));
 	}
 	if (GETPOST('remonth') && GETPOST('reday') && GETPOST('reyear'))
 	{
@@ -206,60 +206,60 @@ 
 		{
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-			$action='create';
+			$action = 'create';
 		}
 
-		if ($socid<1)
+		if ($socid < 1)
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
-			$action='create';
+			$action = 'create';
 			$error++;
 		}
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 		if ($ret < 0) {
-			$error ++;
+			$error++;
 			$action = 'create';
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			$object->socid						= $socid;
-			$object->date_contrat				= $datecontrat;
+			$object->socid = $socid;
+			$object->date_contrat = $datecontrat;
 
-			$object->commercial_suivi_id		= GETPOST('commercial_suivi_id','int');
-			$object->commercial_signature_id	= GETPOST('commercial_signature_id','int');
+			$object->commercial_suivi_id = GETPOST('commercial_suivi_id', 'int');
+			$object->commercial_signature_id = GETPOST('commercial_signature_id', 'int');
 
-			$object->note_private				= GETPOST('note_private','alpha');
-			$object->note_public				= GETPOST('note_public','alpha');
-			$object->fk_project					= GETPOST('projectid','int');
-			$object->remise_percent				= GETPOST('remise_percent','alpha');
-			$object->ref						= GETPOST('ref','alpha');
-			$object->ref_customer				= GETPOST('ref_customer','alpha');
-			$object->ref_supplier				= GETPOST('ref_supplier','alpha');
+			$object->note_private = GETPOST('note_private', 'alpha');
+			$object->note_public				= GETPOST('note_public', 'alpha');
+			$object->fk_project					= GETPOST('projectid', 'int');
+			$object->remise_percent = GETPOST('remise_percent', 'alpha');
+			$object->ref = GETPOST('ref', 'alpha');
+			$object->ref_customer				= GETPOST('ref_customer', 'alpha');
+			$object->ref_supplier				= GETPOST('ref_supplier', 'alpha');
 
 			// If creation from another object of another module (Example: origin=propal, originid=1)
-			if (! empty($origin) && ! empty($originid))
+			if (!empty($origin) && !empty($originid))
 			{
 				// Parse element/subelement (ex: project_task)
 				$element = $subelement = $origin;
-				if (preg_match('/^([^_]+)_([^_]+)/i',$origin,$regs))
+				if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs))
 				{
 					$element = $regs[1];
 					$subelement = $regs[2];
 				}
 
 				// For compatibility
-				if ($element == 'order')    { $element = $subelement = 'commande'; }
-				if ($element == 'propal')   { $element = 'comm/propal'; $subelement = 'propal'; }
+				if ($element == 'order') { $element = $subelement = 'commande'; }
+				if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; }
 
 				$object->origin    = $origin;
 				$object->origin_id = $originid;
 
 				// Possibility to add external linked objects with hooks
 				$object->linked_objects[$object->origin] = $object->origin_id;
-				if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects']))
+				if (is_array($_POST['other_linked_objects']) && !empty($_POST['other_linked_objects']))
 				{
 					$object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']);
 				}
@@ -277,54 +277,54 @@ 
 					$srcobject = new $classname($db);
 
 					dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
-					$result=$srcobject->fetch($object->origin_id);
+					$result = $srcobject->fetch($object->origin_id);
 					if ($result > 0)
 					{
 						$srcobject->fetch_thirdparty();
 						$lines = $srcobject->lines;
-						if (empty($lines) && method_exists($srcobject,'fetch_lines'))
+						if (empty($lines) && method_exists($srcobject, 'fetch_lines'))
 						{
 							$srcobject->fetch_lines();
 							$lines = $srcobject->lines;
 						}
 
-						$fk_parent_line=0;
-						$num=count($lines);
+						$fk_parent_line = 0;
+						$num = count($lines);
 
-						for ($i=0;$i<$num;$i++)
+						for ($i = 0; $i < $num; $i++)
 						{
-							$product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
+							$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 
-							if ($product_type == 1 || (! empty($conf->global->CONTRACT_SUPPORT_PRODUCTS) && in_array($product_type, array(0,1)))) { 	// TODO Exclude also deee
+							if ($product_type == 1 || (!empty($conf->global->CONTRACT_SUPPORT_PRODUCTS) && in_array($product_type, array(0, 1)))) { 	// TODO Exclude also deee
 								// service prédéfini
 								if ($lines[$i]->fk_product > 0)
 								{
 									$product_static = new Product($db);
 
 									// Define output language
-									if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+									if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
 									{
 										$prod = new Product($db);
-										$prod->id=$lines[$i]->fk_product;
+										$prod->id = $lines[$i]->fk_product;
 										$prod->getMultiLangs();
 
 										$outputlangs = $langs;
-										$newlang='';
-										if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-										if (empty($newlang)) $newlang=$srcobject->thirdparty->default_lang;
-										if (! empty($newlang))
+										$newlang = '';
+										if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+										if (empty($newlang)) $newlang = $srcobject->thirdparty->default_lang;
+										if (!empty($newlang))
 										{
-											$outputlangs = new Translate("",$conf);
+											$outputlangs = new Translate("", $conf);
 											$outputlangs->setDefaultLang($newlang);
 										}
 
-										$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
+										$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
 									}
 									else
 									{
 										$label = $lines[$i]->product_label;
 									}
-									$desc = ($lines[$i]->desc && $lines[$i]->desc!=$lines[$i]->libelle)?dol_htmlentitiesbr($lines[$i]->desc):'';
+									$desc = ($lines[$i]->desc && $lines[$i]->desc != $lines[$i]->libelle) ?dol_htmlentitiesbr($lines[$i]->desc) : '';
 								}
 								else {
 									$desc = dol_htmlentitiesbr($lines[$i]->desc);
@@ -339,7 +339,7 @@ 
 									$array_options = $lines[$i]->array_options;
 								}
 
-								$txtva = $lines[$i]->vat_src_code ? $lines[$i]->tva_tx . ' (' .  $lines[$i]->vat_src_code . ')' : $lines[$i]->tva_tx;
+								$txtva = $lines[$i]->vat_src_code ? $lines[$i]->tva_tx.' ('.$lines[$i]->vat_src_code.')' : $lines[$i]->tva_tx;
 
 								// View third's localtaxes for now
 								$localtax1_tx = get_localtax($txtva, 1, $object->thirdparty);
@@ -403,7 +403,7 @@ 
 				else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
-				$action='create';
+				$action = 'create';
 			}
 		}
 	}
@@ -417,18 +417,18 @@ 
 	else if ($action == 'addline' && $user->rights->contrat->creer)
 	{
 		// Set if we used free entry or predefined product
-		$predef='';
-		$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+		$predef = '';
+		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
 		$price_ht = GETPOST('price_ht');
 		$price_ht_devise = GETPOST('multicurrency_price_ht');
 		if (GETPOST('prod_entry_mode') == 'free')
 		{
-			$idprod=0;
+			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		}
 		else
 		{
-			$idprod=GETPOST('idprod', 'int');
+			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
 
@@ -446,8 +446,8 @@ 
 			$error++;
 		}
 
-	  $date_start = dol_mktime(GETPOST('date_start' . $predef . 'hour'), GETPOST('date_start' . $predef . 'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start' . $predef . 'month'), GETPOST('date_start' . $predef . 'day'), GETPOST('date_start' . $predef . 'year'));
-	  $date_end = dol_mktime(GETPOST('date_end' . $predef . 'hour'), GETPOST('date_end' . $predef . 'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end' . $predef . 'month'), GETPOST('date_end' . $predef . 'day'), GETPOST('date_end' . $predef . 'year'));
+	  $date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
+	  $date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 	  if (!empty($date_start) && !empty($date_end) && $date_start > $date_end)
 	  {
 		  setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors');
@@ -462,16 +462,16 @@ 
 		if (is_array($extralabelsline)) {
 			// Get extra fields
 			foreach ($extralabelsline as $key => $value) {
-				unset($_POST["options_" . $key]);
+				unset($_POST["options_".$key]);
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			// Clean parameters
-			$date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
-			$date_end=dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
-			$price_base_type = (GETPOST('price_base_type', 'alpha')?GETPOST('price_base_type', 'alpha'):'HT');
+			$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
+			$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
+			$price_base_type = (GETPOST('price_base_type', 'alpha') ?GETPOST('price_base_type', 'alpha') : 'HT');
 
 			// Ecrase $pu par celui du produit
 			// Ecrase $desc par celui du produit
@@ -483,9 +483,9 @@ 
 				$prod->fetch($idprod);
 
 				// Update if prices fields are defined
-				$tva_tx = get_default_tva($mysoc,$object->thirdparty,$prod->id);
-				$tva_npr = get_default_npr($mysoc,$object->thirdparty,$prod->id);
-				if (empty($tva_tx)) $tva_npr=0;
+				$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
+				$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
+				if (empty($tva_tx)) $tva_npr = 0;
 
 				$pu_ht = $prod->price;
 				$pu_ttc = $prod->price_ttc;
@@ -500,13 +500,13 @@ 
 					$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
 					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
 				}
-				elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
-					require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
 					$prodcustprice = new Productcustomerprice($db);
 
-					$filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->thirdparty->id);
+					$filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $object->thirdparty->id);
 
 					$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
 					if ($result) {
@@ -515,9 +515,9 @@ 
 							$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
 							$price_base_type = $prodcustprice->lines [0]->price_base_type;
 							$tva_tx = $prodcustprice->lines [0]->tva_tx;
-							if ($prodcustprice->lines[0]->default_vat_code && ! preg_match('/\(.*\)/', $tva_tx)) $tva_tx.= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
 							$tva_npr = $prodcustprice->lines[0]->recuperableonly;
-							if (empty($tva_tx)) $tva_npr=0;
+							if (empty($tva_tx)) $tva_npr = 0;
 						}
 					}
 				}
@@ -531,45 +531,45 @@ 
 				{
 					if ($price_base_type != 'HT')
 					{
-						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat/100)), 'MU');
+						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
 					}
 					else
 				  {
-						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat/100)), 'MU');
+						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 					}
 				}
 
-			   	$desc=$prod->description;
-			   	$desc=dol_concatdesc($desc,$product_desc, '', !empty($conf->global->CHANGE_ORDER_CONCAT_DESCRIPTION));
+			   	$desc = $prod->description;
+			   	$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->CHANGE_ORDER_CONCAT_DESCRIPTION));
 				$fk_unit = $prod->fk_unit;
 			}
 			else
 			{
-				$pu_ht=GETPOST('price_ht');
+				$pu_ht = GETPOST('price_ht');
 				$price_base_type = 'HT';
-				$tva_tx=GETPOST('tva_tx')?str_replace('*','',GETPOST('tva_tx')):0;		// tva_tx field may be disabled, so we use vat rate 0
-				$tva_npr=preg_match('/\*/',GETPOST('tva_tx'))?1:0;
-				$desc=$product_desc;
-				$fk_unit= GETPOST('units', 'alpha');
+				$tva_tx = GETPOST('tva_tx') ?str_replace('*', '', GETPOST('tva_tx')) : 0; // tva_tx field may be disabled, so we use vat rate 0
+				$tva_npr = preg_match('/\*/', GETPOST('tva_tx')) ? 1 : 0;
+				$desc = $product_desc;
+				$fk_unit = GETPOST('units', 'alpha');
 			}
 
-			$localtax1_tx=get_localtax($tva_tx,1,$object->thirdparty,$mysoc,$tva_npr);
-			$localtax2_tx=get_localtax($tva_tx,2,$object->thirdparty,$mysoc,$tva_npr);
+			$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $mysoc, $tva_npr);
+			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr);
 
 			// ajout prix achat
 			$fk_fournprice = $_POST['fournprice'];
-			if ( ! empty($_POST['buying_price']) )
+			if (!empty($_POST['buying_price']))
 			  $pa_ht = $_POST['buying_price'];
 			else
 			  $pa_ht = null;
 
-			$info_bits=0;
+			$info_bits = 0;
 			if ($tva_npr) $info_bits |= 0x01;
 
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS) )&& ($price_min && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min))))
+			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && ($price_min && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min))))
 			{
-				$object->error = $langs->trans("CantBeLessThanMinPrice",price(price2num($price_min,'MU'),0,$langs,0,0,-1,$conf->currency));
-				$result = -1 ;
+				$object->error = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
+				$result = -1;
 			}
 			else
 			{
@@ -598,13 +598,13 @@ 
 			if ($result > 0)
 			{
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && ! empty($conf->global->CONTRACT_ADDON_PDF))    // No generation if default type not defined
+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && !empty($conf->global->CONTRACT_ADDON_PDF))    // No generation if default type not defined
 				{
 					$outputlangs = $langs;
 					$newlang = '';
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
 					if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-					if (! empty($newlang)) {
+					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
@@ -653,7 +653,7 @@ 
 		}
 	}
 
-	else if ($action == 'updateline' && $user->rights->contrat->creer && ! GETPOST('cancel','alpha'))
+	else if ($action == 'updateline' && $user->rights->contrat->creer && !GETPOST('cancel', 'alpha'))
 	{
 		$error = 0;
 
@@ -665,7 +665,7 @@ 
 			$error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$objectline = new ContratLigne($db);
 			if ($objectline->fetch(GETPOST('elrowid')) < 0)
@@ -677,10 +677,10 @@ 
 
 		$db->begin();
 
-		if (! $error)
+		if (!$error)
 		{
-			if ($date_start_real_update == '') $date_start_real_update=$objectline->date_ouverture;
-			if ($date_end_real_update == '')   $date_end_real_update=$objectline->date_cloture;
+			if ($date_start_real_update == '') $date_start_real_update = $objectline->date_ouverture;
+			if ($date_end_real_update == '')   $date_end_real_update = $objectline->date_cloture;
 
 			$vat_rate = GETPOST('eltva_tx');
 			// Define info_bits
@@ -690,44 +690,44 @@ 
 
 			// Define vat_rate
 			$vat_rate = str_replace('*', '', $vat_rate);
-			$localtax1_tx=get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
-			$localtax2_tx=get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
+			$localtax1_tx = get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
+			$localtax2_tx = get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
 
 			$txtva = $vat_rate;
 
 			// Clean vat code
-			$vat_src_code='';
+			$vat_src_code = '';
 			if (preg_match('/\((.*)\)/', $txtva, $reg))
 			{
 				  $vat_src_code = $reg[1];
-				  $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+				  $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
 
 			// ajout prix d'achat
 			$fk_fournprice = $_POST['fournprice'];
-			if ( ! empty($_POST['buying_price']) )
+			if (!empty($_POST['buying_price']))
 			  $pa_ht = $_POST['buying_price'];
 			else
 			  $pa_ht = null;
 
 			$fk_unit = GETPOST('unit', 'alpha');
 
-			$objectline->description=GETPOST('product_desc','none');
-			$objectline->price_ht=GETPOST('elprice');
-			$objectline->subprice=GETPOST('elprice');
-			$objectline->qty=GETPOST('elqty');
-			$objectline->remise_percent=GETPOST('elremise_percent');
-			$objectline->tva_tx=($txtva?$txtva:0);	// Field may be disabled, so we use vat rate 0
-			$objectline->vat_src_code=$vat_src_code;
-			$objectline->localtax1_tx=is_numeric($localtax1_tx)?$localtax1_tx:0;
-			$objectline->localtax2_tx=is_numeric($localtax2_tx)?$localtax2_tx:0;
-			$objectline->date_ouverture_prevue=$date_start_update;
-			$objectline->date_ouverture=$date_start_real_update;
-			$objectline->date_fin_validite=$date_end_update;
-			$objectline->date_cloture=$date_end_real_update;
-			$objectline->fk_user_cloture=$user->id;
-			$objectline->fk_fournprice=$fk_fournprice;
-			$objectline->pa_ht=$pa_ht;
+			$objectline->description = GETPOST('product_desc', 'none');
+			$objectline->price_ht = GETPOST('elprice');
+			$objectline->subprice = GETPOST('elprice');
+			$objectline->qty = GETPOST('elqty');
+			$objectline->remise_percent = GETPOST('elremise_percent');
+			$objectline->tva_tx = ($txtva ? $txtva : 0); // Field may be disabled, so we use vat rate 0
+			$objectline->vat_src_code = $vat_src_code;
+			$objectline->localtax1_tx = is_numeric($localtax1_tx) ? $localtax1_tx : 0;
+			$objectline->localtax2_tx = is_numeric($localtax2_tx) ? $localtax2_tx : 0;
+			$objectline->date_ouverture_prevue = $date_start_update;
+			$objectline->date_ouverture = $date_start_real_update;
+			$objectline->date_fin_validite = $date_end_update;
+			$objectline->date_cloture = $date_end_real_update;
+			$objectline->fk_user_cloture = $user->id;
+			$objectline->fk_fournprice = $fk_fournprice;
+			$objectline->pa_ht = $pa_ht;
 
 			if ($fk_unit > 0) {
 			  $objectline->fk_unit = GETPOST('unit');
@@ -739,11 +739,11 @@ 
 			$extrafieldsline = new ExtraFields($db);
 			$extralabelsline = $extrafieldsline->fetch_name_optionals_label($objectline->table_element);
 			$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
-			$objectline->array_options=$array_options;
+			$objectline->array_options = $array_options;
 
 			// TODO verifier price_min si fk_product et multiprix
 
-			$result=$objectline->update($user);
+			$result = $objectline->update($user);
 			if ($result < 0)
 			{
 				$error++;
@@ -751,7 +751,7 @@ 
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$db->commit();
 		}
@@ -763,7 +763,7 @@ 
 
 	else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
-		$result = $object->deleteline(GETPOST('lineid'),$user);
+		$result = $object->deleteline(GETPOST('lineid'), $user);
 
 		if ($result >= 0)
 		{
@@ -787,13 +787,13 @@ 
 			{
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
 				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-				if (! empty($newlang)) {
+				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
-				$model=$object->modelpdf;
+				$model = $object->modelpdf;
 				$ret = $object->fetch($id); // Reload to get new records
 
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -836,7 +836,7 @@ 
 
 	else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
 	{
-		$result=$object->delete($user);
+		$result = $object->delete($user);
 		if ($result >= 0)
 		{
 			header("Location: list.php?restore_lastsearch_values=1");
@@ -853,9 +853,9 @@ 
 		if (GETPOST('newcid') > 0)
 		{
 			$contractline = new ContratLigne($db);
-			$result=$contractline->fetch(GETPOST('lineid'));
+			$result = $contractline->fetch(GETPOST('lineid'));
 			$contractline->fk_contrat = GETPOST('newcid');
-			$result=$contractline->update($user,1);
+			$result = $contractline->update($user, 1);
 			if ($result >= 0)
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
@@ -877,10 +877,10 @@ 
 
 		// Fill array 'array_options' with data from update form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
+		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute', 'none'));
 		if ($ret < 0) $error++;
 
-		if (! $error) {
+		if (!$error) {
 			$result = $object->insertExtraFields('CONTRACT_MODIFY');
 			if ($result < 0)
 			{
@@ -893,14 +893,14 @@ 
 			$action = 'edit_extras';
 		}
 	}
-	elseif ($action=='setref_supplier')
+	elseif ($action == 'setref_supplier')
 	{
-		$cancelbutton = GETPOST('cancel','alpha');
+		$cancelbutton = GETPOST('cancel', 'alpha');
 		if (!$cancelbutton) {
 
 			$object->oldcopy = dol_clone($object);
 
-			$result = $object->setValueFrom('ref_supplier', GETPOST('ref_supplier','alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
+			$result = $object->setValueFrom('ref_supplier', GETPOST('ref_supplier', 'alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$action = 'editref_supplier';
@@ -910,19 +910,19 @@ 
 			}
 		}
 		else {
-			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 			exit;
 		}
 	}
-	elseif ($action=='setref_customer')
+	elseif ($action == 'setref_customer')
 	{
-		$cancelbutton = GETPOST('cancel','alpha');
+		$cancelbutton = GETPOST('cancel', 'alpha');
 
 		if (!$cancelbutton)
 		{
 			$object->oldcopy = dol_clone($object);
 
-			$result = $object->setValueFrom('ref_customer', GETPOST('ref_customer','alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
+			$result = $object->setValueFrom('ref_customer', GETPOST('ref_customer', 'alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$action = 'editref_customer';
@@ -932,13 +932,13 @@ 
 			}
 		}
 		else {
-			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 			exit;
 		}
 	}
-	elseif ($action=='setref')
+	elseif ($action == 'setref')
 	{
-		$cancelbutton = GETPOST('cancel','alpha');
+		$cancelbutton = GETPOST('cancel', 'alpha');
 
 		if (!$cancelbutton) {
 			$result = $object->fetch($id);
@@ -948,14 +948,14 @@ 
 
 			$old_ref = $object->ref;
 
-	        $result = $object->setValueFrom('ref', GETPOST('ref','alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
+	        $result = $object->setValueFrom('ref', GETPOST('ref', 'alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
 	        if ($result < 0) {
 	            setEventMessages($object->error, $object->errors, 'errors');
 	            $action = 'editref';
 	        } else {
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-				$old_filedir = $conf->contrat->dir_output . '/' . dol_sanitizeFileName($old_ref);
-				$new_filedir = $conf->contrat->dir_output . '/' . dol_sanitizeFileName($object->ref);
+				$old_filedir = $conf->contrat->dir_output.'/'.dol_sanitizeFileName($old_ref);
+				$new_filedir = $conf->contrat->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
 				$files = dol_dir_list($old_filedir);
 				if (!empty($files))
@@ -967,36 +967,36 @@ 
 					}
 				}
 
-	            header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
+	            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 	            exit;
 	        }
 	    }
 	    else {
-	        header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
+	        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 	        exit;
 	    }
 	}
-	elseif ($action=='setdate_contrat')
+	elseif ($action == 'setdate_contrat')
 	{
-		$cancelbutton = GETPOST('cancel','alpha');
+		$cancelbutton = GETPOST('cancel', 'alpha');
 
 		if (!$cancelbutton) {
 			$result = $object->fetch($id);
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-			$datacontrat=dol_mktime(GETPOST('date_contrathour'), GETPOST('date_contratmin'), 0, GETPOST('date_contratmonth'), GETPOST('date_contratday'), GETPOST('date_contratyear'));
+			$datacontrat = dol_mktime(GETPOST('date_contrathour'), GETPOST('date_contratmin'), 0, GETPOST('date_contratmonth'), GETPOST('date_contratday'), GETPOST('date_contratyear'));
 			$result = $object->setValueFrom('date_contrat', $datacontrat, '', null, 'date', '', $user, 'CONTRACT_MODIFY');
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$action = 'editdate_contrat';
 			} else {
-				header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
+				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
 		}
 		else {
-			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 			exit;
 		}
 	}
@@ -1008,14 +1008,14 @@ 
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	// Actions to send emails
-	$trigger_name='CONTRACT_SENTBYMAIL';
-	$paramname='id';
-	$mode='emailfromcontract';
-	$trackid='con'.$object->id;
+	$trigger_name = 'CONTRACT_SENTBYMAIL';
+	$paramname = 'id';
+	$mode = 'emailfromcontract';
+	$trackid = 'con'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 
-	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->contrat->creer)
+	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->contrat->creer)
 	{
 		if ($action == 'addcontact')
 		{
@@ -1044,7 +1044,7 @@ 
 		// bascule du statut d'un contact
 		else if ($action == 'swapstatut')
 		{
-			$result=$object->swapContactStatus(GETPOST('ligne'));
+			$result = $object->swapContactStatus(GETPOST('ligne'));
 		}
 
 		// Efface un contact
@@ -1066,7 +1066,7 @@ 
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes')
 	{
-		if (! GETPOST('socid', 3))
+		if (!GETPOST('socid', 3))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		}
@@ -1075,7 +1075,7 @@ 
 			if ($object->id > 0) {
 				$result = $object->createFromClone($socid);
 				if ($result > 0) {
-					header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $result);
+					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit();
 				} else {
 					if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
@@ -1091,21 +1091,21 @@ 
  * View
  */
 
-llxHeader('',$langs->trans("Contract"),"");
+llxHeader('', $langs->trans("Contract"), "");
 
 $form = new Form($db);
 $formfile = new FormFile($db);
-if (! empty($conf->projet->enabled)) $formproject = new FormProjets($db);
+if (!empty($conf->projet->enabled)) $formproject = new FormProjets($db);
 
-$objectlignestatic=new ContratLigne($db);
+$objectlignestatic = new ContratLigne($db);
 
 // Load object modContract
-$module=(! empty($conf->global->CONTRACT_ADDON)?$conf->global->CONTRACT_ADDON:'mod_contract_serpis');
+$module = (!empty($conf->global->CONTRACT_ADDON) ? $conf->global->CONTRACT_ADDON : 'mod_contract_serpis');
 if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php')
 {
-	$module = substr($module, 0, dol_strlen($module)-4);
+	$module = substr($module, 0, dol_strlen($module) - 4);
 }
-$result=dol_include_once('/core/modules/contract/'.$module.'.php');
+$result = dol_include_once('/core/modules/contract/'.$module.'.php');
 if ($result > 0)
 {
 	$modCodeContract = new $module();
@@ -1114,16 +1114,16 @@ 
 // Create
 if ($action == 'create')
 {
-	print load_fiche_titre($langs->trans('AddContract'),'','title_commercial.png');
+	print load_fiche_titre($langs->trans('AddContract'), '', 'title_commercial.png');
 
 	$soc = new Societe($db);
-	if ($socid>0) $soc->fetch($socid);
+	if ($socid > 0) $soc->fetch($socid);
 
 	if (GETPOST('origin') && GETPOST('originid'))
 	{
 		// Parse element/subelement (ex: project_task)
 		$element = $subelement = GETPOST('origin');
-		if (preg_match('/^([^_]+)_([^_]+)/i',GETPOST('origin'),$regs))
+		if (preg_match('/^([^_]+)_([^_]+)/i', GETPOST('origin'), $regs))
 		{
 			$element = $regs[1];
 			$subelement = $regs[2];
@@ -1131,39 +1131,39 @@ 
 
 		if ($element == 'project')
 		{
-			$projectid=GETPOST('originid');
+			$projectid = GETPOST('originid');
 		}
 		else
 		{
 			// For compatibility
-			if ($element == 'order' || $element == 'commande')    { $element = $subelement = 'commande'; }
-			if ($element == 'propal')   { $element = 'comm/propal'; $subelement = 'propal'; }
+			if ($element == 'order' || $element == 'commande') { $element = $subelement = 'commande'; }
+			if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; }
 
 			dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 
 			$classname = ucfirst($subelement);
 			$objectsrc = new $classname($db);
 			$objectsrc->fetch(GETPOST('originid'));
-			if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines'))  $objectsrc->fetch_lines();
+			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines'))  $objectsrc->fetch_lines();
 			$objectsrc->fetch_thirdparty();
 
 			// Replicate extrafields
 			$objectsrc->fetch_optionals($originid);
 			$object->array_options = $objectsrc->array_options;
 
-			$projectid          = (!empty($objectsrc->fk_project)?$objectsrc->fk_project:'');
+			$projectid = (!empty($objectsrc->fk_project) ? $objectsrc->fk_project : '');
 
 			$soc = $objectsrc->thirdparty;
 
-			$note_private		= (! empty($objectsrc->note_private) ? $objectsrc->note_private : '');
-			$note_public		= (! empty($objectsrc->note_public) ? $objectsrc->note_public : '');
+			$note_private = (!empty($objectsrc->note_private) ? $objectsrc->note_private : '');
+			$note_public = (!empty($objectsrc->note_public) ? $objectsrc->note_public : '');
 
 			// Object source contacts list
-			$srccontactslist = $objectsrc->liste_contact(-1,'external',1);
+			$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
 		}
 	}
 	else {
-		$projectid = GETPOST('projectid','int');
+		$projectid = GETPOST('projectid', 'int');
 		$note_private = GETPOST("note_private");
 		$note_public = GETPOST("note_public");
 	}
@@ -1183,26 +1183,26 @@ 
 
 	// Ref
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Ref').'</td><td>';
-	if (! empty($modCodeContract->code_auto)) {
-		$tmpcode=$langs->trans("Draft");
+	if (!empty($modCodeContract->code_auto)) {
+		$tmpcode = $langs->trans("Draft");
 	} else {
-		$tmpcode='<input name="ref" class="maxwidth100" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
+		$tmpcode = '<input name="ref" class="maxwidth100" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref') ?GETPOST('ref') : $tmpcode).'">';
 	}
 	print $tmpcode;
 	print '</td></tr>';
 
 	// Ref customer
 	print '<tr><td>'.$langs->trans('RefCustomer').'</td>';
-	print '<td><input type="text" class="maxwidth150" name="ref_customer" id="ref_customer" value="'.dol_escape_htmltag(GETPOST('ref_customer','alpha')).'"></td></tr>';
+	print '<td><input type="text" class="maxwidth150" name="ref_customer" id="ref_customer" value="'.dol_escape_htmltag(GETPOST('ref_customer', 'alpha')).'"></td></tr>';
 
 	// Ref supplier
 	print '<tr><td>'.$langs->trans('RefSupplier').'</td>';
-	print '<td><input type="text" class="maxwidth150" name="ref_supplier" id="ref_supplier" value="'.dol_escape_htmltag(GETPOST('ref_supplier','alpha')).'"></td></tr>';
+	print '<td><input type="text" class="maxwidth150" name="ref_supplier" id="ref_supplier" value="'.dol_escape_htmltag(GETPOST('ref_supplier', 'alpha')).'"></td></tr>';
 
 	// Thirdparty
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
-	if ($socid>0)
+	if ($socid > 0)
 	{
 		print '<td>';
 		print $soc->getNomUrl(1);
@@ -1218,15 +1218,15 @@ 
 	}
 	print '</tr>'."\n";
 
-	if($socid>0)
+	if ($socid > 0)
 	{
 		// Ligne info remises tiers
 		print '<tr><td>'.$langs->trans('Discounts').'</td><td>';
-		if ($soc->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_percent);
+		if ($soc->remise_percent) print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
 		else print $langs->trans("CompanyHasNoRelativeDiscount");
 		print '. ';
-		$absolute_discount=$soc->getAvailableDiscounts();
-		if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
+		$absolute_discount = $soc->getAvailableDiscounts();
+		if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency));
 		else print $langs->trans("CompanyHasNoAbsoluteDiscount");
 		print '.';
 		print '</td></tr>';
@@ -1234,12 +1234,12 @@ 
 
 	// Commercial suivi
 	print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPFOLL").'</span></td><td>';
-	print $form->select_dolusers(GETPOST("commercial_suivi_id")?GETPOST("commercial_suivi_id"):$user->id,'commercial_suivi_id',1,'');
+	print $form->select_dolusers(GETPOST("commercial_suivi_id") ?GETPOST("commercial_suivi_id") : $user->id, 'commercial_suivi_id', 1, '');
 	print '</td></tr>';
 
 	// Commercial signature
 	print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPSIGN").'</span></td><td>';
-	print $form->select_dolusers(GETPOST("commercial_signature_id")?GETPOST("commercial_signature_id"):$user->id,'commercial_signature_id',1,'');
+	print $form->select_dolusers(GETPOST("commercial_signature_id") ?GETPOST("commercial_signature_id") : $user->id, 'commercial_signature_id', 1, '');
 	print '</td></tr>';
 
 	print '<tr><td><span class="fieldrequired">'.$langs->trans("Date").'</span></td><td>';
@@ -1247,34 +1247,34 @@ 
 	print "</td></tr>";
 
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (!empty($conf->projet->enabled))
 	{
 		$langs->load('projects');
 
-		$formproject=new FormProjets($db);
+		$formproject = new FormProjets($db);
 
 		print '<tr><td>'.$langs->trans("Project").'</td><td>';
-		$formproject->select_projects(($soc->id>0?$soc->id:-1),$projectid,"projectid",0,0,1,1);
-		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">' . $langs->trans("AddProject") . '</a>';
+		$formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, "projectid", 0, 0, 1, 1);
+		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">'.$langs->trans("AddProject").'</a>';
 		print "</td></tr>";
 	}
 
 	print '<tr><td>'.$langs->trans("NotePublic").'</td><td class="tdtop">';
-	$doleditor=new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td></tr>';
 
 	if (empty($user->societe_id))
 	{
 		print '<tr><td>'.$langs->trans("NotePrivate").'</td><td class="tdtop">';
-		$doleditor=new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		print '</td></tr>';
 	}
 
 	// Other attributes
-	$parameters=array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"', 'cols'=>3);
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	$parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'cols'=>3);
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
 	// Other attributes
@@ -1289,7 +1289,7 @@ 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
+	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	print '</div>';
 
 	if (is_object($objectsrc))
@@ -1312,18 +1312,18 @@ 
 /*                                                                             */
 /* *************************************************************************** */
 {
-	$now=dol_now();
+	$now = dol_now();
 
 	if ($object->id > 0)
 	{
 		$object->fetch_thirdparty();
 
-		$result=$object->fetch_lines(); // This also init $this->nbofserviceswait, $this->nbofservicesopened, $this->nbofservicesexpired=, $this->nbofservicesclosed
+		$result = $object->fetch_lines(); // This also init $this->nbofserviceswait, $this->nbofservicesopened, $this->nbofservicesexpired=, $this->nbofservicesclosed
 		if ($result < 0) {
-            dol_print_error($db,$object->error);
+            dol_print_error($db, $object->error);
         }
 
-		$nbofservices=count($object->lines);
+		$nbofservices = count($object->lines);
 
 		$author = new User($db);
 		$author->fetch($object->user_author_id);
@@ -1344,7 +1344,7 @@ 
 
         if ($action == 'delete') {
             //Confirmation de la suppression du contrat
-            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("DeleteAContract"),$langs->trans("ConfirmDeleteAContract"),"confirm_delete",'',0,1);
+            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("DeleteAContract"), $langs->trans("ConfirmDeleteAContract"), "confirm_delete", '', 0, 1);
         } elseif ($action == 'valid') {
             //Confirmation de la validation
             $ref = substr($object->ref, 1, 4);
@@ -1353,17 +1353,17 @@ 
             } else {
                 $numref = $object->ref;
             }
-            $text = $langs->trans('ConfirmValidateContract',$numref);
-            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("ValidateAContract"),$text,"confirm_valid",'',0,1);
+            $text = $langs->trans('ConfirmValidateContract', $numref);
+            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ValidateAContract"), $text, "confirm_valid", '', 0, 1);
         } elseif ($action == 'close') {
             // Confirmation de la fermeture
-            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("CloseAContract"),$langs->trans("ConfirmCloseContract"),"confirm_close",'',0,1);
+            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("CloseAContract"), $langs->trans("ConfirmCloseContract"), "confirm_close", '', 0, 1);
         } elseif ($action == 'activate') {
-            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("ActivateAllOnContract"),$langs->trans("ConfirmActivateAllOnContract"),"confirm_activate",'',0,1);
+            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ActivateAllOnContract"), $langs->trans("ConfirmActivateAllOnContract"), "confirm_activate", '', 0, 1);
         } elseif ($action == 'clone') {
             // Clone confirmation
-            $formquestion = array(array('type' => 'other','name' => 'socid','label' => $langs->trans("SelectThirdParty"),'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=2 OR s.client=3)')));
-            $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('CloneContract'), $langs->trans('ConfirmCloneContract', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+            $formquestion = array(array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=2 OR s.client=3)')));
+            $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('CloneContract'), $langs->trans('ConfirmCloneContract', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
         }
 
 
@@ -1386,7 +1386,7 @@ 
         /*
          *   Contrat
          */
-		if (! empty($object->brouillon) && $user->rights->contrat->creer)
+		if (!empty($object->brouillon) && $user->rights->contrat->creer)
 		{
 			print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -1395,61 +1395,61 @@ 
 
 		// Contract card
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(! empty($socid)?'&socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-		$morehtmlref='';
-		if (! empty($modCodeContract->code_auto)) {
-			$morehtmlref.=$object->ref;
+		$morehtmlref = '';
+		if (!empty($modCodeContract->code_auto)) {
+			$morehtmlref .= $object->ref;
 		} else {
-			$morehtmlref.=$form->editfieldkey("",'ref',$object->ref,$object,$user->rights->contrat->creer,'string','',0,3);
-			$morehtmlref.=$form->editfieldval("",'ref',$object->ref,$object,$user->rights->contrat->creer,'string','',0,2);
+			$morehtmlref .= $form->editfieldkey("", 'ref', $object->ref, $object, $user->rights->contrat->creer, 'string', '', 0, 3);
+			$morehtmlref .= $form->editfieldval("", 'ref', $object->ref, $object, $user->rights->contrat->creer, 'string', '', 0, 2);
 		}
 
-		$morehtmlref.='<div class="refidno">';
+		$morehtmlref .= '<div class="refidno">';
 		// Ref customer
-		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->contrat->creer, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->contrat->creer, 'string', '', null, null, '', 1);
+		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->contrat->creer, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->contrat->creer, 'string', '', null, null, '', 1);
 		// Ref supplier
-		$morehtmlref.='<br>';
-		$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->contrat->creer, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->contrat->creer, 'string', '', null, null, '', 1);
+		$morehtmlref .= '<br>';
+		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->contrat->creer, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->contrat->creer, 'string', '', null, null, '', 1);
 		// Thirdparty
-		$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref.=' (<a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->thirdparty->id.'&search_name='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherContracts").'</a>)';
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->thirdparty->id.'&search_name='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherContracts").'</a>)';
 		// Project
-		if (! empty($conf->projet->enabled))
+		if (!empty($conf->projet->enabled))
 		{
 			$langs->load("projects");
-			$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->contrat->creer)
 			{
 				if ($action != 'classify')
-					$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					$morehtmlref .= '<a href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 					if ($action == 'classify') {
 						//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-						$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-						$morehtmlref.='<input type="hidden" name="action" value="classin">';
-						$morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-						$morehtmlref.=$formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-						$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-						$morehtmlref.='</form>';
+						$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+						$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+						$morehtmlref .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+						$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+						$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+						$morehtmlref .= '</form>';
 					} else {
-						$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
 					}
 			} else {
-				if (! empty($object->fk_project)) {
+				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
 					$proj->fetch($object->fk_project);
-					$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-					$morehtmlref.=$proj->ref;
-					$morehtmlref.='</a>';
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
 				} else {
-					$morehtmlref.='';
+					$morehtmlref .= '';
 				}
 			}
 		}
-		$morehtmlref.='</div>';
+		$morehtmlref .= '</div>';
 
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
@@ -1463,11 +1463,11 @@ 
 
 		// Ligne info remises tiers
 		print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
-		if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent);
+		if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount", $object->thirdparty->remise_percent);
 		else print $langs->trans("CompanyHasNoRelativeDiscount");
-		$absolute_discount=$object->thirdparty->getAvailableDiscounts();
+		$absolute_discount = $object->thirdparty->getAvailableDiscounts();
 		print '. ';
-		if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
+		if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency));
 		else print $langs->trans("CompanyHasNoAbsoluteDiscount");
 		print '.';
 		print '</td></tr>';
@@ -1475,35 +1475,35 @@ 
 		// Date
 		print '<tr>';
 		print '<td class="titlefield">';
-		print $form->editfieldkey("Date",'date_contrat',$object->date_contrat,$object,$user->rights->contrat->creer);
+		print $form->editfieldkey("Date", 'date_contrat', $object->date_contrat, $object, $user->rights->contrat->creer);
 		print '</td><td>';
-		print $form->editfieldval("Date",'date_contrat',$object->date_contrat,$object,$user->rights->contrat->creer,'datehourpicker');
+		print $form->editfieldval("Date", 'date_contrat', $object->date_contrat, $object, $user->rights->contrat->creer, 'datehourpicker');
 		print '</td>';
 		print '</tr>';
 
 		// Other attributes
 		$cols = 3;
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 		print "</table>";
 
 		print '</div>';
 
-		if (! empty($object->brouillon) && $user->rights->contrat->creer)
+		if (!empty($object->brouillon) && $user->rights->contrat->creer)
 		{
 			print '</form>';
 		}
 
 		echo '<br>';
 
-		if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+		if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 		{
 			$blocname = 'contacts';
 			$title = $langs->trans('ContactsAddresses');
 			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 		}
 
-		if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+		if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 		{
 			$blocname = 'notes';
 			$title = $langs->trans('Notes');
@@ -1513,54 +1513,54 @@ 
 
 		$colorb = '666666';
 
-		$arrayothercontracts=$object->getListOfContracts('others');
+		$arrayothercontracts = $object->getListOfContracts('others');
 
 		/*
          * Lines of contracts
          */
 
-		$productstatic=new Product($db);
+		$productstatic = new Product($db);
 
-		$usemargins=0;
-		if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
+		$usemargins = 0;
+		if (!empty($conf->margin->enabled) && !empty($object->element) && in_array($object->element, array('facture', 'propal', 'commande'))) $usemargins = 1;
 
-		$var=false;
+		$var = false;
 
 		// Title line for service
-		$cursorline=1;
+		$cursorline = 1;
 		print '<div id="contrat-lines-container" data-contractid="'.$object->id.'"  data-element="'.$object->element.'" >';
 		while ($cursorline <= $nbofservices)
 		{
-			print '<div id="contrat-line-container'.$object->lines[$cursorline-1]->id.'" data-contratlineid = "'.$object->lines[$cursorline-1]->id.'" data-element="'.$object->lines[$cursorline-1]->element.'" >';
+			print '<div id="contrat-line-container'.$object->lines[$cursorline - 1]->id.'" data-contratlineid = "'.$object->lines[$cursorline - 1]->id.'" data-element="'.$object->lines[$cursorline - 1]->element.'" >';
 			print '<form name="update" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden" name="action" value="updateline">';
-			print '<input type="hidden" name="elrowid" value="'.$object->lines[$cursorline-1]->id.'">';
-			print '<input type="hidden" name="idprod" value="'.(!empty($object->lines[$cursorline-1]->fk_product) ? $object->lines[$cursorline-1]->fk_product : 0).'">';
-			print '<input type="hidden" name="fournprice" value="'.(!empty($object->lines[$cursorline-1]->fk_fournprice) ? $object->lines[$cursorline-1]->fk_fournprice : 0).'">';
+			print '<input type="hidden" name="elrowid" value="'.$object->lines[$cursorline - 1]->id.'">';
+			print '<input type="hidden" name="idprod" value="'.(!empty($object->lines[$cursorline - 1]->fk_product) ? $object->lines[$cursorline - 1]->fk_product : 0).'">';
+			print '<input type="hidden" name="fournprice" value="'.(!empty($object->lines[$cursorline - 1]->fk_fournprice) ? $object->lines[$cursorline - 1]->fk_fournprice : 0).'">';
 
 			// Area with common detail of line
 			print '<div class="div-table-responsive-no-min">';
 			print '<table class="notopnoleftnoright allwidth tableforservicepart1" width="100%">';
 
 			$sql = "SELECT cd.rowid, cd.statut, cd.label as label_det, cd.fk_product, cd.product_type, cd.description, cd.price_ht, cd.qty,";
-			$sql.= " cd.tva_tx, cd.vat_src_code, cd.remise_percent, cd.info_bits, cd.subprice, cd.multicurrency_subprice,";
-			$sql.= " cd.date_ouverture_prevue as date_debut, cd.date_ouverture as date_debut_reelle,";
-			$sql.= " cd.date_fin_validite as date_fin, cd.date_cloture as date_fin_reelle,";
-			$sql.= " cd.commentaire as comment, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht,";
-			$sql.= " cd.fk_unit,";
-			$sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
-			$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-			$sql.= " WHERE cd.rowid = ".$object->lines[$cursorline-1]->id;
+			$sql .= " cd.tva_tx, cd.vat_src_code, cd.remise_percent, cd.info_bits, cd.subprice, cd.multicurrency_subprice,";
+			$sql .= " cd.date_ouverture_prevue as date_debut, cd.date_ouverture as date_debut_reelle,";
+			$sql .= " cd.date_fin_validite as date_fin, cd.date_cloture as date_fin_reelle,";
+			$sql .= " cd.commentaire as comment, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht,";
+			$sql .= " cd.fk_unit,";
+			$sql .= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
+			$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
+			$sql .= " WHERE cd.rowid = ".$object->lines[$cursorline - 1]->id;
 
 			$result = $db->query($sql);
 			if ($result)
 			{
 				$total = 0;
 
-				print '<tr class="liste_titre'.($cursorline?' liste_titre_add':'').'">';
-				print '<td>'.$langs->trans("ServiceNb",$cursorline).'</td>';
+				print '<tr class="liste_titre'.($cursorline ? ' liste_titre_add' : '').'">';
+				print '<td>'.$langs->trans("ServiceNb", $cursorline).'</td>';
 				print '<td width="80" align="center">'.$langs->trans("VAT").'</td>';
 				print '<td width="80" align="right">'.$langs->trans("PriceUHT").'</td>';
 				if (!empty($conf->multicurrency->enabled)) {
@@ -1569,7 +1569,7 @@ 
 				print '<td width="30" align="center">'.$langs->trans("Qty").'</td>';
 				if ($conf->global->PRODUCT_USE_UNITS) print '<td width="30" align="left">'.$langs->trans("Unit").'</td>';
 				print '<td width="50" align="right">'.$langs->trans("ReductionShort").'</td>';
-				if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print '<td width="50" align="right">'.$langs->trans("BuyingPrice").'</td>';
+				if (!empty($conf->margin->enabled) && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print '<td width="50" align="right">'.$langs->trans("BuyingPrice").'</td>';
 				print '<td width="30">&nbsp;</td>';
 				print "</tr>\n";
 
@@ -1584,12 +1584,12 @@ 
 					if ($objp->fk_product > 0)
 					{
 						print '<td>';
-						$productstatic->id=$objp->fk_product;
-						$productstatic->type=$objp->ptype;
-						$productstatic->ref=$objp->pref;
-						$productstatic->entity=$objp->pentity;
-						$productstatic->label=$objp->plabel;
-						$text = $productstatic->getNomUrl(1,'',32);
+						$productstatic->id = $objp->fk_product;
+						$productstatic->type = $objp->ptype;
+						$productstatic->ref = $objp->pref;
+						$productstatic->entity = $objp->pentity;
+						$productstatic->label = $objp->plabel;
+						$text = $productstatic->getNomUrl(1, '', 32);
 						if ($objp->plabel)
 						{
 							$text .= ' - ';
@@ -1598,13 +1598,13 @@ 
 						$description = $objp->description;
 
 						// Add description in form
-						if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+						if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
 						{
-							$text .= (! empty($objp->description) && $objp->description!=$objp->plabel)?'<br>'.dol_htmlentitiesbr($objp->description):'';
-							$description = '';	// Already added into main visible desc
+							$text .= (!empty($objp->description) && $objp->description != $objp->plabel) ? '<br>'.dol_htmlentitiesbr($objp->description) : '';
+							$description = ''; // Already added into main visible desc
 						}
 
-						echo $form->textwithtooltip($text,$description,3,'','',$cursorline,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
+						echo $form->textwithtooltip($text, $description, 3, '', '', $cursorline, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
 
 						print '</td>';
 					}
@@ -1614,7 +1614,7 @@ 
 					}
 					// TVA
 					print '<td align="center">';
-					print vatrate($objp->tva_tx.($objp->vat_src_code?(' ('.$objp->vat_src_code.')'):''), '%', $objp->info_bits);
+					print vatrate($objp->tva_tx.($objp->vat_src_code ? (' ('.$objp->vat_src_code.')') : ''), '%', $objp->info_bits);
 					print '</td>';
 					// Price
 					print '<td align="right">'.($objp->subprice != '' ? price($objp->subprice) : '')."</td>\n";
@@ -1625,7 +1625,7 @@ 
 					// Quantite
 					print '<td align="center">'.$objp->qty.'</td>';
 					// Unit
-					if($conf->global->PRODUCT_USE_UNITS) print '<td align="left">'.$langs->trans($object->lines[$cursorline-1]->getLabelOfUnit()).'</td>';
+					if ($conf->global->PRODUCT_USE_UNITS) print '<td align="left">'.$langs->trans($object->lines[$cursorline - 1]->getLabelOfUnit()).'</td>';
 					// Remise
 					if ($objp->remise_percent > 0)
 					{
@@ -1637,7 +1637,7 @@ 
 					}
 
 					// Margin
-					if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print '<td align="right" class="nowrap">'.price($objp->pa_ht).'</td>';
+					if (!empty($conf->margin->enabled) && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print '<td align="right" class="nowrap">'.price($objp->pa_ht).'</td>';
 
 					// Icon move, update et delete (statut contrat 0=brouillon,1=valide,2=ferme)
 					print '<td align="right" class="nowrap">';
@@ -1645,7 +1645,7 @@ 
 					{
 						print '<!-- link to move service line into another contract -->';
 						print '<a class="reposition" style="padding-left: 5px;" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=move&amp;rowid='.$objp->rowid.'">';
-						print img_picto($langs->trans("MoveToAnotherContract"),'uparrow');
+						print img_picto($langs->trans("MoveToAnotherContract"), 'uparrow');
 						print '</a>';
 					}
 					if ($user->rights->contrat->creer && ($object->statut >= 0))
@@ -1654,7 +1654,7 @@ 
 						print img_edit();
 						print '</a>';
 					}
-					if ( $user->rights->contrat->creer && ($object->statut >= 0))
+					if ($user->rights->contrat->creer && ($object->statut >= 0))
 					{
 						print '<a style="padding-left: 5px;" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=deleteline&amp;rowid='.$objp->rowid.'">';
 						print img_delete();
@@ -1685,7 +1685,7 @@ 
 							print dol_print_date($db->jdate($objp->date_debut), 'day');
 							// Warning si date prevu passee et pas en service
 							if ($objp->statut == 0 && $db->jdate($objp->date_debut) < ($now - $conf->contrat->services->inactifs->warning_delay)) {
-								$warning_delay=$conf->contrat->services->inactifs->warning_delay / 3600 / 24;
+								$warning_delay = $conf->contrat->services->inactifs->warning_delay / 3600 / 24;
 								$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
 								print " ".img_warning($textlate);
 							}
@@ -1697,7 +1697,7 @@ 
 						{
 							print dol_print_date($db->jdate($objp->date_fin), 'day');
 							if ($objp->statut == 4 && $db->jdate($objp->date_fin) < ($now - $conf->contrat->services->expires->warning_delay)) {
-								$warning_delay=$conf->contrat->services->expires->warning_delay / 3600 / 24;
+								$warning_delay = $conf->contrat->services->expires->warning_delay / 3600 / 24;
 								$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
 								print " ".img_warning($textlate);
 							}
@@ -1709,10 +1709,10 @@ 
 					}
 
 					// Display lines extrafields
-					if (is_array($extralabelslines) && count($extralabelslines)>0) {
+					if (is_array($extralabelslines) && count($extralabelslines) > 0) {
 						$line = new ContratLigne($db);
 						$line->fetch_optionals($objp->rowid);
-						print $line->showOptionals($extrafieldsline, 'view', array('style'=>'class="oddeven"', 'colspan'=>$colspan), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+						print $line->showOptionals($extrafieldsline, 'view', array('style'=>'class="oddeven"', 'colspan'=>$colspan), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD) ? 0 : 1);
 					}
 				}
 				// Ligne en mode update
@@ -1723,30 +1723,30 @@ 
 					print '<td>';
 					if ($objp->fk_product)
 					{
-						$productstatic->id=$objp->fk_product;
-						$productstatic->type=$objp->ptype;
-						$productstatic->ref=$objp->pref;
-						$productstatic->entity=$objp->pentity;
-						print $productstatic->getNomUrl(1,'',32);
-						print $objp->label?' - '.dol_trunc($objp->label,32):'';
+						$productstatic->id = $objp->fk_product;
+						$productstatic->type = $objp->ptype;
+						$productstatic->ref = $objp->pref;
+						$productstatic->entity = $objp->pentity;
+						print $productstatic->getNomUrl(1, '', 32);
+						print $objp->label ? ' - '.dol_trunc($objp->label, 32) : '';
 						print '<br>';
 					}
 					else
 					{
-						print $objp->label?$objp->label.'<br>':'';
+						print $objp->label ? $objp->label.'<br>' : '';
 					}
 
 					// editeur wysiwyg
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-					$nbrows=ROWS_2;
-					if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-					$enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
-					$doleditor=new DolEditor('product_desc',$objp->description,'',92,'dolibarr_details','',false,true,$enable,$nbrows,'90%');
+					$nbrows = ROWS_2;
+					if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
+					$enable = (isset($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
+					$doleditor = new DolEditor('product_desc', $objp->description, '', 92, 'dolibarr_details', '', false, true, $enable, $nbrows, '90%');
 					$doleditor->Create();
 
 					print '</td>';
 					print '<td align="right">';
-					print $form->load_tva("eltva_tx", $objp->tva_tx.($objp->vat_src_code?(' ('.$objp->vat_src_code.')'):''), $mysoc, $object->thirdparty, $objp->fk_product, $objp->info_bits, $objp->product_type, 0, 1);
+					print $form->load_tva("eltva_tx", $objp->tva_tx.($objp->vat_src_code ? (' ('.$objp->vat_src_code.')') : ''), $mysoc, $object->thirdparty, $objp->fk_product, $objp->info_bits, $objp->product_type, 0, 1);
 					print '</td>';
 					print '<td align="right"><input size="5" type="text" name="elprice" value="'.price($objp->subprice).'"></td>';
 					print '<td align="center"><input size="2" type="text" name="elqty" value="'.$objp->qty.'"></td>';
@@ -1757,11 +1757,11 @@ 
 						print '</td>';
 					}
 					print '<td align="right" class="nowrap"><input size="1" type="text" name="elremise_percent" value="'.$objp->remise_percent.'">%</td>';
-					if (! empty($usemargins))
+					if (!empty($usemargins))
 					{
 						print '<td align="right">';
 						if ($objp->fk_product) print '<select id="fournprice" name="fournprice"></select>';
-						print '<input id="buying_price" type="text" size="5" name="buying_price" value="'.price($objp->pa_ht,0,'',0).'"></td>';
+						print '<input id="buying_price" type="text" size="5" name="buying_price" value="'.price($objp->pa_ht, 0, '', 0).'"></td>';
 					}
 					print '<td align="center">';
 					print '<input type="submit" class="button" name="save" value="'.$langs->trans("Modify").'">';
@@ -1769,24 +1769,24 @@ 
 					print '</td>';
 					print '</tr>';
 
-					$colspan=6;
-					if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) $colspan++;
-					if($conf->global->PRODUCT_USE_UNITS) $colspan++;
+					$colspan = 6;
+					if (!empty($conf->margin->enabled) && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) $colspan++;
+					if ($conf->global->PRODUCT_USE_UNITS) $colspan++;
 
 					// Ligne dates prevues
 					print '<tr class="oddeven">';
 					print '<td colspan="'.$colspan.'">';
 					print $langs->trans("DateStartPlanned").' ';
-					print $form->selectDate($db->jdate($objp->date_debut), "date_start_update", $usehm, $usehm, ($db->jdate($objp->date_debut)>0?0:1), "update");
+					print $form->selectDate($db->jdate($objp->date_debut), "date_start_update", $usehm, $usehm, ($db->jdate($objp->date_debut) > 0 ? 0 : 1), "update");
 					print ' &nbsp;&nbsp;'.$langs->trans("DateEndPlanned").' ';
-					print $form->selectDate($db->jdate($objp->date_fin), "date_end_update", $usehm, $usehm, ($db->jdate($objp->date_fin)>0?0:1), "update");
+					print $form->selectDate($db->jdate($objp->date_fin), "date_end_update", $usehm, $usehm, ($db->jdate($objp->date_fin) > 0 ? 0 : 1), "update");
 					print '</td>';
 					print '</tr>';
 
-					if (is_array($extralabelslines) && count($extralabelslines)>0) {
+					if (is_array($extralabelslines) && count($extralabelslines) > 0) {
 						$line = new ContratLigne($db);
 						$line->fetch_optionals($objp->rowid);
-						print $line->showOptionals($extrafieldsline, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+						print $line->showOptionals($extrafieldsline, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD) ? 0 : 1);
 					}
 				}
 
@@ -1800,7 +1800,7 @@ 
 			if ($object->statut > 0)
 			{
 				print '<tr class="oddeven">';
-				print '<td class="tdhrthin" colspan="'.($conf->margin->enabled?7:6).'"><hr class="opacitymedium tdhrthin"></td>';
+				print '<td class="tdhrthin" colspan="'.($conf->margin->enabled ? 7 : 6).'"><hr class="opacitymedium tdhrthin"></td>';
 				print "</tr>\n";
 			}
 
@@ -1813,52 +1813,52 @@ 
 			/*
              * Confirmation to delete service line of contract
              */
-			if ($action == 'deleteline' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline-1]->id == GETPOST('rowid'))
+			if ($action == 'deleteline' && !$_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline - 1]->id == GETPOST('rowid'))
 			{
-				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("DeleteContractLine"),$langs->trans("ConfirmDeleteContractLine"),"confirm_deleteline",'',0,1);
+				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'), $langs->trans("DeleteContractLine"), $langs->trans("ConfirmDeleteContractLine"), "confirm_deleteline", '', 0, 1);
 				if ($ret == 'html') print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
 			}
 
 			/*
              * Confirmation to move service toward another contract
              */
-			if ($action == 'move' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline-1]->id == GETPOST('rowid'))
+			if ($action == 'move' && !$_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline - 1]->id == GETPOST('rowid'))
 			{
-				$arraycontractid=array();
-				foreach($arrayothercontracts as $contractcursor)
+				$arraycontractid = array();
+				foreach ($arrayothercontracts as $contractcursor)
 				{
-					$arraycontractid[$contractcursor->id]=$contractcursor->ref;
+					$arraycontractid[$contractcursor->id] = $contractcursor->ref;
 				}
 				//var_dump($arraycontractid);
 				// Cree un tableau formulaire
-				$formquestion=array(
+				$formquestion = array(
 				'text' => $langs->trans("ConfirmMoveToAnotherContractQuestion"),
 				array('type' => 'select', 'name' => 'newcid', 'values' => $arraycontractid));
 
-				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("MoveToAnotherContract"),$langs->trans("ConfirmMoveToAnotherContract"),"confirm_move",$formquestion);
+				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'), $langs->trans("MoveToAnotherContract"), $langs->trans("ConfirmMoveToAnotherContract"), "confirm_move", $formquestion);
 				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
 			}
 
 			/*
              * Confirmation de la validation activation
              */
-			if ($action == 'active' && ! $_REQUEST["cancel"] && $user->rights->contrat->activer && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
+			if ($action == 'active' && !$_REQUEST["cancel"] && $user->rights->contrat->activer && $object->lines[$cursorline - 1]->id == GETPOST('ligne'))
 			{
 				$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 				$dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-				$comment      = GETPOST('comment','alpha');
-				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment),$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",dol_print_date($dateactstart,"%A %d %B %Y")),"confirm_active", '', 0, 1);
+				$comment      = GETPOST('comment', 'alpha');
+				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("ActivateService"), $langs->trans("ConfirmActivateService", dol_print_date($dateactstart, "%A %d %B %Y")), "confirm_active", '', 0, 1);
 				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
 			}
 
 			/*
              * Confirmation de la validation fermeture
              */
-			if ($action == 'closeline' && ! $_REQUEST["cancel"] && $user->rights->contrat->activer && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
+			if ($action == 'closeline' && !$_REQUEST["cancel"] && $user->rights->contrat->activer && $object->lines[$cursorline - 1]->id == GETPOST('ligne'))
 			{
 				$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 				$dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-				$comment      = GETPOST('comment','alpha');
+				$comment      = GETPOST('comment', 'alpha');
 
 				if (empty($dateactend))
 				{
@@ -1866,7 +1866,7 @@ 
 				}
 				else
 				{
-					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne','int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1);
+					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne', 'int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService", dol_print_date($dateactend, "%A %d %B %Y")), "confirm_closeline", '', 0, 1);
 				}
 				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
 			}
@@ -1875,27 +1875,27 @@ 
 			// Area with status and activation info of line
 			if ($object->statut > 0)
 			{
-				print '<table class="notopnoleftnoright tableforservicepart2'.($cursorline < $nbofservices ?' boxtablenobottom':'').'" width="100%">';
+				print '<table class="notopnoleftnoright tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').'" width="100%">';
 
 				print '<tr class="oddeven">';
-				print '<td>'.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).'</td>';
+				print '<td>'.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline - 1]->getLibStatut(4).'</td>';
 				print '<td width="30" align="right">';
 				if ($user->societe_id == 0)
 				{
 					if ($object->statut > 0 && $action != 'activateline' && $action != 'unactivateline')
 					{
-						$tmpaction='activateline';
-						$tmpactionpicto='play';
-						$tmpactiontext=$langs->trans("Activate");
+						$tmpaction = 'activateline';
+						$tmpactionpicto = 'play';
+						$tmpactiontext = $langs->trans("Activate");
 						if ($objp->statut == 4)
 						{
-							$tmpaction='unactivateline';
-							$tmpactionpicto='playstop';
-							$tmpactiontext=$langs->trans("Disable");
+							$tmpaction = 'unactivateline';
+							$tmpactionpicto = 'playstop';
+							$tmpactiontext = $langs->trans("Disable");
 						}
-						if (($tmpaction=='activateline' && $user->rights->contrat->activer) || ($tmpaction=='unactivateline' && $user->rights->contrat->desactiver))
+						if (($tmpaction == 'activateline' && $user->rights->contrat->activer) || ($tmpaction == 'unactivateline' && $user->rights->contrat->desactiver))
 						{
-							print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;ligne=' . $object->lines[$cursorline - 1]->id . '&amp;action=' . $tmpaction . '">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline - 1]->id.'&amp;action='.$tmpaction.'">';
 							print img_picto($tmpactiontext, $tmpactionpicto);
 							print '</a>';
 						}
@@ -1908,13 +1908,13 @@ 
 
 				print '<td>';
 				// Si pas encore active
-				if (! $objp->date_debut_reelle) {
+				if (!$objp->date_debut_reelle) {
 					print $langs->trans("DateStartReal").': ';
 					if ($objp->date_debut_reelle) print dol_print_date($objp->date_debut_reelle, 'day');
 					else print $langs->trans("ContractStatusNotRunning");
 				}
 				// Si active et en cours
-				if ($objp->date_debut_reelle && ! $objp->date_fin_reelle) {
+				if ($objp->date_debut_reelle && !$objp->date_fin_reelle) {
 					print $langs->trans("DateStartReal").': ';
 					print dol_print_date($objp->date_debut_reelle, 'day');
 				}
@@ -1926,7 +1926,7 @@ 
 					print $langs->trans("DateEndReal").': ';
 					print dol_print_date($objp->date_fin_reelle, 'day');
 				}
-				if (! empty($objp->comment)) print " &nbsp;-&nbsp; ".$objp->comment;
+				if (!empty($objp->comment)) print " &nbsp;-&nbsp; ".$objp->comment;
 				print '</td>';
 
 				print '<td align="center">&nbsp;</td>';
@@ -1936,25 +1936,25 @@ 
 			}
 
 			// Form to activate line
-			if ($user->rights->contrat->activer && $action == 'activateline' && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
+			if ($user->rights->contrat->activer && $action == 'activateline' && $object->lines[$cursorline - 1]->id == GETPOST('ligne'))
 			{
 				print '<form name="active" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.GETPOST('ligne').'&amp;action=active" method="post">';
 				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-				print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ?' boxtablenobottom':'').'" width="100%">';
+				print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').'" width="100%">';
 
 				// Definie date debut et fin par defaut
 				$dateactstart = $objp->date_debut;
 				if (GETPOST('remonth')) $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-				elseif (! $dateactstart) $dateactstart = time();
+				elseif (!$dateactstart) $dateactstart = time();
 
 				$dateactend = $objp->date_fin;
 				if (GETPOST('endmonth')) $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-				elseif (! $dateactend)
+				elseif (!$dateactend)
 				{
 					if ($objp->fk_product > 0)
 					{
-						$product=new Product($db);
+						$product = new Product($db);
 						$product->fetch($objp->fk_product);
 						$dateactend = dol_time_plus_duree(time(), $product->duration_value, $product->duration_unit);
 					}
@@ -1973,7 +1973,7 @@ 
 				print '</tr>';
 
 				print '<tr class="oddeven">';
-				print '<td class="nohover">'.$langs->trans("Comment").'</td><td colspan="3" class="nohover" colspan="'.($conf->margin->enabled?4:3).'"><input size="80" type="text" name="comment" value="'.$_POST["comment"].'"></td>';
+				print '<td class="nohover">'.$langs->trans("Comment").'</td><td colspan="3" class="nohover" colspan="'.($conf->margin->enabled ? 4 : 3).'"><input size="80" type="text" name="comment" value="'.$_POST["comment"].'"></td>';
 				print '<td class="nohover right">';
 				print '<input type="submit" class="button" name="activate" value="'.$langs->trans("Activate").'"> &nbsp; ';
 				print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -1985,37 +1985,37 @@ 
 				print '</form>';
 			}
 
-			if ($user->rights->contrat->activer && $action == 'unactivateline' && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
+			if ($user->rights->contrat->activer && $action == 'unactivateline' && $object->lines[$cursorline - 1]->id == GETPOST('ligne'))
 			{
 				/**
 				 * Disable a contract line
 				 */
 				print '<!-- Form to disabled a line -->'."\n";
-				print '<form name="closeline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline-1]->id.'" method="post">';
+				print '<form name="closeline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline - 1]->id.'" method="post">';
 
 				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 				print '<input type="hidden" name="action" value="closeline">';
 
-				print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ?' boxtablenobottom':'').'" width="100%">';
+				print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').'" width="100%">';
 
 				// Definie date debut et fin par defaut
 				$dateactstart = $objp->date_debut_reelle;
 				if (GETPOST('remonth')) $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-				elseif (! $dateactstart) $dateactstart = time();
+				elseif (!$dateactstart) $dateactstart = time();
 
 				$dateactend = $objp->date_fin_reelle;
 				if (GETPOST('endmonth')) $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-				elseif (! $dateactend)
+				elseif (!$dateactend)
 				{
 					if ($objp->fk_product > 0)
 					{
-						$product=new Product($db);
+						$product = new Product($db);
 						$product->fetch($objp->fk_product);
 						$dateactend = dol_time_plus_duree(time(), $product->duration_value, $product->duration_unit);
 					}
 				}
-				$now=dol_now();
-				if ($dateactend > $now) $dateactend=$now;
+				$now = dol_now();
+				if ($dateactend > $now) $dateactend = $now;
 
 				print '<tr class="oddeven"><td colspan="2" class="nohover">';
 				if ($objp->statut >= 4)
@@ -2023,7 +2023,7 @@ 
 					if ($objp->statut == 4)
 					{
 						print $langs->trans("DateEndReal").' ';
-						print $form->selectDate($dateactend, "end", $usehm, $usehm, ($objp->date_fin_reelle>0?0:1), "closeline", 1, 1);
+						print $form->selectDate($dateactend, "end", $usehm, $usehm, ($objp->date_fin_reelle > 0 ? 0 : 1), "closeline", 1, 1);
 					}
 				}
 				print '</td>';
@@ -2050,23 +2050,23 @@ 
 		// Form to add new line
 		if ($user->rights->contrat->creer && ($object->statut == 0))
 		{
-			$dateSelector=1;
+			$dateSelector = 1;
 
 			print "\n";
-			print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline')?'#add':'#line_'.GETPOST('lineid')).'" method="POST">
+			print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#line_'.GETPOST('lineid')).'" method="POST">
 			<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">
-			<input type="hidden" name="action" value="'.(($action != 'editline')?'addline':'updateline').'">
+			<input type="hidden" name="action" value="'.(($action != 'editline') ? 'addline' : 'updateline').'">
 			<input type="hidden" name="mode" value="">
 			<input type="hidden" name="id" value="'.$object->id.'">
 			';
 
 			print '<div class="div-table-responsive-no-min">';
-			print '<table id="tablelines" class="noborder noshadow" width="100%">';	// Array with (n*2)+1 lines
+			print '<table id="tablelines" class="noborder noshadow" width="100%">'; // Array with (n*2)+1 lines
 
 			// Form to add new line
 	   		if ($action != 'editline')
 			{
-				$forcetoshowtitlelines=1;
+				$forcetoshowtitlelines = 1;
 
 				// Add free products/services
 				$object->formAddObjectLine(1, $mysoc, $soc);
@@ -2091,17 +2091,17 @@ 
 		{
 			print '<div class="tabsAction">';
 
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 
 			if (empty($reshook))
 			{
 				// Send
 				if ($object->statut == 1) {
 					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
 					} else
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans('SendMail') . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
 				}
 
 				if ($object->statut == 0 && $nbofservices)
@@ -2115,14 +2115,14 @@ 
 					else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Modify").'</a></div>';
 				}
 
-				if (! empty($conf->facture->enabled) && $object->statut > 0)
+				if (!empty($conf->facture->enabled) && $object->statut > 0)
 				{
 					$langs->load("bills");
 					if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateBill").'</a></div>';
 					else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateBill").'</a></div>';
 				}
 
-				if (! empty($conf->commande->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices)
+				if (!empty($conf->commande->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices)
 				{
 					$langs->load("orders");
 					if ($user->rights->commande->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateOrder").'</a></div>';
@@ -2131,7 +2131,7 @@ 
 
 				// Clone
 				if ($user->rights->contrat->creer) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=' . $object->element . '">' . $langs->trans("ToClone") . '</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object='.$object->element.'">'.$langs->trans("ToClone").'</a></div>';
 				}
 
 				if ($object->nbofservicesclosed > 0 || $object->nbofserviceswait > 0)
@@ -2194,8 +2194,8 @@ 
     		 * Documents generes
     		*/
 			$filename = dol_sanitizeFileName($object->ref);
-			$filedir = $conf->contrat->dir_output . "/" . dol_sanitizeFileName($object->ref);
-			$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+			$filedir = $conf->contrat->dir_output."/".dol_sanitizeFileName($object->ref);
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 			$genallowed = $user->rights->contrat->lire;
 			$delallowed = $user->rights->contrat->creer;
 
@@ -2211,7 +2211,7 @@ 
 			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 			// List of actions on element
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'contract', $socid, 1);
 
@@ -2220,8 +2220,8 @@ 
 		}
 
 		// Presend form
-		$modelmail='contract';
-		$defaulttopic='SendContractRef';
+		$modelmail = 'contract';
+		$defaulttopic = 'SendContractRef';
 		$diroutput = $conf->contrat->dir_output;
 		$trackid = 'con'.$object->id;
 
@@ -2236,7 +2236,7 @@ 
 ?>
 
 <?php
-if (! empty($conf->margin->enabled) && $action == 'editline')
+if (!empty($conf->margin->enabled) && $action == 'editline')
 {
 ?>
 

Braces +255 added lines, -199 removed lines

@@ -40,7 +40,9 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (! empty($conf->propal->enabled))  require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (! empty($conf->propal->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
 if (! empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
@@ -62,7 +64,9 @@ 
 $usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:0);
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result=restrictedArea($user,'contrat',$id);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -74,11 +78,13 @@ 
 // Load object
 if ($id > 0 || ! empty($ref) && $action!='add') {
 	$ret = $object->fetch($id, $ref);
-	if ($ret > 0)
-		$ret = $object->fetch_thirdparty();
-	if ($ret < 0)
-		dol_print_error('', $object->error);
-}
+	if ($ret > 0) {
+			$ret = $object->fetch_thirdparty();
+	}
+	if ($ret < 0) {
+			dol_print_error('', $object->error);
+	}
+	}
 
 // fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
@@ -98,7 +104,9 @@ 
 
 $parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 if (empty($reshook))
 {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
@@ -113,13 +121,10 @@ 
 		{
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	else if ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->contrat->activer)
+	} else if ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->contrat->activer)
 	{
 		if (! GETPOST('dateend'))
 		{
@@ -133,8 +138,7 @@ 
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else
+			} else
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -310,8 +314,12 @@ 
 
 										$outputlangs = $langs;
 										$newlang='';
-										if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-										if (empty($newlang)) $newlang=$srcobject->thirdparty->default_lang;
+										if (empty($newlang) && GETPOST('lang_id','aZ09')) {
+										    $newlang=GETPOST('lang_id','aZ09');
+										}
+										if (empty($newlang)) {
+										    $newlang=$srcobject->thirdparty->default_lang;
+										}
 										if (! empty($newlang))
 										{
 											$outputlangs = new Translate("",$conf);
@@ -319,23 +327,23 @@ 
 										}
 
 										$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
-									}
-									else
+									} else
 									{
 										$label = $lines[$i]->product_label;
 									}
 									$desc = ($lines[$i]->desc && $lines[$i]->desc!=$lines[$i]->libelle)?dol_htmlentitiesbr($lines[$i]->desc):'';
-								}
-								else {
+								} else {
 									$desc = dol_htmlentitiesbr($lines[$i]->desc);
 								}
 
 								// Extrafields
 								$array_options = array();
-								if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) 							// For avoid conflicts if
+								if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
+								    // For avoid conflicts if
 								// trigger used
 								{
 									$lines[$i]->fetch_optionals($lines[$i]->rowid);
+								}
 									$array_options = $lines[$i]->array_options;
 								}
 
@@ -372,8 +380,7 @@ 
 								}
 							}
 						}
-					}
-					else
+					} else
 					{
 						setEventMessages($srcobject->error, $srcobject->errors, 'errors');
 						$error++;
@@ -383,32 +390,28 @@ 
 					$parameters = array('objFrom' => $srcobject);
 					$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
 					// modified by hook
-					if ($reshook < 0)
-						$error++;
-				}
-				else
+					if ($reshook < 0) {
+											$error++;
+					}
+				} else
 				{
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 				}
-			}
-			else
+			} else
 			{
 				$result = $object->create($user);
 				if ($result > 0)
 				{
 					header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
-				}
-				else {
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 				$action='create';
 			}
 		}
-	}
-
-	else if ($action == 'classin' && $user->rights->contrat->creer)
+	} else if ($action == 'classin' && $user->rights->contrat->creer)
 	{
 		$object->setProject(GETPOST('projectid'));
 	}
@@ -425,8 +428,7 @@ 
 		{
 			$idprod=0;
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else
+		} else
 		{
 			$idprod=GETPOST('idprod', 'int');
 			$tva_tx = '';
@@ -485,7 +487,9 @@ 
 				// Update if prices fields are defined
 				$tva_tx = get_default_tva($mysoc,$object->thirdparty,$prod->id);
 				$tva_npr = get_default_npr($mysoc,$object->thirdparty,$prod->id);
-				if (empty($tva_tx)) $tva_npr=0;
+				if (empty($tva_tx)) {
+				    $tva_npr=0;
+				}
 
 				$pu_ht = $prod->price;
 				$pu_ttc = $prod->price_ttc;
@@ -499,8 +503,7 @@ 
 					$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
 					$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
 					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
-				}
-				elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+				} elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
 					require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
 
@@ -515,9 +518,13 @@ 
 							$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
 							$price_base_type = $prodcustprice->lines [0]->price_base_type;
 							$tva_tx = $prodcustprice->lines [0]->tva_tx;
-							if ($prodcustprice->lines[0]->default_vat_code && ! preg_match('/\(.*\)/', $tva_tx)) $tva_tx.= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+							if ($prodcustprice->lines[0]->default_vat_code && ! preg_match('/\(.*\)/', $tva_tx)) {
+							    $tva_tx.= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+							}
 							$tva_npr = $prodcustprice->lines[0]->recuperableonly;
-							if (empty($tva_tx)) $tva_npr=0;
+							if (empty($tva_tx)) {
+							    $tva_npr=0;
+							}
 						}
 					}
 				}
@@ -532,8 +539,7 @@ 
 					if ($price_base_type != 'HT')
 					{
 						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat/100)), 'MU');
-					}
-					else
+					} else
 				  {
 						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat/100)), 'MU');
 					}
@@ -542,8 +548,7 @@ 
 			   	$desc=$prod->description;
 			   	$desc=dol_concatdesc($desc,$product_desc, '', !empty($conf->global->CHANGE_ORDER_CONCAT_DESCRIPTION));
 				$fk_unit = $prod->fk_unit;
-			}
-			else
+			} else
 			{
 				$pu_ht=GETPOST('price_ht');
 				$price_base_type = 'HT';
@@ -558,20 +563,22 @@ 
 
 			// ajout prix achat
 			$fk_fournprice = $_POST['fournprice'];
-			if ( ! empty($_POST['buying_price']) )
-			  $pa_ht = $_POST['buying_price'];
-			else
-			  $pa_ht = null;
+			if ( ! empty($_POST['buying_price']) ) {
+						  $pa_ht = $_POST['buying_price'];
+			} else {
+						  $pa_ht = null;
+			}
 
 			$info_bits=0;
-			if ($tva_npr) $info_bits |= 0x01;
+			if ($tva_npr) {
+			    $info_bits |= 0x01;
+			}
 
 			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS) )&& ($price_min && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min))))
 			{
 				$object->error = $langs->trans("CantBeLessThanMinPrice",price(price2num($price_min,'MU'),0,$langs,0,0,-1,$conf->currency));
 				$result = -1 ;
-			}
-			else
+			} else
 			{
 				// Insert line
 				$result = $object->addline(
@@ -598,12 +605,18 @@ 
 			if ($result > 0)
 			{
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && ! empty($conf->global->CONTRACT_ADDON_PDF))    // No generation if default type not defined
+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && ! empty($conf->global->CONTRACT_ADDON_PDF)) {
+				    // No generation if default type not defined
 				{
 					$outputlangs = $langs;
+				}
 					$newlang = '';
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+					    $newlang = GETPOST('lang_id','aZ09');
+					}
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+					    $newlang = $object->thirdparty->default_lang;
+					}
 					if (! empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -645,15 +658,12 @@ 
 				unset($_POST['date_endday']);
 				unset($_POST['date_endmonth']);
 				unset($_POST['date_endyear']);
-			}
-			else
+			} else
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	else if ($action == 'updateline' && $user->rights->contrat->creer && ! GETPOST('cancel','alpha'))
+	} else if ($action == 'updateline' && $user->rights->contrat->creer && ! GETPOST('cancel','alpha'))
 	{
 		$error = 0;
 
@@ -679,14 +689,19 @@ 
 
 		if (! $error)
 		{
-			if ($date_start_real_update == '') $date_start_real_update=$objectline->date_ouverture;
-			if ($date_end_real_update == '')   $date_end_real_update=$objectline->date_cloture;
+			if ($date_start_real_update == '') {
+			    $date_start_real_update=$objectline->date_ouverture;
+			}
+			if ($date_end_real_update == '') {
+			    $date_end_real_update=$objectline->date_cloture;
+			}
 
 			$vat_rate = GETPOST('eltva_tx');
 			// Define info_bits
 			$info_bits = 0;
-			if (preg_match('/\*/', $vat_rate))
-				  $info_bits |= 0x01;
+			if (preg_match('/\*/', $vat_rate)) {
+							  $info_bits |= 0x01;
+			}
 
 			// Define vat_rate
 			$vat_rate = str_replace('*', '', $vat_rate);
@@ -705,10 +720,11 @@ 
 
 			// ajout prix d'achat
 			$fk_fournprice = $_POST['fournprice'];
-			if ( ! empty($_POST['buying_price']) )
-			  $pa_ht = $_POST['buying_price'];
-			else
-			  $pa_ht = null;
+			if ( ! empty($_POST['buying_price']) ) {
+						  $pa_ht = $_POST['buying_price'];
+			} else {
+						  $pa_ht = null;
+			}
 
 			$fk_unit = GETPOST('unit', 'alpha');
 
@@ -754,14 +770,11 @@ 
 		if (! $error)
 		{
 			$db->commit();
-		}
-		else
+		} else
 		{
 			$db->rollback();
 		}
-	}
-
-	else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->contrat->creer)
+	} else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 		$result = $object->deleteline(GETPOST('lineid'),$user);
 
@@ -769,14 +782,11 @@ 
 		{
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
-		}
-		else
+		} else
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contrat->creer)
+	} else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 		$result = $object->validate($user);
 
@@ -787,8 +797,12 @@ 
 			{
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+				    $newlang = GETPOST('lang_id','aZ09');
+				}
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+				    $newlang = $object->thirdparty->default_lang;
+				}
 				if (! empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -798,14 +812,11 @@ 
 
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
-		}
-		else
+		} else
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	else if ($action == 'reopen' && $user->rights->contrat->creer)
+	} else if ($action == 'reopen' && $user->rights->contrat->creer)
 	{
 		$result = $object->reopen($user);
 		if ($result < 0)
@@ -832,23 +843,18 @@ 
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
+	} else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
 	{
 		$result=$object->delete($user);
 		if ($result >= 0)
 		{
 			header("Location: list.php?restore_lastsearch_values=1");
 			return;
-		}
-		else
+		} else
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	else if ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contrat->creer)
+	} else if ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 		if (GETPOST('newcid') > 0)
 		{
@@ -860,25 +866,24 @@ 
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 				return;
-			}
-			else
+			} else
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else
+		} else
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("RefNewContract")), null, 'errors');
 		}
-	}
-	else if ($action == 'update_extras')
+	} else if ($action == 'update_extras')
 	{
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+		    $error++;
+		}
 
 		if (! $error) {
 			$result = $object->insertExtraFields('CONTRACT_MODIFY');
@@ -892,8 +897,7 @@ 
 		if ($error) {
 			$action = 'edit_extras';
 		}
-	}
-	elseif ($action=='setref_supplier')
+	} elseif ($action=='setref_supplier')
 	{
 		$cancelbutton = GETPOST('cancel','alpha');
 		if (!$cancelbutton) {
@@ -908,13 +912,11 @@ 
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
-		}
-		else {
+		} else {
 			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
 			exit;
 		}
-	}
-	elseif ($action=='setref_customer')
+	} elseif ($action=='setref_customer')
 	{
 		$cancelbutton = GETPOST('cancel','alpha');
 
@@ -930,13 +932,11 @@ 
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
-		}
-		else {
+		} else {
 			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
 			exit;
 		}
-	}
-	elseif ($action=='setref')
+	} elseif ($action=='setref')
 	{
 		$cancelbutton = GETPOST('cancel','alpha');
 
@@ -960,7 +960,9 @@ 
 				$files = dol_dir_list($old_filedir);
 				if (!empty($files))
 				{
-					if (!is_dir($new_filedir)) dol_mkdir($new_filedir);
+					if (!is_dir($new_filedir)) {
+					    dol_mkdir($new_filedir);
+					}
 					foreach ($files as $file)
 					{
 						dol_move($file['fullname'], $new_filedir.'/'.$file['name']);
@@ -970,13 +972,11 @@ 
 	            header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
 	            exit;
 	        }
-	    }
-	    else {
+	    } else {
 	        header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
 	        exit;
 	    }
-	}
-	elseif ($action=='setdate_contrat')
+	} elseif ($action=='setdate_contrat')
 	{
 		$cancelbutton = GETPOST('cancel','alpha');
 
@@ -994,8 +994,7 @@ 
 				header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
 				exit;
 			}
-		}
-		else {
+		} else {
 			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
 			exit;
 		}
@@ -1026,15 +1025,13 @@ 
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else
+			} else
 			{
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-				}
-				else
+				} else
 				{
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
@@ -1056,8 +1053,7 @@ 
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -1069,8 +1065,7 @@ 
 		if (! GETPOST('socid', 3))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else
+		} else
 		{
 			if ($object->id > 0) {
 				$result = $object->createFromClone($socid);
@@ -1078,7 +1073,9 @@ 
 					header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $result);
 					exit();
 				} else {
-					if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
+					if (count($object->errors) > 0) {
+					    setEventMessages($object->error, $object->errors, 'errors');
+					}
 					$action = '';
 				}
 			}
@@ -1095,7 +1092,9 @@ 
 
 $form = new Form($db);
 $formfile = new FormFile($db);
-if (! empty($conf->projet->enabled)) $formproject = new FormProjets($db);
+if (! empty($conf->projet->enabled)) {
+    $formproject = new FormProjets($db);
+}
 
 $objectlignestatic=new ContratLigne($db);
 
@@ -1117,7 +1116,9 @@ 
 	print load_fiche_titre($langs->trans('AddContract'),'','title_commercial.png');
 
 	$soc = new Societe($db);
-	if ($socid>0) $soc->fetch($socid);
+	if ($socid>0) {
+	    $soc->fetch($socid);
+	}
 
 	if (GETPOST('origin') && GETPOST('originid'))
 	{
@@ -1132,8 +1133,7 @@ 
 		if ($element == 'project')
 		{
 			$projectid=GETPOST('originid');
-		}
-		else
+		} else
 		{
 			// For compatibility
 			if ($element == 'order' || $element == 'commande')    { $element = $subelement = 'commande'; }
@@ -1144,7 +1144,9 @@ 
 			$classname = ucfirst($subelement);
 			$objectsrc = new $classname($db);
 			$objectsrc->fetch(GETPOST('originid'));
-			if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines'))  $objectsrc->fetch_lines();
+			if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines')) {
+			    $objectsrc->fetch_lines();
+			}
 			$objectsrc->fetch_thirdparty();
 
 			// Replicate extrafields
@@ -1161,8 +1163,7 @@ 
 			// Object source contacts list
 			$srccontactslist = $objectsrc->liste_contact(-1,'external',1);
 		}
-	}
-	else {
+	} else {
 		$projectid = GETPOST('projectid','int');
 		$note_private = GETPOST("note_private");
 		$note_public = GETPOST("note_public");
@@ -1208,8 +1209,7 @@ 
 		print $soc->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$soc->id.'">';
 		print '</td>';
-	}
-	else
+	} else
 	{
 		print '<td>';
 		print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300');
@@ -1222,12 +1222,18 @@ 
 	{
 		// Ligne info remises tiers
 		print '<tr><td>'.$langs->trans('Discounts').'</td><td>';
-		if ($soc->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_percent);
-		else print $langs->trans("CompanyHasNoRelativeDiscount");
+		if ($soc->remise_percent) {
+		    print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_percent);
+		} else {
+		    print $langs->trans("CompanyHasNoRelativeDiscount");
+		}
 		print '. ';
 		$absolute_discount=$soc->getAvailableDiscounts();
-		if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
-		else print $langs->trans("CompanyHasNoAbsoluteDiscount");
+		if ($absolute_discount) {
+		    print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
+		} else {
+		    print $langs->trans("CompanyHasNoAbsoluteDiscount");
+		}
 		print '.';
 		print '</td></tr>';
 	}
@@ -1304,8 +1310,7 @@ 
 	}
 
 	print "</form>\n";
-}
-else
+} else
 /* *************************************************************************** */
 /*                                                                             */
 /* Mode vue et edition                                                         */
@@ -1416,7 +1421,9 @@ 
 		$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->contrat->creer, 'string', '', null, null, '', 1);
 		// Thirdparty
 		$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref.=' (<a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->thirdparty->id.'&search_name='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherContracts").'</a>)';
+		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		    $morehtmlref.=' (<a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->thirdparty->id.'&search_name='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherContracts").'</a>)';
+		}
 		// Project
 		if (! empty($conf->projet->enabled))
 		{
@@ -1424,8 +1431,9 @@ 
 			$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 			if ($user->rights->contrat->creer)
 			{
-				if ($action != 'classify')
-					$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				if ($action != 'classify') {
+									$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				}
 					if ($action == 'classify') {
 						//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 						$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
@@ -1463,12 +1471,18 @@ 
 
 		// Ligne info remises tiers
 		print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
-		if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent);
-		else print $langs->trans("CompanyHasNoRelativeDiscount");
+		if ($object->thirdparty->remise_percent) {
+		    print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent);
+		} else {
+		    print $langs->trans("CompanyHasNoRelativeDiscount");
+		}
 		$absolute_discount=$object->thirdparty->getAvailableDiscounts();
 		print '. ';
-		if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
-		else print $langs->trans("CompanyHasNoAbsoluteDiscount");
+		if ($absolute_discount) {
+		    print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
+		} else {
+		    print $langs->trans("CompanyHasNoAbsoluteDiscount");
+		}
 		print '.';
 		print '</td></tr>';
 
@@ -1522,7 +1536,9 @@ 
 		$productstatic=new Product($db);
 
 		$usemargins=0;
-		if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
+		if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) {
+		    $usemargins=1;
+		}
 
 		$var=false;
 
@@ -1567,9 +1583,13 @@ 
 					print '<td width="80" align="right">'.$langs->trans("PriceUHTCurrency").'</td>';
 				}
 				print '<td width="30" align="center">'.$langs->trans("Qty").'</td>';
-				if ($conf->global->PRODUCT_USE_UNITS) print '<td width="30" align="left">'.$langs->trans("Unit").'</td>';
+				if ($conf->global->PRODUCT_USE_UNITS) {
+				    print '<td width="30" align="left">'.$langs->trans("Unit").'</td>';
+				}
 				print '<td width="50" align="right">'.$langs->trans("ReductionShort").'</td>';
-				if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print '<td width="50" align="right">'.$langs->trans("BuyingPrice").'</td>';
+				if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) {
+				    print '<td width="50" align="right">'.$langs->trans("BuyingPrice").'</td>';
+				}
 				print '<td width="30">&nbsp;</td>';
 				print "</tr>\n";
 
@@ -1607,8 +1627,7 @@ 
 						echo $form->textwithtooltip($text,$description,3,'','',$cursorline,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
 
 						print '</td>';
-					}
-					else
+					} else
 					{
 						print '<td>'.img_object($langs->trans("ShowProductOrService"), ($objp->product_type ? 'service' : 'product')).' '.dol_htmlentitiesbr($objp->description)."</td>\n";
 					}
@@ -1625,19 +1644,22 @@ 
 					// Quantite
 					print '<td align="center">'.$objp->qty.'</td>';
 					// Unit
-					if($conf->global->PRODUCT_USE_UNITS) print '<td align="left">'.$langs->trans($object->lines[$cursorline-1]->getLabelOfUnit()).'</td>';
+					if($conf->global->PRODUCT_USE_UNITS) {
+					    print '<td align="left">'.$langs->trans($object->lines[$cursorline-1]->getLabelOfUnit()).'</td>';
+					}
 					// Remise
 					if ($objp->remise_percent > 0)
 					{
 						print '<td align="right">'.$objp->remise_percent."%</td>\n";
-					}
-					else
+					} else
 					{
 						print '<td>&nbsp;</td>';
 					}
 
 					// Margin
-					if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print '<td align="right" class="nowrap">'.price($objp->pa_ht).'</td>';
+					if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) {
+					    print '<td align="right" class="nowrap">'.price($objp->pa_ht).'</td>';
+					}
 
 					// Icon move, update et delete (statut contrat 0=brouillon,1=valide,2=ferme)
 					print '<td align="right" class="nowrap">';
@@ -1689,8 +1711,9 @@ 
 								$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
 								print " ".img_warning($textlate);
 							}
+						} else {
+						    print $langs->trans("Unknown");
 						}
-						else print $langs->trans("Unknown");
 						print ' &nbsp;-&nbsp; ';
 						print $langs->trans("DateEndPlanned").': ';
 						if ($objp->date_fin)
@@ -1701,8 +1724,9 @@ 
 								$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
 								print " ".img_warning($textlate);
 							}
+						} else {
+						    print $langs->trans("Unknown");
 						}
-						else print $langs->trans("Unknown");
 
 						print '</td>';
 						print '</tr>';
@@ -1730,8 +1754,7 @@ 
 						print $productstatic->getNomUrl(1,'',32);
 						print $objp->label?' - '.dol_trunc($objp->label,32):'';
 						print '<br>';
-					}
-					else
+					} else
 					{
 						print $objp->label?$objp->label.'<br>':'';
 					}
@@ -1739,7 +1762,9 @@ 
 					// editeur wysiwyg
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 					$nbrows=ROWS_2;
-					if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+					if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
+					    $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+					}
 					$enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
 					$doleditor=new DolEditor('product_desc',$objp->description,'',92,'dolibarr_details','',false,true,$enable,$nbrows,'90%');
 					$doleditor->Create();
@@ -1760,7 +1785,9 @@ 
 					if (! empty($usemargins))
 					{
 						print '<td align="right">';
-						if ($objp->fk_product) print '<select id="fournprice" name="fournprice"></select>';
+						if ($objp->fk_product) {
+						    print '<select id="fournprice" name="fournprice"></select>';
+						}
 						print '<input id="buying_price" type="text" size="5" name="buying_price" value="'.price($objp->pa_ht,0,'',0).'"></td>';
 					}
 					print '<td align="center">';
@@ -1770,8 +1797,12 @@ 
 					print '</tr>';
 
 					$colspan=6;
-					if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) $colspan++;
-					if($conf->global->PRODUCT_USE_UNITS) $colspan++;
+					if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) {
+					    $colspan++;
+					}
+					if($conf->global->PRODUCT_USE_UNITS) {
+					    $colspan++;
+					}
 
 					// Ligne dates prevues
 					print '<tr class="oddeven">';
@@ -1791,8 +1822,7 @@ 
 				}
 
 				$db->free($result);
-			}
-			else
+			} else
 			{
 				dol_print_error($db);
 			}
@@ -1816,7 +1846,9 @@ 
 			if ($action == 'deleteline' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline-1]->id == GETPOST('rowid'))
 			{
 				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("DeleteContractLine"),$langs->trans("ConfirmDeleteContractLine"),"confirm_deleteline",'',0,1);
-				if ($ret == 'html') print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
+				if ($ret == 'html') {
+				    print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
+				}
 			}
 
 			/*
@@ -1863,8 +1895,7 @@ 
 				if (empty($dateactend))
 				{
 					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEndReal")), null, 'errors');
-				}
-				else
+				} else
 				{
 					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne','int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1);
 				}
@@ -1910,8 +1941,11 @@ 
 				// Si pas encore active
 				if (! $objp->date_debut_reelle) {
 					print $langs->trans("DateStartReal").': ';
-					if ($objp->date_debut_reelle) print dol_print_date($objp->date_debut_reelle, 'day');
-					else print $langs->trans("ContractStatusNotRunning");
+					if ($objp->date_debut_reelle) {
+					    print dol_print_date($objp->date_debut_reelle, 'day');
+					} else {
+					    print $langs->trans("ContractStatusNotRunning");
+					}
 				}
 				// Si active et en cours
 				if ($objp->date_debut_reelle && ! $objp->date_fin_reelle) {
@@ -1926,7 +1960,9 @@ 
 					print $langs->trans("DateEndReal").': ';
 					print dol_print_date($objp->date_fin_reelle, 'day');
 				}
-				if (! empty($objp->comment)) print " &nbsp;-&nbsp; ".$objp->comment;
+				if (! empty($objp->comment)) {
+				    print " &nbsp;-&nbsp; ".$objp->comment;
+				}
 				print '</td>';
 
 				print '<td align="center">&nbsp;</td>';
@@ -1945,12 +1981,16 @@ 
 
 				// Definie date debut et fin par defaut
 				$dateactstart = $objp->date_debut;
-				if (GETPOST('remonth')) $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-				elseif (! $dateactstart) $dateactstart = time();
+				if (GETPOST('remonth')) {
+				    $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+				} elseif (! $dateactstart) {
+				    $dateactstart = time();
+				}
 
 				$dateactend = $objp->date_fin;
-				if (GETPOST('endmonth')) $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-				elseif (! $dateactend)
+				if (GETPOST('endmonth')) {
+				    $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+				} elseif (! $dateactend)
 				{
 					if ($objp->fk_product > 0)
 					{
@@ -2000,12 +2040,16 @@ 
 
 				// Definie date debut et fin par defaut
 				$dateactstart = $objp->date_debut_reelle;
-				if (GETPOST('remonth')) $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-				elseif (! $dateactstart) $dateactstart = time();
+				if (GETPOST('remonth')) {
+				    $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+				} elseif (! $dateactstart) {
+				    $dateactstart = time();
+				}
 
 				$dateactend = $objp->date_fin_reelle;
-				if (GETPOST('endmonth')) $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-				elseif (! $dateactend)
+				if (GETPOST('endmonth')) {
+				    $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+				} elseif (! $dateactend)
 				{
 					if ($objp->fk_product > 0)
 					{
@@ -2015,7 +2059,9 @@ 
 					}
 				}
 				$now=dol_now();
-				if ($dateactend > $now) $dateactend=$now;
+				if ($dateactend > $now) {
+				    $dateactend=$now;
+				}
 
 				print '<tr class="oddeven"><td colspan="2" class="nohover">';
 				if ($objp->statut >= 4)
@@ -2100,33 +2146,46 @@ 
 				if ($object->statut == 1) {
 					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a></div>';
-					} else
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans('SendMail') . '</a></div>';
+					} else {
+											print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans('SendMail') . '</a></div>';
+					}
 				}
 
 				if ($object->statut == 0 && $nbofservices)
 				{
-					if ($user->rights->contrat->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a></div>';
-					else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Validate").'</a></div>';
+					if ($user->rights->contrat->creer) {
+					    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a></div>';
+					} else {
+					    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Validate").'</a></div>';
+					}
 				}
 				if ($object->statut == 1)
 				{
-					if ($user->rights->contrat->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Modify").'</a></div>';
-					else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Modify").'</a></div>';
+					if ($user->rights->contrat->creer) {
+					    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Modify").'</a></div>';
+					} else {
+					    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Modify").'</a></div>';
+					}
 				}
 
 				if (! empty($conf->facture->enabled) && $object->statut > 0)
 				{
 					$langs->load("bills");
-					if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateBill").'</a></div>';
-					else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateBill").'</a></div>';
+					if ($user->rights->facture->creer) {
+					    print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateBill").'</a></div>';
+					} else {
+					    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateBill").'</a></div>';
+					}
 				}
 
 				if (! empty($conf->commande->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices)
 				{
 					$langs->load("orders");
-					if ($user->rights->commande->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateOrder").'</a></div>';
-					else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateOrder").'</a></div>';
+					if ($user->rights->commande->creer) {
+					    print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateOrder").'</a></div>';
+					} else {
+					    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateOrder").'</a></div>';
+					}
 				}
 
 				// Clone
@@ -2139,8 +2198,7 @@ 
 					if ($user->rights->contrat->activer)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=activate">'.$langs->trans("ActivateAllContracts").'</a></div>';
-					}
-					else
+					} else
 					{
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("ActivateAllContracts").'</a></div>';
 					}
@@ -2150,8 +2208,7 @@ 
 					if ($user->rights->contrat->desactiver)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=close">'.$langs->trans("CloseAllContracts").'</a></div>';
-					}
-					else
+					} else
 					{
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CloseAllContracts").'</a></div>';
 					}
@@ -2171,8 +2228,7 @@ 
 				if (($user->rights->contrat->creer && $object->statut == 0) || $user->rights->contrat->supprimer)
 				{
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a></div>';
-				}
-				else
+				} else
 				{
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Delete").'</a></div>';
 				}

dolibarr/htdocs/contrat/tpl/linkedobjectblock.tpl.php

Indentation +14 added lines, -14 removed lines

@@ -19,8 +19,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 ?>
@@ -52,18 +52,18 @@ 
     <td></td>
 	<td align="center"><?php echo dol_print_date($objectlink->date_contrat,'day'); ?></td>
     <td align="right"><?php
-		// Price of contract is not shown by default because a contract is a list of service with
-		// start and end date that change with time andd that may be different that the period of reference for price.
-		// So price of a contract does often means nothing. Prices is on the different invoices done on same contract.
-		if ($user->rights->contrat->lire && empty($conf->global->CONTRACT_SHOW_TOTAL_OF_PRODUCT_AS_PRICE))
-		{
-			$totalcontrat = 0;
-			foreach ($objectlink->lines as $linecontrat) {
-				$totalcontrat = $totalcontrat + $linecontrat->total_ht;
-			    $total = $total + $linecontrat->total_ht;
-			}
-			echo price($totalcontrat);
-		} ?></td>
+        // Price of contract is not shown by default because a contract is a list of service with
+        // start and end date that change with time andd that may be different that the period of reference for price.
+        // So price of a contract does often means nothing. Prices is on the different invoices done on same contract.
+        if ($user->rights->contrat->lire && empty($conf->global->CONTRACT_SHOW_TOTAL_OF_PRODUCT_AS_PRICE))
+        {
+            $totalcontrat = 0;
+            foreach ($objectlink->lines as $linecontrat) {
+                $totalcontrat = $totalcontrat + $linecontrat->total_ht;
+                $total = $total + $linecontrat->total_ht;
+            }
+            echo price($totalcontrat);
+        } ?></td>
 	<td align="right"><?php echo $objectlink->getLibStatut(7); ?></td>
 	<td align="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
 </tr>

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -38,19 +38,19 @@ 
 // Load translation files required by the page
 $langs->load("contracts");
 
-$total=0; $ilink=0;
-foreach($linkedObjectBlock as $key => $objectlink)
+$total = 0; $ilink = 0;
+foreach ($linkedObjectBlock as $key => $objectlink)
 {
     $ilink++;
 
-    $trclass='oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
+    $trclass = 'oddeven';
+    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
 ?>
 <tr class="<?php echo $trclass; ?>">
     <td><?php echo $langs->trans("Contract"); ?></td>
     <td><?php echo $objectlink->getNomUrl(1); ?></td>
     <td></td>
-	<td align="center"><?php echo dol_print_date($objectlink->date_contrat,'day'); ?></td>
+	<td align="center"><?php echo dol_print_date($objectlink->date_contrat, 'day'); ?></td>
     <td align="right"><?php
 		// Price of contract is not shown by default because a contract is a list of service with
 		// start and end date that change with time andd that may be different that the period of reference for price.

Braces +4 added lines, -2 removed lines

@@ -44,8 +44,10 @@
     $ilink++;
 
     $trclass='oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
-?>
+    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+        $trclass.=' liste_sub_total';
+    }
+    ?>
 <tr class="<?php echo $trclass; ?>">
     <td><?php echo $langs->trans("Contract"); ?></td>
     <td><?php echo $objectlink->getNomUrl(1); ?></td>

dolibarr/htdocs/contrat/info.php

Indentation +30 added lines, -30 removed lines

@@ -27,7 +27,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
@@ -102,35 +102,35 @@ 
 // Project
 if (! empty($conf->projet->enabled))
 {
-	$langs->load("projects");
-	$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	if ($user->rights->contrat->creer)
-	{
-		if ($action != 'classify')
-			//$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-			$morehtmlref.=' : ';
-		if ($action == 'classify') {
-			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-			$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-			$morehtmlref.='<input type="hidden" name="action" value="classin">';
-			$morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			$morehtmlref.=$formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-			$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-			$morehtmlref.='</form>';
-		} else {
-			$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
-		}
-	} else {
-		if (! empty($object->fk_project)) {
-			$proj = new Project($db);
-			$proj->fetch($object->fk_project);
-			$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-			$morehtmlref.=$proj->ref;
-			$morehtmlref.='</a>';
-		} else {
-			$morehtmlref.='';
-		}
-	}
+    $langs->load("projects");
+    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+    if ($user->rights->contrat->creer)
+    {
+        if ($action != 'classify')
+            //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+            $morehtmlref.=' : ';
+        if ($action == 'classify') {
+            //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+            $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+            $morehtmlref.='<input type="hidden" name="action" value="classin">';
+            $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            $morehtmlref.=$formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+            $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+            $morehtmlref.='</form>';
+        } else {
+            $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+        }
+    } else {
+        if (! empty($object->fk_project)) {
+            $proj = new Project($db);
+            $proj->fetch($object->fk_project);
+            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+            $morehtmlref.=$proj->ref;
+            $morehtmlref.='</a>';
+        } else {
+            $morehtmlref.='';
+        }
+    }
 }
 $morehtmlref.='</div>';
 

Spacing +35 added lines, -35 removed lines

@@ -26,24 +26,24 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+if (!empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
 $langs->load("contracts");
 
-$action		= GETPOST('action','alpha');
-$confirm	= GETPOST('confirm','alpha');
-$id			= GETPOST('id','int');
-$ref		= GETPOST('ref','alpha');
+$action		= GETPOST('action', 'alpha');
+$confirm	= GETPOST('confirm', 'alpha');
+$id			= GETPOST('id', 'int');
+$ref		= GETPOST('ref', 'alpha');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) $socid = $user->societe_id;
 $result = restrictedArea($user, 'contrat', $id, '');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('contractcard','globalcard'));
+$hookmanager->initHooks(array('contractcard', 'globalcard'));
 
 
 /*
@@ -60,7 +60,7 @@ 
 
 $form = new Form($db);
 
-llxHeader('',$langs->trans("Contract"),"");
+llxHeader('', $langs->trans("Contract"), "");
 
 $object = new Contrat($db);
 $object->fetch($id, $ref);
@@ -78,61 +78,61 @@ 
 
 // Contract card
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(! empty($socid)?'&socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-$morehtmlref='';
+$morehtmlref = '';
 //if (! empty($modCodeContract->code_auto)) {
-$morehtmlref.=$object->ref;
+$morehtmlref .= $object->ref;
 /*} else {
  $morehtmlref.=$form->editfieldkey("",'ref',$object->ref,0,'string','',0,3);
 $morehtmlref.=$form->editfieldval("",'ref',$object->ref,0,'string','',0,2);
 }*/
 
-$morehtmlref.='<div class="refidno">';
+$morehtmlref .= '<div class="refidno">';
 // Ref customer
-$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
-$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1);
+$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
+$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1);
 // Ref supplier
-$morehtmlref.='<br>';
-$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
-$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+$morehtmlref .= '<br>';
+$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
 // Thirdparty
-$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 // Project
-if (! empty($conf->projet->enabled))
+if (!empty($conf->projet->enabled))
 {
 	$langs->load("projects");
-	$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->contrat->creer)
 	{
 		if ($action != 'classify')
 			//$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-			$morehtmlref.=' : ';
+			$morehtmlref .= ' : ';
 		if ($action == 'classify') {
 			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-			$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-			$morehtmlref.='<input type="hidden" name="action" value="classin">';
-			$morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			$morehtmlref.=$formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-			$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-			$morehtmlref.='</form>';
+			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+			$morehtmlref .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			$morehtmlref .= '</form>';
 		} else {
-			$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
 		}
 	} else {
-		if (! empty($object->fk_project)) {
+		if (!empty($object->fk_project)) {
 			$proj = new Project($db);
 			$proj->fetch($object->fk_project);
-			$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-			$morehtmlref.=$proj->ref;
-			$morehtmlref.='</a>';
+			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+			$morehtmlref .= $proj->ref;
+			$morehtmlref .= '</a>';
 		} else {
-			$morehtmlref.='';
+			$morehtmlref .= '';
 		}
 	}
 }
-$morehtmlref.='</div>';
+$morehtmlref .= '</div>';
 
 
 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);

Braces +6 added lines, -3 removed lines

@@ -39,7 +39,9 @@ 
 $ref		= GETPOST('ref','alpha');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'contrat', $id, '');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -106,9 +108,10 @@ 
 	$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 	if ($user->rights->contrat->creer)
 	{
-		if ($action != 'classify')
-			//$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		if ($action != 'classify') {
+					//$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			$morehtmlref.=' : ';
+		}
 		if ($action == 'classify') {
 			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 			$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';

dolibarr/htdocs/contrat/document.php

Indentation +72 added lines, -72 removed lines

@@ -34,7 +34,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
@@ -48,9 +48,9 @@ 
 // Security check
 if ($user->societe_id > 0)
 {
-	unset($_GET["action"]);
-	$action='';
-	$socid = $user->societe_id;
+    unset($_GET["action"]);
+    $action='';
+    $socid = $user->societe_id;
 }
 $result = restrictedArea($user, 'contrat', $id);
 
@@ -70,7 +70,7 @@ 
 $object->fetch($id, $ref);
 if ($object->id > 0)
 {
-	$object->fetch_thirdparty();
+    $object->fetch_thirdparty();
 }
 
 $upload_dir = $conf->contrat->dir_output.'/'.dol_sanitizeFileName($object->ref);
@@ -98,84 +98,84 @@ 
 
 if ($object->id)
 {
-	$head=contract_prepare_head($object);
+    $head=contract_prepare_head($object);
 
-	dol_fiche_head($head, 'documents', $langs->trans("Contract"), -1, 'contract');
+    dol_fiche_head($head, 'documents', $langs->trans("Contract"), -1, 'contract');
 
 
-	// Build file list
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-	$totalsize=0;
-	foreach($filearray as $key => $file)
-	{
-		$totalsize+=$file['size'];
-	}
+    // Build file list
+    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+    $totalsize=0;
+    foreach($filearray as $key => $file)
+    {
+        $totalsize+=$file['size'];
+    }
 
 
-	// Contract card
+    // Contract card
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(! empty($socid)?'&socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(! empty($socid)?'&socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
 
-	$morehtmlref='';
-	//if (! empty($modCodeContract->code_auto)) {
-	$morehtmlref.=$object->ref;
-	/*} else {
+    $morehtmlref='';
+    //if (! empty($modCodeContract->code_auto)) {
+    $morehtmlref.=$object->ref;
+    /*} else {
 	 $morehtmlref.=$form->editfieldkey("",'ref',$object->ref,0,'string','',0,3);
 	$morehtmlref.=$form->editfieldval("",'ref',$object->ref,0,'string','',0,2);
 	}*/
 
-	$morehtmlref.='<div class="refidno">';
-	// Ref customer
-	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1);
-	// Ref supplier
-	$morehtmlref.='<br>';
-	$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
-	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-		$langs->load("projects");
-		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-		if ($user->rights->contrat->creer)
-		{
-			if ($action != 'classify')
-				//$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-				$morehtmlref.=' : ';
-			if ($action == 'classify') {
-				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-				$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-				$morehtmlref.='<input type="hidden" name="action" value="classin">';
-				$morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-				$morehtmlref.=$formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-				$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-				$morehtmlref.='</form>';
-			} else {
-				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
-			}
-		} else {
-			if (! empty($object->fk_project)) {
-				$proj = new Project($db);
-				$proj->fetch($object->fk_project);
-				$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-				$morehtmlref.=$proj->ref;
-				$morehtmlref.='</a>';
-			} else {
-				$morehtmlref.='';
-			}
-		}
-	}
-	$morehtmlref.='</div>';
-
-
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
-
-
-	print '<div class="fichecenter">';
-	print '<div class="underbanner clearboth"></div>';
+    $morehtmlref.='<div class="refidno">';
+    // Ref customer
+    $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
+    $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1);
+    // Ref supplier
+    $morehtmlref.='<br>';
+    $morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+    $morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+    // Thirdparty
+    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+    // Project
+    if (! empty($conf->projet->enabled))
+    {
+        $langs->load("projects");
+        $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+        if ($user->rights->contrat->creer)
+        {
+            if ($action != 'classify')
+                //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                $morehtmlref.=' : ';
+            if ($action == 'classify') {
+                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+                $morehtmlref.='<input type="hidden" name="action" value="classin">';
+                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                $morehtmlref.=$formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+                $morehtmlref.='</form>';
+            } else {
+                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+            }
+        } else {
+            if (! empty($object->fk_project)) {
+                $proj = new Project($db);
+                $proj->fetch($object->fk_project);
+                $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+                $morehtmlref.=$proj->ref;
+                $morehtmlref.='</a>';
+            } else {
+                $morehtmlref.='';
+            }
+        }
+    }
+    $morehtmlref.='</div>';
+
+
+    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
+
+
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
 
 
     print '<table class="border" width="100%">';
@@ -195,7 +195,7 @@ 
 }
 else
 {
-	print $langs->trans("ErrorUnknown");
+    print $langs->trans("ErrorUnknown");
 }
 
 

Spacing +50 added lines, -50 removed lines

@@ -33,37 +33,37 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+if (!empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array('other', 'products', 'contracts'));
 
-$action		= GETPOST('action','alpha');
-$confirm	= GETPOST('confirm','alpha');
-$id			= GETPOST('id','int');
-$ref		= GETPOST('ref','alpha');
+$action		= GETPOST('action', 'alpha');
+$confirm	= GETPOST('confirm', 'alpha');
+$id			= GETPOST('id', 'int');
+$ref		= GETPOST('ref', 'alpha');
 
 // Security check
 if ($user->societe_id > 0)
 {
 	unset($_GET["action"]);
-	$action='';
+	$action = '';
 	$socid = $user->societe_id;
 }
 $result = restrictedArea($user, 'contrat', $id);
 
 // Get parameters
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "name";
 
 
 $object = new Contrat($db);
@@ -74,17 +74,17 @@ 
 }
 
 $upload_dir = $conf->contrat->dir_output.'/'.dol_sanitizeFileName($object->ref);
-$modulepart='contract';
+$modulepart = 'contract';
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('contractcard','globalcard'));
+$hookmanager->initHooks(array('contractcard', 'globalcard'));
 
 
 /*
  * Actions
  */
 
-include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 
 /*
@@ -93,82 +93,82 @@ 
 
 $form = new Form($db);
 
-llxHeader('',$langs->trans("Contract"),"");
+llxHeader('', $langs->trans("Contract"), "");
 
 
 if ($object->id)
 {
-	$head=contract_prepare_head($object);
+	$head = contract_prepare_head($object);
 
 	dol_fiche_head($head, 'documents', $langs->trans("Contract"), -1, 'contract');
 
 
 	// Build file list
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-	$totalsize=0;
-	foreach($filearray as $key => $file)
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file)
 	{
-		$totalsize+=$file['size'];
+		$totalsize += $file['size'];
 	}
 
 
 	// Contract card
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(! empty($socid)?'&socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-	$morehtmlref='';
+	$morehtmlref = '';
 	//if (! empty($modCodeContract->code_auto)) {
-	$morehtmlref.=$object->ref;
+	$morehtmlref .= $object->ref;
 	/*} else {
 	 $morehtmlref.=$form->editfieldkey("",'ref',$object->ref,0,'string','',0,3);
 	$morehtmlref.=$form->editfieldval("",'ref',$object->ref,0,'string','',0,2);
 	}*/
 
-	$morehtmlref.='<div class="refidno">';
+	$morehtmlref .= '<div class="refidno">';
 	// Ref customer
-	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1);
 	// Ref supplier
-	$morehtmlref.='<br>';
-	$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+	$morehtmlref .= '<br>';
+	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
 	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (!empty($conf->projet->enabled))
 	{
 		$langs->load("projects");
-		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->contrat->creer)
 		{
 			if ($action != 'classify')
 				//$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-				$morehtmlref.=' : ';
+				$morehtmlref .= ' : ';
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-				$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-				$morehtmlref.='<input type="hidden" name="action" value="classin">';
-				$morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-				$morehtmlref.=$formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-				$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-				$morehtmlref.='</form>';
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
-				$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-				$morehtmlref.=$proj->ref;
-				$morehtmlref.='</a>';
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
 			} else {
-				$morehtmlref.='';
+				$morehtmlref .= '';
 			}
 		}
 	}
-	$morehtmlref.='</div>';
+	$morehtmlref .= '</div>';
 
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
@@ -180,7 +180,7 @@ 
 
     print '<table class="border" width="100%">';
     print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
     print '</table>';
 
     print '</div>';
@@ -190,8 +190,8 @@ 
     $modulepart = 'contract';
     $permission = $user->rights->contrat->creer;
     $permtoedit = $user->rights->contrat->creer;
-    $param = '&id=' . $object->id;
-    include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+    $param = '&id='.$object->id;
+    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
 else
 {

Braces +10 added lines, -6 removed lines

@@ -62,8 +62,12 @@ 
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
+if (! $sortfield) {
+    $sortfield="name";
+}
 
 
 $object = new Contrat($db);
@@ -142,9 +146,10 @@ 
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 		if ($user->rights->contrat->creer)
 		{
-			if ($action != 'classify')
-				//$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			if ($action != 'classify') {
+							//$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref.=' : ';
+			}
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 				$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
@@ -192,8 +197,7 @@ 
     $permtoedit = $user->rights->contrat->creer;
     $param = '&id=' . $object->id;
     include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
+} else
 {
 	print $langs->trans("ErrorUnknown");
 }

dolibarr/htdocs/contrat/services_list.php

Indentation +320 added lines, -320 removed lines

@@ -93,20 +93,20 @@ 
 
 if ($search_status != '')
 {
-	$tmp=explode('&', $search_status);
-	$mode=$tmp[0];
-	if (empty($tmp[1])) $filter='';
-	else
-	{
-		if ($tmp[1] == 'filter=notexpired') $filter='notexpired';
-		if ($tmp[1] == 'filter=expired') $filter='expired';
-	}
+    $tmp=explode('&', $search_status);
+    $mode=$tmp[0];
+    if (empty($tmp[1])) $filter='';
+    else
+    {
+        if ($tmp[1] == 'filter=notexpired') $filter='notexpired';
+        if ($tmp[1] == 'filter=expired') $filter='expired';
+    }
 }
 else
 {
-	$search_status = $mode;
-	if ($filter == 'expired') $search_status.='&filter=expired';
-	if ($filter == 'notexpired') $search_status.='&filter=notexpired';
+    $search_status = $mode;
+    if ($filter == 'expired') $search_status.='&filter=expired';
+    if ($filter == 'notexpired') $search_status.='&filter=notexpired';
 }
 
 $staticcontrat=new Contrat($db);
@@ -114,29 +114,29 @@ 
 $companystatic=new Societe($db);
 
 $arrayfields=array(
-	'c.ref'=>array('label'=>$langs->trans("Contract"), 'checked'=>1, 'position'=>80),
-	'p.description'=>array('label'=>$langs->trans("Service"), 'checked'=>1, 'position'=>80),
-	'cd.qty'=>array('label'=>$langs->trans("Qty"), 'checked'=>0, 'position'=>100),
-	'cd.total_ht'=>array('label'=>$langs->trans("TotalHT"), 'checked'=>0, 'position'=>100),
-	'cd.total_tva'=>array('label'=>$langs->trans("TotalVAT"), 'checked'=>0, 'position'=>100),
-	'cd.tva_tx'=>array('label'=>$langs->trans("VAT"), 'checked'=>0, 'position'=>100),
-	'cd.subprice'=>array('label'=>$langs->trans("PriceUHT"), 'checked'=>0, 'position'=>100),
-	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>100),
-	'cd.date_ouverture_prevue'=>array('label'=>$langs->trans("DateStartPlannedShort"), 'checked'=>(($mode == "" || $mode == -1) || $mode == "0")),
-	'cd.date_ouverture'=>array('label'=>$langs->trans("DateStartRealShort"), 'checked'=>(($mode == "" || $mode == -1) || $mode > 0)),
-	'cd.date_fin_validite'=>array('label'=>$langs->trans("DateEndPlannedShort"), 'checked'=>(($mode == "" || $mode == -1) || $mode < 5)),
-	'cd.date_cloture'=>array('label'=>$langs->trans("DateEndRealShort"), 'checked'=>(($mode == "" || $mode == -1) || $mode >= 5)),
-	'status'=>array('label'=>$langs->trans("Status"), 'checked'=>1),
-	//'cd.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-	'cd.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
+    'c.ref'=>array('label'=>$langs->trans("Contract"), 'checked'=>1, 'position'=>80),
+    'p.description'=>array('label'=>$langs->trans("Service"), 'checked'=>1, 'position'=>80),
+    'cd.qty'=>array('label'=>$langs->trans("Qty"), 'checked'=>0, 'position'=>100),
+    'cd.total_ht'=>array('label'=>$langs->trans("TotalHT"), 'checked'=>0, 'position'=>100),
+    'cd.total_tva'=>array('label'=>$langs->trans("TotalVAT"), 'checked'=>0, 'position'=>100),
+    'cd.tva_tx'=>array('label'=>$langs->trans("VAT"), 'checked'=>0, 'position'=>100),
+    'cd.subprice'=>array('label'=>$langs->trans("PriceUHT"), 'checked'=>0, 'position'=>100),
+    's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>100),
+    'cd.date_ouverture_prevue'=>array('label'=>$langs->trans("DateStartPlannedShort"), 'checked'=>(($mode == "" || $mode == -1) || $mode == "0")),
+    'cd.date_ouverture'=>array('label'=>$langs->trans("DateStartRealShort"), 'checked'=>(($mode == "" || $mode == -1) || $mode > 0)),
+    'cd.date_fin_validite'=>array('label'=>$langs->trans("DateEndPlannedShort"), 'checked'=>(($mode == "" || $mode == -1) || $mode < 5)),
+    'cd.date_cloture'=>array('label'=>$langs->trans("DateEndRealShort"), 'checked'=>(($mode == "" || $mode == -1) || $mode >= 5)),
+    'status'=>array('label'=>$langs->trans("Status"), 'checked'=>1),
+    //'cd.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+    'cd.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
 );
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-	foreach($extrafields->attribute_label as $key => $val)
-	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
-	}
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+    }
 }
 
 
@@ -155,37 +155,37 @@ 
 
 if (empty($reshook))
 {
-	// Selection of new fields
-	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All test are required to be compatible with all browsers
-	{
-   		$search_product_category=0;
-		$search_name="";
-		$search_contract="";
-		$search_service="";
-		$search_status=-1;
-		$opouvertureprevuemonth="";
-		$opouvertureprevueday="";
-		$opouvertureprevueyear="";
-		$filter_opouvertureprevue="";
-		$op1month="";
-		$op1day="";
-		$op1year="";
-		$filter_op1="";
-		$op2month="";
-		$op2day="";
-		$op2year="";
-		$filter_op2="";
-		$opcloturemonth="";
-		$opclotureday="";
-		$opclotureyear="";
-		$filter_opcloture="";
-		$mode='';
-		$filter='';
-		$toselect='';
-		$search_array_options=array();
-	}
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All test are required to be compatible with all browsers
+    {
+            $search_product_category=0;
+        $search_name="";
+        $search_contract="";
+        $search_service="";
+        $search_status=-1;
+        $opouvertureprevuemonth="";
+        $opouvertureprevueday="";
+        $opouvertureprevueyear="";
+        $filter_opouvertureprevue="";
+        $op1month="";
+        $op1day="";
+        $op1year="";
+        $filter_op1="";
+        $op2month="";
+        $op2day="";
+        $op2year="";
+        $filter_op2="";
+        $opcloturemonth="";
+        $opclotureday="";
+        $opclotureyear="";
+        $filter_opcloture="";
+        $mode='';
+        $filter='';
+        $toselect='';
+        $search_array_options=array();
+    }
 }
 
 
@@ -255,13 +255,13 @@ 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	{
-		$page = 0;
-		$offset = 0;
-	}
+    $result = $db->query($sql);
+    $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+        $page = 0;
+        $offset = 0;
+    }
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -271,8 +271,8 @@ 
 $resql=$db->query($sql);
 if (! $resql)
 {
-	dol_print_error($db);
-	exit;
+    dol_print_error($db);
+    exit;
 }
 
 $num = $db->num_rows($resql);
@@ -310,8 +310,8 @@ 
 
 // List of mass actions available
 $arrayofmassactions =  array(
-	//'presend'=>$langs->trans("SendByMail"),
-	//'builddoc'=>$langs->trans("PDFMerge"),
+    //'presend'=>$langs->trans("SendByMail"),
+    //'builddoc'=>$langs->trans("PDFMerge"),
 );
 //if ($user->rights->contrat->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
 //if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
@@ -336,8 +336,8 @@ 
 
 if ($sall)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
+    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+    print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
 }
 
 $morefilter = '';
@@ -345,12 +345,12 @@ 
 // If the user can view categories of products
 if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
 {
-	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-	$moreforfilter.='<div class="divsearchfield">';
-	$moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
-	$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-	$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
-	$moreforfilter.='</div>';
+    include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+    $moreforfilter.='<div class="divsearchfield">';
+    $moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
+    $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
+    $moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
+    $moreforfilter.='</div>';
 }
 
 $parameters=array();
@@ -361,9 +361,9 @@ 
 
 if (! empty($moreforfilter))
 {
-	print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	print $moreforfilter;
-	print '</div>';
+    print '<div class="liste_titre liste_titre_bydiv centpercent">';
+    print $moreforfilter;
+    print '</div>';
 }
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
@@ -401,93 +401,93 @@ 
 print '<tr class="liste_titre">';
 if (! empty($arrayfields['c.ref']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input type="hidden" name="filter" value="'.$filter.'">';
-	print '<input type="hidden" name="mode" value="'.$mode.'">';
-	print '<input type="text" class="flat" size="3" name="search_contract" value="'.dol_escape_htmltag($search_contract).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input type="hidden" name="filter" value="'.$filter.'">';
+    print '<input type="hidden" name="mode" value="'.$mode.'">';
+    print '<input type="text" class="flat" size="3" name="search_contract" value="'.dol_escape_htmltag($search_contract).'">';
+    print '</td>';
 }
 // Service label
 if (! empty($arrayfields['p.description']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat maxwidth100" name="search_service" value="'.dol_escape_htmltag($search_service).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input type="text" class="flat maxwidth100" name="search_service" value="'.dol_escape_htmltag($search_service).'">';
+    print '</td>';
 }
 // detail lines
 if (! empty($arrayfields['cd.qty']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '</td>';
 }
 if (! empty($arrayfields['cd.total_ht']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '</td>';
 }
 if (! empty($arrayfields['cd.total_tva']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '</td>';
 }
 if (! empty($arrayfields['cd.tva_tx']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '</td>';
 }
 if (! empty($arrayfields['cd.subprice']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '</td>';
 }
 // Third party
 if (! empty($arrayfields['s.nom']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat maxwidth100" name="search_name" value="'.dol_escape_htmltag($search_name).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input type="text" class="flat maxwidth100" name="search_name" value="'.dol_escape_htmltag($search_name).'">';
+    print '</td>';
 }
 
 
 if (! empty($arrayfields['cd.date_ouverture_prevue']['checked']))
 {
-	print '<td class="liste_titre" align="center">';
-	$arrayofoperators=array('<'=>'<','>'=>'>');
-	print $form->selectarray('filter_opouvertureprevue',$arrayofoperators,$filter_opouvertureprevue,1);
-	print ' ';
-	$filter_dateouvertureprevue=dol_mktime(0,0,0,$opouvertureprevuemonth,$opouvertureprevueday,$opouvertureprevueyear);
-	print $form->selectDate($filter_dateouvertureprevue, 'opouvertureprevue', 0, 0, 1, '', 1, 0);
-	print '</td>';
+    print '<td class="liste_titre" align="center">';
+    $arrayofoperators=array('<'=>'<','>'=>'>');
+    print $form->selectarray('filter_opouvertureprevue',$arrayofoperators,$filter_opouvertureprevue,1);
+    print ' ';
+    $filter_dateouvertureprevue=dol_mktime(0,0,0,$opouvertureprevuemonth,$opouvertureprevueday,$opouvertureprevueyear);
+    print $form->selectDate($filter_dateouvertureprevue, 'opouvertureprevue', 0, 0, 1, '', 1, 0);
+    print '</td>';
 }
 if (! empty($arrayfields['cd.date_ouverture']['checked']))
 {
-	print '<td class="liste_titre" align="center">';
-	$arrayofoperators=array('<'=>'<','>'=>'>');
-	print $form->selectarray('filter_op1',$arrayofoperators,$filter_op1,1);
-	print ' ';
-	$filter_date1=dol_mktime(0,0,0,$op1month,$op1day,$op1year);
-	print $form->selectDate($filter_date1, 'op1', 0, 0, 1, '', 1, 0);
-	print '</td>';
+    print '<td class="liste_titre" align="center">';
+    $arrayofoperators=array('<'=>'<','>'=>'>');
+    print $form->selectarray('filter_op1',$arrayofoperators,$filter_op1,1);
+    print ' ';
+    $filter_date1=dol_mktime(0,0,0,$op1month,$op1day,$op1year);
+    print $form->selectDate($filter_date1, 'op1', 0, 0, 1, '', 1, 0);
+    print '</td>';
 }
 if (! empty($arrayfields['cd.date_fin_validite']['checked']))
 {
-	print '<td class="liste_titre" align="center">';
-	$arrayofoperators=array('<'=>'<','>'=>'>');
-	print $form->selectarray('filter_op2',$arrayofoperators,$filter_op2,1);
-	print ' ';
-	$filter_date2=dol_mktime(0,0,0,$op2month,$op2day,$op2year);
-	print $form->selectDate($filter_date2, 'op2', 0, 0, 1, '', 1, 0);
-	print '</td>';
+    print '<td class="liste_titre" align="center">';
+    $arrayofoperators=array('<'=>'<','>'=>'>');
+    print $form->selectarray('filter_op2',$arrayofoperators,$filter_op2,1);
+    print ' ';
+    $filter_date2=dol_mktime(0,0,0,$op2month,$op2day,$op2year);
+    print $form->selectDate($filter_date2, 'op2', 0, 0, 1, '', 1, 0);
+    print '</td>';
 }
 if (! empty($arrayfields['cd.date_cloture']['checked']))
 {
-	print '<td class="liste_titre" align="center">';
-	$arrayofoperators=array('<'=>'<','>'=>'>');
-	print $form->selectarray('filter_opcloture',$arrayofoperators,$filter_opcloture,1);
-	print ' ';
-	$filter_date_cloture=dol_mktime(0,0,0,$opcloturemonth,$opclotureday,$opclotureyear);
-	print $form->selectDate($filter_date_cloture, 'opcloture', 0, 0, 1, '', 1, 0);
-	print '</td>';
+    print '<td class="liste_titre" align="center">';
+    $arrayofoperators=array('<'=>'<','>'=>'>');
+    print $form->selectarray('filter_opcloture',$arrayofoperators,$filter_opcloture,1);
+    print ' ';
+    $filter_date_cloture=dol_mktime(0,0,0,$opcloturemonth,$opclotureday,$opclotureyear);
+    print $form->selectDate($filter_date_cloture, 'opcloture', 0, 0, 1, '', 1, 0);
+    print '</td>';
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -498,29 +498,29 @@ 
 print $hookmanager->resPrint;
 if (! empty($arrayfields['cd.datec']['checked']))
 {
-	// Date creation
-	print '<td class="liste_titre">';
-	print '</td>';
+    // Date creation
+    print '<td class="liste_titre">';
+    print '</td>';
 }
 if (! empty($arrayfields['cd.tms']['checked']))
 {
-	// Date modification
-	print '<td class="liste_titre">';
-	print '</td>';
+    // Date modification
+    print '<td class="liste_titre">';
+    print '</td>';
 }
 if (! empty($arrayfields['status']['checked']))
 {
-	// Status
-	print '<td class="liste_titre" align="right">';
-	$arrayofstatus=array(
-		'0'=>$langs->trans("ServiceStatusInitial"),
-		'4'=>$langs->trans("ServiceStatusRunning"),
-		'4&filter=notexpired'=>$langs->trans("ServiceStatusNotLate"),
-		'4&filter=expired'=>$langs->trans("ServiceStatusLate"),
-		'5'=>$langs->trans("ServiceStatusClosed")
-	);
-	print $form->selectarray('search_status', $arrayofstatus, (strstr($search_status, ',')?-1:$search_status), 1, 0, '', 0, 0, 0, '', 'maxwidth100onsmartphone');
-	print '</td>';
+    // Status
+    print '<td class="liste_titre" align="right">';
+    $arrayofstatus=array(
+        '0'=>$langs->trans("ServiceStatusInitial"),
+        '4'=>$langs->trans("ServiceStatusRunning"),
+        '4&filter=notexpired'=>$langs->trans("ServiceStatusNotLate"),
+        '4&filter=expired'=>$langs->trans("ServiceStatusLate"),
+        '5'=>$langs->trans("ServiceStatusClosed")
+    );
+    print $form->selectarray('search_status', $arrayofstatus, (strstr($search_status, ',')?-1:$search_status), 1, 0, '', 0, 0, 0, '', 'maxwidth100onsmartphone');
+    print '</td>';
 }
 // Action column
 print '<td class="liste_titre" align="right">';
@@ -536,74 +536,74 @@ 
 $totalarray=array();
 while ($i < min($num,$limit))
 {
-	$obj = $db->fetch_object($resql);
+    $obj = $db->fetch_object($resql);
 
-	$contractstatic->id=$obj->cid;
-	$contractstatic->ref=$obj->ref?$obj->ref:$obj->cid;
+    $contractstatic->id=$obj->cid;
+    $contractstatic->ref=$obj->ref?$obj->ref:$obj->cid;
 
-	$companystatic->id=$obj->socid;
-	$companystatic->name=$obj->name;
-	$companystatic->email=$obj->email;
-	$companystatic->client=$obj->client;
-	$companystatic->fournisseur=$obj->fournisseur;
+    $companystatic->id=$obj->socid;
+    $companystatic->name=$obj->name;
+    $companystatic->email=$obj->email;
+    $companystatic->client=$obj->client;
+    $companystatic->fournisseur=$obj->fournisseur;
 
-	print '<tr class="oddeven">';
+    print '<tr class="oddeven">';
 
-	// Ref
-	if (! empty($arrayfields['c.ref']['checked']))
-	{
-		print '<td>';
-		print $contractstatic->getNomUrl(1,16);
-		print '</td>';
+    // Ref
+    if (! empty($arrayfields['c.ref']['checked']))
+    {
+        print '<td>';
+        print $contractstatic->getNomUrl(1,16);
+        print '</td>';
         if (! $i) $totalarray['nbfield']++;
-	}
-	// Service
-	if (! empty($arrayfields['p.description']['checked']))
-	{
-		print '<td>';
-		if ($obj->pid > 0)
-		{
-			$productstatic->id=$obj->pid;
-			$productstatic->type=$obj->ptype;
-			$productstatic->ref=$obj->pref;
-			$productstatic->entity=$obj->pentity;
-			print $productstatic->getNomUrl(1,'',24);
-			print $obj->label?' - '.dol_trunc($obj->label,16):'';
-			if (! empty($obj->description) && ! empty($conf->global->PRODUCT_DESC_IN_LIST)) print '<br>'.dol_nl2br($obj->description);
-		}
-		else
-		{
-			if ($obj->type == 0) print img_object($obj->description,'product').' '.dol_trunc($obj->description,24);
-			if ($obj->type == 1) print img_object($obj->description,'service').' '.dol_trunc($obj->description,24);
-		}
-		print '</td>';
+    }
+    // Service
+    if (! empty($arrayfields['p.description']['checked']))
+    {
+        print '<td>';
+        if ($obj->pid > 0)
+        {
+            $productstatic->id=$obj->pid;
+            $productstatic->type=$obj->ptype;
+            $productstatic->ref=$obj->pref;
+            $productstatic->entity=$obj->pentity;
+            print $productstatic->getNomUrl(1,'',24);
+            print $obj->label?' - '.dol_trunc($obj->label,16):'';
+            if (! empty($obj->description) && ! empty($conf->global->PRODUCT_DESC_IN_LIST)) print '<br>'.dol_nl2br($obj->description);
+        }
+        else
+        {
+            if ($obj->type == 0) print img_object($obj->description,'product').' '.dol_trunc($obj->description,24);
+            if ($obj->type == 1) print img_object($obj->description,'service').' '.dol_trunc($obj->description,24);
+        }
+        print '</td>';
         if (! $i) $totalarray['nbfield']++;
-	}
+    }
 
-	if (! empty($arrayfields['cd.qty']['checked']))
-	{
-		print '<td>';
-		print $obj->qty;
-		print '</td>';
+    if (! empty($arrayfields['cd.qty']['checked']))
+    {
+        print '<td>';
+        print $obj->qty;
+        print '</td>';
         if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['cd.total_ht']['checked']))
-	{
-		print '<td align="right">';
-		print price($obj->total_ht);
-		print '</td>';
-		$totalarray['totalht'] += $obj->total_ht;
+    }
+    if (! empty($arrayfields['cd.total_ht']['checked']))
+    {
+        print '<td align="right">';
+        print price($obj->total_ht);
+        print '</td>';
+        $totalarray['totalht'] += $obj->total_ht;
         if (! $i) {
             $totalarray['displaytotalline']++;
             $totalarray['nbfield']++;
             $totalarray['totalhtfield']=$totalarray['nbfield'];
         }
     }
-	if (! empty($arrayfields['cd.total_tva']['checked']))
-	{
-		print '<td align="right">';
-		print price($obj->total_tva);
-		print '</td>';
+    if (! empty($arrayfields['cd.total_tva']['checked']))
+    {
+        print '<td align="right">';
+        print price($obj->total_tva);
+        print '</td>';
         $totalarray['totalvat'] += $obj->total_tva;
         if (! $i) {
             $totalarray['nbfield']++;
@@ -611,136 +611,136 @@ 
             $totalarray['displaytotalline']++;
         }
     }
-	if (! empty($arrayfields['cd.tva_tx']['checked']))
-	{
-		print '<td align="right">';
-		print price2num($obj->tva_tx).'%';
-		print '</td>';
+    if (! empty($arrayfields['cd.tva_tx']['checked']))
+    {
+        print '<td align="right">';
+        print price2num($obj->tva_tx).'%';
+        print '</td>';
         if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['cd.subprice']['checked']))
-	{
-		print '<td align="right">';
-		print price($obj->subprice);
-		print '</td>';
+    }
+    if (! empty($arrayfields['cd.subprice']['checked']))
+    {
+        print '<td align="right">';
+        print price($obj->subprice);
+        print '</td>';
         if (! $i) $totalarray['nbfield']++;
-	}
+    }
 
 
-	// Third party
-	if (! empty($arrayfields['s.nom']['checked']))
-	{
-		print '<td>';
-		print $companystatic->getNomUrl(1,'customer',28);
-		print '</td>';
+    // Third party
+    if (! empty($arrayfields['s.nom']['checked']))
+    {
+        print '<td>';
+        print $companystatic->getNomUrl(1,'customer',28);
+        print '</td>';
         if (! $i) $totalarray['nbfield']++;
-	}
-
-	// Start date
-	if (! empty($arrayfields['cd.date_ouverture_prevue']['checked']))
-	{
-		print '<td align="center">';
-		print ($obj->date_ouverture_prevue?dol_print_date($db->jdate($obj->date_ouverture_prevue), 'dayhour'):'&nbsp;');
-		if ($db->jdate($obj->date_ouverture_prevue) && ($db->jdate($obj->date_ouverture_prevue) < ($now - $conf->contrat->services->inactifs->warning_delay)) && $obj->statut == 0)
-		print ' '.img_picto($langs->trans("Late"),"warning");
-		else print '&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '</td>';
+    }
+
+    // Start date
+    if (! empty($arrayfields['cd.date_ouverture_prevue']['checked']))
+    {
+        print '<td align="center">';
+        print ($obj->date_ouverture_prevue?dol_print_date($db->jdate($obj->date_ouverture_prevue), 'dayhour'):'&nbsp;');
+        if ($db->jdate($obj->date_ouverture_prevue) && ($db->jdate($obj->date_ouverture_prevue) < ($now - $conf->contrat->services->inactifs->warning_delay)) && $obj->statut == 0)
+        print ' '.img_picto($langs->trans("Late"),"warning");
+        else print '&nbsp;&nbsp;&nbsp;&nbsp;';
+        print '</td>';
         if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['cd.date_ouverture']['checked']))
-	{
-		print '<td align="center">'.($obj->date_ouverture?dol_print_date($db->jdate($obj->date_ouverture), 'dayhour'):'&nbsp;').'</td>';
+    }
+    if (! empty($arrayfields['cd.date_ouverture']['checked']))
+    {
+        print '<td align="center">'.($obj->date_ouverture?dol_print_date($db->jdate($obj->date_ouverture), 'dayhour'):'&nbsp;').'</td>';
         if (! $i) $totalarray['nbfield']++;
-	}
-	// End date
-	if (! empty($arrayfields['cd.date_fin_validite']['checked']))
-	{
-		print '<td align="center">'.($obj->date_fin_validite?dol_print_date($db->jdate($obj->date_fin_validite), 'dayhour'):'&nbsp;');
-		if ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < ($now - $conf->contrat->services->expires->warning_delay) && $obj->statut < 5)
-		{
-			$warning_delay=$conf->contrat->services->expires->warning_delay / 3600 / 24;
-			$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
-			print img_warning($textlate);
-		}
-		else print '&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '</td>';
+    }
+    // End date
+    if (! empty($arrayfields['cd.date_fin_validite']['checked']))
+    {
+        print '<td align="center">'.($obj->date_fin_validite?dol_print_date($db->jdate($obj->date_fin_validite), 'dayhour'):'&nbsp;');
+        if ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < ($now - $conf->contrat->services->expires->warning_delay) && $obj->statut < 5)
+        {
+            $warning_delay=$conf->contrat->services->expires->warning_delay / 3600 / 24;
+            $textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
+            print img_warning($textlate);
+        }
+        else print '&nbsp;&nbsp;&nbsp;&nbsp;';
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Close date (real end date)
+    if (! empty($arrayfields['cd.date_cloture']['checked']))
+    {
+        print '<td align="center">'.dol_print_date($db->jdate($obj->date_cloture), 'dayhour').'</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+
+    // Extra fields
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+    // Fields from hook
+    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+    $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    // Date creation
+    if (! empty($arrayfields['cd.datec']['checked']))
+    {
+        print '<td align="center">';
+        print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Date modification
+    if (! empty($arrayfields['cd.tms']['checked']))
+    {
+        print '<td align="center">';
+        print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+        print '</td>';
         if (! $i) $totalarray['nbfield']++;
-	}
-	// Close date (real end date)
-	if (! empty($arrayfields['cd.date_cloture']['checked']))
-	{
-		print '<td align="center">'.dol_print_date($db->jdate($obj->date_cloture), 'dayhour').'</td>';
+    }
+    // Status
+    if (! empty($arrayfields['status']['checked']))
+    {
+        print '<td align="right">';
+        if ($obj->cstatut == 0)	// If contract is draft, we say line is also draft
+        {
+            print $contractstatic->LibStatut(0,5,($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now));
+        }
+        else
+        {
+            print $staticcontratligne->LibStatut($obj->statut,5,($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now)?1:0);
+        }
+        print '</td>';
         if (! $i) $totalarray['nbfield']++;
-	}
-
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-	$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Date creation
-	if (! empty($arrayfields['cd.datec']['checked']))
-	{
-		print '<td align="center">';
-		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Date modification
-	if (! empty($arrayfields['cd.tms']['checked']))
-	{
-		print '<td align="center">';
-		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Status
-	if (! empty($arrayfields['status']['checked']))
-	{
-	   print '<td align="right">';
-	   if ($obj->cstatut == 0)	// If contract is draft, we say line is also draft
-	   {
-		   print $contractstatic->LibStatut(0,5,($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now));
-	   }
-	   else
-	   {
-		   print $staticcontratligne->LibStatut($obj->statut,5,($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now)?1:0);
-	   }
-	   print '</td>';
-       if (! $i) $totalarray['nbfield']++;
-	}
-	// Action column
-	print '<td class="nowrap" align="center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-	{
-		$selected=0;
-		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
-	}
-	print '</td>';
-	if (! $i) $totalarray['nbfield']++;
-
-	print "</tr>\n";
-	$i++;
+    }
+    // Action column
+    print '<td class="nowrap" align="center">';
+    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+    {
+        $selected=0;
+        if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+        print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+    }
+    print '</td>';
+    if (! $i) $totalarray['nbfield']++;
+
+    print "</tr>\n";
+    $i++;
 }
 
 // Show total line
 if (isset($totalarray['displaytotalline'])) {
-	print '<tr class="liste_total">';
-	$i=0;
-	while ($i < $totalarray['nbfield']) {
-		$i++;
-		if ($i == 1) {
-			if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
-			else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
-		}
-		elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
-		elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
-		elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
-		else print '<td></td>';
-	}
-	print '</tr>';
+    print '<tr class="liste_total">';
+    $i=0;
+    while ($i < $totalarray['nbfield']) {
+        $i++;
+        if ($i == 1) {
+            if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
+            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+        }
+        elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
+        elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
+        elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
+        else print '<td></td>';
+    }
+    print '</tr>';
 }
 
 $db->free($resql);

Spacing +290 added lines, -290 removed lines

@@ -34,47 +34,47 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'contracts', 'companies'));
 
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield="c.rowid";
-if (! $sortorder) $sortorder="ASC";
+if (!$sortfield) $sortfield = "c.rowid";
+if (!$sortorder) $sortorder = "ASC";
 
 $mode = GETPOST("mode");
-$filter=GETPOST("filter");
-$search_name=GETPOST("search_name");
-$search_contract=GETPOST("search_contract");
-$search_service=GETPOST("search_service");
-$search_status=GETPOST("search_status","alpha");
-$statut=GETPOST('statut')?GETPOST('statut'):1;
-$search_product_category=GETPOST('search_product_category','int');
-$socid=GETPOST('socid','int');
-$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'contractservicelist'.$mode;
-
-$opouvertureprevuemonth=GETPOST('opouvertureprevuemonth');
-$opouvertureprevueday=GETPOST('opouvertureprevueday');
-$opouvertureprevueyear=GETPOST('opouvertureprevueyear');
-$filter_opouvertureprevue=GETPOST('filter_opouvertureprevue');
-
-$op1month=GETPOST('op1month');
-$op1day=GETPOST('op1day');
-$op1year=GETPOST('op1year');
-$filter_op1=GETPOST('filter_op1');
-
-$op2month=GETPOST('op2month');
-$op2day=GETPOST('op2day');
-$op2year=GETPOST('op2year');
-$filter_op2=GETPOST('filter_op2');
-
-$opcloturemonth=GETPOST('opcloturemonth');
-$opclotureday=GETPOST('opclotureday');
-$opclotureyear=GETPOST('opclotureyear');
-$filter_opcloture=GETPOST('filter_opcloture');
+$filter = GETPOST("filter");
+$search_name = GETPOST("search_name");
+$search_contract = GETPOST("search_contract");
+$search_service = GETPOST("search_service");
+$search_status = GETPOST("search_status", "alpha");
+$statut = GETPOST('statut') ?GETPOST('statut') : 1;
+$search_product_category = GETPOST('search_product_category', 'int');
+$socid = GETPOST('socid', 'int');
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'contractservicelist'.$mode;
+
+$opouvertureprevuemonth = GETPOST('opouvertureprevuemonth');
+$opouvertureprevueday = GETPOST('opouvertureprevueday');
+$opouvertureprevueyear = GETPOST('opouvertureprevueyear');
+$filter_opouvertureprevue = GETPOST('filter_opouvertureprevue');
+
+$op1month = GETPOST('op1month');
+$op1day = GETPOST('op1day');
+$op1year = GETPOST('op1year');
+$filter_op1 = GETPOST('filter_op1');
+
+$op2month = GETPOST('op2month');
+$op2day = GETPOST('op2day');
+$op2year = GETPOST('op2year');
+$filter_op2 = GETPOST('filter_op2');
+
+$opcloturemonth = GETPOST('opcloturemonth');
+$opclotureday = GETPOST('opclotureday');
+$opclotureyear = GETPOST('opclotureyear');
+$filter_opcloture = GETPOST('filter_opcloture');
 
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -84,36 +84,36 @@ 
 
 // fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label('contratdet');
-$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Security check
-$contratid = GETPOST('id','int');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
-$result = restrictedArea($user, 'contrat',$contratid);
+$contratid = GETPOST('id', 'int');
+if (!empty($user->societe_id)) $socid = $user->societe_id;
+$result = restrictedArea($user, 'contrat', $contratid);
 
 if ($search_status != '')
 {
-	$tmp=explode('&', $search_status);
-	$mode=$tmp[0];
-	if (empty($tmp[1])) $filter='';
+	$tmp = explode('&', $search_status);
+	$mode = $tmp[0];
+	if (empty($tmp[1])) $filter = '';
 	else
 	{
-		if ($tmp[1] == 'filter=notexpired') $filter='notexpired';
-		if ($tmp[1] == 'filter=expired') $filter='expired';
+		if ($tmp[1] == 'filter=notexpired') $filter = 'notexpired';
+		if ($tmp[1] == 'filter=expired') $filter = 'expired';
 	}
 }
 else
 {
 	$search_status = $mode;
-	if ($filter == 'expired') $search_status.='&filter=expired';
-	if ($filter == 'notexpired') $search_status.='&filter=notexpired';
+	if ($filter == 'expired') $search_status .= '&filter=expired';
+	if ($filter == 'notexpired') $search_status .= '&filter=notexpired';
 }
 
-$staticcontrat=new Contrat($db);
-$staticcontratligne=new ContratLigne($db);
-$companystatic=new Societe($db);
+$staticcontrat = new Contrat($db);
+$staticcontratligne = new ContratLigne($db);
+$companystatic = new Societe($db);
 
-$arrayfields=array(
+$arrayfields = array(
 	'c.ref'=>array('label'=>$langs->trans("Contract"), 'checked'=>1, 'position'=>80),
 	'p.description'=>array('label'=>$langs->trans("Service"), 'checked'=>1, 'position'=>80),
 	'cd.qty'=>array('label'=>$langs->trans("Qty"), 'checked'=>0, 'position'=>100),
@@ -133,9 +133,9 @@ 
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-	foreach($extrafields->attribute_label as $key => $val)
+	foreach ($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+		if (!empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key] = array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key] < 0) ? 0 : 1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key]) != 3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
@@ -146,11 +146,11 @@ 
  * Actions
  */
 
-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction=''; }
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction = ''; }
 
-$parameters=array('socid'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
@@ -158,33 +158,33 @@ 
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All test are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
 	{
-   		$search_product_category=0;
-		$search_name="";
-		$search_contract="";
-		$search_service="";
-		$search_status=-1;
-		$opouvertureprevuemonth="";
-		$opouvertureprevueday="";
-		$opouvertureprevueyear="";
-		$filter_opouvertureprevue="";
-		$op1month="";
-		$op1day="";
-		$op1year="";
-		$filter_op1="";
-		$op2month="";
-		$op2day="";
-		$op2year="";
-		$filter_op2="";
-		$opcloturemonth="";
-		$opclotureday="";
-		$opclotureyear="";
-		$filter_opcloture="";
-		$mode='';
-		$filter='';
-		$toselect='';
-		$search_array_options=array();
+   		$search_product_category = 0;
+		$search_name = "";
+		$search_contract = "";
+		$search_service = "";
+		$search_status = -1;
+		$opouvertureprevuemonth = "";
+		$opouvertureprevueday = "";
+		$opouvertureprevueyear = "";
+		$filter_opouvertureprevue = "";
+		$op1month = "";
+		$op1day = "";
+		$op1year = "";
+		$filter_op1 = "";
+		$op2month = "";
+		$op2day = "";
+		$op2year = "";
+		$filter_op2 = "";
+		$opcloturemonth = "";
+		$opclotureday = "";
+		$opclotureyear = "";
+		$filter_opcloture = "";
+		$mode = '';
+		$filter = '';
+		$toselect = '';
+		$search_array_options = array();
 	}
 }
 
@@ -193,64 +193,64 @@ 
  * View
  */
 
-$now=dol_now();
+$now = dol_now();
 
-$form=new Form($db);
+$form = new Form($db);
 
 $sql = "SELECT c.rowid as cid, c.ref, c.statut as cstatut,";
-$sql.= " s.rowid as socid, s.nom as name, s.email, s.client, s.fournisseur,";
-$sql.= " cd.rowid, cd.description, cd.statut,";
-$sql.= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype, p.entity as pentity,";
+$sql .= " s.rowid as socid, s.nom as name, s.email, s.client, s.fournisseur,";
+$sql .= " cd.rowid, cd.description, cd.statut,";
+$sql .= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype, p.entity as pentity,";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk_user,";
-$sql.= " cd.date_ouverture_prevue,";
-$sql.= " cd.date_ouverture,";
-$sql.= " cd.date_fin_validite,";
-$sql.= " cd.date_cloture,";
-$sql.= " cd.qty,";
-$sql.= " cd.total_ht,";
-$sql.= " cd.total_tva,";
-$sql.= " cd.tva_tx,";
-$sql.= " cd.subprice,";
+$sql .= " cd.date_ouverture_prevue,";
+$sql .= " cd.date_ouverture,";
+$sql .= " cd.date_fin_validite,";
+$sql .= " cd.date_cloture,";
+$sql .= " cd.qty,";
+$sql .= " cd.total_ht,";
+$sql .= " cd.total_tva,";
+$sql .= " cd.tva_tx,";
+$sql .= " cd.subprice,";
 //$sql.= " cd.date_c as date_creation,";
-$sql.= " cd.tms as date_update";
+$sql .= " cd.tms as date_update";
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+foreach ($extrafields->attribute_label as $key => $val) $sql .= ($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c,";
-$sql.= " ".MAIN_DB_PREFIX."societe as s,";
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c,";
+$sql .= " ".MAIN_DB_PREFIX."societe as s,";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
-$sql.= " ".MAIN_DB_PREFIX."contratdet as cd";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet_extrafields as ef on (cd.rowid = ef.fk_object)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-if ($search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=cd.fk_product';
-$sql.= " WHERE c.entity = ".$conf->entity;
-$sql.= " AND c.rowid = cd.fk_contrat";
-if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
-$sql.= " AND c.fk_soc = s.rowid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($mode == "0") $sql.= " AND cd.statut = 0";
-if ($mode == "4") $sql.= " AND cd.statut = 4";
-if ($mode == "5") $sql.= " AND cd.statut = 5";
-if ($filter == "expired") $sql.= " AND cd.date_fin_validite < '".$db->idate($now)."'";
-if ($filter == "notexpired") $sql.= " AND cd.date_fin_validite >= '".$db->idate($now)."'";
-if ($search_name)     $sql.= " AND s.nom LIKE '%".$db->escape($search_name)."%'";
-if ($search_contract) $sql.= " AND c.ref LIKE '%".$db->escape($search_contract)."%' ";
-if ($search_service)  $sql.= " AND (p.ref LIKE '%".$db->escape($search_service)."%' OR p.description LIKE '%".$db->escape($search_service)."%' OR cd.description LIKE '%".$db->escape($search_service)."%')";
-if ($socid > 0)       $sql.= " AND s.rowid = ".$socid;
-$filter_dateouvertureprevue=dol_mktime(0,0,0,$opouvertureprevuemonth,$opouvertureprevueday,$opouvertureprevueyear);
-$filter_date1=dol_mktime(0,0,0,$op1month,$op1day,$op1year);
-$filter_date2=dol_mktime(0,0,0,$op2month,$op2day,$op2year);
-$filter_datecloture=dol_mktime(0,0,0,$opcloturemonth,$opclotureday,$opclotureyear);
-if (! empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1 && $filter_dateouvertureprevue != '') $sql.= " AND cd.date_ouverture_prevue ".$filter_opouvertureprevue." '".$db->idate($filter_dateouvertureprevue)."'";
-if (! empty($filter_op1) && $filter_op1 != -1 && $filter_date1 != '') $sql.= " AND cd.date_ouverture ".$filter_op1." '".$db->idate($filter_date1)."'";
-if (! empty($filter_op2) && $filter_op2 != -1 && $filter_date2 != '') $sql.= " AND cd.date_fin_validite ".$filter_op2." '".$db->idate($filter_date2)."'";
-if (! empty($filter_opcloture) && $filter_opcloture != -1 && $filter_datecloture != '') $sql.= " AND cd.date_cloture ".$filter_opcloture." '".$db->idate($filter_datecloture)."'";
+$sql .= " ".MAIN_DB_PREFIX."contratdet as cd";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet_extrafields as ef on (cd.rowid = ef.fk_object)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
+if ($search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=cd.fk_product';
+$sql .= " WHERE c.entity = ".$conf->entity;
+$sql .= " AND c.rowid = cd.fk_contrat";
+if ($search_product_category > 0) $sql .= " AND cp.fk_categorie = ".$search_product_category;
+$sql .= " AND c.fk_soc = s.rowid";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if ($mode == "0") $sql .= " AND cd.statut = 0";
+if ($mode == "4") $sql .= " AND cd.statut = 4";
+if ($mode == "5") $sql .= " AND cd.statut = 5";
+if ($filter == "expired") $sql .= " AND cd.date_fin_validite < '".$db->idate($now)."'";
+if ($filter == "notexpired") $sql .= " AND cd.date_fin_validite >= '".$db->idate($now)."'";
+if ($search_name)     $sql .= " AND s.nom LIKE '%".$db->escape($search_name)."%'";
+if ($search_contract) $sql .= " AND c.ref LIKE '%".$db->escape($search_contract)."%' ";
+if ($search_service)  $sql .= " AND (p.ref LIKE '%".$db->escape($search_service)."%' OR p.description LIKE '%".$db->escape($search_service)."%' OR cd.description LIKE '%".$db->escape($search_service)."%')";
+if ($socid > 0)       $sql .= " AND s.rowid = ".$socid;
+$filter_dateouvertureprevue = dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
+$filter_date1 = dol_mktime(0, 0, 0, $op1month, $op1day, $op1year);
+$filter_date2 = dol_mktime(0, 0, 0, $op2month, $op2day, $op2year);
+$filter_datecloture = dol_mktime(0, 0, 0, $opcloturemonth, $opclotureday, $opclotureyear);
+if (!empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1 && $filter_dateouvertureprevue != '') $sql .= " AND cd.date_ouverture_prevue ".$filter_opouvertureprevue." '".$db->idate($filter_dateouvertureprevue)."'";
+if (!empty($filter_op1) && $filter_op1 != -1 && $filter_date1 != '') $sql .= " AND cd.date_ouverture ".$filter_op1." '".$db->idate($filter_date1)."'";
+if (!empty($filter_op2) && $filter_op2 != -1 && $filter_date2 != '') $sql .= " AND cd.date_fin_validite ".$filter_op2." '".$db->idate($filter_date2)."'";
+if (!empty($filter_opcloture) && $filter_opcloture != -1 && $filter_datecloture != '') $sql .= " AND cd.date_cloture ".$filter_opcloture." '".$db->idate($filter_datecloture)."'";
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
-$sql .= $db->order($sortfield,$sortorder);
+$sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -268,8 +268,8 @@ 
 
 //print $sql;
 dol_syslog("contrat/services_list.php", LOG_DEBUG);
-$resql=$db->query($sql);
-if (! $resql)
+$resql = $db->query($sql);
+if (!$resql)
 {
 	dol_print_error($db);
 	exit;
@@ -288,36 +288,36 @@ 
 
 llxHeader(null, $langs->trans("Services"));
 
-$param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($search_contract) $param.='&amp;search_contract='.urlencode($search_contract);
-if ($search_name)      $param.='&amp;search_name='.urlencode($search_name);
-if ($search_service)  $param.='&amp;search_service='.urlencode($search_service);
-if ($mode)            $param.='&amp;mode='.urlencode($mode);
-if ($filter)          $param.='&amp;filter='.urlencode($filter);
-if (! empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1) $param.='&amp;filter_opouvertureprevue='.urlencode($filter_opouvertureprevue);
-if (! empty($filter_op1) && $filter_op1 != -1) $param.='&amp;filter_op1='.urlencode($filter_op1);
-if (! empty($filter_op2) && $filter_op2 != -1) $param.='&amp;filter_op2='.urlencode($filter_op2);
-if (! empty($filter_opcloture) && $filter_opcloture != -1) $param.='&amp;filter_opcloture='.urlencode($filter_opcloture);
-if ($filter_dateouvertureprevue != '') $param.='&amp;opouvertureprevueday='.$opouvertureprevueday.'&amp;opouvertureprevuemonth='.$opouvertureprevuemonth.'&amp;opouvertureprevueyear='.$opouvertureprevueyear;
-if ($filter_date1 != '') $param.='&amp;op1day='.$op1day.'&amp;op1month='.$op1month.'&amp;op1year='.$op1year;
-if ($filter_date2 != '') $param.='&amp;op2day='.$op2day.'&amp;op2month='.$op2month.'&amp;op2year='.$op2year;
-if ($filter_datecloture != '') $param.='&amp;opclotureday='.$op2day.'&amp;opcloturemonth='.$op2month.'&amp;opclotureyear='.$op2year;
-if ($optioncss != '') $param.='&optioncss='.$optioncss;
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+if ($search_contract) $param .= '&amp;search_contract='.urlencode($search_contract);
+if ($search_name)      $param .= '&amp;search_name='.urlencode($search_name);
+if ($search_service)  $param .= '&amp;search_service='.urlencode($search_service);
+if ($mode)            $param .= '&amp;mode='.urlencode($mode);
+if ($filter)          $param .= '&amp;filter='.urlencode($filter);
+if (!empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1) $param .= '&amp;filter_opouvertureprevue='.urlencode($filter_opouvertureprevue);
+if (!empty($filter_op1) && $filter_op1 != -1) $param .= '&amp;filter_op1='.urlencode($filter_op1);
+if (!empty($filter_op2) && $filter_op2 != -1) $param .= '&amp;filter_op2='.urlencode($filter_op2);
+if (!empty($filter_opcloture) && $filter_opcloture != -1) $param .= '&amp;filter_opcloture='.urlencode($filter_opcloture);
+if ($filter_dateouvertureprevue != '') $param .= '&amp;opouvertureprevueday='.$opouvertureprevueday.'&amp;opouvertureprevuemonth='.$opouvertureprevuemonth.'&amp;opouvertureprevueyear='.$opouvertureprevueyear;
+if ($filter_date1 != '') $param .= '&amp;op1day='.$op1day.'&amp;op1month='.$op1month.'&amp;op1year='.$op1year;
+if ($filter_date2 != '') $param .= '&amp;op2day='.$op2day.'&amp;op2month='.$op2month.'&amp;op2year='.$op2year;
+if ($filter_datecloture != '') $param .= '&amp;opclotureday='.$op2day.'&amp;opcloturemonth='.$op2month.'&amp;opclotureyear='.$op2year;
+if ($optioncss != '') $param .= '&optioncss='.$optioncss;
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // List of mass actions available
-$arrayofmassactions =  array(
+$arrayofmassactions = array(
 	//'presend'=>$langs->trans("SendByMail"),
 	//'builddoc'=>$langs->trans("PDFMerge"),
 );
 //if ($user->rights->contrat->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
 //if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
-$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-print '<form method="POST" action="'. $_SERVER["PHP_SELF"] .'">';
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
@@ -327,17 +327,17 @@ 
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-$title=$langs->trans("ListOfServices");
-if ($mode == "0") $title=$langs->trans("ListOfInactiveServices");	// Must use == "0"
-if ($mode == "4" && $filter != "expired") $title=$langs->trans("ListOfRunningServices");
-if ($mode == "4" && $filter == "expired") $title=$langs->trans("ListOfExpiredServices");
-if ($mode == "5") $title=$langs->trans("ListOfClosedServices");
+$title = $langs->trans("ListOfServices");
+if ($mode == "0") $title = $langs->trans("ListOfInactiveServices"); // Must use == "0"
+if ($mode == "4" && $filter != "expired") $title = $langs->trans("ListOfRunningServices");
+if ($mode == "4" && $filter == "expired") $title = $langs->trans("ListOfExpiredServices");
+if ($mode == "5") $title = $langs->trans("ListOfClosedServices");
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
 
 if ($sall)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
 
 $morefilter = '';
@@ -346,60 +346,60 @@ 
 if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
 {
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-	$moreforfilter.='<div class="divsearchfield">';
-	$moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
+	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= $langs->trans('IncludingProductWithTag').': ';
 	$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-	$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
-	$moreforfilter.='</div>';
+	$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
+	$moreforfilter .= '</div>';
 }
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 else $moreforfilter = $hookmanager->resPrint;
 
 
-if (! empty($moreforfilter))
+if (!empty($moreforfilter))
 {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	print '</div>';
 }
 
-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
 
 print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 print '<tr class="liste_titre">';
-if (! empty($arrayfields['c.ref']['checked'])) print_liste_field_titre($arrayfields['c.ref']['label'],$_SERVER["PHP_SELF"],"c.ref","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['p.description']['checked'])) print_liste_field_titre($arrayfields['p.description']['label'],$_SERVER["PHP_SELF"],"p.description","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['cd.qty']['checked']))  print_liste_field_titre($arrayfields['cd.qty']['label'],$_SERVER["PHP_SELF"],"cd.qty","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['cd.total_ht']['checked']))  print_liste_field_titre($arrayfields['cd.total_ht']['label'],$_SERVER["PHP_SELF"],"cd.total_ht","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['cd.total_tva']['checked']))  print_liste_field_titre($arrayfields['cd.total_tva']['label'],$_SERVER["PHP_SELF"],"cd.total_tva","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['cd.tva_tx']['checked']))  print_liste_field_titre($arrayfields['cd.tva_tx']['label'],$_SERVER["PHP_SELF"],"cd.tva_tx","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['cd.subprice']['checked']))  print_liste_field_titre($arrayfields['cd.subprice']['label'],$_SERVER["PHP_SELF"],"cd.subprice","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['cd.date_ouverture_prevue']['checked'])) print_liste_field_titre($arrayfields['cd.date_ouverture_prevue']['label'],$_SERVER["PHP_SELF"],"cd.date_ouverture_prevue","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['cd.date_ouverture']['checked'])) print_liste_field_titre($arrayfields['cd.date_ouverture']['label'],$_SERVER["PHP_SELF"],"cd.date_ouverture","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['cd.date_fin_validite']['checked'])) print_liste_field_titre($arrayfields['cd.date_fin_validite']['label'],$_SERVER["PHP_SELF"],"cd.date_fin_validite","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['cd.date_cloture']['checked'])) print_liste_field_titre($arrayfields['cd.date_cloture']['label'],$_SERVER["PHP_SELF"],"cd.date_cloture","",$param,'align="center"',$sortfield,$sortorder);
+if (!empty($arrayfields['c.ref']['checked'])) print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], "c.ref", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['p.description']['checked'])) print_liste_field_titre($arrayfields['p.description']['label'], $_SERVER["PHP_SELF"], "p.description", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['cd.qty']['checked']))  print_liste_field_titre($arrayfields['cd.qty']['label'], $_SERVER["PHP_SELF"], "cd.qty", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['cd.total_ht']['checked']))  print_liste_field_titre($arrayfields['cd.total_ht']['label'], $_SERVER["PHP_SELF"], "cd.total_ht", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['cd.total_tva']['checked']))  print_liste_field_titre($arrayfields['cd.total_tva']['label'], $_SERVER["PHP_SELF"], "cd.total_tva", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['cd.tva_tx']['checked']))  print_liste_field_titre($arrayfields['cd.tva_tx']['label'], $_SERVER["PHP_SELF"], "cd.tva_tx", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['cd.subprice']['checked']))  print_liste_field_titre($arrayfields['cd.subprice']['label'], $_SERVER["PHP_SELF"], "cd.subprice", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['cd.date_ouverture_prevue']['checked'])) print_liste_field_titre($arrayfields['cd.date_ouverture_prevue']['label'], $_SERVER["PHP_SELF"], "cd.date_ouverture_prevue", "", $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['cd.date_ouverture']['checked'])) print_liste_field_titre($arrayfields['cd.date_ouverture']['label'], $_SERVER["PHP_SELF"], "cd.date_ouverture", "", $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['cd.date_fin_validite']['checked'])) print_liste_field_titre($arrayfields['cd.date_fin_validite']['label'], $_SERVER["PHP_SELF"], "cd.date_fin_validite", "", $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['cd.date_cloture']['checked'])) print_liste_field_titre($arrayfields['cd.date_cloture']['label'], $_SERVER["PHP_SELF"], "cd.date_cloture", "", $param, 'align="center"', $sortfield, $sortorder);
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (! empty($arrayfields['cd.datec']['checked']))  print_liste_field_titre($arrayfields['cd.datec']['label'],$_SERVER["PHP_SELF"],"cd.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['cd.tms']['checked']))    print_liste_field_titre($arrayfields['cd.tms']['label'],$_SERVER["PHP_SELF"],"cd.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['status']['checked'])) print_liste_field_titre($arrayfields['status']['label'],$_SERVER["PHP_SELF"],"cd.statut,c.statut","",$param,'align="right"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+if (!empty($arrayfields['cd.datec']['checked']))  print_liste_field_titre($arrayfields['cd.datec']['label'], $_SERVER["PHP_SELF"], "cd.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['cd.tms']['checked']))    print_liste_field_titre($arrayfields['cd.tms']['label'], $_SERVER["PHP_SELF"], "cd.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['status']['checked'])) print_liste_field_titre($arrayfields['status']['label'], $_SERVER["PHP_SELF"], "cd.statut,c.statut", "", $param, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (! empty($arrayfields['c.ref']['checked']))
+if (!empty($arrayfields['c.ref']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input type="hidden" name="filter" value="'.$filter.'">';
@@ -408,40 +408,40 @@ 
 	print '</td>';
 }
 // Service label
-if (! empty($arrayfields['p.description']['checked']))
+if (!empty($arrayfields['p.description']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat maxwidth100" name="search_service" value="'.dol_escape_htmltag($search_service).'">';
 	print '</td>';
 }
 // detail lines
-if (! empty($arrayfields['cd.qty']['checked']))
+if (!empty($arrayfields['cd.qty']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
-if (! empty($arrayfields['cd.total_ht']['checked']))
+if (!empty($arrayfields['cd.total_ht']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
-if (! empty($arrayfields['cd.total_tva']['checked']))
+if (!empty($arrayfields['cd.total_tva']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
-if (! empty($arrayfields['cd.tva_tx']['checked']))
+if (!empty($arrayfields['cd.tva_tx']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
-if (! empty($arrayfields['cd.subprice']['checked']))
+if (!empty($arrayfields['cd.subprice']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Third party
-if (! empty($arrayfields['s.nom']['checked']))
+if (!empty($arrayfields['s.nom']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat maxwidth100" name="search_name" value="'.dol_escape_htmltag($search_name).'">';
@@ -449,43 +449,43 @@ 
 }
 
 
-if (! empty($arrayfields['cd.date_ouverture_prevue']['checked']))
+if (!empty($arrayfields['cd.date_ouverture_prevue']['checked']))
 {
 	print '<td class="liste_titre" align="center">';
-	$arrayofoperators=array('<'=>'<','>'=>'>');
-	print $form->selectarray('filter_opouvertureprevue',$arrayofoperators,$filter_opouvertureprevue,1);
+	$arrayofoperators = array('<'=>'<', '>'=>'>');
+	print $form->selectarray('filter_opouvertureprevue', $arrayofoperators, $filter_opouvertureprevue, 1);
 	print ' ';
-	$filter_dateouvertureprevue=dol_mktime(0,0,0,$opouvertureprevuemonth,$opouvertureprevueday,$opouvertureprevueyear);
+	$filter_dateouvertureprevue = dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
 	print $form->selectDate($filter_dateouvertureprevue, 'opouvertureprevue', 0, 0, 1, '', 1, 0);
 	print '</td>';
 }
-if (! empty($arrayfields['cd.date_ouverture']['checked']))
+if (!empty($arrayfields['cd.date_ouverture']['checked']))
 {
 	print '<td class="liste_titre" align="center">';
-	$arrayofoperators=array('<'=>'<','>'=>'>');
-	print $form->selectarray('filter_op1',$arrayofoperators,$filter_op1,1);
+	$arrayofoperators = array('<'=>'<', '>'=>'>');
+	print $form->selectarray('filter_op1', $arrayofoperators, $filter_op1, 1);
 	print ' ';
-	$filter_date1=dol_mktime(0,0,0,$op1month,$op1day,$op1year);
+	$filter_date1 = dol_mktime(0, 0, 0, $op1month, $op1day, $op1year);
 	print $form->selectDate($filter_date1, 'op1', 0, 0, 1, '', 1, 0);
 	print '</td>';
 }
-if (! empty($arrayfields['cd.date_fin_validite']['checked']))
+if (!empty($arrayfields['cd.date_fin_validite']['checked']))
 {
 	print '<td class="liste_titre" align="center">';
-	$arrayofoperators=array('<'=>'<','>'=>'>');
-	print $form->selectarray('filter_op2',$arrayofoperators,$filter_op2,1);
+	$arrayofoperators = array('<'=>'<', '>'=>'>');
+	print $form->selectarray('filter_op2', $arrayofoperators, $filter_op2, 1);
 	print ' ';
-	$filter_date2=dol_mktime(0,0,0,$op2month,$op2day,$op2year);
+	$filter_date2 = dol_mktime(0, 0, 0, $op2month, $op2day, $op2year);
 	print $form->selectDate($filter_date2, 'op2', 0, 0, 1, '', 1, 0);
 	print '</td>';
 }
-if (! empty($arrayfields['cd.date_cloture']['checked']))
+if (!empty($arrayfields['cd.date_cloture']['checked']))
 {
 	print '<td class="liste_titre" align="center">';
-	$arrayofoperators=array('<'=>'<','>'=>'>');
-	print $form->selectarray('filter_opcloture',$arrayofoperators,$filter_opcloture,1);
+	$arrayofoperators = array('<'=>'<', '>'=>'>');
+	print $form->selectarray('filter_opcloture', $arrayofoperators, $filter_opcloture, 1);
 	print ' ';
-	$filter_date_cloture=dol_mktime(0,0,0,$opcloturemonth,$opclotureday,$opclotureyear);
+	$filter_date_cloture = dol_mktime(0, 0, 0, $opcloturemonth, $opclotureday, $opclotureyear);
 	print $form->selectDate($filter_date_cloture, 'opcloture', 0, 0, 1, '', 1, 0);
 	print '</td>';
 }
@@ -493,233 +493,233 @@ 
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (! empty($arrayfields['cd.datec']['checked']))
+if (!empty($arrayfields['cd.datec']['checked']))
 {
 	// Date creation
 	print '<td class="liste_titre">';
 	print '</td>';
 }
-if (! empty($arrayfields['cd.tms']['checked']))
+if (!empty($arrayfields['cd.tms']['checked']))
 {
 	// Date modification
 	print '<td class="liste_titre">';
 	print '</td>';
 }
-if (! empty($arrayfields['status']['checked']))
+if (!empty($arrayfields['status']['checked']))
 {
 	// Status
 	print '<td class="liste_titre" align="right">';
-	$arrayofstatus=array(
+	$arrayofstatus = array(
 		'0'=>$langs->trans("ServiceStatusInitial"),
 		'4'=>$langs->trans("ServiceStatusRunning"),
 		'4&filter=notexpired'=>$langs->trans("ServiceStatusNotLate"),
 		'4&filter=expired'=>$langs->trans("ServiceStatusLate"),
 		'5'=>$langs->trans("ServiceStatusClosed")
 	);
-	print $form->selectarray('search_status', $arrayofstatus, (strstr($search_status, ',')?-1:$search_status), 1, 0, '', 0, 0, 0, '', 'maxwidth100onsmartphone');
+	print $form->selectarray('search_status', $arrayofstatus, (strstr($search_status, ',') ?-1 : $search_status), 1, 0, '', 0, 0, 0, '', 'maxwidth100onsmartphone');
 	print '</td>';
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpicto=$form->showFilterAndCheckAddButtons(0);
+$searchpicto = $form->showFilterAndCheckAddButtons(0);
 print $searchpicto;
 print '</td>';
 print "</tr>\n";
 
-$contractstatic=new Contrat($db);
-$productstatic=new Product($db);
+$contractstatic = new Contrat($db);
+$productstatic = new Product($db);
 
-$i=0;
-$totalarray=array();
-while ($i < min($num,$limit))
+$i = 0;
+$totalarray = array();
+while ($i < min($num, $limit))
 {
 	$obj = $db->fetch_object($resql);
 
-	$contractstatic->id=$obj->cid;
-	$contractstatic->ref=$obj->ref?$obj->ref:$obj->cid;
+	$contractstatic->id = $obj->cid;
+	$contractstatic->ref = $obj->ref ? $obj->ref : $obj->cid;
 
-	$companystatic->id=$obj->socid;
-	$companystatic->name=$obj->name;
-	$companystatic->email=$obj->email;
-	$companystatic->client=$obj->client;
-	$companystatic->fournisseur=$obj->fournisseur;
+	$companystatic->id = $obj->socid;
+	$companystatic->name = $obj->name;
+	$companystatic->email = $obj->email;
+	$companystatic->client = $obj->client;
+	$companystatic->fournisseur = $obj->fournisseur;
 
 	print '<tr class="oddeven">';
 
 	// Ref
-	if (! empty($arrayfields['c.ref']['checked']))
+	if (!empty($arrayfields['c.ref']['checked']))
 	{
 		print '<td>';
-		print $contractstatic->getNomUrl(1,16);
+		print $contractstatic->getNomUrl(1, 16);
 		print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (!$i) $totalarray['nbfield']++;
 	}
 	// Service
-	if (! empty($arrayfields['p.description']['checked']))
+	if (!empty($arrayfields['p.description']['checked']))
 	{
 		print '<td>';
 		if ($obj->pid > 0)
 		{
-			$productstatic->id=$obj->pid;
-			$productstatic->type=$obj->ptype;
-			$productstatic->ref=$obj->pref;
-			$productstatic->entity=$obj->pentity;
-			print $productstatic->getNomUrl(1,'',24);
-			print $obj->label?' - '.dol_trunc($obj->label,16):'';
-			if (! empty($obj->description) && ! empty($conf->global->PRODUCT_DESC_IN_LIST)) print '<br>'.dol_nl2br($obj->description);
+			$productstatic->id = $obj->pid;
+			$productstatic->type = $obj->ptype;
+			$productstatic->ref = $obj->pref;
+			$productstatic->entity = $obj->pentity;
+			print $productstatic->getNomUrl(1, '', 24);
+			print $obj->label ? ' - '.dol_trunc($obj->label, 16) : '';
+			if (!empty($obj->description) && !empty($conf->global->PRODUCT_DESC_IN_LIST)) print '<br>'.dol_nl2br($obj->description);
 		}
 		else
 		{
-			if ($obj->type == 0) print img_object($obj->description,'product').' '.dol_trunc($obj->description,24);
-			if ($obj->type == 1) print img_object($obj->description,'service').' '.dol_trunc($obj->description,24);
+			if ($obj->type == 0) print img_object($obj->description, 'product').' '.dol_trunc($obj->description, 24);
+			if ($obj->type == 1) print img_object($obj->description, 'service').' '.dol_trunc($obj->description, 24);
 		}
 		print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (!$i) $totalarray['nbfield']++;
 	}
 
-	if (! empty($arrayfields['cd.qty']['checked']))
+	if (!empty($arrayfields['cd.qty']['checked']))
 	{
 		print '<td>';
 		print $obj->qty;
 		print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (!$i) $totalarray['nbfield']++;
 	}
-	if (! empty($arrayfields['cd.total_ht']['checked']))
+	if (!empty($arrayfields['cd.total_ht']['checked']))
 	{
 		print '<td align="right">';
 		print price($obj->total_ht);
 		print '</td>';
 		$totalarray['totalht'] += $obj->total_ht;
-        if (! $i) {
+        if (!$i) {
             $totalarray['displaytotalline']++;
             $totalarray['nbfield']++;
-            $totalarray['totalhtfield']=$totalarray['nbfield'];
+            $totalarray['totalhtfield'] = $totalarray['nbfield'];
         }
     }
-	if (! empty($arrayfields['cd.total_tva']['checked']))
+	if (!empty($arrayfields['cd.total_tva']['checked']))
 	{
 		print '<td align="right">';
 		print price($obj->total_tva);
 		print '</td>';
         $totalarray['totalvat'] += $obj->total_tva;
-        if (! $i) {
+        if (!$i) {
             $totalarray['nbfield']++;
-            $totalarray['totalvatfield']=$totalarray['nbfield'];
+            $totalarray['totalvatfield'] = $totalarray['nbfield'];
             $totalarray['displaytotalline']++;
         }
     }
-	if (! empty($arrayfields['cd.tva_tx']['checked']))
+	if (!empty($arrayfields['cd.tva_tx']['checked']))
 	{
 		print '<td align="right">';
 		print price2num($obj->tva_tx).'%';
 		print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (!$i) $totalarray['nbfield']++;
 	}
-	if (! empty($arrayfields['cd.subprice']['checked']))
+	if (!empty($arrayfields['cd.subprice']['checked']))
 	{
 		print '<td align="right">';
 		print price($obj->subprice);
 		print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (!$i) $totalarray['nbfield']++;
 	}
 
 
 	// Third party
-	if (! empty($arrayfields['s.nom']['checked']))
+	if (!empty($arrayfields['s.nom']['checked']))
 	{
 		print '<td>';
-		print $companystatic->getNomUrl(1,'customer',28);
+		print $companystatic->getNomUrl(1, 'customer', 28);
 		print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Start date
-	if (! empty($arrayfields['cd.date_ouverture_prevue']['checked']))
+	if (!empty($arrayfields['cd.date_ouverture_prevue']['checked']))
 	{
 		print '<td align="center">';
-		print ($obj->date_ouverture_prevue?dol_print_date($db->jdate($obj->date_ouverture_prevue), 'dayhour'):'&nbsp;');
+		print ($obj->date_ouverture_prevue ?dol_print_date($db->jdate($obj->date_ouverture_prevue), 'dayhour') : '&nbsp;');
 		if ($db->jdate($obj->date_ouverture_prevue) && ($db->jdate($obj->date_ouverture_prevue) < ($now - $conf->contrat->services->inactifs->warning_delay)) && $obj->statut == 0)
-		print ' '.img_picto($langs->trans("Late"),"warning");
+		print ' '.img_picto($langs->trans("Late"), "warning");
 		else print '&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (!$i) $totalarray['nbfield']++;
 	}
-	if (! empty($arrayfields['cd.date_ouverture']['checked']))
+	if (!empty($arrayfields['cd.date_ouverture']['checked']))
 	{
-		print '<td align="center">'.($obj->date_ouverture?dol_print_date($db->jdate($obj->date_ouverture), 'dayhour'):'&nbsp;').'</td>';
-        if (! $i) $totalarray['nbfield']++;
+		print '<td align="center">'.($obj->date_ouverture ?dol_print_date($db->jdate($obj->date_ouverture), 'dayhour') : '&nbsp;').'</td>';
+        if (!$i) $totalarray['nbfield']++;
 	}
 	// End date
-	if (! empty($arrayfields['cd.date_fin_validite']['checked']))
+	if (!empty($arrayfields['cd.date_fin_validite']['checked']))
 	{
-		print '<td align="center">'.($obj->date_fin_validite?dol_print_date($db->jdate($obj->date_fin_validite), 'dayhour'):'&nbsp;');
+		print '<td align="center">'.($obj->date_fin_validite ?dol_print_date($db->jdate($obj->date_fin_validite), 'dayhour') : '&nbsp;');
 		if ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < ($now - $conf->contrat->services->expires->warning_delay) && $obj->statut < 5)
 		{
-			$warning_delay=$conf->contrat->services->expires->warning_delay / 3600 / 24;
+			$warning_delay = $conf->contrat->services->expires->warning_delay / 3600 / 24;
 			$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
 			print img_warning($textlate);
 		}
 		else print '&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (!$i) $totalarray['nbfield']++;
 	}
 	// Close date (real end date)
-	if (! empty($arrayfields['cd.date_cloture']['checked']))
+	if (!empty($arrayfields['cd.date_cloture']['checked']))
 	{
 		print '<td align="center">'.dol_print_date($db->jdate($obj->date_cloture), 'dayhour').'</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-	$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (! empty($arrayfields['cd.datec']['checked']))
+	if (!empty($arrayfields['cd.datec']['checked']))
 	{
 		print '<td align="center">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Date modification
-	if (! empty($arrayfields['cd.tms']['checked']))
+	if (!empty($arrayfields['cd.tms']['checked']))
 	{
 		print '<td align="center">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Status
-	if (! empty($arrayfields['status']['checked']))
+	if (!empty($arrayfields['status']['checked']))
 	{
 	   print '<td align="right">';
 	   if ($obj->cstatut == 0)	// If contract is draft, we say line is also draft
 	   {
-		   print $contractstatic->LibStatut(0,5,($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now));
+		   print $contractstatic->LibStatut(0, 5, ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now));
 	   }
 	   else
 	   {
-		   print $staticcontratligne->LibStatut($obj->statut,5,($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now)?1:0);
+		   print $staticcontratligne->LibStatut($obj->statut, 5, ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now) ? 1 : 0);
 	   }
 	   print '</td>';
-       if (! $i) $totalarray['nbfield']++;
+       if (!$i) $totalarray['nbfield']++;
 	}
 	// Action column
 	print '<td class="nowrap" align="center">';
 	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
-		$selected=0;
-		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+		$selected = 0;
+		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
-	if (! $i) $totalarray['nbfield']++;
+	if (!$i) $totalarray['nbfield']++;
 
 	print "</tr>\n";
 	$i++;
@@ -728,7 +728,7 @@ 
 // Show total line
 if (isset($totalarray['displaytotalline'])) {
 	print '<tr class="liste_total">';
-	$i=0;
+	$i = 0;
 	while ($i < $totalarray['nbfield']) {
 		$i++;
 		if ($i == 1) {
@@ -745,8 +745,8 @@ 
 
 $db->free($resql);
 
-$parameters=array('sql' => $sql);
-$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+$parameters = array('sql' => $sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print '</table>';

Braces +296 added lines, -108 removed lines

@@ -42,8 +42,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield="c.rowid";
-if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) {
+    $sortfield="c.rowid";
+}
+if (! $sortorder) {
+    $sortorder="ASC";
+}
 
 $mode = GETPOST("mode");
 $filter=GETPOST("filter");
@@ -88,26 +92,36 @@ 
 
 // Security check
 $contratid = GETPOST('id','int');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (! empty($user->societe_id)) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'contrat',$contratid);
 
 if ($search_status != '')
 {
 	$tmp=explode('&', $search_status);
 	$mode=$tmp[0];
-	if (empty($tmp[1])) $filter='';
-	else
+	if (empty($tmp[1])) {
+	    $filter='';
+	} else
 	{
-		if ($tmp[1] == 'filter=notexpired') $filter='notexpired';
-		if ($tmp[1] == 'filter=expired') $filter='expired';
+		if ($tmp[1] == 'filter=notexpired') {
+		    $filter='notexpired';
+		}
+		if ($tmp[1] == 'filter=expired') {
+		    $filter='expired';
+		}
 	}
-}
-else
+} else
 {
 	$search_status = $mode;
-	if ($filter == 'expired') $search_status.='&filter=expired';
-	if ($filter == 'notexpired') $search_status.='&filter=notexpired';
-}
+	if ($filter == 'expired') {
+	    $search_status.='&filter=expired';
+	}
+	if ($filter == 'notexpired') {
+	    $search_status.='&filter=notexpired';
+	}
+	}
 
 $staticcontrat=new Contrat($db);
 $staticcontratligne=new ContratLigne($db);
@@ -135,7 +149,9 @@ 
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+		if (! empty($extrafields->attribute_list[$key])) {
+		    $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+		}
 	}
 }
 
@@ -151,16 +167,20 @@ 
 
 $parameters=array('socid'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All test are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) {
+	    // All test are required to be compatible with all browsers
 	{
    		$search_product_category=0;
+	}
 		$search_name="";
 		$search_contract="";
 		$search_service="";
@@ -201,7 +221,9 @@ 
 $sql.= " s.rowid as socid, s.nom as name, s.email, s.client, s.fournisseur,";
 $sql.= " cd.rowid, cd.description, cd.statut,";
 $sql.= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype, p.entity as pentity,";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk_user,";
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql .= " sc.fk_soc, sc.fk_user,";
+}
 $sql.= " cd.date_ouverture_prevue,";
 $sql.= " cd.date_ouverture,";
 $sql.= " cd.date_fin_validite,";
@@ -214,40 +236,78 @@ 
 //$sql.= " cd.date_c as date_creation,";
 $sql.= " cd.tms as date_update";
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+foreach ($extrafields->attribute_label as $key => $val) {
+    $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+}
 // Add fields from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."contrat as c,";
 $sql.= " ".MAIN_DB_PREFIX."societe as s,";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
+}
 $sql.= " ".MAIN_DB_PREFIX."contratdet as cd";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet_extrafields as ef on (cd.rowid = ef.fk_object)";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet_extrafields as ef on (cd.rowid = ef.fk_object)";
+}
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-if ($search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=cd.fk_product';
+if ($search_product_category > 0) {
+    $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=cd.fk_product';
+}
 $sql.= " WHERE c.entity = ".$conf->entity;
 $sql.= " AND c.rowid = cd.fk_contrat";
-if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
+if ($search_product_category > 0) {
+    $sql.=" AND cp.fk_categorie = ".$search_product_category;
+}
 $sql.= " AND c.fk_soc = s.rowid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($mode == "0") $sql.= " AND cd.statut = 0";
-if ($mode == "4") $sql.= " AND cd.statut = 4";
-if ($mode == "5") $sql.= " AND cd.statut = 5";
-if ($filter == "expired") $sql.= " AND cd.date_fin_validite < '".$db->idate($now)."'";
-if ($filter == "notexpired") $sql.= " AND cd.date_fin_validite >= '".$db->idate($now)."'";
-if ($search_name)     $sql.= " AND s.nom LIKE '%".$db->escape($search_name)."%'";
-if ($search_contract) $sql.= " AND c.ref LIKE '%".$db->escape($search_contract)."%' ";
-if ($search_service)  $sql.= " AND (p.ref LIKE '%".$db->escape($search_service)."%' OR p.description LIKE '%".$db->escape($search_service)."%' OR cd.description LIKE '%".$db->escape($search_service)."%')";
-if ($socid > 0)       $sql.= " AND s.rowid = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
+if ($mode == "0") {
+    $sql.= " AND cd.statut = 0";
+}
+if ($mode == "4") {
+    $sql.= " AND cd.statut = 4";
+}
+if ($mode == "5") {
+    $sql.= " AND cd.statut = 5";
+}
+if ($filter == "expired") {
+    $sql.= " AND cd.date_fin_validite < '".$db->idate($now)."'";
+}
+if ($filter == "notexpired") {
+    $sql.= " AND cd.date_fin_validite >= '".$db->idate($now)."'";
+}
+if ($search_name) {
+    $sql.= " AND s.nom LIKE '%".$db->escape($search_name)."%'";
+}
+if ($search_contract) {
+    $sql.= " AND c.ref LIKE '%".$db->escape($search_contract)."%' ";
+}
+if ($search_service) {
+    $sql.= " AND (p.ref LIKE '%".$db->escape($search_service)."%' OR p.description LIKE '%".$db->escape($search_service)."%' OR cd.description LIKE '%".$db->escape($search_service)."%')";
+}
+if ($socid > 0) {
+    $sql.= " AND s.rowid = ".$socid;
+}
 $filter_dateouvertureprevue=dol_mktime(0,0,0,$opouvertureprevuemonth,$opouvertureprevueday,$opouvertureprevueyear);
 $filter_date1=dol_mktime(0,0,0,$op1month,$op1day,$op1year);
 $filter_date2=dol_mktime(0,0,0,$op2month,$op2day,$op2year);
 $filter_datecloture=dol_mktime(0,0,0,$opcloturemonth,$opclotureday,$opclotureyear);
-if (! empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1 && $filter_dateouvertureprevue != '') $sql.= " AND cd.date_ouverture_prevue ".$filter_opouvertureprevue." '".$db->idate($filter_dateouvertureprevue)."'";
-if (! empty($filter_op1) && $filter_op1 != -1 && $filter_date1 != '') $sql.= " AND cd.date_ouverture ".$filter_op1." '".$db->idate($filter_date1)."'";
-if (! empty($filter_op2) && $filter_op2 != -1 && $filter_date2 != '') $sql.= " AND cd.date_fin_validite ".$filter_op2." '".$db->idate($filter_date2)."'";
-if (! empty($filter_opcloture) && $filter_opcloture != -1 && $filter_datecloture != '') $sql.= " AND cd.date_cloture ".$filter_opcloture." '".$db->idate($filter_datecloture)."'";
+if (! empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1 && $filter_dateouvertureprevue != '') {
+    $sql.= " AND cd.date_ouverture_prevue ".$filter_opouvertureprevue." '".$db->idate($filter_dateouvertureprevue)."'";
+}
+if (! empty($filter_op1) && $filter_op1 != -1 && $filter_date1 != '') {
+    $sql.= " AND cd.date_ouverture ".$filter_op1." '".$db->idate($filter_date1)."'";
+}
+if (! empty($filter_op2) && $filter_op2 != -1 && $filter_date2 != '') {
+    $sql.= " AND cd.date_fin_validite ".$filter_op2." '".$db->idate($filter_date2)."'";
+}
+if (! empty($filter_opcloture) && $filter_opcloture != -1 && $filter_datecloture != '') {
+    $sql.= " AND cd.date_cloture ".$filter_opcloture." '".$db->idate($filter_datecloture)."'";
+}
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 $sql .= $db->order($sortfield,$sortorder);
@@ -257,9 +317,11 @@ 
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
+	    // if total resultset is smaller then paging size (filtering), goto and load page 0
 	{
 		$page = 0;
+	}
 		$offset = 0;
 	}
 }
@@ -289,22 +351,54 @@ 
 llxHeader(null, $langs->trans("Services"));
 
 $param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($search_contract) $param.='&amp;search_contract='.urlencode($search_contract);
-if ($search_name)      $param.='&amp;search_name='.urlencode($search_name);
-if ($search_service)  $param.='&amp;search_service='.urlencode($search_service);
-if ($mode)            $param.='&amp;mode='.urlencode($mode);
-if ($filter)          $param.='&amp;filter='.urlencode($filter);
-if (! empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1) $param.='&amp;filter_opouvertureprevue='.urlencode($filter_opouvertureprevue);
-if (! empty($filter_op1) && $filter_op1 != -1) $param.='&amp;filter_op1='.urlencode($filter_op1);
-if (! empty($filter_op2) && $filter_op2 != -1) $param.='&amp;filter_op2='.urlencode($filter_op2);
-if (! empty($filter_opcloture) && $filter_opcloture != -1) $param.='&amp;filter_opcloture='.urlencode($filter_opcloture);
-if ($filter_dateouvertureprevue != '') $param.='&amp;opouvertureprevueday='.$opouvertureprevueday.'&amp;opouvertureprevuemonth='.$opouvertureprevuemonth.'&amp;opouvertureprevueyear='.$opouvertureprevueyear;
-if ($filter_date1 != '') $param.='&amp;op1day='.$op1day.'&amp;op1month='.$op1month.'&amp;op1year='.$op1year;
-if ($filter_date2 != '') $param.='&amp;op2day='.$op2day.'&amp;op2month='.$op2month.'&amp;op2year='.$op2year;
-if ($filter_datecloture != '') $param.='&amp;opclotureday='.$op2day.'&amp;opcloturemonth='.$op2month.'&amp;opclotureyear='.$op2year;
-if ($optioncss != '') $param.='&optioncss='.$optioncss;
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+    $param.='&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+    $param.='&limit='.$limit;
+}
+if ($search_contract) {
+    $param.='&amp;search_contract='.urlencode($search_contract);
+}
+if ($search_name) {
+    $param.='&amp;search_name='.urlencode($search_name);
+}
+if ($search_service) {
+    $param.='&amp;search_service='.urlencode($search_service);
+}
+if ($mode) {
+    $param.='&amp;mode='.urlencode($mode);
+}
+if ($filter) {
+    $param.='&amp;filter='.urlencode($filter);
+}
+if (! empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1) {
+    $param.='&amp;filter_opouvertureprevue='.urlencode($filter_opouvertureprevue);
+}
+if (! empty($filter_op1) && $filter_op1 != -1) {
+    $param.='&amp;filter_op1='.urlencode($filter_op1);
+}
+if (! empty($filter_op2) && $filter_op2 != -1) {
+    $param.='&amp;filter_op2='.urlencode($filter_op2);
+}
+if (! empty($filter_opcloture) && $filter_opcloture != -1) {
+    $param.='&amp;filter_opcloture='.urlencode($filter_opcloture);
+}
+if ($filter_dateouvertureprevue != '') {
+    $param.='&amp;opouvertureprevueday='.$opouvertureprevueday.'&amp;opouvertureprevuemonth='.$opouvertureprevuemonth.'&amp;opouvertureprevueyear='.$opouvertureprevueyear;
+}
+if ($filter_date1 != '') {
+    $param.='&amp;op1day='.$op1day.'&amp;op1month='.$op1month.'&amp;op1year='.$op1year;
+}
+if ($filter_date2 != '') {
+    $param.='&amp;op2day='.$op2day.'&amp;op2month='.$op2month.'&amp;op2year='.$op2year;
+}
+if ($filter_datecloture != '') {
+    $param.='&amp;opclotureday='.$op2day.'&amp;opcloturemonth='.$op2month.'&amp;opclotureyear='.$op2year;
+}
+if ($optioncss != '') {
+    $param.='&optioncss='.$optioncss;
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -318,7 +412,9 @@ 
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" action="'. $_SERVER["PHP_SELF"] .'">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+    print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
@@ -328,15 +424,26 @@ 
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $title=$langs->trans("ListOfServices");
-if ($mode == "0") $title=$langs->trans("ListOfInactiveServices");	// Must use == "0"
-if ($mode == "4" && $filter != "expired") $title=$langs->trans("ListOfRunningServices");
-if ($mode == "4" && $filter == "expired") $title=$langs->trans("ListOfExpiredServices");
-if ($mode == "5") $title=$langs->trans("ListOfClosedServices");
+if ($mode == "0") {
+    $title=$langs->trans("ListOfInactiveServices");
+}
+// Must use == "0"
+if ($mode == "4" && $filter != "expired") {
+    $title=$langs->trans("ListOfRunningServices");
+}
+if ($mode == "4" && $filter == "expired") {
+    $title=$langs->trans("ListOfExpiredServices");
+}
+if ($mode == "5") {
+    $title=$langs->trans("ListOfClosedServices");
+}
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
 
 if ($sall)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+	foreach($fieldstosearchall as $key => $val) {
+	    $fieldstosearchall[$key]=$langs->trans($val);
+	}
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
 }
 
@@ -355,8 +462,11 @@ 
 
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-else $moreforfilter = $hookmanager->resPrint;
+if (empty($reshook)) {
+    $moreforfilter .= $hookmanager->resPrint;
+} else {
+    $moreforfilter = $hookmanager->resPrint;
+}
 
 
 if (! empty($moreforfilter))
@@ -374,27 +484,57 @@ 
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
 print '<tr class="liste_titre">';
-if (! empty($arrayfields['c.ref']['checked'])) print_liste_field_titre($arrayfields['c.ref']['label'],$_SERVER["PHP_SELF"],"c.ref","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['p.description']['checked'])) print_liste_field_titre($arrayfields['p.description']['label'],$_SERVER["PHP_SELF"],"p.description","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['cd.qty']['checked']))  print_liste_field_titre($arrayfields['cd.qty']['label'],$_SERVER["PHP_SELF"],"cd.qty","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['cd.total_ht']['checked']))  print_liste_field_titre($arrayfields['cd.total_ht']['label'],$_SERVER["PHP_SELF"],"cd.total_ht","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['cd.total_tva']['checked']))  print_liste_field_titre($arrayfields['cd.total_tva']['label'],$_SERVER["PHP_SELF"],"cd.total_tva","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['cd.tva_tx']['checked']))  print_liste_field_titre($arrayfields['cd.tva_tx']['label'],$_SERVER["PHP_SELF"],"cd.tva_tx","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['cd.subprice']['checked']))  print_liste_field_titre($arrayfields['cd.subprice']['label'],$_SERVER["PHP_SELF"],"cd.subprice","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['cd.date_ouverture_prevue']['checked'])) print_liste_field_titre($arrayfields['cd.date_ouverture_prevue']['label'],$_SERVER["PHP_SELF"],"cd.date_ouverture_prevue","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['cd.date_ouverture']['checked'])) print_liste_field_titre($arrayfields['cd.date_ouverture']['label'],$_SERVER["PHP_SELF"],"cd.date_ouverture","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['cd.date_fin_validite']['checked'])) print_liste_field_titre($arrayfields['cd.date_fin_validite']['label'],$_SERVER["PHP_SELF"],"cd.date_fin_validite","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['cd.date_cloture']['checked'])) print_liste_field_titre($arrayfields['cd.date_cloture']['label'],$_SERVER["PHP_SELF"],"cd.date_cloture","",$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['c.ref']['checked'])) {
+    print_liste_field_titre($arrayfields['c.ref']['label'],$_SERVER["PHP_SELF"],"c.ref","",$param,"",$sortfield,$sortorder);
+}
+if (! empty($arrayfields['p.description']['checked'])) {
+    print_liste_field_titre($arrayfields['p.description']['label'],$_SERVER["PHP_SELF"],"p.description","",$param,"",$sortfield,$sortorder);
+}
+if (! empty($arrayfields['cd.qty']['checked'])) {
+    print_liste_field_titre($arrayfields['cd.qty']['label'],$_SERVER["PHP_SELF"],"cd.qty","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['cd.total_ht']['checked'])) {
+    print_liste_field_titre($arrayfields['cd.total_ht']['label'],$_SERVER["PHP_SELF"],"cd.total_ht","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['cd.total_tva']['checked'])) {
+    print_liste_field_titre($arrayfields['cd.total_tva']['label'],$_SERVER["PHP_SELF"],"cd.total_tva","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['cd.tva_tx']['checked'])) {
+    print_liste_field_titre($arrayfields['cd.tva_tx']['label'],$_SERVER["PHP_SELF"],"cd.tva_tx","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['cd.subprice']['checked'])) {
+    print_liste_field_titre($arrayfields['cd.subprice']['label'],$_SERVER["PHP_SELF"],"cd.subprice","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.nom']['checked'])) {
+    print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
+}
+if (! empty($arrayfields['cd.date_ouverture_prevue']['checked'])) {
+    print_liste_field_titre($arrayfields['cd.date_ouverture_prevue']['label'],$_SERVER["PHP_SELF"],"cd.date_ouverture_prevue","",$param,'align="center"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['cd.date_ouverture']['checked'])) {
+    print_liste_field_titre($arrayfields['cd.date_ouverture']['label'],$_SERVER["PHP_SELF"],"cd.date_ouverture","",$param,'align="center"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['cd.date_fin_validite']['checked'])) {
+    print_liste_field_titre($arrayfields['cd.date_fin_validite']['label'],$_SERVER["PHP_SELF"],"cd.date_fin_validite","",$param,'align="center"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['cd.date_cloture']['checked'])) {
+    print_liste_field_titre($arrayfields['cd.date_cloture']['label'],$_SERVER["PHP_SELF"],"cd.date_cloture","",$param,'align="center"',$sortfield,$sortorder);
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
 $parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (! empty($arrayfields['cd.datec']['checked']))  print_liste_field_titre($arrayfields['cd.datec']['label'],$_SERVER["PHP_SELF"],"cd.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['cd.tms']['checked']))    print_liste_field_titre($arrayfields['cd.tms']['label'],$_SERVER["PHP_SELF"],"cd.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['status']['checked'])) print_liste_field_titre($arrayfields['status']['label'],$_SERVER["PHP_SELF"],"cd.statut,c.statut","",$param,'align="right"',$sortfield,$sortorder);
+if (! empty($arrayfields['cd.datec']['checked'])) {
+    print_liste_field_titre($arrayfields['cd.datec']['label'],$_SERVER["PHP_SELF"],"cd.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['cd.tms']['checked'])) {
+    print_liste_field_titre($arrayfields['cd.tms']['label'],$_SERVER["PHP_SELF"],"cd.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['status']['checked'])) {
+    print_liste_field_titre($arrayfields['status']['label'],$_SERVER["PHP_SELF"],"cd.statut,c.statut","",$param,'align="right"',$sortfield,$sortorder);
+}
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 print "</tr>\n";
 
@@ -555,7 +695,9 @@ 
 		print '<td>';
 		print $contractstatic->getNomUrl(1,16);
 		print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (! $i) {
+            $totalarray['nbfield']++;
+        }
 	}
 	// Service
 	if (! empty($arrayfields['p.description']['checked']))
@@ -569,15 +711,22 @@ 
 			$productstatic->entity=$obj->pentity;
 			print $productstatic->getNomUrl(1,'',24);
 			print $obj->label?' - '.dol_trunc($obj->label,16):'';
-			if (! empty($obj->description) && ! empty($conf->global->PRODUCT_DESC_IN_LIST)) print '<br>'.dol_nl2br($obj->description);
-		}
-		else
+			if (! empty($obj->description) && ! empty($conf->global->PRODUCT_DESC_IN_LIST)) {
+			    print '<br>'.dol_nl2br($obj->description);
+			}
+		} else
 		{
-			if ($obj->type == 0) print img_object($obj->description,'product').' '.dol_trunc($obj->description,24);
-			if ($obj->type == 1) print img_object($obj->description,'service').' '.dol_trunc($obj->description,24);
+			if ($obj->type == 0) {
+			    print img_object($obj->description,'product').' '.dol_trunc($obj->description,24);
+			}
+			if ($obj->type == 1) {
+			    print img_object($obj->description,'service').' '.dol_trunc($obj->description,24);
+			}
 		}
 		print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (! $i) {
+            $totalarray['nbfield']++;
+        }
 	}
 
 	if (! empty($arrayfields['cd.qty']['checked']))
@@ -585,7 +734,9 @@ 
 		print '<td>';
 		print $obj->qty;
 		print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (! $i) {
+            $totalarray['nbfield']++;
+        }
 	}
 	if (! empty($arrayfields['cd.total_ht']['checked']))
 	{
@@ -616,14 +767,18 @@ 
 		print '<td align="right">';
 		print price2num($obj->tva_tx).'%';
 		print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (! $i) {
+            $totalarray['nbfield']++;
+        }
 	}
 	if (! empty($arrayfields['cd.subprice']['checked']))
 	{
 		print '<td align="right">';
 		print price($obj->subprice);
 		print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (! $i) {
+            $totalarray['nbfield']++;
+        }
 	}
 
 
@@ -633,7 +788,9 @@ 
 		print '<td>';
 		print $companystatic->getNomUrl(1,'customer',28);
 		print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (! $i) {
+            $totalarray['nbfield']++;
+        }
 	}
 
 	// Start date
@@ -641,16 +798,22 @@ 
 	{
 		print '<td align="center">';
 		print ($obj->date_ouverture_prevue?dol_print_date($db->jdate($obj->date_ouverture_prevue), 'dayhour'):'&nbsp;');
-		if ($db->jdate($obj->date_ouverture_prevue) && ($db->jdate($obj->date_ouverture_prevue) < ($now - $conf->contrat->services->inactifs->warning_delay)) && $obj->statut == 0)
-		print ' '.img_picto($langs->trans("Late"),"warning");
-		else print '&nbsp;&nbsp;&nbsp;&nbsp;';
+		if ($db->jdate($obj->date_ouverture_prevue) && ($db->jdate($obj->date_ouverture_prevue) < ($now - $conf->contrat->services->inactifs->warning_delay)) && $obj->statut == 0) {
+				print ' '.img_picto($langs->trans("Late"),"warning");
+		} else {
+		    print '&nbsp;&nbsp;&nbsp;&nbsp;';
+		}
 		print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (! $i) {
+            $totalarray['nbfield']++;
+        }
 	}
 	if (! empty($arrayfields['cd.date_ouverture']['checked']))
 	{
 		print '<td align="center">'.($obj->date_ouverture?dol_print_date($db->jdate($obj->date_ouverture), 'dayhour'):'&nbsp;').'</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (! $i) {
+            $totalarray['nbfield']++;
+        }
 	}
 	// End date
 	if (! empty($arrayfields['cd.date_fin_validite']['checked']))
@@ -661,16 +824,21 @@ 
 			$warning_delay=$conf->contrat->services->expires->warning_delay / 3600 / 24;
 			$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
 			print img_warning($textlate);
+		} else {
+		    print '&nbsp;&nbsp;&nbsp;&nbsp;';
 		}
-		else print '&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (! $i) {
+            $totalarray['nbfield']++;
+        }
 	}
 	// Close date (real end date)
 	if (! empty($arrayfields['cd.date_cloture']['checked']))
 	{
 		print '<td align="center">'.dol_print_date($db->jdate($obj->date_cloture), 'dayhour').'</td>';
-        if (! $i) $totalarray['nbfield']++;
+        if (! $i) {
+            $totalarray['nbfield']++;
+        }
 	}
 
 	// Extra fields
@@ -685,7 +853,9 @@ 
 		print '<td align="center">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Date modification
 	if (! empty($arrayfields['cd.tms']['checked']))
@@ -693,33 +863,44 @@ 
 		print '<td align="center">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Status
 	if (! empty($arrayfields['status']['checked']))
 	{
 	   print '<td align="right">';
-	   if ($obj->cstatut == 0)	// If contract is draft, we say line is also draft
+	   if ($obj->cstatut == 0) {
+	       // If contract is draft, we say line is also draft
 	   {
 		   print $contractstatic->LibStatut(0,5,($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now));
 	   }
-	   else
+	   } else
 	   {
 		   print $staticcontratligne->LibStatut($obj->statut,5,($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now)?1:0);
 	   }
 	   print '</td>';
-       if (! $i) $totalarray['nbfield']++;
+       if (! $i) {
+           $totalarray['nbfield']++;
+       }
 	}
 	// Action column
 	print '<td class="nowrap" align="center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+	if ($massactionbutton || $massaction) {
+	    // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
 		$selected=0;
-		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+	}
+		if (in_array($obj->rowid, $arrayofselected)) {
+		    $selected=1;
+		}
 		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
 	}
 	print '</td>';
-	if (! $i) $totalarray['nbfield']++;
+	if (! $i) {
+	    $totalarray['nbfield']++;
+	}
 
 	print "</tr>\n";
 	$i++;
@@ -732,13 +913,20 @@ 
 	while ($i < $totalarray['nbfield']) {
 		$i++;
 		if ($i == 1) {
-			if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
-			else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+			if ($num < $limit && empty($offset)) {
+			    print '<td align="left">'.$langs->trans("Total").'</td>';
+			} else {
+			    print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+			}
+		} elseif ($totalarray['totalhtfield'] == $i) {
+		    print '<td align="right">'.price($totalarray['totalht']).'</td>';
+		} elseif ($totalarray['totalvatfield'] == $i) {
+		    print '<td align="right">'.price($totalarray['totalvat']).'</td>';
+		} elseif ($totalarray['totalttcfield'] == $i) {
+		    print '<td align="right">'.price($totalarray['totalttc']).'</td>';
+		} else {
+		    print '<td></td>';
 		}
-		elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
-		elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
-		elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
-		else print '<td></td>';
 	}
 	print '</tr>';
 }

dolibarr/htdocs/contrat/admin/contractdet_extrafields.php

Braces +6 added lines, -2 removed lines

@@ -40,13 +40,17 @@
 // List of supported format
 $tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+    $type2label[$key]=$langs->transnoentitiesnoconv($val);
+}
 
 $action=GETPOST('action', 'alpha');
 $attrname=GETPOST('attrname', 'alpha');
 $elementtype='contratdet';  //Must be the $element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+    accessforbidden();
+}
 
 
 /*

Indentation +2 added lines, -2 removed lines

@@ -93,8 +93,8 @@
 
 if ($action == 'create')
 {
-	print '<br><div id="newattrib"></div>';
-	print load_fiche_titre($langs->trans('NewAttribute'));
+    print '<br><div id="newattrib"></div>';
+    print load_fiche_titre($langs->trans('NewAttribute'));
 
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }

Spacing +11 added lines, -11 removed lines

@@ -30,7 +30,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
@@ -41,13 +41,13 @@ 
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=ExtraFields::$type2label;
-$type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action=GETPOST('action', 'alpha');
-$attrname=GETPOST('attrname', 'alpha');
-$elementtype='contratdet';  //Must be the $element of the class that manage extrafield
+$action = GETPOST('action', 'alpha');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'contratdet'; //Must be the $element of the class that manage extrafield
 
 if (!$user->admin) accessforbidden();
 
@@ -68,10 +68,10 @@ 
 
 llxHeader();
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ContractsSetup"), $linkback, 'title_setup');
 
-$head=contract_admin_prepare_head();
+$head = contract_admin_prepare_head();
 
 dol_fiche_head($head, 'attributeslines', $langs->trans("Contracts"), -1, 'contract');
 
@@ -108,7 +108,7 @@ 
 /* Edition d'un champ optionnel                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && ! empty($attrname))
+if ($action == 'edit' && !empty($attrname))
 {
     print "<br>";
     print load_fiche_titre($langs->trans("FieldEdition", $attrname));

dolibarr/htdocs/contrat/admin/contract_extrafields.php

Indentation +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
 
 if ($action == 'create')
 {
-	print '<br><div name="topofform" id="newattrib"></div>';
+    print '<br><div name="topofform" id="newattrib"></div>';
     print load_fiche_titre($langs->trans('NewAttribute'));
 
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
@@ -107,7 +107,7 @@ 
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
 {
-	print '<div name="topofform"></div><br>';
+    print '<div name="topofform"></div><br>';
     print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';

Braces +6 added lines, -2 removed lines

@@ -40,13 +40,17 @@
 // List of supported format
 $tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+    $type2label[$key]=$langs->transnoentitiesnoconv($val);
+}
 
 $action=GETPOST('action', 'alpha');
 $attrname=GETPOST('attrname', 'alpha');
 $elementtype='contrat';  //Must be the $element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+    accessforbidden();
+}
 
 
 /*

Spacing +12 added lines, -12 removed lines

@@ -30,24 +30,24 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("companies","admin","contracts"));
+$langs->loadLangs(array("companies", "admin", "contracts"));
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=ExtraFields::$type2label;
-$type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action=GETPOST('action', 'alpha');
-$attrname=GETPOST('attrname', 'alpha');
-$elementtype='contrat';  //Must be the $element of the class that manage extrafield
+$action = GETPOST('action', 'alpha');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'contrat'; //Must be the $element of the class that manage extrafield
 
 if (!$user->admin) accessforbidden();
 
@@ -68,10 +68,10 @@ 
 
 llxHeader();
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ContractsSetup"), $linkback, 'title_setup');
 
-$head=contract_admin_prepare_head();
+$head = contract_admin_prepare_head();
 
 dol_fiche_head($head, 'attributes', $langs->trans("Contracts"), -1, 'contract');
 
@@ -108,7 +108,7 @@ 
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && ! empty($attrname))
+if ($action == 'edit' && !empty($attrname))
 {
 	print '<div name="topofform"></div><br>';
     print load_fiche_titre($langs->trans("FieldEdition", $attrname));