From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 2 Nov 2011 10:27:21 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b559b96bb8a95e039d7ddb05c0d9bd797fa788c5;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 9b5e57e9a..1fd6e251c 100644
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -17,7 +17,7 @@ class wsMaintenance {
 
 		$r = $core->con->select('SELECT * FROM books ORDER by book_id');
 		while ($r->fetch()) {
-			$dao->saveCompositionVersion($r->book_id,$r->composition_update);
+			$dao->saveCompositionVersion($r->book_id, $r->composition_update);
 		}
 	}
 
@@ -557,6 +557,21 @@ class wsMaintenance {
 		}
 	}
 
+	public static function mergeEntreprise($args) {
+		global $core;
+
+		$from = $args[0];
+		$to = $args[1];
+
+		$c = $core->con->openCursor('utilisateurs');
+		$c->entreprise = $to;
+		$c->update('WHERE entreprise=' . $from);
+
+		$core->con->execute('DELETE FROM entreprises WHERE entreprise_id=' . $from);
+
+		$core->refreshWSUsersTree();
+	}
+
 }
 
 ?>
\ No newline at end of file