From dd17f8e1cafa0230a2f770cd8651d76c7e3514f2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 6 Mar 2005 00:29:48 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20La=20suppression=20d'un=20groupe=20ne=20?=
 =?UTF-8?q?fonctionnait=20pas=20si=20le=20groupe=20avait=20des=20permissio?=
 =?UTF-8?q?ns=20ou=20user=20affect=E9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/usergroup.class.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/usergroup.class.php b/htdocs/usergroup.class.php
index 6bade39093d..adc87ec9b4e 100644
--- a/htdocs/usergroup.class.php
+++ b/htdocs/usergroup.class.php
@@ -298,15 +298,27 @@ class UserGroup
 	 
   function delete()
   {
+    $this->db->begin();
+    
+    $sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights";
+    $sql .= " WHERE fk_usergroup = ".$this->id;
+    $this->db->query($sql);
+
+    $sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user";
+    $sql .= " WHERE fk_usergroup = ".$this->id;
+    $this->db->query($sql);
+
     $sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup";
     $sql .= " WHERE rowid = ".$this->id;
     $result=$this->db->query($sql);
     if ($result) 
     {
+        $this->db->commit();
 	    return 1;
     }
     else
     {
+        $this->db->rollback();
         dolibarr_print_error($this->db);
 	    return -1;
     }