(no commit message)

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