From 53ac76856c3f89a41a3dbae41d43e03d31e369f7 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 1 Aug 2007 08:51:00 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20les=20boites=20n'=E9taient=20pas=20sauve?=
 =?UTF-8?q?gard=E9es=20dans=20le=20bon=20ordre?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/boxes.php |  2 +-
 htdocs/index.php | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/htdocs/boxes.php b/htdocs/boxes.php
index 86b3c58efab..7ad14777df0 100644
--- a/htdocs/boxes.php
+++ b/htdocs/boxes.php
@@ -185,7 +185,7 @@ class InfoBox
 		    $sql.= " values (";
 		    $sql.= " ".$boxid[$ii].",";
 		    $sql.= " ".$zone.",";
-		    $sql.= " ".$boxorder[$ii].",";
+		    $sql.= " ".($boxorder[$ii]+1).",";
 		    $sql.= " ".$userid;
 		    $sql.= ")";
 		    $result = $this->db->query($sql);
diff --git a/htdocs/index.php b/htdocs/index.php
index 811a501dedc..f9b262d13c6 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -547,24 +547,19 @@ if (sizeof($boxarray))
 	print '<table width="100%" class="notopnoleftnoright">';
 	print '<td>'."\n";
 	
-	$box_id = Array();
-	
-	// Création de la liste des id
-	for ($ii=0, $ni=sizeof($boxarray); $ii < $ni; $ii++)
-	{
-		$box_id[$ii] = $boxarray[$ii]->box_id;
-	}
-	$boxid = join(',',$box_id);
+	$boxid_left = Array();
+	$boxid_right = Array();
 	
 	// Affichage colonne gauche (boites paires)
 	print '<div id="left"  style="width: 50%; padding: 0px; margin: 0px; float: left;">'."\n";
 	for ($ii=0, $ni=sizeof($boxarray); $ii < $ni; $ii++)
 	{
-		if ($ii%2 != 1)
+		if ($ii%2 != 1) // pair
 		{
 			print '<div id="boxto_'.$ii.'">';
 			//print 'box_id '.$boxarray[$ii]->box_id.' ';
 		  //print 'box_order '.$boxarray[$ii]->box_order.'<br>';
+		  $boxid_left[$ii] = $boxarray[$ii]->box_id;
 			// Affichage boite ii
 			$box=$boxarray[$ii];
 			$box->loadBox();
@@ -581,11 +576,12 @@ if (sizeof($boxarray))
   print '<div id="right" style="width: 50%; padding: 0px; margin: 0px; float: left;">'."\n";
 	for ($ii=0, $ni=sizeof($boxarray); $ii < $ni; $ii++)
 	{
-		if ($ii%2 == 1)
+		if ($ii%2 == 1) //impair
 		{
 			print '<div id="boxto_'.$ii.'">';
 			//print 'box_id '.$boxarray[$ii]->box_id.' ';
 		  //print 'box_order '.$boxarray[$ii]->box_order.'<br>';
+		  $boxid_right[$ii] = $boxarray[$ii]->box_id;
 			// Affichage boite ii
 			$box=$boxarray[$ii];
 			$box->loadBox();
@@ -604,6 +600,8 @@ if (sizeof($boxarray))
 
 if ($conf->use_ajax && $conf->browser->firefox)
 {
+	$boxid = join(',',$boxid_left).','.join(',',$boxid_right);
+	
 	print '<script type="text/javascript" language="javascript">
 	function updateOrder(){
     var left_list = cleanSerialize(Sortable.serialize(\'left\'));