diff --git a/ChangeLog b/ChangeLog
index 8c04eaf7a42..fd18deeac14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,9 @@ WARNING:
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
 * Hook 'maildao' was renamed into 'mail' into the method sendfile that send emails, and method was renamed from
   'doaction' into 'sendMail'. 
-  
+* Rename trigger CONTRACT_SERVICE_ACTIVATE into LINECONTRACT_ACTIVATE and
+  CONTRACT_SERVICE_CLOSE into LINECONTRACT_CLOSE
+
 
 ***** ChangeLog for 7.0.0 compared to 6.0.5 *****
 For users:
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index c2b6e03ee5b..6111be6c7ee 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -810,18 +810,30 @@ if (empty($reshook))
 	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)
 	{
-		$object->closeAll($user);
+		$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)
 	{
-		$object->activateAll($user);
+		$result = $object->activateAll($user);
+		if ($result < 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 623b968ca92..0e4b7a1c8f9 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -272,7 +272,8 @@ class Contrat extends CommonObject
 		// Load lines
 		$this->fetch_lines();
 
-		$ok=true;
+		$error=0;
+
 		foreach($this->lines as $contratline)
 		{
 			// Open lines not already open
@@ -281,26 +282,27 @@ class Contrat extends CommonObject
 				$result = $contratline->active_line($user, $date_start, -1);
 				if ($result < 0)
 				{
-					$ok=false;
+					$error++;
+					$this->errors = $contratline->error;
+					$this->errors = $contratline->errors;
 					break;
 				}
 			}
 		}
 
-		if ($this->statut == 0)
+		if (! $error && $this->statut == 0)
 		{
 			$result=$this->validate($user);
-			if ($result < 0) $ok=false;
+			if ($result < 0) $error++;
 		}
 
-		if ($ok)
+		if (! $error)
 		{
 			$this->db->commit();
 			return 1;
 		}
 		else
 		{
-			dol_print_error($this->db,'Error in activateAll function');
 			$this->db->rollback();
 			return -1;
 		}
@@ -310,7 +312,7 @@ class Contrat extends CommonObject
 	 * 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	int			$notrigger		1=Does not execute triggers, 0=Execute triggers
 	 * @return	int							<0 if KO, >0 if OK
 	 */
 	function closeAll(User $user, $notrigger=0)
@@ -322,7 +324,8 @@ class Contrat extends CommonObject
 
 		$now = dol_now();
 
-		$ok=true;
+		$error = 0;
+
 		foreach($this->lines as $contratline)
 		{
 			// Close lines not already closed
@@ -331,29 +334,30 @@ class Contrat extends CommonObject
 				$contratline->date_cloture=$now;
 				$contratline->fk_user_cloture=$user->id;
 				$contratline->statut='5';
-				$result=$contratline->update($user);
+				$result=$contratline->close_line($user, $now);
 				if ($result < 0)
 				{
-					$ok=false;
+					$error++;
+					$this->errors = $contratline->error;
+					$this->errors = $contratline->errors;
 					break;
 				}
 	        }
 		}
 
-		if ($this->statut == 0)
+		if (! $error && $this->statut == 0)
 		{
 			$result=$this->validate($user, '', $notrigger);
-			if ($result < 0) $ok=false;
+			if ($result < 0) $error++;
 		}
 
-        if ($ok)
+        if (! $error)
         {
             $this->db->commit();
             return 1;
         }
         else
         {
-            dol_print_error($this->db,'Error in closeAll function');
             $this->db->rollback();
             return -1;
         }
@@ -3122,7 +3126,7 @@ class ContratLigne extends CommonObjectLine
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			// Call trigger
-			$result = $this->call_trigger('CONTRACT_SERVICE_ACTIVATE', $user);
+			$result = $this->call_trigger('LINECONTRACT_ACTIVATE', $user);
 			if ($result < 0) {
 				$error++;
 				$this->db->rollback();
@@ -3142,10 +3146,10 @@ class ContratLigne extends CommonObjectLine
 	/**
 	 *  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
-	 * @return int                    <0 if KO, >0 if OK
+	 * @param    User 	$user 			Objet User who close contract
+	 * @param  	 int 	$date_end 		Date end
+	 * @param    string $comment 		A comment typed by user
+	 * @return int                    	<0 if KO, >0 if OK
 	 */
 	function close_line($user, $date_end, $comment = '')
 	{
@@ -3171,7 +3175,7 @@ class ContratLigne extends CommonObjectLine
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			// Call trigger
-			$result = $this->call_trigger('CONTRACT_SERVICE_CLOSE', $user);
+			$result = $this->call_trigger('LINECONTRACT_CLOSE', $user);
 			if ($result < 0) {
 				$error++;
 				$this->db->rollback();