Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

2021-06-17 22:02:29 +02:00 · 2021-06-17 22:02:29 +02:00 · 10dadb2247
commit 10dadb2247
parent 62cbea6bca 51eaecdc6b
1 changed files with 3 additions and 2 deletions
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@ -477,8 +477,9 @@ class Mailing extends CommonObject
 	/**
 	 *  Delete emailing
 	 *
-	 *  @param	int		$rowid      id du mailing a supprimer
-	 *  @return int         		1 en cas de succes
+	 *  @param	int		$rowid      Id if emailing to delete
+	 *  @param	int		$notrigger	Disable triggers
+	 *  @return int         		>0 if OK, <0 if KO
 	 */
 	public function delete($rowid, $notrigger = 0)
 	{