From fcd95ce0732dd5fc62a2a45cb605f01ac5068142 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Thu, 18 Jul 2019 18:04:05 +0200
Subject: [PATCH 1/3] Fix missing trigger call

---
 .../prelevement/class/bonprelevement.class.php     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 89aa09523e7..1574fc3eb60 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1136,12 +1136,22 @@ class BonPrelevement extends CommonObject
 	 *	Get object and lines from database
 	 *
 	 *  @param	User	$user		Object user that delete
+	 *  @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return	int					>0 if OK, <0 if KO
 	 */
-	function delete($user=null)
+	function delete($user=null, $notrigger = 0)
 	{
 		$this->db->begin();
 
+        $error = 0;
+        if (! $notrigger)
+        {
+            // Call trigger
+            $result=$this->call_trigger('BON_PRELEVEMENT_DELETE', $user);
+            if ($result < 0) $error++;
+            // End call triggers
+        }
+
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_facture WHERE fk_prelevement_lignes IN (SELECT rowid FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id.")";
 		$resql1=$this->db->query($sql);
 		if (! $resql1) dol_print_error($this->db);
@@ -1158,7 +1168,7 @@ class BonPrelevement extends CommonObject
 		$resql4=$this->db->query($sql);
 		if (! $resql4) dol_print_error($this->db);
 
-		if ($resql1 && $resql2 && $resql3)
+		if ($resql1 && $resql2 && $resql3 && !$error)
 		{
 			$this->db->commit();
 			return 1;

From e5801c0b6872059d9e08516f70f9d569fd90d92f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Jul 2019 04:06:22 +0200
Subject: [PATCH 2/3] Update bonprelevement.class.php

---
 .../class/bonprelevement.class.php            | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 1574fc3eb60..7a5a190c465 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1133,24 +1133,24 @@ class BonPrelevement extends CommonObject
 
 
 	/**
-	 *	Get object and lines from database
+	 *  Get object and lines from database
 	 *
 	 *  @param	User	$user		Object user that delete
-	 *  @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *	@return	int					>0 if OK, <0 if KO
+	 *  @param	int	$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *  @return	int			>0 if OK, <0 if KO
 	 */
-	function delete($user=null, $notrigger = 0)
+	function delete($user = null, $notrigger = 0)
 	{
 		$this->db->begin();
 
-        $error = 0;
-        if (! $notrigger)
-        {
-            // Call trigger
-            $result=$this->call_trigger('BON_PRELEVEMENT_DELETE', $user);
-            if ($result < 0) $error++;
-            // End call triggers
-        }
+		$error = 0;
+		if (! $notrigger)
+		{
+		    // Call trigger
+		    $result=$this->call_trigger('BON_PRELEVEMENT_DELETE', $user);
+		    if ($result < 0) $error++;
+		    // End call triggers
+		}
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_facture WHERE fk_prelevement_lignes IN (SELECT rowid FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id.")";
 		$resql1=$this->db->query($sql);

From 1f308915ee8d9e5638f86d7017b82b7c78376ebb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Jul 2019 13:23:17 +0200
Subject: [PATCH 3/3] Fix trans

---
 htdocs/langs/en_US/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index a05eb631e13..a1d042a07a1 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1698,7 +1698,7 @@ ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
 ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
+ListOfNotificationsPerUserOrContact=List of possible notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses