From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 18 Feb 2011 15:14:41 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=f1386daa33974201e6c4c5357a5b25352bee2823;p=cubeextranet.git

---

diff --git a/importWs.php b/importWs.php
index 8ef292a01..94b74f395 100644
--- a/importWs.php
+++ b/importWs.php
@@ -422,7 +422,7 @@ function oldIconesToColor($iid, &$parametres)
 	if ($line['iid'] != '') {
 		$parametres->iconSet = $line['iid'];
 		$parametres->iconsHMargin = $line['iid'] == 1?20:0;
-		$parametres->iconsTMargin = $line['iid'] == 1?7:0;
+		$parametres->menuHeight=39;
 		$parametres->colorizeIcons = false;
 		$parametres->couleurI = 'ffffff';
 		return $line['iid'];
@@ -430,7 +430,7 @@ function oldIconesToColor($iid, &$parametres)
 	$parametres->iconSet = 1;
 	$parametres->colorizeIcons = 1;
 	$parametres->iconsHMargin = 20;
-	$parametres->iconsTMargin = 7;
+	$parametres->menuHeight=39;
 	$parametres->couleurI = $line['color'];
 
 	return 1;
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index c17fb7b5a..a69cfca94 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -61,6 +61,9 @@ class wsDAOBook extends commonDAO {
 	protected function getNextId()
 	{
 		$r = $this->con->select('SELECT MAX(book_id) AS book_id FROM books');
+		if($r<10000){
+			return 10000;
+		}
 		return $r->book_id + 1;
 	}